From fec538be86ecc66e431f4e533becbeb0f0d3e4ae Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Mon, 20 Apr 2020 19:04:48 +0300
Subject: [PATCH] Improve resource line

---
 .../{Resource.vue => ResourceBalance.vue}     |  0
 src/DashboardView/VillageResource.vue         | 51 ++++++++++++++
 src/DashboardView/VillageStateList.vue        | 66 +++++++------------
 3 files changed, 76 insertions(+), 41 deletions(-)
 rename src/DashboardView/{Resource.vue => ResourceBalance.vue} (100%)
 create mode 100644 src/DashboardView/VillageResource.vue

diff --git a/src/DashboardView/Resource.vue b/src/DashboardView/ResourceBalance.vue
similarity index 100%
rename from src/DashboardView/Resource.vue
rename to src/DashboardView/ResourceBalance.vue
diff --git a/src/DashboardView/VillageResource.vue b/src/DashboardView/VillageResource.vue
new file mode 100644
index 0000000..cb8127f
--- /dev/null
+++ b/src/DashboardView/VillageResource.vue
@@ -0,0 +1,51 @@
+<template>
+  <span :class="classes" :title="title" v-text="formatted"></span>
+</template>
+
+<script>
+export default {
+  props: ['value', 'max', 'speed'],
+  data() {
+    return {};
+  },
+  computed: {
+    formatted() {
+      return this.value;
+    },
+    percent() {
+      return Math.floor((this.value / this.max) * 100);
+    },
+    title() {
+      if (this.speed < 0) {
+        const time = this.fractionalHourToTime(this.value / this.speed);
+        return `${this.value}, ${this.percent}%, опустеет через ${time}`;
+      } else {
+        const time = this.fractionalHourToTime((this.max - this.value) / this.speed);
+        return `${this.value}, ${this.percent}%, заполнится через ${time}`;
+      }
+    },
+    classes() {
+      return {
+        warning: this.percent >= 70 && this.percent < 95,
+        bad: this.percent >= 95,
+      };
+    },
+  },
+  methods: {
+    fractionalHourToTime(value) {
+      const hours = Math.floor(value);
+      const minutes = Math.round((value - hours) * 60);
+      return `${hours}:${String(minutes).padStart(2, '0')}`;
+    },
+  },
+};
+</script>
+
+<style scoped>
+.warning {
+  color: orange;
+}
+.bad {
+  color: red;
+}
+</style>
diff --git a/src/DashboardView/VillageStateList.vue b/src/DashboardView/VillageStateList.vue
index 876b0ff..7028152 100644
--- a/src/DashboardView/VillageStateList.vue
+++ b/src/DashboardView/VillageStateList.vue
@@ -16,26 +16,18 @@
         <template v-for="village in shared.villages">
           <tr class="normal-line top-line">
             <td :class="{ active: village.active }" :title="village.id">{{ village.name }}</td>
-            <td
-              class="right"
-              v-text="village.lumber"
-              :title="resourceTitle(village.lumber, village.warehouse, village.lumber_hour)"
-            ></td>
-            <td
-              class="right"
-              v-text="village.clay"
-              :title="resourceTitle(village.clay, village.warehouse, village.clay_hour)"
-            ></td>
-            <td
-              class="right"
-              v-text="village.iron"
-              :title="resourceTitle(village.iron, village.warehouse, village.iron_hour)"
-            ></td>
-            <td
-              class="right"
-              v-text="village.crop"
-              :title="resourceTitle(village.crop, village.granary, village.crop_hour)"
-            ></td>
+            <td class="right">
+              <filling :value="village.lumber" :max="village.warehouse" :speed="village.lumber_hour"></filling>
+            </td>
+            <td class="right">
+              <filling :value="village.clay" :max="village.warehouse" :speed="village.clay_hour"></filling>
+            </td>
+            <td class="right">
+              <filling :value="village.iron" :max="village.warehouse" :speed="village.iron_hour"></filling>
+            </td>
+            <td class="right">
+              <filling :value="village.crop" :max="village.granary" :speed="village.crop_hour"></filling>
+            </td>
             <td class="right">
               <a :href="warehousePath(village)" v-text="village.warehouse"></a>
             </td>
@@ -115,11 +107,13 @@
 
 <script>
 import { path } from '../utils';
-import Resource from './Resource';
+import ResourceBalance from './ResourceBalance';
+import VillageResource from './VillageResource';
 
 export default {
   components: {
-    resource: Resource,
+    resource: ResourceBalance,
+    filling: VillageResource,
   },
   data() {
     return {
@@ -140,21 +134,6 @@ export default {
     quartersPath(village) {
       return path('/build.php', { newdid: village.id, gid: 19 });
     },
-    resourceTitle(current, max, speed) {
-      const percent = Math.floor((current / max) * 100);
-      if (speed < 0) {
-        const time = this.fractionalHourToTime(current / speed);
-        return `${current}, ${percent}%, опустеет через ${time}`;
-      } else {
-        const time = this.fractionalHourToTime((max - current) / speed);
-        return `${current}, ${percent}%, заполнится через ${time}`;
-      }
-    },
-    fractionalHourToTime(value) {
-      const hours = Math.floor(value);
-      const minutes = Math.round((value - hours) * 60);
-      return `${hours}:${String(minutes).padStart(2, '0')}`;
-    },
     secondsToTime(value) {
       const hours = Math.floor(value / 3600);
       const minutes = Math.floor((value % 3600) / 60);
@@ -171,10 +150,19 @@ export default {
   border-collapse: collapse;
 }
 
+.top-line td {
+  border-top: 1px solid #ddd;
+}
+
 .normal-line td {
   padding: 4px;
 }
 
+.filling-line td {
+  padding: 0;
+  border: 1px solid #ddd;
+}
+
 .performance-line td {
   padding: 0 4px 4px;
   font-size: 90%;
@@ -189,10 +177,6 @@ export default {
   font-weight: bold;
 }
 
-.top-line td {
-  border-top: 1px solid #ddd;
-}
-
 .right {
   text-align: right;
 }