-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #254 from sfbrigade/feature/issue250
Feature/issue250
- Loading branch information
Showing
5 changed files
with
345 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,225 @@ | ||
| <template> | ||
| <data-view :title="title" :date="date" :url="url"> | ||
| <bar | ||
| v-if="displayData != null" | ||
| :chart-data="displayData" | ||
| :options="displayOption" | ||
| :height="240" | ||
| /> | ||
| </data-view> | ||
| </template> | ||
|
|
||
| <script> | ||
| import DataView from '@/components/DataView.vue' | ||
| export default { | ||
| components: { DataView }, | ||
| props: { | ||
| title: { | ||
| type: String, | ||
| required: false, | ||
| default: '' | ||
| }, | ||
| chartData: { | ||
| type: Array, | ||
| required: false, | ||
| default: () => [] | ||
| }, | ||
| selectedCounties: { | ||
| type: Array, | ||
| required: false, | ||
| default: () => [] | ||
| }, | ||
| chartDataType: { | ||
| type: String, | ||
| required: true, | ||
| default: 'cases' | ||
| }, | ||
| date: { | ||
| type: String, | ||
| required: true, | ||
| default: '' | ||
| }, | ||
| unit: { | ||
| type: String, | ||
| required: false, | ||
| default: '' | ||
| }, | ||
| url: { | ||
| type: String, | ||
| required: false, | ||
| default: '' | ||
| } | ||
| }, | ||
| data() { | ||
| return {} | ||
| }, | ||
| computed: { | ||
| displayData() { | ||
| if (this.selectedCounties.length) { | ||
| const dataSets = [] | ||
| if (this.chartDataType === 'casesperpeople') { | ||
| for (const county of this.selectedCounties) { | ||
| dataSets.push({ | ||
| type: 'line', | ||
| fill: false, | ||
| borderWidth: 1, | ||
| pointBackgroundColor: 'rgba(0,0,0,0)', | ||
| pointBorderColor: 'rgba(0,0,0,0)', | ||
| borderColor: county.color, | ||
| lineTension: 0, | ||
| label: county.name, | ||
| data: this.chartData[county.name].graph.map(d => { | ||
| return ( | ||
| d.confirmedTransition / | ||
| (this.chartData[county.name].population / 1000) | ||
| ) | ||
| }) | ||
| }) | ||
| } | ||
| return { | ||
| labels: this.chartData[this.selectedCounties[0].name].graph.map( | ||
| d => { | ||
| return d.label | ||
| } | ||
| ), | ||
| datasets: dataSets | ||
| } | ||
| } else { | ||
| // Percent Increase in 7 days | ||
| for (const county of this.selectedCounties) { | ||
| const confirmedCumulativeIn7daysQueue = [] | ||
| dataSets.push({ | ||
| type: 'line', | ||
| fill: false, | ||
| borderWidth: 1, | ||
| pointBackgroundColor: 'rgba(0,0,0,0)', | ||
| pointBorderColor: 'rgba(0,0,0,0)', | ||
| borderColor: county.color, | ||
| lineTension: 0, | ||
| label: county.name, | ||
| data: this.chartData[county.name].graph.map(d => { | ||
| confirmedCumulativeIn7daysQueue.push(d.cumulative) | ||
| if (confirmedCumulativeIn7daysQueue.length > 7) { | ||
| const confirmedCumulative7daysBefore = confirmedCumulativeIn7daysQueue.shift() | ||
| return ( | ||
| ((d.cumulative - confirmedCumulative7daysBefore) / | ||
| confirmedCumulative7daysBefore) * | ||
| 100 | ||
| ) | ||
| } else { | ||
| return null | ||
| } | ||
| }) | ||
| }) | ||
| } | ||
| return { | ||
| labels: this.chartData[this.selectedCounties[0].name].graph.map( | ||
| d => { | ||
| return d.label | ||
| } | ||
| ), | ||
| datasets: dataSets | ||
| } | ||
| } | ||
| } else { | ||
| return { | ||
| datasets: [] | ||
| } | ||
| } | ||
| }, | ||
| displayOption() { | ||
| const unit = this.unit | ||
| return { | ||
| tooltips: { | ||
| displayColors: false, | ||
| callbacks: { | ||
| label(tooltipItem) { | ||
| const labelText = | ||
| (Math.round(tooltipItem.value * 100) / 100).toLocaleString() + | ||
| unit | ||
| return labelText | ||
| }, | ||
| title(tooltipItem, data) { | ||
| return data.labels[tooltipItem[0].index] | ||
| } | ||
| } | ||
| }, | ||
| barValueSpacing: 20, | ||
| responsive: true, | ||
| maintainAspectRatio: false, | ||
| legend: { | ||
| display: true | ||
| }, | ||
| scales: { | ||
| xAxes: [ | ||
| { | ||
| id: 'day', | ||
| stacked: false, | ||
| gridLines: { | ||
| display: false | ||
| }, | ||
| ticks: { | ||
| fontSize: 12, | ||
| maxTicksLimit: 20, | ||
| fontColor: '#808080', | ||
| maxRotation: 0, | ||
| minRotation: 0, | ||
| callback: label => { | ||
| return label.split('/')[1] | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| id: 'month', | ||
| stacked: false, | ||
| gridLines: { | ||
| drawOnChartArea: false, | ||
| drawTicks: true, | ||
| drawBorder: false, | ||
| tickMarkLength: 10 | ||
| }, | ||
| ticks: { | ||
| fontSize: 12, | ||
| fontColor: '#808080', | ||
| padding: 3, | ||
| fontStyle: 'bold', | ||
| gridLines: { | ||
| display: true | ||
| }, | ||
| callback: label => { | ||
| const month = label.split(' ')[0] | ||
| return month | ||
| } | ||
| }, | ||
| type: 'time', | ||
| time: { | ||
| unit: 'month' | ||
| } | ||
| } | ||
| ], | ||
| yAxes: [ | ||
| { | ||
| location: 'bottom', | ||
| stacked: false, | ||
| gridLines: { | ||
| display: true, | ||
| color: '#E5E5E5' | ||
| }, | ||
| ticks: { | ||
| suggestedMin: 0, | ||
| maxTicksLimit: 8, | ||
| fontColor: '#808080' | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| </script> | ||
|
|
||
| <style lang="scss" scoped></style> |
Oops, something went wrong.