Merge pull request #36 from petrvecera/playerScore

Load the VM store after correct filter is applied
petrvecera · Aug 21, 2017 · 93f4804 · 93f4804
2 parents dc4ae1d + 07c9ae6
commit 93f4804
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/App/app/view/charts/PlayerVsPlayerViewController.js b/App/app/view/charts/PlayerVsPlayerViewController.js
@@ -122,13 +122,8 @@ Ext.define('Enif.view.charts.PlayerVsPlayerViewController', {
         const playerData = Ext.getStore('SortedPlayerData').getData();
         if (!playerData) return;
 
-        const gameStore = Ext.getStore('GameRawData');
-        gameStore.clearFilter();
-
-
         let thisStoreData = [];
 
-
         const VM = this.getViewModel(),
         playerId = VM.get('firstPlayerId'),
         playerId2 = VM.get('secondPlayerId'),
@@ -138,6 +133,8 @@ Ext.define('Enif.view.charts.PlayerVsPlayerViewController', {
         //init filtering of the grid store
         this.filterMatchesStore();
 
+        const gameStore = VM.getStore('playedGames');
+
         let score = 0,
         wins = 0,
         loses = 0,

diff --git a/App/metadata/view/charts.PlayerVsPlayerViewModel b/App/metadata/view/charts.PlayerVsPlayerViewModel
@@ -89,13 +89,8 @@
                             "const playerData = Ext.getStore('SortedPlayerData').getData();",
                             "if (!playerData) return;",
                             "",
-                            "const gameStore = Ext.getStore('GameRawData');",
-                            "gameStore.clearFilter();",
-                            "",
-                            "",
                             "let thisStoreData = [];",
                             "",
-                            "",
                             "const VM = this.getViewModel(),",
                             "      playerId = VM.get('firstPlayerId'),",
                             "      playerId2 = VM.get('secondPlayerId'),",
@@ -105,6 +100,8 @@
                             "//init filtering of the grid store",
                             "this.filterMatchesStore();",
                             "",
+                            "const gameStore = VM.getStore('playedGames');",
+                            "",
                             "let score = 0,",
                             "    wins = 0,",
                             "    loses = 0,",