Update: ローラー作戦のChartData生成を共通化

a01sa01to · May 4, 2021 · c9f9532 · c9f9532
1 parent ffb1300
commit c9f9532
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 93 deletions.
diff --git a/components/roller/Mito.vue b/components/roller/Mito.vue
@@ -39,47 +39,22 @@
 </template>
 
 <script>
-import dayjs from 'dayjs'
-
 import DataView from '@/components/DataView.vue'
 import RollerChart from '@/components/RollerChart.vue'
 import Data from '@/data/roller/mito.json'
+import formatRollerInspection from '@/utils/formatRollerInspection'
 
 export default {
   components: {
     DataView,
     RollerChart,
   },
   data() {
-    // 検査陽性者の状況
-    const updatedAt = dayjs(Data.date).format('YYYY/MM/DD HH:mm')
-
-    const data = Data.data
-    const today = new Date()
-    const chartDataAccept = []
-    const chartDataCollect = []
-    let acSum = 0
-    let coSum = 0
-    data
-      .filter((d) => new Date(d.date) < today)
-      .forEach((d) => {
-        const date = new Date(d.date)
-        if (!isNaN(d.accept) && !isNaN(d.collect)) {
-          acSum += d.accept
-          coSum += d.collect
-          chartDataAccept.push({
-            label: `${date.getMonth() + 1}/${date.getDate()}`,
-            transition: d.accept,
-            cumulative: acSum,
-          })
-          chartDataCollect.push({
-            label: `${date.getMonth() + 1}/${date.getDate()}`,
-            transition: d.collect,
-            cumulative: coSum,
-          })
-        }
-      })
-
+    const {
+      chartDataAccept,
+      chartDataCollect,
+      updatedAt,
+    } = formatRollerInspection(Data)
     return {
       Data,
       chartDataAccept,

diff --git a/components/roller/TsuchiuraSakura.vue b/components/roller/TsuchiuraSakura.vue
@@ -39,47 +39,22 @@
 </template>
 
 <script>
-import dayjs from 'dayjs'
-
 import DataView from '@/components/DataView.vue'
 import RollerChart from '@/components/RollerChart.vue'
 import Data from '@/data/roller/tsuchiuraSakura.json'
+import formatRollerInspection from '@/utils/formatRollerInspection'
 
 export default {
   components: {
     DataView,
     RollerChart,
   },
   data() {
-    // 検査陽性者の状況
-    const updatedAt = dayjs(Data.date).format('YYYY/MM/DD HH:mm')
-
-    const data = Data.data
-    const today = new Date()
-    const chartDataAccept = []
-    const chartDataCollect = []
-    let acSum = 0
-    let coSum = 0
-    data
-      .filter((d) => new Date(d.date) < today)
-      .forEach((d) => {
-        const date = new Date(d.date)
-        if (!isNaN(d.accept) && !isNaN(d.collect)) {
-          acSum += d.accept
-          coSum += d.collect
-          chartDataAccept.push({
-            label: `${date.getMonth() + 1}/${date.getDate()}`,
-            transition: d.accept,
-            cumulative: acSum,
-          })
-          chartDataCollect.push({
-            label: `${date.getMonth() + 1}/${date.getDate()}`,
-            transition: d.collect,
-            cumulative: coSum,
-          })
-        }
-      })
-
+    const {
+      chartDataAccept,
+      chartDataCollect,
+      updatedAt,
+    } = formatRollerInspection(Data)
     return {
       Data,
       chartDataAccept,

diff --git a/components/roller/TsukubaAmakubo.vue b/components/roller/TsukubaAmakubo.vue
@@ -39,47 +39,22 @@
 </template>
 
 <script>
-import dayjs from 'dayjs'
-
 import DataView from '@/components/DataView.vue'
 import RollerChart from '@/components/RollerChart.vue'
 import Data from '@/data/roller/tsukubaAmakubo.json'
+import formatRollerInspection from '@/utils/formatRollerInspection'
 
 export default {
   components: {
     DataView,
     RollerChart,
   },
   data() {
-    // 検査陽性者の状況
-    const updatedAt = dayjs(Data.date).format('YYYY/MM/DD HH:mm')
-
-    const data = Data.data
-    const today = new Date()
-    const chartDataAccept = []
-    const chartDataCollect = []
-    let acSum = 0
-    let coSum = 0
-    data
-      .filter((d) => new Date(d.date) < today)
-      .forEach((d) => {
-        const date = new Date(d.date)
-        if (!isNaN(d.accept) && !isNaN(d.collect)) {
-          acSum += d.accept
-          coSum += d.collect
-          chartDataAccept.push({
-            label: `${date.getMonth() + 1}/${date.getDate()}`,
-            transition: d.accept,
-            cumulative: acSum,
-          })
-          chartDataCollect.push({
-            label: `${date.getMonth() + 1}/${date.getDate()}`,
-            transition: d.collect,
-            cumulative: coSum,
-          })
-        }
-      })
-
+    const {
+      chartDataAccept,
+      chartDataCollect,
+      updatedAt,
+    } = formatRollerInspection(Data)
     return {
       Data,
       chartDataAccept,

diff --git a/utils/formatRollerInspection.ts b/utils/formatRollerInspection.ts
@@ -0,0 +1,51 @@
+import dayjs from 'dayjs'
+type DataType = {
+  date: string
+  nowTotal: { ac: number; co: number }
+  data: { date: string; accept: number; collect: number }[]
+}
+type ChartDataType = {
+  label: string
+  transition: number
+  cumulative: number
+}[]
+export default (Data: DataType) => {
+  // 検査陽性者の状況
+  const updatedAt = dayjs(Data.date).format('YYYY/MM/DD HH:mm')
+
+  const data = Data.data
+  const today = new Date()
+  const chartDataAccept: ChartDataType = []
+  const chartDataCollect: ChartDataType = []
+  let acSum = 0
+  let coSum = 0
+  data
+    .filter((d) => new Date(d.date) < today)
+    .forEach((d) => {
+      const date = new Date(d.date)
+      if (!isNaN(d.accept) && !isNaN(d.collect)) {
+        acSum += d.accept
+        coSum += d.collect
+        chartDataAccept.push({
+          label: `${date.getFullYear()}/${
+            date.getMonth() + 1
+          }/${date.getDate()}`,
+          transition: d.accept,
+          cumulative: acSum,
+        })
+        chartDataCollect.push({
+          label: `${date.getFullYear()}/${
+            date.getMonth() + 1
+          }/${date.getDate()}`,
+          transition: d.collect,
+          cumulative: coSum,
+        })
+      }
+    })
+
+  return {
+    chartDataAccept,
+    chartDataCollect,
+    updatedAt,
+  }
+}