Merge pull request #135 from ezraroi/134-dashboard-bets-stats-to-use-…

…team-flag added
ezraroi · Sep 20, 2024 · f873d37 · f873d37
2 parents e839404 + 508bbf6
commit f873d37
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 5 deletions.
diff --git a/Mundialito/Client/src/Dashboard/Dashboard.html b/Mundialito/Client/src/Dashboard/Dashboard.html
@@ -82,7 +82,12 @@ <h6><small>{{::game.AwayTeam.Name}}</small></h6>
                                             <uib-accordion-heading>
                                                 <div class="row">
                                                     <div class="col-md-1 col-xs-2 text-center">
-                                                        <span class="badge">{{item[0]}}</span>
+                                                        <div ng-if="groupedTeams[item[0]] === undefined">
+                                                            <span class="badge">{{item[0]}}</span>
+                                                        </div>
+                                                        <div ng-if="groupedTeams[item[0]] !== undefined">
+                                                            <team-flag team="groupedTeams[item[0]][0]"></team-flag>
+                                                        </div>
                                                     </div>
                                                     <div class="col-md-10 col-xs-9">
                                                         <uib-progressbar max="100" min="0"

diff --git a/Mundialito/Client/src/Dashboard/DashboardCtrl.js b/Mundialito/Client/src/Dashboard/DashboardCtrl.js
@@ -9,6 +9,19 @@ angular.module('mundialitoApp').controller('DashboardCtrl', ['$scope', '$log', '
         $scope.toggleValue = {};
         $scope.players = players;
 
+        // Function to group teams by ShortName
+        function groupTeamsByShortName(teams) {
+            return teams.reduce((acc, team) => {
+                const shortName = team.ShortName;
+                if (!acc[shortName]) {
+                    acc[shortName] = [];
+                }
+                acc[shortName].push(team);
+                return acc;
+            }, {});
+        }
+        $scope.groupedTeams = groupTeamsByShortName(teams);
+
         $scope.changed = (game) => {
             if ($scope.toggleValue[game.GameId]) {
                 $scope.selectedDic[game.GameId] = $scope.marksDic[game.GameId];

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-edab6c6f8348e96ec77828311e34fb09.js"></script>
+            <script src="js/app-min-b9de64167c2b03c8f2f816e6e633631e.js"></script>
         }
         else {
             <script src="lib/lib-77990d6df268e8d3d432fb52597000f9.js"></script>
-            <script src="js/app-3aca63029d88fd16639d2f211875992c.js"></script>
+            <script src="js/app-06c454b6fe15193adf661d79a88ef6c0.js"></script>
         }
     </div>
 </body>

diff --git a/Mundialito/wwwroot/App/Dashboard/Dashboard.html b/Mundialito/wwwroot/App/Dashboard/Dashboard.html
@@ -82,7 +82,12 @@ <h6><small>{{::game.AwayTeam.Name}}</small></h6>
                                             <uib-accordion-heading>
                                                 <div class="row">
                                                     <div class="col-md-1 col-xs-2 text-center">
-                                                        <span class="badge">{{item[0]}}</span>
+                                                        <div ng-if="groupedTeams[item[0]] === undefined">
+                                                            <span class="badge">{{item[0]}}</span>
+                                                        </div>
+                                                        <div ng-if="groupedTeams[item[0]] !== undefined">
+                                                            <team-flag team="groupedTeams[item[0]][0]"></team-flag>
+                                                        </div>
                                                     </div>
                                                     <div class="col-md-10 col-xs-9">
                                                         <uib-progressbar max="100" min="0"

diff --git a/...s/app-3aca63029d88fd16639d2f211875992c.js → ...s/app-06c454b6fe15193adf661d79a88ef6c0.js b/...s/app-3aca63029d88fd16639d2f211875992c.js → ...s/app-06c454b6fe15193adf661d79a88ef6c0.js
@@ -673,6 +673,19 @@ angular.module('mundialitoApp').controller('DashboardCtrl', ['$scope', '$log', '
         $scope.toggleValue = {};
         $scope.players = players;
 
+        // Function to group teams by ShortName
+        function groupTeamsByShortName(teams) {
+            return teams.reduce((acc, team) => {
+                const shortName = team.ShortName;
+                if (!acc[shortName]) {
+                    acc[shortName] = [];
+                }
+                acc[shortName].push(team);
+                return acc;
+            }, {});
+        }
+        $scope.groupedTeams = groupTeamsByShortName(teams);
+
         $scope.changed = (game) => {
             if ($scope.toggleValue[game.GameId]) {
                 $scope.selectedDic[game.GameId] = $scope.marksDic[game.GameId];

diff --git a/Mundialito/wwwroot/js/app-min-b9de64167c2b03c8f2f816e6e633631e.js b/Mundialito/wwwroot/js/app-min-b9de64167c2b03c8f2f816e6e633631e.js
diff --git a/Mundialito/wwwroot/js/app-min-edab6c6f8348e96ec77828311e34fb09.js b/Mundialito/wwwroot/js/app-min-edab6c6f8348e96ec77828311e34fb09.js