Support for services with custom ids

HackerDom · Aug 21, 2023 · 9c5c885 · 9c5c885
1 parent 0408633
commit 9c5c885
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/scoreboard/src/model.ts b/scoreboard/src/model.ts
@@ -153,30 +153,30 @@ export class GameModel {
         return services;
     }
 
-    getTags(team_id: number): string[] {
-        return this.teams[team_id].tags ?? [];
+    getTags(teamId: number): string[] {
+        return this.teams[teamId].tags ?? [];
     }
 
-    getHost(team_id: number) {
-        return this.teams[team_id].network;
+    getHost(teamId: number) {
+        return this.teams[teamId].network;
     }
 
-    getLogo(team_id: number) {
-        return this.teams[team_id].logo;
+    getLogo(teamId: number) {
+        return this.teams[teamId].logo;
     }
 
     getRound() {
         return this.allScoreboards.length === 0 ? 0 : this.allScoreboards[this.allScoreboards.length - 1].round;
     }
 
-    getSlaPeriods(team_id: string, service_id: string) {
+    getSlaPeriods(teamId: string, serviceId: string) {
         if (this.allScoreboards.length === 0 || this.allScoreboards.length < this.allScoreboards[this.allScoreboards.length - 1].round) {
             return [];
         }
-        if (this.allRoundsSla[team_id][service_id].length === this.allScoreboards.length) {
-            return this.allRoundsSla[team_id][service_id];
+        if (this.allRoundsSla[teamId][serviceId].length === this.allScoreboards.length) {
+            return this.allRoundsSla[teamId][serviceId];
         }
-        if (this.allRoundsSla[team_id][service_id].length === this.allScoreboards.length - 1) {
+        if (this.allRoundsSla[teamId][serviceId].length === this.allScoreboards.length - 1) {
             const scoreboard = this.allScoreboards[this.allScoreboards.length - 1].scoreboard;
             this.fillAllRoundsSlaForScoreboard(scoreboard);
         } else {
@@ -186,33 +186,34 @@ export class GameModel {
                 this.fillAllRoundsSlaForScoreboard(scoreboard);
             }
         }
-        return this.allRoundsSla[team_id][service_id];
+        return this.allRoundsSla[teamId][serviceId];
     }
 
     getSlaPeriodsForSomeServiceOfSomeTeam() {
-        let team_ids = Object.keys(this.allRoundsSla);
-        if (team_ids.length === 0)
+        let teamIds = Object.keys(this.allRoundsSla);
+        if (teamIds.length === 0)
             return [];
 
-        let team_id = team_ids[0];
+        let teamId = teamIds[0];
 
-        let service_ids = Object.keys(this.allRoundsSla[team_id]);
-        if (service_ids.length === 0)
+        let serviceIds = Object.keys(this.allRoundsSla[teamId]);
+        if (serviceIds.length === 0)
             return [];
 
-        let service_id = service_ids[0];
+        let serviceId = serviceIds[0];
 
-        return this.getSlaPeriods(team_id, service_id);
+        return this.getSlaPeriods(teamId, serviceId);
     }
 
     fillAllRoundsSlaForScoreboard(scoreboard: Scoreboard | HistoricalScoreboard) {
         for (let t = 0; t < scoreboard.length; t++) {
             const team = scoreboard[t];
-            const team_id = GameModel.GetTeamId(team);
+            const teamId = GameModel.GetTeamId(team);
             for (let s = 0; s < team.services.length; s++) {
                 const service = team.services[s];
+                const serviceId = parseInt(this.services[s].id, 10);
                 const isUp = service.status === 101;
-                this.allRoundsSla[team_id][s + 1].push(isUp);
+                this.allRoundsSla[teamId][serviceId].push(isUp);
             }
         }
     }

diff --git a/scoreboard/src/scoreboard.tsx b/scoreboard/src/scoreboard.tsx
@@ -161,8 +161,8 @@ class Scoreboard extends Component<ScoreboardProps> {
             if (window.outerWidth < 150)
                 return;
             if (container !== null && !_this.isIE) {
-                if (window.outerWidth - _this.compactScoreboardWidth < width) {
-                    _this.zoom = (window.outerWidth - 40 - _this.compactScoreboardWidth) / width;
+                if (window.innerWidth - _this.compactScoreboardWidth < width) {
+                    _this.zoom = (window.innerWidth - 20 - _this.compactScoreboardWidth) / width;
                     if (_this.isFirefox)
                         container.setAttribute("style", "transform:scale(" + _this.zoom + ");");
                     else

diff --git a/scoreboard/src/serviceblock.tsx b/scoreboard/src/serviceblock.tsx
@@ -44,9 +44,9 @@ class Serviceblock extends Component<ServiceblockProps> {
         const roundsCount = model.roundsCount;
         const maxSla = Math.ceil((service.sla * round + 100 * (roundsCount - round)) / roundsCount);
         let serviceReleased = true;
-        model.services.forEach((s) => {
+        model.services.forEach((s, i) => {
             if (s.id === service.id.toString()) {
-                serviceReleased = model.services[service.id - 1].phase !== "NOT_RELEASED";
+                serviceReleased = model.services[i].phase !== "NOT_RELEASED";
             }
         })