Merge pull request #183 from KaiShoya/bugfix/#182_sum_count_was_not_u…

…pdated

release v1.12.3

components/pages/data/AggregationByDrinksTable.vue

@@ -3,19 +3,16 @@
   lang="ts"
 >
 import { useAggregationByDrinksStore } from '~/store/pages/data/components/aggregationByDrinks'
-const { $i18n } = useNuxtApp()
-const { chartDataTitle, computedTableData } = storeToRefs(useAggregationByDrinksStore())
-
-const footers = [
-  $i18n.t('data.total'),
-  computedTableData.value.reduce((accumulator, currentValue) => accumulator + Number(currentValue[1]), 0),
-]
+const { chartDataTitle, computedTableData, computedSumCount } = storeToRefs(useAggregationByDrinksStore())
 </script>
 
 <template>
   <MoleculesBaseTable
     :headers="chartDataTitle"
     :table-data="computedTableData"
-    :footers="footers"
+    :footers="[
+      $t('data.total'),
+      computedSumCount,
+    ]"
   />
 </template>

components/pages/data/graphs/ComboChart.vue

@@ -1,4 +1,7 @@
-<script setup lang="ts">
+<script
+  setup
+  lang="ts"
+>
 import { GChart } from 'vue-google-charts'
 withDefaults(defineProps<{
   data: Array<Array<String | Number>>,
@@ -14,6 +17,7 @@ withDefaults(defineProps<{
 
 <template>
   <GChart
+    v-if="data.length > 1"
     type="ComboChart"
     :data="data"
     :options="options"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drink-counter",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "license": "MIT",
   "engines": {
     "node": "20"

store/pages/data/components/aggregationByDrinks.ts

@@ -9,7 +9,7 @@ export const useAggregationByDrinksStore = defineStore('aggregationByDrinksStore
   const drinksStore = useDrinksStore()
   const { drinks } = storeToRefs(drinksStore)
 
-  const chartDataTitle = ['Name', 'Count']
+  const chartDataTitle = ref<Array<string>>(['Name', 'Count'])
   const aggregationByDrinks = ref<Array<AggregationByDrink>>([])
 
   const fetchSumCount = async () => {
@@ -48,11 +48,18 @@ export const useAggregationByDrinksStore = defineStore('aggregationByDrinksStore
     )
   })
 
+  /**
+   * 合計値計算ロジック
+   */
+  const computedSumCount = computed(() => {
+    return computedTableData.value.reduce((accumulator, currentValue) => accumulator + Number(currentValue[1]), 0)
+  })
+
   /**
    * 円グラフ用データ
    */
   const computedChartData = computed(() => {
-    return [chartDataTitle, ...computedTableData.value]
+    return [chartDataTitle.value, ...computedTableData.value]
   })
 
   /**
@@ -71,6 +78,7 @@ export const useAggregationByDrinksStore = defineStore('aggregationByDrinksStore
     fetchSumCountPerYear,
     fetchSumCountPerMonth,
     computedTableData,
+    computedSumCount,
     computedChartData,
     computedPieChartOptions,
   }

store/pages/data/monthly.ts

@@ -18,7 +18,6 @@ export const useMonthlyStore = defineStore('monthlyStore', () => {
   const { fetchSumCountPerMonth } = useAggregationByDrinksStore()
 
   const graphDataTitleBase = ['日付', '合計']
-  const chartDataTitle = ['Name', 'Count']
 
   const yearMonth = ref<string>(processIntoYearMonth(new Date()))
   const graphDataTitle = ref<string[]>(graphDataTitleBase)
@@ -102,7 +101,6 @@ export const useMonthlyStore = defineStore('monthlyStore', () => {
 
   return {
     yearMonth,
-    chartDataTitle,
     prevMonth,
     nextMonth,
     fetchDrinkCounters,

store/pages/data/total.ts

@@ -12,8 +12,6 @@ export const useTotalStore = defineStore('totalStore', () => {
   const { fetchAggregationByDow } = useAggregationByDowStore()
   const { fetchSumCount } = useAggregationByDrinksStore()
 
-  const chartDataTitle = ['Name', 'Count']
-
   const fetchDrinkCountersAll = async () => {
     const fetchDrinksError = await fetchDrinks()
     if (fetchDrinksError) {
@@ -36,7 +34,6 @@ export const useTotalStore = defineStore('totalStore', () => {
   }
 
   return {
-    chartDataTitle,
     fetchDrinkCountersAll,
   }
 })