staging

.github/workflows/data-update.yml

@@ -31,6 +31,7 @@ jobs:
           path: development
       - run: |
           cp -rf $GITHUB_WORKSPACE/data_setup/inspections_summary.json development/data/
+          cp -rf $GITHUB_WORKSPACE/data_setup/inspections_breakdown.json development/data/
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v2
         with:
@@ -52,6 +53,7 @@ jobs:
           path: staging
       - run: |
           cp -rf $GITHUB_WORKSPACE/data_setup/inspections_summary.json staging/data/
+          cp -rf $GITHUB_WORKSPACE/data_setup/inspections_breakdown.json development/data/
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v2
         with:
@@ -73,6 +75,7 @@ jobs:
           path: master
       - run: |
           cp -rf $GITHUB_WORKSPACE/data_setup/inspections_summary.json master/data/
+          cp -rf $GITHUB_WORKSPACE/data_setup/inspections_breakdown.json development/data/
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v2
         with:

.github/workflows/deploy.yml

@@ -46,34 +46,7 @@ jobs:
           AWS_REGION: 'ap-northeast-1'
           FROM_PATH: './dist'
           DEST_PATH: ${{ secrets.AWS_S3_BUCKET_PRODUCTION }}
-
-      - name: Temporarily disable "include administrators" branch protection
-        uses: benjefferies/branch-protection-bot@master
-        if: always()
-        with:
-          access-token: ${{ secrets.ACCESS_TOKEN }}
-          branch: production
-
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./dist
-          publish_branch: production
-
-      - name: Enable "include administrators" branch protection
-        uses: benjefferies/branch-protection-bot@master
-        if: always()  # Force to always run this step to ensure "include administrators" is always turned back on
-        with:
-          access-token: ${{ secrets.ACCESS_TOKEN }}
-          owner: covid19-kitakyushu
-          repo: covid19
-          branch: production
-      - name: Create GitHub release
-        uses: rymndhng/release-on-push-action@master
-        with:
-          bump_version_scheme: patch
-
+
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:

components/cards/InspectionBreakdownCard.vue

@@ -0,0 +1,61 @@
+<template>
+  <v-col cols="12" md="6" class="DataCard">
+    <time-stacked-bar-chart
+      :title="$t('検査実施件数内訳')"
+      :title-id="'number-of-tested-breakdown'"
+      :chart-id="'time-stacked-bar-chart-inspections-breakdown'"
+      :chart-data="inspectionsBreakdownGraph"
+      :date="inspectionsBreakdown.last_update"
+      :items="inspectionsBreakdownItems"
+      :labels="inspectionsBreakdownLabels"
+      :unit="$t('件.tested')"
+      :data-labels="inspectionsBreakdownDataLabels"
+      :url="
+        'https://ckan.open-governmentdata.org/dataset/401005_kitakyushu_covid19_test_count_breakdown'
+      "
+    >
+      <!-- 件.tested = 検査数
+      <template v-if="$i18n.locale !== 'ja-basic'" v-slot:additionalNotes>
+        <br />
+        {{ $t('※1: 疑い例・接触者調査') }}
+        <br />
+        {{ $t('※2: チャーター便・クルーズ船') }}
+      </template>
+      -->
+    </time-stacked-bar-chart>
+  </v-col>
+</template>
+
+<script>
+import inspectionsBreakdown from '@/data/inspections_breakdown.json'
+import TimeStackedBarChart from '@/components/TimeStackedBarChart.vue'
+export default {
+  components: {
+    TimeStackedBarChart
+  },
+  data() {
+    // 検査実施日別状況
+    const inspectionsBreakdownGraph = [
+      inspectionsBreakdown.data['帰国者接触者外来等検査件数'],
+      inspectionsBreakdown.data['ＰＣＲ検査センター検査件数']
+    ]
+    const inspectionsBreakdownItems = [
+      this.$t('帰国者接触者外来等'),
+      this.$t('ＰＣＲ検査センター')
+    ]
+    const inspectionsBreakdownLabels = inspectionsBreakdown.labels
+    const inspectionsBreakdownDataLabels = [
+      this.$t('帰国者接触者外来等'),
+      this.$t('ＰＣＲ検査センター')
+    ]
+    const data = {
+      inspectionsBreakdown,
+      inspectionsBreakdownGraph,
+      inspectionsBreakdownItems,
+      inspectionsBreakdownLabels,
+      inspectionsBreakdownDataLabels
+    }
+    return data
+  }
+}
+</script>