From 68bb76378dd454acbeab18f655e06bc900b2c41d Mon Sep 17 00:00:00 2001 From: davidteather Date: Sun, 6 Dec 2020 14:48:20 -0600 Subject: [PATCH] Fix API & Add Hospitalization --- .../components/landing/landing.component.html | 8 +++---- .../components/landing/landing.component.ts | 5 +++- .../app/services/data-collector.service.ts | 6 ++--- .../app/stats-row/stats-row.component.html | 24 +++++++++++++++---- 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/corona-dashboard/src/app/components/landing/landing.component.html b/corona-dashboard/src/app/components/landing/landing.component.html index c25b8f7..0d32c0d 100644 --- a/corona-dashboard/src/app/components/landing/landing.component.html +++ b/corona-dashboard/src/app/components/landing/landing.component.html @@ -1,5 +1,5 @@
-
+

  On Campus  On Campus -
+

  Near Campus  Near Campus -
+

  Madison, WI  Madison, WI -
+
Last Updated: {{covid_data.updated}}
diff --git a/corona-dashboard/src/app/components/landing/landing.component.ts b/corona-dashboard/src/app/components/landing/landing.component.ts index 2ed07b4..247afd0 100644 --- a/corona-dashboard/src/app/components/landing/landing.component.ts +++ b/corona-dashboard/src/app/components/landing/landing.component.ts @@ -84,6 +84,7 @@ export class LandingComponent implements OnInit { }) dataService.getHistory(tmp_arr_2, 14, res.features[0].attributes.DATE).subscribe((results) => { + console.log(results); this.process_history(results, 14) }) @@ -125,6 +126,7 @@ export class LandingComponent implements OnInit { this.covid_data[key_word].pos_change = this.covid_data[key_word].pos_change + this.refine_number(e.attributes.POS_NEW) || this.refine_number(e.attributes.POS_NEW); this.covid_data[key_word].neg_change = this.covid_data[key_word].neg_change + this.refine_number(e.attributes.NEG_NEW) || this.refine_number(e.attributes.NEG_NEW); this.covid_data[key_word].deaths = this.covid_data[key_word].deaths + this.refine_number(e.attributes.DEATHS) || this.refine_number(e.attributes.DEATHS); + this.covid_data[key_word].hosp_total = this.covid_data[key_word].hosp_total + this.refine_number(e.attributes.HOSP_YES) || this.refine_number(e.attributes.HOSP_YES); } }) } @@ -140,7 +142,8 @@ export class LandingComponent implements OnInit { if (key.includes(e.attributes.GEOID)) { this.covid_data[key_word]['pos_' + String(days) + '_days_ago'] = this.covid_data[key_word]['pos_' + String(days) + '_days_ago'] + this.refine_number(e.attributes.POSITIVE) || this.refine_number(e.attributes.POSITIVE); this.covid_data[key_word]['neg_' + String(days) + '_days_ago'] = this.covid_data[key_word]['neg_' + String(days) + '_days_ago'] + this.refine_number(e.attributes.NEGATIVE) || this.refine_number(e.attributes.NEGATIVE); - this.covid_data[key_word]['deaths_' + String(days) + '_days_ago'] = this.covid_data[key_word]['deaths_' + String(days) + '_days_ago'] + this.refine_number(e.attributes.DEATHS) || this.refine_number(e.attributes.DEATHS) + this.covid_data[key_word]['deaths_' + String(days) + '_days_ago'] = this.covid_data[key_word]['deaths_' + String(days) + '_days_ago'] + this.refine_number(e.attributes.DEATHS) || this.refine_number(e.attributes.DEATHS); + this.covid_data[key_word]['hosp_' + String(days) + '_days_ago'] = this.covid_data[key_word]['hosp_' + String(days) + '_days_ago'] + this.refine_number(e.attributes.HOSP_YES) || this.refine_number(e.attributes.HOSP_YES); } }) } diff --git a/corona-dashboard/src/app/services/data-collector.service.ts b/corona-dashboard/src/app/services/data-collector.service.ts index 1344f91..bbd8489 100644 --- a/corona-dashboard/src/app/services/data-collector.service.ts +++ b/corona-dashboard/src/app/services/data-collector.service.ts @@ -18,7 +18,7 @@ export class DataCollectorService { filter = filter + " OR " } } - return this.http.get(`https://dhsgis.wi.gov/server/rest/services/DHS_COVID19/COVID19_WI/FeatureServer/10/query?outFields=*&returnGeometry=false&resultOffset=0&resultRecordCount=${geoIDs.length}&f=json&orderByFields=DATE desc&where=GEO = 'Census tract' AND (${filter})`) + return this.http.get(`https://dhsgis.wi.gov/server/rest/services/DHS_COVID19/COVID19_WI/MapServer/13/query?outFields=*&returnGeometry=false&resultOffset=0&resultRecordCount=${geoIDs.length}&f=json&orderByFields=DATE desc&where=GEO = 'Census tract' AND (${filter})`) } getHistory(geoIDs:any[], daysAgo:number, currDataEpoch:number): Observable { @@ -32,11 +32,11 @@ export class DataCollectorService { filter = filter + " OR " } } - return this.http.get(`https://dhsgis.wi.gov/server/rest/services/DHS_COVID19/COVID19_WI/FeatureServer/10/query?outFields=*&returnGeometry=false&resultOffset=0&resultRecordCount=${geoIDs.length}&f=json&orderByFields=DATE desc&where=GEO = 'Census tract' AND DATE >= TIMESTAMP '${now.toISOString().split("T")[0] + " " + "00:00:00"}' AND DATE <= TIMESTAMP '${now.toISOString().split("T")[0] + " " + "23:59:59"}' AND (${filter})`) + return this.http.get(`https://dhsgis.wi.gov/server/rest/services/DHS_COVID19/COVID19_WI/MapServer/13/query?outFields=*&returnGeometry=false&resultOffset=0&resultRecordCount=${geoIDs.length}&f=json&orderByFields=DATE desc&where=GEO = 'Census tract' AND DATE >= TIMESTAMP '${now.toISOString().split("T")[0] + " " + "00:00:00"}' AND DATE <= TIMESTAMP '${now.toISOString().split("T")[0] + " " + "23:59:59"}' AND (${filter})`) } getDataTimestamp(): Observable { - return this.http.get(`https://dhsgis.wi.gov/server/rest/services/DHS_COVID19/COVID19_WI/FeatureServer/10/query?outFields=*&returnGeometry=false&resultOffset=0&resultRecordCount=1&f=json&orderByFields=DATE desc&where=GEO = 'Census tract'`) + return this.http.get(`https://dhsgis.wi.gov/server/rest/services/DHS_COVID19/COVID19_WI/MapServer/13/query?outFields=*&returnGeometry=false&resultOffset=0&resultRecordCount=1&f=json&orderByFields=DATE desc&where=GEO = 'Census tract'`) } } diff --git a/corona-dashboard/src/app/stats-row/stats-row.component.html b/corona-dashboard/src/app/stats-row/stats-row.component.html index d9d80e6..dcf3e35 100644 --- a/corona-dashboard/src/app/stats-row/stats-row.component.html +++ b/corona-dashboard/src/app/stats-row/stats-row.component.html @@ -1,8 +1,9 @@
-
+
-

Active Cases: {{data.positive-data.pos_14_days_ago-(data.deaths-data.deaths_14_days_ago)}} +

Active Cases: + {{data.positive-data.pos_14_days_ago-(data.deaths-data.deaths_14_days_ago)}} (+{{data.positive-data.pos_1_days_ago}})Active Cases: {{data.positive-d

Total Positive: {{data.positive}}

-
+

Daily Negative: {{data.negative-data.neg_1_days_ago}} *

Weekly Negative: {{data.negative-data.neg_7_days_ago}}

+
+
+ +

Hospitalized: + {{data.hosp_14_days_ago}} + (+{{data.hosp_total-data.hosp_1_days_ago}}) + * +

+

Total Hospitalized: {{data.hosp_total}}

+