UI improvements

src/DashboardView/VillageStateList.vue

@@ -59,24 +59,7 @@
             <td></td>
           </tr>
 
-          <resource-line :title="'Добыча:'" :resources="villageState.performance" />
-
-          <resource-line
-            v-if="villageState.required.active"
-            :title="'След. задача:'"
-            :color="false"
-            :sign="false"
-            :hide-zero="false"
-            :resources="villageState.required.resources"
-          />
-
-          <resource-line
-            v-if="villageState.required.active"
-            :title="'Баланс след.:'"
-            :hint="'Баланс следующей задачи'"
-            :resources="villageState.required.balance"
-            :time1="renderGatheringTime(villageState.required.time)"
-          />
+          <resource-line :title="'Добыча:'" :resources="villageState.performance" :color="false" />
 
           <resource-line
             v-for="queueState of villageState.queues"
@@ -87,6 +70,7 @@
             :resources="queueState.firstTask.balance"
             :time1="renderGatheringTime(queueState.firstTask.time)"
             :time2="renderTimeInSeconds(queueState.currentTaskFinishSeconds)"
+            :color="queueState.isWaiting"
           />
 
           <resource-line

src/VillageState.ts

@@ -45,6 +45,7 @@ interface VillageProductionQueueState {
     queue: ProductionQueue;
     tasks: Array<Task>;
     isActive: boolean;
+    isWaiting: boolean;
     currentTaskFinishTimestamp: number;
     currentTaskFinishSeconds: number;
     firstTask: ResourceLineState;
@@ -165,20 +166,22 @@ function createProductionQueueState(
 ): VillageProductionQueueState {
     const queue = taskQueueInfo.queue;
     const tasks = taskQueueInfo.tasks;
+    const taskEndingTimestamp = taskQueueInfo.finishTs;
     const resources = storage.getResources();
     const performance = storage.getResourcesPerformance();
-
     const firstTaskResources = tasks.slice(0, 1).reduce(taskResourceReducer, Resources.zero());
     const allTaskResources = tasks.reduce(taskResourceReducer, Resources.zero());
-    const taskEndingTimestamp = taskQueueInfo.finishTs;
+
+    const currentTimestamp = timestamp();
 
     return {
         queue,
         tasks,
-        isActive: tasks.length !== 0 || taskEndingTimestamp > timestamp(),
+        isActive: tasks.length !== 0 || taskEndingTimestamp > currentTimestamp,
+        isWaiting: tasks.length !== 0 && taskEndingTimestamp < currentTimestamp,
         currentTaskFinishTimestamp: taskEndingTimestamp,
         currentTaskFinishSeconds: Math.max(
-            taskEndingTimestamp ? taskEndingTimestamp - timestamp() : 0,
+            taskEndingTimestamp ? taskEndingTimestamp - currentTimestamp : 0,
             0
         ),
         firstTask: makeResourceBalance(firstTaskResources, resources, performance),