Don't use team_id = 1 and service_id = 1, because we may not exist. C…

…alculate graph cell width according to the rounds count
HackerDom · Jul 22, 2023 · c447276 · c447276
1 parent 0cb948f
commit c447276
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/scoreboard/src/controller.ts b/scoreboard/src/controller.ts
@@ -35,7 +35,7 @@ export default class Controller extends EventEmitter {
                 }
             }).then((allScoreboards: History) => {
             this.model!.setScoreboards(allScoreboards.map((s) => s));
-            this.model!.getSlaPeriods("1", "1");
+            this.model!.getSlaPeriodsForSomeServiceOfSomeTeam()
             this.emit('history');
         });
     }
@@ -77,7 +77,7 @@ export default class Controller extends EventEmitter {
 
     processState(state: StateEventData) {
         this.model!.setScoreboard(state);
-        this.model!.getSlaPeriods("1", "1");
+        this.model!.getSlaPeriodsForSomeServiceOfSomeTeam()
         this.emit('updateScoreboard');
     }
 }
diff --git a/scoreboard/src/model.ts b/scoreboard/src/model.ts
@@ -85,14 +85,14 @@ export class GameModel {
             this.roundsCount = 1280; // TODO: set actual rounds count
         this.roundsPerGraphColumn = 20;
         this.roundsPerGraphBorder = 60;
-        if (this.roundsCount > 600) {
-            this.roundsPerGraphColumn *= 2;
-            this.roundsPerGraphBorder *= 2;
-        }
-        if (this.roundsCount > 1200) {
+
+        let _roundsCount = this.roundsCount;
+        while (_roundsCount > 600) {
             this.roundsPerGraphColumn *= 2;
             this.roundsPerGraphBorder *= 2;
+            _roundsCount /= 2;
         }
+
         this.selectedTeam = null;
         this.slalineWidth = 80;
         this.slaPeriodLength = Math.ceil(this.roundsCount / this.slalineWidth);
@@ -182,6 +182,22 @@ export class GameModel {
         return this.allRoundsSla[team_id][service_id];
     }
 
+    getSlaPeriodsForSomeServiceOfSomeTeam() {
+        let team_ids = Object.keys(this.allRoundsSla);
+        if (team_ids.length == 0)
+            return [];
+
+        let team_id = team_ids[0];
+
+        let service_ids = Object.keys(this.allRoundsSla[team_id]);
+        if (service_ids.length == 0)
+            return [];
+
+        let service_id = service_ids[0];
+
+        return this.getSlaPeriods(team_id, service_id);
+    }
+
     fillAllRoundsSlaForScoreboard(scoreboard: Scoreboard | HistoricalScoreboard) {
         for (let t = 0; t < scoreboard.length; t++) {
             const team = scoreboard[t];

diff --git a/scoreboard/src/setupProxy.js b/scoreboard/src/setupProxy.js
@@ -15,9 +15,9 @@ const proxy = require('http-proxy-middleware');
 */
 
 module.exports = function (app) {
-    app.use(proxy('/logo.png', {target: 'http://10.10.10.10:8080/', ws: true, changeOrigin: true}));
-    app.use(proxy('/api/events', {target: 'http://10.10.10.10:8080/', ws: true, changeOrigin: true}));
-    app.use(proxy('/api', {target: 'http://10.10.10.10:8080/', changeOrigin: true}));
-    app.use(proxy('/history', {target: 'http://10.10.10.10:8080/', changeOrigin: true}));
-    app.use(proxy('/data', {target: 'http://10.10.10.10:8080/', changeOrigin: true}));
+    app.use(proxy('/logo.png', {target: 'https://training.ctf.hitb.org/', ws: true, changeOrigin: true}));
+    app.use(proxy('/api/events', {target: 'https://training.ctf.hitb.org/', ws: true, changeOrigin: true}));
+    app.use(proxy('/api', {target: 'https://training.ctf.hitb.org/', changeOrigin: true}));
+    app.use(proxy('/history', {target: 'https://training.ctf.hitb.org/', changeOrigin: true}));
+    app.use(proxy('/data', {target: 'https://training.ctf.hitb.org/', changeOrigin: true}));
 };