Merge pull request #240 from SKosaka/development

#239 入院患者数と残り病床数カードの削除
stop-covid19-hyogo · Apr 12, 2020 · 0da691a · 0da691a
2 parents 8c05a71 + b98c553
commit 0da691a
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 40 deletions.
diff --git a/components/WhatsNew.vue b/components/WhatsNew.vue
@@ -8,29 +8,32 @@
     </h3>
     <ul class="WhatsNew-list">
       <li v-for="(item, i) in items" :key="i" class="WhatsNew-list-item">
-        <a
+        <div class="WhatsNew-list-item-anchor">
+          <!-- <a
           class="WhatsNew-list-item-anchor"
           :href="item.url"
           target="_blank"
           rel="noopener noreferrer"
-        >
+        > -->
           <time
-            class="WhatsNew-list-item-anchor-time px-2"
+            class="WhatsNew-list-item-anchor WhatsNew-list-item-anchor-time px-2"
             :datetime="formattedDate(item.date)"
           >
             {{ item.date }}
           </time>
-          <span class="WhatsNew-list-item-anchor-link">
+          <span>
+            <!-- <span class="WhatsNew-list-item-anchor-link"> -->
             {{ item.text }}
-            <v-icon
+            <!-- <v-icon
               v-if="!isInternalLink(item.url)"
               class="WhatsNew-item-ExternalLinkIcon"
               size="12"
             >
               mdi-open-in-new
-            </v-icon>
+            </v-icon> -->
           </span>
-        </a>
+          <!-- </a> -->
+        </div>
       </li>
     </ul>
   </div>
