Merge pull request #95 from Disfactory/bugfix/report-record-date

bugfix/report-record-date
Disfactory · Apr 14, 2021 · 08be732 · 08be732
2 parents 48935ed + 89044ea
commit 08be732
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/src/components/CreateFactorySteps.vue b/src/components/CreateFactorySteps.vue
@@ -94,7 +94,7 @@
 
                 <div class="d-block  mr-7" style="height: 36px; width: 1px; background-color: #EAF3BF;" />
 
-                <h5 class=" mr-2">精度</h5>
+                <h5 class=" mr-2">經度</h5>
 
                 <v-text-field hide-details class=" mr-7" outilned solo v-model="locationInputState.longitude" placeholder="例：121.5231872" dense />
 
@@ -129,7 +129,7 @@
                   以下經緯度版本為WGS84
                 </p>
 
-                <h3 class="mb-2">精度</h3>
+                <h3 class="mb-2">經度</h3>
 
                 <v-text-field outilned solo v-model="locationInputState.longitude" placeholder="例：121.5231872" />
 

diff --git a/src/components/FactoryDetailPage.vue b/src/components/FactoryDetailPage.vue
@@ -39,7 +39,7 @@
 
           <p class="caption mb-0" style="color: #A1A1A1;">
             工廠編號 {{ factoryId }} <br>
-            最後更新 2020/4/12
+            {{ lastUpdatedAt }}
           </p>
 
           <div class="copied-message flex justify-center align-items-center" v-if="showCopiedMessage && !scrollOff">
@@ -276,22 +276,37 @@ export default createComponent({
       if (appState.factoryData) {
         (async () => {
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          reportRecords.value = await getFactoryReportRecords(appState.factoryData?.id!)
+          reportRecords.value = ((await getFactoryReportRecords(appState.factoryData?.id!)) || []).sort((a, b) => {
+            return new Date(b.created_at) >= new Date(a.created_at) ? 1 : -1
+          })
         })()
       }
     })
     const pastDescriptions = computed(() => {
-      return reportRecords.value.sort((a, b) => {
-        return new Date(b.created_at) >= new Date(a.created_at) ? 1 : -1
-      }).map(record => {
+      return reportRecords.value.map(record => {
         const date = new Date(record.created_at)
-        const dateStr = `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDay()}`
+        const dateStr = `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`
         return {
           date: dateStr,
           others: record.others
         }
       }).filter(rec => rec.others)
     })
+    const lastUpdatedAt = computed(() => {
+      if (!appState.factoryData || !appState.factoryData.reported_at) {
+        return null
+      }
+
+      let date
+      if (reportRecords.value.length === 0) {
+        date = new Date(appState.factoryData.reported_at)
+      } else {
+        date = new Date(reportRecords.value[0].created_at)
+      }
+      const dateStr = `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`
+
+      return `最後更新 ${dateStr}`
+    })
 
     return {
       full,
@@ -309,6 +324,7 @@ export default createComponent({
       factoryName,
       factoryAddressAndLandcode,
       pastDescriptions,
+      lastUpdatedAt,
       longitude,
       latitude,
       factoryDetailScrollerRef,