Merge pull request #126 from ezraroi/54-change-games-filter-dropdown-…

…to-toggle-like-in-the-dashboard-view added
ezraroi · Sep 18, 2024 · 125c1ad · 125c1ad
2 parents 4079dcd + aae9117
commit 125c1ad
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 15 deletions.
diff --git a/Mundialito/Client/src/Games/Games.html b/Mundialito/Client/src/Games/Games.html
@@ -4,10 +4,10 @@
             <div class="panel-heading">
                 <div class="row">
                     <div class="col-md-3 col-xs-12">
-                        <select ui-select2="{allowClear: false}" class="form-control" ng-model="gamesFilter">
-                            <option value="All" selected="selected">All Games</option>
-                            <option value="OnlyOpen">Only Open</option>
-                        </select>
+                        <toggle ng-model="gamesToggle" size="btn-sm" off-class="btn-success"
+                                        on-class="btn-info" ng-change="changed()"
+                                        on="<i class='fa-solid fa-list'></i> All"
+                                        off="<i class='fa-regular fa-folder-open'></i> Open"></toggle>
                     </div>
                 </div>
             </div>

diff --git a/Mundialito/Client/src/Games/GamesCtrl.js b/Mundialito/Client/src/Games/GamesCtrl.js
@@ -1,10 +1,17 @@
 'use strict';
 angular.module('mundialitoApp').controller('GamesCtrl', ['$scope','$log','GamesManager','games','teams', 'StadiumsManager' ,'Alert',function ($scope,$log, GamesManager, games, teams, StadiumsManager, Alert) {
     $scope.newGame = null;
-    $scope.gamesFilter = "All";
+    $scope.gamesFilter = "Open";
+    $scope.gamesToggle = false;
     $scope.games = games;
     $scope.teams = teams;
-
+    $scope.changed = () => {
+        if ($scope.gamesFilter === "Open") {
+            $scope.gamesFilter = "All"
+        } else {
+            $scope.gamesFilter = "Open"
+        }
+    }
 
     StadiumsManager.loadAllStadiums().then(function (res) {
         $scope.stadiums = res;

diff --git a/Mundialito/Views/Home/Index.cshtml b/Mundialito/Views/Home/Index.cshtml
@@ -145,11 +145,11 @@
         @if (env.IsProduction())
         {
             <script src="lib/lib-min-2d5e40df8764ea1d842fca768d139b58.js"></script>
-            <script src="js/app-min-ba6257de0a6b1191450457166bb9f1de.js"></script>
+            <script src="js/app-min-eb8d027ceaca1adaf5298c9ee868b9c5.js"></script>
         }
         else {
             <script src="lib/lib-77990d6df268e8d3d432fb52597000f9.js"></script>
-            <script src="js/app-0e225f795ac563e8bed1c5a039aff720.js"></script>
+            <script src="js/app-f1ca643234fe743ef96cc67e8374c645.js"></script>
         }
     </div>
 </body>

diff --git a/Mundialito/wwwroot/App/Games/Games.html b/Mundialito/wwwroot/App/Games/Games.html
@@ -4,10 +4,10 @@
             <div class="panel-heading">
                 <div class="row">
                     <div class="col-md-3 col-xs-12">
-                        <select ui-select2="{allowClear: false}" class="form-control" ng-model="gamesFilter">
-                            <option value="All" selected="selected">All Games</option>
-                            <option value="OnlyOpen">Only Open</option>
-                        </select>
+                        <toggle ng-model="gamesToggle" size="btn-sm" off-class="btn-success"
+                                        on-class="btn-info" ng-change="changed()"
+                                        on="<i class='fa-solid fa-list'></i> All"
+                                        off="<i class='fa-regular fa-folder-open'></i> Open"></toggle>
                     </div>
                 </div>
             </div>

diff --git a/...s/app-0e225f795ac563e8bed1c5a039aff720.js → ...s/app-f1ca643234fe743ef96cc67e8374c645.js b/...s/app-0e225f795ac563e8bed1c5a039aff720.js → ...s/app-f1ca643234fe743ef96cc67e8374c645.js
@@ -1065,10 +1065,17 @@ angular.module('mundialitoApp').controller('GameCtrl', ['$scope', '$log', 'Const
 'use strict';
 angular.module('mundialitoApp').controller('GamesCtrl', ['$scope','$log','GamesManager','games','teams', 'StadiumsManager' ,'Alert',function ($scope,$log, GamesManager, games, teams, StadiumsManager, Alert) {
     $scope.newGame = null;
-    $scope.gamesFilter = "All";
+    $scope.gamesFilter = "Open";
+    $scope.gamesToggle = false;
     $scope.games = games;
     $scope.teams = teams;
-
+    $scope.changed = () => {
+        if ($scope.gamesFilter === "Open") {
+            $scope.gamesFilter = "All"
+        } else {
+            $scope.gamesFilter = "Open"
+        }
+    }
 
     StadiumsManager.loadAllStadiums().then(function (res) {
         $scope.stadiums = res;

diff --git a/Mundialito/wwwroot/js/app-min-ba6257de0a6b1191450457166bb9f1de.js b/Mundialito/wwwroot/js/app-min-ba6257de0a6b1191450457166bb9f1de.js
diff --git a/Mundialito/wwwroot/js/app-min-eb8d027ceaca1adaf5298c9ee868b9c5.js b/Mundialito/wwwroot/js/app-min-eb8d027ceaca1adaf5298c9ee868b9c5.js