wip: Atualizando o Gráfico: Países: França e Alemanha; Quando começou…

…: 22/02/2020 até 26/10/2020; Criando uma classe para carregar os dados
emilianoeloi · Oct 27, 2020 · b53151c · b53151c
1 parent 8c25a6a
commit b53151c
Show file tree

Hide file tree

Showing 15 changed files with 27,751 additions and 28 deletions.
diff --git a/BD/COVID-19 b/BD/COVID-19
diff --git a/confirmados.png b/confirmados.png
diff --git a/integrate/csse_covid_19_daily_reports/10-08-2020.csv b/integrate/csse_covid_19_daily_reports/10-08-2020.csv
@@ -350,7 +350,7 @@ FIPS,Admin2,Province_State,Country_Region,Last_Update,Lat,Long_,Confirmed,Deaths
 ,,,Kazakhstan,2020-10-09 04:23:59,48.0196,66.9237,108561,1746,103758,3057,Kazakhstan,578.1684722459588,1.6083123773730899
 ,,,Kenya,2020-10-09 04:23:59,-0.0236,37.9062,40178,751,31710,7717,Kenya,74.72015740739019,1.869182139479317
 ,,,"Korea, South",2020-10-09 04:23:59,35.90775700000001,127.766922,24476,428,22569,1479,"Korea, South",47.74017951485593,1.7486517404804707
-,,,Kosovo,2020-10-09 04:23:59,42.602636,20.902977,15938,638,14143,1157,Kosovo,880.3744657157724,4.003011670222111
+,,,Kosovo,2020-10-09 04:23:59,42.602636,20.902977,15971,638,14189,1144,Kosovo,880.3744657157724,4.003011670222111
 ,,,Kuwait,2020-10-09 04:23:59,29.31166,47.481766,109441,642,101314,7485,Kuwait,2562.6831872050593,0.5866174468435047
 ,,,Kyrgyzstan,2020-10-09 04:23:59,41.20438,74.766098,48342,1073,43957,3312,Kyrgyzstan,740.9654315761142,2.21960200239957
 ,,,Laos,2020-10-09 04:23:59,19.85627,102.495496,23,0,22,1,Laos,0.3161270423868636,0.0

diff --git a/integrate/csse_covid_19_daily_reports/10-09-2020.csv b/integrate/csse_covid_19_daily_reports/10-09-2020.csv
@@ -350,7 +350,7 @@ FIPS,Admin2,Province_State,Country_Region,Last_Update,Lat,Long_,Confirmed,Deaths
 ,,,Kazakhstan,2020-10-10 04:23:57,48.0196,66.9237,108663,1746,103910,3007,Kazakhstan,578.7116984889842,1.6068026835261313
 ,,,Kenya,2020-10-10 04:23:57,-0.0236,37.9062,40620,755,31876,7989,Kenya,75.54215724745356,1.8586903003446578
 ,,,"Korea, South",2020-10-10 04:23:57,35.90775700000001,127.766922,24548,430,22624,1494,"Korea, South",47.88061475448128,1.7516701971647384
-,,,Kosovo,2020-10-10 04:23:57,42.602636,20.902977,15971,638,14189,1144,Kosovo,882.1973015401304,3.9947404670966127
+,,,Kosovo,2020-10-10 04:23:57,42.602636,20.902977,16050,641,14250,1159,Kosovo,882.1973015401304,3.9947404670966127
 ,,,Kuwait,2020-10-10 04:23:57,29.31166,47.481766,110076,649,102024,7403,Kuwait,2577.5524210742237,0.58959264508158
 ,,,Kyrgyzstan,2020-10-10 04:23:57,41.20438,74.766098,48617,1077,44097,3443,Kyrgyzstan,745.1805135686554,2.2152744924614844
 ,,,Laos,2020-10-10 04:23:57,19.85627,102.495496,23,0,22,1,Laos,0.3161270423868636,0.0

diff --git a/integrate/csse_covid_19_daily_reports/10-17-2020.csv b/integrate/csse_covid_19_daily_reports/10-17-2020.csv
@@ -350,7 +350,7 @@ FIPS,Admin2,Province_State,Country_Region,Last_Update,Lat,Long_,Confirmed,Deaths
 ,,,Kazakhstan,2020-10-18 04:24:25,48.0196,66.9237,109406,1768,105001,2637,Kazakhstan,582.6687288671011,1.615999122534413
 ,,,Kenya,2020-10-18 04:24:25,-0.0236,37.9062,44196,825,31752,11619,Kenya,82.1925450937582,1.8666847678522944
 ,,,"Korea, South",2020-10-18 04:24:25,35.90775700000001,127.766922,25199,444,23312,1443,"Korea, South",49.15038337942698,1.7619746815349815
