Merge pull request #7111 from kaizumaki/feature/fix-isBetween-option

[bugfix]isBetweenの第３引数を'day'にする
Tokyo-Metro-Gov · Feb 21, 2022 · f8d5b9c · f8d5b9c
2 parents 9578612 + cbc1d4b
commit f8d5b9c
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/components/index/CardsFeatured/TestedNumber/Chart.vue b/components/index/CardsFeatured/TestedNumber/Chart.vue
@@ -273,7 +273,7 @@ const options: ThisTypedComponentOptionsWithRecordProps<
       const graphSeries = getGraphSeriesStyle(this.chartData.length)
       const rangeDate = this.labels.filter((item) => {
         const date = dayjs(item)
-        return date.isBetween(this.startDate, this.endDate, null, '[]')
+        return date.isBetween(this.startDate, this.endDate, 'day', '[]')
       })
       if (this.dataKind === 'transition') {
         return {

diff --git a/components/index/CardsFeatured/TokyoFeverConsultationCenterReportsNumber/Chart.vue b/components/index/CardsFeatured/TokyoFeverConsultationCenterReportsNumber/Chart.vue
@@ -275,7 +275,7 @@ const options: ThisTypedComponentOptionsWithRecordProps<
 
       const rangeDate = this.labels.filter((item) => {
         const date = dayjs(item)
-        return date.isBetween(this.startDate, this.endDate, null, '[]')
+        return date.isBetween(this.startDate, this.endDate, 'day', '[]')
       })
 
       return {

diff --git a/components/index/CardsFeatured/Vaccination/Chart.vue b/components/index/CardsFeatured/Vaccination/Chart.vue
@@ -258,7 +258,7 @@ const options: ThisTypedComponentOptionsWithRecordProps<
 
       const rangeDate = this.labels.filter((item) => {
         const date = dayjs(item)
-        return date.isBetween(this.startDate, this.endDate, null, '[]')
+        return date.isBetween(this.startDate, this.endDate, 'day', '[]')
       })
 
       return {

diff --git a/components/index/CardsMonitoring/HospitalizedNumber/Chart.vue b/components/index/CardsMonitoring/HospitalizedNumber/Chart.vue
@@ -362,7 +362,7 @@ const options: ThisTypedComponentOptionsWithRecordProps<
       const values = this.chartData
         .filter((item) => {
           const date = dayjs(item.label)
-          return date.isBetween(this.startDate, this.endDate, null, '[]')
+          return date.isBetween(this.startDate, this.endDate, 'day', '[]')
         })
         .map((d) => d.transition)
       const max = Math.max(...values) + this.addedValue

diff --git a/components/index/CardsMonitoring/MonitoringConfirmedCasesNumber/Chart.vue b/components/index/CardsMonitoring/MonitoringConfirmedCasesNumber/Chart.vue
@@ -246,7 +246,7 @@ export default Vue.extend<Data, Methods, Computed, Props>({
       displayLegends: [true, true],
       colors,
       startDate: '2020-01-01',
-      endDate: dayjs().format('YYYY-MM-DD'),
+      endDate: dayjs().format('YYYY-MM-DDT00:00:00+09:00'),
     }
   },
   computed: {
@@ -314,7 +314,7 @@ export default Vue.extend<Data, Methods, Computed, Props>({
 
       const rangeDate = this.labels.filter((item) => {
         const date = dayjs(item)
-        return date.isBetween(this.startDate, this.endDate, null, '[]')
+        return date.isBetween(this.startDate, this.endDate, 'day', '[]')
       })
 
       return {

diff --git a/components/index/CardsMonitoring/PositiveRate/Chart.vue b/components/index/CardsMonitoring/PositiveRate/Chart.vue
@@ -335,7 +335,7 @@ const options: ThisTypedComponentOptionsWithRecordProps<
     displayData() {
       const rangeDate = this.labels.filter((item) => {
         const date = dayjs(item)
-        return date.isBetween(this.startDate, this.endDate, null, '[]')
+        return date.isBetween(this.startDate, this.endDate, 'day', '[]')
       })
 
       return {

diff --git a/components/index/CardsMonitoring/SevereCase/Chart.vue b/components/index/CardsMonitoring/SevereCase/Chart.vue
@@ -304,7 +304,7 @@ const options: ThisTypedComponentOptionsWithRecordProps<
       const values = this.chartData
         .filter((item) => {
           const date = dayjs(item.label)
-          return date.isBetween(this.startDate, this.endDate, null, '[]')
+          return date.isBetween(this.startDate, this.endDate, 'day', '[]')
         })
         .map((d) => d.transition)
       const max = Math.max(...values)

diff --git a/components/index/CardsMonitoring/UntrackedRate/Chart.vue b/components/index/CardsMonitoring/UntrackedRate/Chart.vue
@@ -308,7 +308,7 @@ export default Vue.extend<Data, Methods, Computed, Props>({
     displayData() {
       const rangeDate = this.labels.filter((item) => {
         const date = dayjs(item)
-        return date.isBetween(this.startDate, this.endDate, null, '[]')
+        return date.isBetween(this.startDate, this.endDate, 'day', '[]')
       })
 
       return {

diff --git a/components/index/_shared/MixedBarAndLineChart.vue b/components/index/_shared/MixedBarAndLineChart.vue
@@ -279,7 +279,7 @@ const options: ThisTypedComponentOptionsWithRecordProps<
     displayData() {
       const rangeDate = this.labels.filter((item) => {
         const date = dayjs(item)
-        return date.isBetween(this.startDate, this.endDate, null, '[]')
+        return date.isBetween(this.startDate, this.endDate, 'day', '[]')
       })
 
       return {

diff --git a/components/index/_shared/TimeBarChart.vue b/components/index/_shared/TimeBarChart.vue
@@ -393,7 +393,7 @@ const options: ThisTypedComponentOptionsWithRecordProps<
       const values = this.chartData
         .filter((item) => {
           const date = dayjs(item.label)
-          return date.isBetween(this.startDate, this.endDate, null, '[]')
+          return date.isBetween(this.startDate, this.endDate, 'day', '[]')
         })
         .map((d) => d[dataKind])
       const max = Math.max(...values)