Merge pull request #83 from swsoyee/fixPrefNameOrder

自治体名カラムがJISでソートできるようになった
swsoyee · Apr 19, 2020 · 14ffe52 · 14ffe52
2 parents 711374b + f183a58
commit 14ffe52
Show file tree

Hide file tree

Showing 3 changed files with 99 additions and 116 deletions.
diff --git a/00_System/CreateTable.R b/00_System/CreateTable.R
@@ -255,17 +255,41 @@ mergeDt <- data.table(
   doubleTimeDay = doubleTimeDay
 )
 
-mergeDt <- merge(mergeDt, totalDischarged, all.x = T)
+mergeDt <- merge(mergeDt, totalDischarged, all.x = T, sort = F)
 signateSub <- provinceAttr[, .(都道府県, 人口)]
 colnames(signateSub) <- c("region", "perMillion")
-mergeDt <- merge(mergeDt, signateSub, all.x = T)
+mergeDt <- merge(mergeDt, signateSub, all.x = T, sort = F)
 mergeDt[, perMillion := round(count / (perMillion / 1000000), 2)]
 
 for (i in mergeDt$region) {
   mergeDt[region == i]$dischargeDiff <- dischargedDiffSparkline[i][[1]]
   mergeDt[region == i]$detailBullet <- detailSparkLine[i][[1]]
 }
 
+# 13個特定警戒都道府県
+alertPref <-
+  c(
+    "東京",
+    "大阪",
+    "北海道",
+    "茨城",
+    "埼玉",
+    "千葉",
+    "神奈川",
+    "石川",
+    "岐阜",
+    "愛知",
+    "京都",
+    "兵庫",
+    "福岡"
+  )
+mergeDt[!(region %in% alertPref), region := paste0("<span style='float:right;'>", region, "</span>")]
+mergeDt[region %in% alertPref, region := paste0(icon("exclamation-triangle"), "<span style='float:right;'>", region, "</span>")]
+
+
+# 自治体名前ソート用
+prefNameId <- sprintf('%02d', seq(2:ncol(byDate)))
+mergeDt[, region := paste0(prefNameId, "|", region)]
 
 # オーダー
 setorder(mergeDt, - count)
@@ -274,7 +298,8 @@ mergeDt[, diff := gsub("\\n", "", diff)]
 mergeDt[, dischargeDiff := gsub("\\n", "", dischargeDiff)]
 mergeDt[, detailBullet := gsub("\\n", "", detailBullet)]
 # クルーズ船とチャーター便データ除外
-mergeDt <- mergeDt[!(region %in% lang[[langCode]][35:36])]
+mergeDt <- mergeDt[!grepl(pattern = paste0(lang[[langCode]][35:36], collapse = "|"), x = mergeDt$region)]
+
 print("テーブル出力")
 fwrite(x = mergeDt, file = paste0(DATA_PATH, "resultSummaryTable.csv"), sep = "@", quote = F)
 

