add breakdown-card (#334)

* Add changes * BOT; UPDATE DATA (#124) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Add changes * masater 20200513 (#131) * ChangeLinks+AddVideoLink * 4/0になるのを修正 * fix Co-authored-by: YasuhiroIhara <[email protected]> Co-authored-by: 池田大樹 <[email protected]> * Add changes * BOT; UPDATE DATA (#139) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Add changes * BOT; UPDATE DATA (#144) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#153) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#156) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#159) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#162) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#165) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#168) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#173) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#176) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#179) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#182) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#185) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#188) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#193) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#196) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#200) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#203) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#206) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#209) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#214) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#217) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#220) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#223) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#230) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#233) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#236) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#240) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#243) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#246) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * rm protection-bot (#247) * BOT; UPDATE DATA (#250) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#253) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#259) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#262) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#265) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#268) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#271) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#274) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA * BOT; UPDATE DATA (#280) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#285) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#291) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#294) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#297) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#300) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#303) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#306) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#309) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#312) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#315) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#318) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#321) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#324) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#327) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#330) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * BOT; UPDATE DATA (#333) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * add breakdown-card * BOT; UPDATE DATA (#337) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * 順序入れ替え * オープンデータURL修正 * ラベル名短縮 Co-authored-by: GitHub Action <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: YasuhiroIhara <[email protected]> Co-authored-by: 池田大樹 <[email protected]> Co-authored-by: Ikeda <[email protected]> Co-authored-by: ShunHisa <[email protected]>
covid19-kitakyushu · Jun 11, 2020 · 3dcda3a · 3dcda3a
1 parent dbf179a
commit 3dcda3a
Show file tree

Hide file tree

Showing 14 changed files with 815 additions and 34 deletions.
diff --git a/.github/workflows/deploy.yml b/.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:

diff --git a/components/cards/InspectionBreakdownCard.vue b/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>