-,,,Kosovo,2020-10-18 04:24:25,42.602636,20.902977,16606,652,14556,1398,Kosovo,917.2730817967197,3.9262917017945322
+,,,Kosovo,2020-10-18 04:24:25,42.602636,20.902977,16754,652,14612,1490,Kosovo,917.2730817967197,3.9262917017945322
 ,,,Kuwait,2020-10-18 04:24:25,29.31166,47.481766,115483,694,107108,7681,Kuwait,2704.1633620672496,0.6009542530069361
 ,,,Kyrgyzstan,2020-10-18 04:24:25,41.20438,74.766098,51490,1108,45509,4873,Kyrgyzstan,789.2166247125507,2.1518741503204506
 ,,,Laos,2020-10-18 04:24:25,19.85627,102.495496,23,0,22,1,Laos,0.3161270423868636,0.0

diff --git a/integrate/csse_covid_19_daily_reports/10-20-2020.csv b/integrate/csse_covid_19_daily_reports/10-20-2020.csv
diff --git a/integrate/csse_covid_19_daily_reports/10-21-2020.csv b/integrate/csse_covid_19_daily_reports/10-21-2020.csv
diff --git a/integrate/csse_covid_19_daily_reports/10-22-2020.csv b/integrate/csse_covid_19_daily_reports/10-22-2020.csv
diff --git a/integrate/csse_covid_19_daily_reports/10-23-2020.csv b/integrate/csse_covid_19_daily_reports/10-23-2020.csv
diff --git a/integrate/csse_covid_19_daily_reports/10-24-2020.csv b/integrate/csse_covid_19_daily_reports/10-24-2020.csv
diff --git a/integrate/csse_covid_19_daily_reports/10-25-2020.csv b/integrate/csse_covid_19_daily_reports/10-25-2020.csv
diff --git a/integrate/csse_covid_19_daily_reports/10-26-2020.csv b/integrate/csse_covid_19_daily_reports/10-26-2020.csv
diff --git a/integrate/index.js b/integrate/index.js
@@ -1,5 +1,5 @@
 const path = require('path');
-const Country = require('./Country.js')
+const loadTest = require('./loadTest.js')
 
 const getCSVRequestFiles = require('./getCSVReportFiles.js');
 const readFile = require('./readFile.js');
@@ -11,21 +11,13 @@ process.env.COUNT = 0;
 
 const csseCovid19DailyReport = path.join(__dirname, 'csse_covid_19_daily_reports');
 
-const argentina = new Country("argentina", "Argentina", "#75AADB")
-const brazil = new Country("brazil", "Brazil", "#009c3b")
-
-const spain = new Country("spain", "Spain", "#AA151B")
-const italy = new Country("italy", "Italy", "#008C45")
-
-const contriesToRequest = [spain, italy]
-
-writeFile.writeIntegrateFile(contriesToRequest)
+writeFile.writeIntegrateFile(loadTest.countries)
 
 getCSVRequestFiles(
    csseCovid19DailyReport,
-   new Date("2020-01-22T00:00:00.000"),
-   new Date("2020-10-19T23:59:59.999"),
-   contriesToRequest,
+   loadTest.starting,
+   loadTest.finishing,
+   loadTest.countries,
    readFile.read,
    writeFile.writeFile
 );
diff --git a/integrate/loadTest.js b/integrate/loadTest.js
@@ -0,0 +1,26 @@
+const Country = require('./Country.js')
+
+class Load {
+    constructor(countries, starting, finishing){
+        this.countries = countries
+        this.starting = starting
+        this.finishing = finishing
+    }
+}
+
+const france = new Country("france", "France", "#0055A4")
+const germany = new Country("germany", "Germany", "#000000")
+
+const argentina = new Country("argentina", "Argentina", "#75AADB")
+const brazil = new Country("brazil", "Brazil", "#009c3b")
+
+const spain = new Country("spain", "Spain", "#AA151B")
+const italy = new Country("italy", "Italy", "#008C45")
+
+const loadTest = new Load(
+    [france, germany],
+    new Date("2020-01-22T00:00:00.000"),
+    new Date("2020-10-26T23:59:59.999")
+)
+
+module.exports = loadTest;
diff --git a/site/public/index.html b/site/public/index.html
@@ -76,19 +76,11 @@ <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-
 
             <a class="nav-link" href="#">
               <span data-feather="file-text"></span>
-              Brazil Ministry of Health
+              <a href="https://www.arcgis.com/apps/opsdashboard/index.html#/bda7594740fd40299423467b48e9ecf6">
+                Novel Coronavirus (COVID-19) Cases, provided by JHU CSSE
+              </a>
             </a>
 
-            <a class="nav-link" href="#">
-              <span data-feather="file-text"></span>
-              Novel Coronavirus (COVID-19) Cases, provided by JHU CSSE
-            </a>
-
-            <a class="nav-link" href="#">
-              <span data-feather="file-text"></span>
-              NYC Department of Health and Mental Hygiene 
-            </a>
-
           </li>
         </ul>
       </div>