Fix task state generation

2 files changed, 14 insertions, 14 deletions

diff --git a/src/scripts/controllers/simulation/statecache.ts b/src/scripts/controllers/simulation/statecache.ts
index 6d34dc03..06dbd424 100644
--- a/src/scripts/controllers/simulation/statecache.ts
+++ b/src/scripts/controllers/simulation/statecache.ts
@@ -84,8 +84,6 @@ export class StateCache {
             this.fetchAllAvailableStates().then((data) => {
                 this.stateList = data;
 
-                this.updateTasks(tick);
-
                 // Determine last cached tick
                 let ticks = Object.keys(this.stateList).sort((a, b) => {
                     return parseInt(a) - parseInt(b);
@@ -94,6 +92,10 @@ export class StateCache {
                     this.lastCachedTick = parseInt(ticks[ticks.length - 1]);
                 }
 
+                for (let i = 1; i <= this.lastCachedTick; i++) {
+                    this.updateTasksForNewTick(i);
+                }
+
                 // Update chart cache
                 this.simulationController.chartController.tickUpdated(tick);
 
@@ -111,7 +113,7 @@ export class StateCache {
         });
     }
 
-    private updateTasks(tick: number): void {
+    private updateTasksForNewTick(tick: number): void {
         const taskIDsInTick = [];
 
         this.stateList[tick].taskStates.forEach((taskState: ITaskState) => {
diff --git a/src/scripts/controllers/simulationcontroller.ts b/src/scripts/controllers/simulationcontroller.ts
index baab21bf..9f06df97 100644
--- a/src/scripts/controllers/simulationcontroller.ts
+++ b/src/scripts/controllers/simulationcontroller.ts
@@ -284,9 +284,9 @@ export class SimulationController {
 
         $(".experiment-list .list-body").on("click", ".remove-experiment", (event: JQueryEventObject) => {
             event.stopPropagation();
-            let affectedRow = $(event.target).closest(".experiment-row");
-            let index = affectedRow.index();
-            let affectedExperiment = this.experiments[index];
+            const affectedRow = $(event.target).closest(".experiment-row");
+            const index = affectedRow.index();
+            const affectedExperiment = this.experiments[index];
 
             MapController.showConfirmDeleteDialog("experiment", () => {
                 this.mapController.api.deleteExperiment(affectedExperiment.simulationId, affectedExperiment.id)
@@ -361,9 +361,9 @@ export class SimulationController {
     }
 
     private populateDropdowns(): void {
-        let pathDropdown = $("#new-experiment-path-select");
-        let traceDropdown = $("#new-experiment-trace-select");
-        let schedulerDropdown = $("#new-experiment-scheduler-select");
+        const pathDropdown = $("#new-experiment-path-select");
+        const traceDropdown = $("#new-experiment-trace-select");
+        const schedulerDropdown = $("#new-experiment-scheduler-select");
 
         pathDropdown.empty();
         for (let i = 0; i < this.simulation.paths.length; i++) {
@@ -504,14 +504,13 @@ export class SimulationController {
             return;
         }
 
-        let html;
-        let container = $(".building-stats-list");
+        const container = $(".building-stats-list");
 
         container.children().remove("div");
 
         this.stateCache.stateList[this.currentTick].roomStates.forEach((roomState: IRoomState) => {
             if (this.colorRepresentation === ColorRepresentation.LOAD && roomState.room !== undefined) {
-                html = '<div>' +
+                const html = '<div>' +
                     '  <h4>' + roomState.room.name + '</h4>' +
                     '  <p>Load: ' + Math.round(roomState.loadFraction * 100) + '%</p>' +
                     '</div>';
@@ -532,7 +531,6 @@ export class SimulationController {
         $("#room-name-field").text(this.mapController.roomModeController.currentRoom.name);
         $("#room-type-field").text(this.mapController.roomModeController.currentRoom.roomType);
 
-        let html;
         let container = $(".room-stats-list");
 
         container.children().remove("div");
@@ -542,7 +540,7 @@ export class SimulationController {
                 return;
             }
             if (this.colorRepresentation === ColorRepresentation.LOAD) {
-                html = '<div>' +
+                const html = '<div>' +
                     '  <h4>' + rackState.rack.name + '</h4>' +
                     '  <p>Load: ' + Math.round(rackState.loadFraction * 100) + '%</p>' +
                     '</div>';