From 1d31914a697855fe1a03c73bc57a65c384f78301 Mon Sep 17 00:00:00 2001
From: Yukai Huang <yukaihuangtw@gmail.com>
Date: Wed, 13 Apr 2022 22:10:44 +0800
Subject: [PATCH 1/3] feat: add factory followups to ui

---
 src/components/FactoryDetailPage.vue | 13 +++++++++++++
 src/types.ts                         |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/components/FactoryDetailPage.vue b/src/components/FactoryDetailPage.vue
index 672b061..c60bfee 100644
--- a/src/components/FactoryDetailPage.vue
+++ b/src/components/FactoryDetailPage.vue
@@ -104,6 +104,10 @@
               <p class="color-gray-light mb-1">{{ desc.date }}</p>
               <p style="line-height: 24px;">{{ desc.others }}</p>
             </div>
+
+            <p v-for="(text, index) in factoryFollowupText" class="mt-2" :key="index">
+              {{ text }}
+            </p>
           </div>
         </div>
       </div>
@@ -174,6 +178,14 @@ export default createComponent({
       }
     })
 
+    const factoryFollowupText = computed(() => {
+      if (appState.factoryData) {
+        return appState.factoryData.follow_ups_for_user
+      } else {
+        return ''
+      }
+    })
+
     const factoryStatusText = computed(() => {
       if (typeof factoryStatus.value !== 'undefined') {
         const factoryDisplayStatus = getDisplayStatusText(factoryStatus.value)
@@ -352,6 +364,7 @@ export default createComponent({
       factoryType,
       factoryName,
       factoryAddressAndLandcode,
+      factoryFollowupText,
       source,
       pastDescriptions,
       lastUpdatedAt,
diff --git a/src/types.ts b/src/types.ts
index f143869..eba79a3 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -104,7 +104,8 @@ export type FactoryData = {
   data_complete: boolean,
   before_release: boolean,
   document_display_status: DocumentDisplayStatus | null,
-  feature?: Feature
+  feature?: Feature,
+  follow_ups_for_user: string[]
 }
 
 export type FactoriesResponse = Array<FactoryData>

From 5f6a2268a6b3db2360d6334a3d098266c964ad7e Mon Sep 17 00:00:00 2001
From: Yukai Huang <yukaihuangtw@gmail.com>
Date: Wed, 13 Apr 2022 22:44:29 +0800
Subject: [PATCH 2/3] fix: followup format

---
 src/components/FactoryDetailPage.vue | 20 ++++++++++++++------
 src/types.ts                         |  5 ++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/components/FactoryDetailPage.vue b/src/components/FactoryDetailPage.vue
index c60bfee..d0f8d00 100644
--- a/src/components/FactoryDetailPage.vue
+++ b/src/components/FactoryDetailPage.vue
@@ -76,6 +76,7 @@
           </template>
 
           <hr v-if="full || $vuetify.breakpoint.mdAndUp">
+
           <v-btn text depressed elevation="0" :ripple="false" color="#697F01" class="m-0 mb-0 px-0 v-btn-plain" @click="expandFactoryDetail" v-if="!full && !$vuetify.breakpoint.mdAndUp">
             顯示更多資訊
             &nbsp;
@@ -105,9 +106,15 @@
               <p style="line-height: 24px;">{{ desc.others }}</p>
             </div>
 
-            <p v-for="(text, index) in factoryFollowupText" class="mt-2" :key="index">
-              {{ text }}
-            </p>
+            <h3 class="mb-1">政府回應</h3>
+
+            <div v-for="(followup, index) in factoryFollowups" class="mt-2" :key="index" style="font-size: 14px">
+              <p class="color-gray-light mb-1">
+                {{ new Date(followup.created_at).toLocaleDateString() }}
+              </p>
+
+              <p style="line-height: 24px;">{{ followup.note }}</p>
+            </div>
           </div>
         </div>
       </div>
@@ -178,11 +185,11 @@ export default createComponent({
       }
     })
 
-    const factoryFollowupText = computed(() => {
+    const factoryFollowups = computed(() => {
       if (appState.factoryData) {
         return appState.factoryData.follow_ups_for_user
       } else {
-        return ''
+        return []
       }
     })
 
@@ -323,6 +330,7 @@ export default createComponent({
         })()
       }
     })
+
     const pastDescriptions = computed(() => {
       return reportRecords.value.map(record => {
         const date = new Date(record.created_at)
@@ -364,7 +372,7 @@ export default createComponent({
       factoryType,
       factoryName,
       factoryAddressAndLandcode,
-      factoryFollowupText,
+      factoryFollowups,
       source,
       pastDescriptions,
       lastUpdatedAt,
diff --git a/src/types.ts b/src/types.ts
index eba79a3..152dce1 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -105,7 +105,10 @@ export type FactoryData = {
   before_release: boolean,
   document_display_status: DocumentDisplayStatus | null,
   feature?: Feature,
-  follow_ups_for_user: string[]
+  follow_ups_for_user: {
+    note: string,
+    created_at: string
+  }[]
 }
 
 export type FactoriesResponse = Array<FactoryData>

From 5e712d477339d4775501c2abc940cd296b935244 Mon Sep 17 00:00:00 2001
From: Yukai Huang <yukaihuangtw@gmail.com>
Date: Wed, 13 Apr 2022 23:36:01 +0800
Subject: [PATCH 3/3] fix: only show followup when there's any

---
 src/components/FactoryDetailPage.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/FactoryDetailPage.vue b/src/components/FactoryDetailPage.vue
index d0f8d00..1960c61 100644
--- a/src/components/FactoryDetailPage.vue
+++ b/src/components/FactoryDetailPage.vue
@@ -106,15 +106,17 @@
               <p style="line-height: 24px;">{{ desc.others }}</p>
             </div>
 
-            <h3 class="mb-1">政府回應</h3>
+            <template v-if="factoryFollowups.length > 0">
+              <h3 class="mb-1">政府回應</h3>
 
-            <div v-for="(followup, index) in factoryFollowups" class="mt-2" :key="index" style="font-size: 14px">
-              <p class="color-gray-light mb-1">
-                {{ new Date(followup.created_at).toLocaleDateString() }}
-              </p>
+              <div v-for="(followup, index) in factoryFollowups" class="mt-2" :key="index" style="font-size: 14px">
+                <p class="color-gray-light mb-1">
+                  {{ new Date(followup.created_at).toLocaleDateString() }}
+                </p>
 
-              <p style="line-height: 24px;">{{ followup.note }}</p>
-            </div>
+                <p style="line-height: 24px;">{{ followup.note }}</p>
+              </div>
+            </template>
           </div>
         </div>
       </div>