From f3a1e67906f8498220b19629ffc1e3db162294ef Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Tue, 19 May 2020 20:07:29 +0300
Subject: [PATCH] Fix village state

---
 src/DashboardView/TaskList.vue         | 8 ++++----
 src/DashboardView/VillageStateList.vue | 8 +-------
 src/VillageState.ts                    | 2 +-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/DashboardView/TaskList.vue b/src/DashboardView/TaskList.vue
index 16e56aa..a4a79bb 100644
--- a/src/DashboardView/TaskList.vue
+++ b/src/DashboardView/TaskList.vue
@@ -10,13 +10,13 @@
     <div class="container">
       <table class="task-table">
         <tr v-for="task in shared.taskList" class="task-item" :class="{ 'this-village': isThisVillageTask(task) }">
-          <td class="time-column" :title="formatDate(task.ts)">{{ formatDate(task.ts) }}</td>
-          <td class="id-column" :title="task.id">{{ task.id }}</td>
+          <td class="time-column" :title="formatDate(task.ts) + ', ' + task.id" v-text="formatDate(task.ts)"></td>
           <td class="actions-column">
             <a href="#" title="Remove task" class="remove-action" v-on:click.prevent="onRemove(task.id)">&times;</a>
           </td>
-          <td class="name-column" :title="task.name">{{ task.name }}</td>
-          <td class="args-column" :title="JSON.stringify(task.args)">{{ JSON.stringify(task.args) }}</td>
+          <td class="village-column" v-text="task.args.villageId || ''"></td>
+          <td class="name-column" :title="task.name" v-text="task.name"></td>
+          <td class="args-column" :title="JSON.stringify(task.args)" v-text="JSON.stringify(task.args)"></td>
         </tr>
       </table>
     </div>
diff --git a/src/DashboardView/VillageStateList.vue b/src/DashboardView/VillageStateList.vue
index feb5f1c..6e0e0ad 100644
--- a/src/DashboardView/VillageStateList.vue
+++ b/src/DashboardView/VillageStateList.vue
@@ -9,7 +9,7 @@
           <th class="right">Железо</th>
           <th class="right">Зерно</th>
           <th class="right" title="Время до окончания добычи необходимых ресурсов">Рес.</th>
-          <th class="right" title="Время до окончания выполнения текущей задачи">Очередь</th>
+          <th class="right" title="Время до окончания выполнения текущей задачи">Оч.</th>
         </tr>
       </thead>
       <tbody>
@@ -107,12 +107,6 @@
             <td></td>
           </tr>
 
-          <resource-line
-            :title="'Баланс задачи:'"
-            :resources="villageState.required.balance"
-            :time1="renderGatheringTime(villageState.required.time)"
-          />
-
           <resource-line
             v-for="queueState of villageState.queues"
             v-bind:key="villageState.id + queueState.queue"
diff --git a/src/VillageState.ts b/src/VillageState.ts
index 05de550..b9235b1 100644
--- a/src/VillageState.ts
+++ b/src/VillageState.ts
@@ -147,7 +147,7 @@ function createProductionQueueState(
 
     return {
         queue,
-        isActive: tasks.length !== 0 || taskEndingTimestamp !== 0,
+        isActive: tasks.length !== 0 || taskEndingTimestamp > timestamp(),
         currentTaskFinishTimestamp: taskEndingTimestamp,
         currentTaskFinishSeconds: Math.max(taskEndingTimestamp ? taskEndingTimestamp - timestamp() : 0, 0),
         firstTask: calcResourceBalance(firstTaskResources, resources, performance),