diff --git a/03_Components/Main/SummaryTable.server.R b/03_Components/Main/SummaryTable.server.R
@@ -58,26 +58,6 @@ output$dischargeAndDeathByPrefTable <- renderDataTable({
   colorsDischarged <-
     colorRampPalette(c(lightGreen, darkGreen))(length(breaksDischarged) + 1)
 
-  alertMark <- icon("exclamation-triangle")
-  # 13個特定警戒都道府県
-  alertPref <-
-    c(
-      "東京",
-      "大阪",
-      "北海道",
-      "茨城",
-      "埼玉",
-      "千葉",
-      "神奈川",
-      "石川",
-      "岐阜",
-      "愛知",
-      "京都",
-      "兵庫",
-      "福岡"
-    )
-  dt[region %in% alertPref, region := paste0(alertMark, " ", region)]
-
   datatable(
     data = dt[, c(1, 8, 12, 7, 9), with = F],
     colnames = c("自治体", "内訳", "退院", "退院推移", "死亡"),
@@ -92,9 +72,14 @@ output$dischargeAndDeathByPrefTable <- renderDataTable({
       scrollY = "540px",
       scrollX = T,
       columnDefs = list(
+        list(
+          className = "dt-left",
+          width = "50px",
+          targets = 1
+        ),
         list(
           className = "dt-center",
-          targets = 1:5
+          targets = 2:5
         ),
         list(
           width = "30px",
@@ -103,6 +88,14 @@ output$dischargeAndDeathByPrefTable <- renderDataTable({
         list(
           width = "15%",
           targets = 4
+        ),
+        list(
+          render = JS("
+             function(data, type, row, meta) {
+                const split = data.split('|');
+                return split[1];
+            }"),
+          targets = 1
         )
       ),
       fnDrawCallback = htmlwidgets::JS("
@@ -156,26 +149,6 @@ output$summaryByRegion <- renderDataTable({
   colorsDeath <-
     colorRampPalette(c("white", lightNavy))(length(breaksDeath) + 1)
 
-  alertMark <- icon("exclamation-triangle")
-  # 13個特定警戒都道府県
-  alertPref <-
-    c(
-      "東京",
-      "大阪",
-      "北海道",
-      "茨城",
-      "埼玉",
-      "千葉",
-      "神奈川",
-      "石川",
-      "岐阜",
-      "愛知",
-      "京都",
-      "兵庫",
-      "福岡"
-    )
-  dt[region %in% alertPref, region := paste0(alertMark, " ", region)]
-
   datatable(
     data = dt[, c(1, 3, 4, 6:9), with = F],
     colnames = c("自治体", "新規", "感染者数", "新規感染", "新規退院", "内訳", "死亡"),
@@ -189,10 +162,15 @@ output$summaryByRegion <- renderDataTable({
       scrollY = "540px",
       scrollX = T,
       columnDefs = list(
+        list(
+          className = "dt-left",
+          width = "50px",
+          targets = 1
+        ),
         list(
           className = "dt-center",
           width = "15%",
-          targets = c(1, 3:5)
+          targets = 3:5
         ),
         list(
           className = "dt-center",
@@ -210,7 +188,7 @@ output$summaryByRegion <- renderDataTable({
                 const split = data.split('|');
                 return split[1];
             }"),
-          targets = 3
+          targets = c(1, 3)
         )
       ),
       fnDrawCallback = htmlwidgets::JS("
@@ -299,26 +277,6 @@ output$confirmedByPrefTable <- renderDataTable({
   colorsPerMillion <-
     colorRampPalette(c("#FFFFFF", darkRed))(length(breaksPerMillion) + 1)
 
-  alertMark <- icon("exclamation-triangle")
-  # 13個特定警戒都道府県
-  alertPref <-
-    c(
-      "東京",
-      "大阪",
-      "北海道",
-      "茨城",
-      "埼玉",
-      "千葉",
-      "神奈川",
-      "石川",
-      "岐阜",
-      "愛知",
-      "京都",
-      "兵庫",
-      "福岡"
-    )
-  dt[region %in% alertPref, region := paste0(alertMark, " ", region)]
-
   datatable(
     data = dt[, c(1, 3, 4, 6, 11, 13), with = F],
     colnames = c("自治体", "新規", "感染者数", "感染推移", "倍増日数", "百万人当たり"),
@@ -338,7 +296,7 @@ output$confirmedByPrefTable <- renderDataTable({
         ),
         list(
           className = "dt-left",
-          width = "15%",
+          width = "50px",
           targets = 1
         ),
         list(
@@ -357,7 +315,7 @@ output$confirmedByPrefTable <- renderDataTable({
                 const split = data.split('|');
                 return split[1];
             }"),
-          targets = 3
+          targets = c(1, 3)
         )
       ),
       fnDrawCallback = htmlwidgets::JS("