@@ -48,9 +51,9 @@ export default Vue.extend({
     }
   },
   methods: {
-    isInternalLink(path: string): boolean {
-      return !/^https?:\/\//.test(path)
-    },
+    // isInternalLink(path: string): boolean {
+    //  return !/^https?:\/\//.test(path)
+    // },
     formattedDate(dateString: string) {
       return convertDateToISO8601Format(dateString)
     }

diff --git a/data/news.json b/data/news.json
@@ -1,14 +1,8 @@
 {
     "newsItems": [
         {
-            "date": "2020\/03\/27",
-            "url": "https:\/\/www.bousai.metro.tokyo.lg.jp\/taisaku\/saigai\/1007261\/1007542.html",
-            "text": "LINE を活用した相談・情報提供サービスを開始"
-        },
-        {
-            "date": "2020\/03\/27",
-            "url": "https:\/\/www.bousai.metro.tokyo.lg.jp\/taisaku\/saigai\/1007261\/1007534.html",
-            "text": "中小企業従業員融資 の申込受付を開始 "
+            "date": "2020/04/12",
+            "text": "病床の大幅追加に伴い、正確な病床数の把握が現時点では困難になったため、「入院患者数と残り病床数」のグラフの公開を一旦中止します。"
         }
     ]
 }
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -188,8 +188,8 @@ const config: Configuration = {
         '/cards/tokyo-st-heatmap',
         '/cards/tokyo-city-heatmap' */
         '/cards/patients-by-age',
-        '/cards/patients-by-clusters',
-        '/cards/patients-and-sickbeds'
+        '/cards/patients-by-clusters'
+        // '/cards/patients-and-sickbeds'
       ]
 
       const routes: string[] = []

diff --git a/pages/cards/_card.vue b/pages/cards/_card.vue
@@ -55,9 +55,9 @@
     <patients-by-clusters
       v-else-if="this.$route.params.card == 'patients-by-clusters'"
     />
-    <patients-and-sickbeds
+    <!-- <patients-and-sickbeds
       v-else-if="this.$route.params.card == 'patients-and-sickbeds'"
-    />
+    /> -->
   </div>
 </template>
 
@@ -89,7 +89,7 @@ import TokyoStMapCard from '@/components/cards/TokyoStMapCard.vue'
 import TokyoCityMapCard from '@/components/cards/TokyoCityMapCard.vue' */
 import PatientsByAge from '@/components/cards/PatientsByAge.vue'
 import PatientsByClusters from '@/components/cards/PatientsByClusters.vue'
-import PatientsAndSickbeds from '@/components/cards/PatientsAndSickbeds.vue'
+// import PatientsAndSickbeds from '@/components/cards/PatientsAndSickbeds.vue'
 import { convertISO8601FormatToDatetime } from '@/utils/formatDate'
 
 export default {
@@ -110,8 +110,8 @@ export default {
     TokyoStMapCard,
     TokyoCityMapCard */
     PatientsByAge,
-    PatientsByClusters,
-    PatientsAndSickbeds
+    PatientsByClusters
+    // PatientsAndSickbeds
   },
   data() {
     let title, updatedAt
@@ -172,10 +172,10 @@ export default {
         title = this.$t('クラスター別陽性患者数')
         updatedAt = clustersSummary.last_update
         break
-      case 'patients-and-sickbeds':
-        title = this.$t('入院患者数と残り病床数')
-        updatedAt = sickbedsSummary.last_update
-        break
+      // case 'patients-and-sickbeds':
+      //   title = this.$t('入院患者数と残り病床数')
+      //   updatedAt = sickbedsSummary.last_update
+      //   break
     }
 
     const updatedTimeStr = convertISO8601FormatToDatetime(updatedAt)

diff --git a/pages/index.vue b/pages/index.vue
@@ -15,13 +15,13 @@
         <span>{{ $t('注釈') }} </span>
       </div>
     </div>
-    <!--<whats-new class="mb-4" :items="newsItems" />
-    <static-info
+    <whats-new class="mb-4" :items="newsItems" />
+    <!-- <static-info
       class="mb-4"
       :url="localePath('/flow')"
       :text="$t('自分や家族の症状に不安や心配があればまずは電話相談をどうぞ')"
       :btn-text="$t('相談の手順を見る')"
-    />-->
+    /> -->
     <v-row class="DataBlock">
       <confirmed-cases-details-card />
       <!--<tested-cases-details-card />-->
@@ -37,7 +37,7 @@
       <chiyoda-visitors-card />-->
       <patients-by-age />
       <patients-by-clusters />
-      <patients-and-sickbeds />
+      <!-- <patients-and-sickbeds /> -->
     </v-row>
     <!--<v-divider />
     <v-row class="DataBlock">
@@ -51,7 +51,7 @@
 import Vue from 'vue'
 import { MetaInfo } from 'vue-meta'
 import PageHeader from '@/components/PageHeader.vue'
-// import WhatsNew from '@/components/WhatsNew.vue'
+import WhatsNew from '@/components/WhatsNew.vue'
 // import StaticInfo from '@/components/StaticInfo.vue'
 import lastUpdate from '@/data/last_update.json'
 import News from '@/data/news.json'
@@ -65,7 +65,7 @@ import TelephoneAdvisoryReportsNumberCard from '@/components/cards/TelephoneAdvi
 import ConsultationDeskReportsNumberCard from '@/components/cards/ConsultationDeskReportsNumberCard.vue' */
 import PatientsByAge from '@/components/cards/PatientsByAge.vue'
 import PatientsByClusters from '@/components/cards/PatientsByClusters.vue'
-import PatientsAndSickbeds from '@/components/cards/PatientsAndSickbeds.vue'
+// import PatientsAndSickbeds from '@/components/cards/PatientsAndSickbeds.vue'
 // import MetroCard from '@/components/cards/MetroCard.vue'
 // import AgencyCard from '@/components/cards/AgencyCard.vue'
 import { convertISO8601FormatToDatetime } from '@/utils/formatDate'
@@ -77,7 +77,7 @@ import TokyoStMapCard from '@/components/cards/TokyoStMapCard.vue' */
 export default Vue.extend({
   components: {
     PageHeader,
-    // WhatsNew,
+    WhatsNew,
     // StaticInfo,
     ConfirmedCasesDetailsCard,
     // TestedCasesDetailsCard,
@@ -94,8 +94,8 @@ export default Vue.extend({
     ShinjukuStMapCard,
     TokyoStMapCard */
     PatientsByAge,
-    PatientsByClusters,
-    PatientsAndSickbeds
+    PatientsByClusters
+    // PatientsAndSickbeds
   },
   data() {
     const updatedTimeStr = convertISO8601FormatToDatetime(

diff --git a/ui-test/ogp_screenshot.py b/ui-test/ogp_screenshot.py
@@ -23,8 +23,8 @@
     #"/cards/shinjuku-st-heatmap": (959, 600),
     #"/cards/tokyo-st-heatmap": (959, 600)
     "/cards/patients-by-age": (959, 500),
-    "/cards/patients-by-clusters": (959, 500),
-    "/cards/patients-and-sickbeds": (959, 500)
+    "/cards/patients-by-clusters": (959, 500)
+    #"/cards/patients-and-sickbeds": (959, 500)
 }
 
 options = webdriver.ChromeOptions()