tested

ezraroi · Sep 12, 2024 · be15636 · be15636
1 parent 8948f36
commit be15636
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/Mundialito/Client/css/Site.css b/Mundialito/Client/css/Site.css
@@ -78,4 +78,8 @@ input.ng-invalid.ng-dirty, textarea.ng-invalid.ng-dirty, select.ng-invalid.ng-di
 .big-logo {
     width: 40px;
     height: 40px;
+}
+
+.label-as-badge {
+    border-radius: 1em;
 }
diff --git a/Mundialito/Client/src/Users/ManageApp.html b/Mundialito/Client/src/Users/ManageApp.html
@@ -13,7 +13,7 @@
                         </thead>
                         <tbody>
                         <tr ng-repeat="user in users">
-                            <td><a href="{{user.getUrl()}}">{{::user.Name}}</a><span style="margin-left: 5px;" class="badge" ng-class="{'badge-success': user.Roles === 'Admin', 'label-default': user.Roles === 'Active', 'label-danger':user.Roles === 'Disabled'}">{{::user.Roles}}</span> </td>
+                            <td><a href="{{user.getUrl()}}">{{::user.Name}}</a><span style="margin-left: 5px;" class="label label-as-badge" ng-class="{'label-success': user.Roles === 'Admin', 'label-default': user.Roles === 'Active', 'label-danger':user.Roles === 'Disabled'}">{{::user.Roles}}</span> </td>
                             <td>{{user.Email}}</td>
                             <td>
                                 <button title="delete" type="button" class="btn btn-danger btn-sm" ng-click="deleteUser(user)" tooltip="Delete User"><i class="fa fa-times-circle"></i> <span class="hidden-xs">Delete</span></button>

diff --git a/Mundialito/Models/GeneralBetsModels.cs b/Mundialito/Models/GeneralBetsModels.cs
@@ -12,7 +12,15 @@ public GeneralBetViewModel(GeneralBet bet, DateTime closeTime)
     {
         OwnerId = bet.User.Id;
         GeneralBetId = bet.GeneralBetId;
-        WinningTeam = bet.WinningTeam;
+        WinningTeam = new Team {
+            TeamId = bet.WinningTeam.TeamId,
+            Name = bet.WinningTeam.Name,
+            Flag = bet.WinningTeam.Flag,
+            Logo = bet.WinningTeam.Logo,
+            ShortName = bet.WinningTeam.ShortName,
+            TeamPage = bet.WinningTeam.TeamPage,
+            IntegrationsData = bet.WinningTeam.IntegrationsData
+        };
         GoldenBootPlayer = bet.GoldBootPlayer;
         IsResolved = bet.IsResolved;
         if (IsResolved)

diff --git a/Mundialito/wwwroot/App/Users/ManageApp.html b/Mundialito/wwwroot/App/Users/ManageApp.html
@@ -13,7 +13,7 @@
                         </thead>
                         <tbody>
                         <tr ng-repeat="user in users">
-                            <td><a href="{{user.getUrl()}}">{{::user.Name}}</a><span style="margin-left: 5px;" class="badge" ng-class="{'badge-success': user.Roles === 'Admin', 'label-default': user.Roles === 'Active', 'label-danger':user.Roles === 'Disabled'}">{{::user.Roles}}</span> </td>
+                            <td><a href="{{user.getUrl()}}">{{::user.Name}}</a><span style="margin-left: 5px;" class="label label-as-badge" ng-class="{'label-success': user.Roles === 'Admin', 'label-default': user.Roles === 'Active', 'label-danger':user.Roles === 'Disabled'}">{{::user.Roles}}</span> </td>
                             <td>{{user.Email}}</td>
                             <td>
                                 <button title="delete" type="button" class="btn btn-danger btn-sm" ng-click="deleteUser(user)" tooltip="Delete User"><i class="fa fa-times-circle"></i> <span class="hidden-xs">Delete</span></button>

diff --git a/Mundialito/wwwroot/css/app-cerulean.css b/Mundialito/wwwroot/css/app-cerulean.css
diff --git a/Mundialito/wwwroot/css/app-space-lab.css b/Mundialito/wwwroot/css/app-space-lab.css