Merge pull request OSSPhilippines#2 from iKnowITWorks/master

Added Mortality and Recovered Percentage.

Author: warengonzaga

lib/cli/index.js

@@ -61,22 +61,23 @@ const borders = { 'top': tblclr('═'),
 // additional informaton
 const source = 'Source: https://www.worldometers.info/coronavirus/',
       repo = 'Code: https://github.com/warengonzaga/covid19-tracker-cli',
-      sourceGlobal = {colSpan:3,content:source},
-      repoGlobal = {colSpan:3,content:repo},
-      sourceCountry = {colSpan:4,content:source},
-      repoCountry = {colSpan:4,content:repo};
+      sourceGlobal = {colSpan:5,content:source},
+      repoGlobal = {colSpan:5,content:repo},
+      sourceCountry = {colSpan:5,content:source},
+      repoCountry = {colSpan:5,content:repo};
 
 // covid19 global tracker
 exports.covid19globaltracker = (c, d, r, u) => {
     const   cases = c, deaths = d, recovered = r, asof = new Date(u),
+            mortalityPercentage = (d/c)*100, recoveredPercentage = (r/c)*100,
             table = new table3({
-                head: [{colSpan:3,content:white('COVID-19 Tracker CLI v'+pkg.version+' - Global Update')}],
+                head: [{colSpan:5,content:white('COVID-19 Tracker CLI v'+pkg.version+' - Global Update')}],
                 chars: borders
             });
     table.push(
-        [{colSpan:3,content:yellow('As of '+asof.toLocaleString()+' [Date:'+currentdate+']')}],
-        [magenta('Cases'), red('Deaths'), green('Recovered')],
-        [formatNumber(cases), formatNumber(deaths), formatNumber(recovered)],
+        [{colSpan:5,content:yellow('As of '+asof.toLocaleString()+' [Date:'+currentdate+']')}],
+        [magenta('Cases'), red('Deaths'), green('Recovered'), red('Mortality %'), green('Recovered %')],
+        [formatNumber(cases), formatNumber(deaths), formatNumber(recovered), mortalityPercentage.toFixed(2), recoveredPercentage.toFixed(2)],
         [sourceGlobal],[repoGlobal]
     );
     return table.toString()+'\n'+footer;
@@ -87,17 +88,18 @@ exports.covid19countrytracker = (n, c, tC, d, tD, r, a, cl, cPOM, u) => {
     const   name = n, cases = c, todayCases = tC,
             deaths = d, todayDeaths = tD, recovered = r,
             active = a, critical = cl, casesPerOneMillion = cPOM,
+            mortalityPercentage = (d/c)*100, recoveredPercentage = (r/c)*100,
             asof = new Date(u);
             table = new table3({
-                head: [{colSpan:4,content:white('COVID-19 Tracker CLI v'+pkg.version+' - '+name+' Update')}],
+                head: [{colSpan:5,content:white('COVID-19 Tracker CLI v'+pkg.version+' - '+name+' Update')}],
                 chars: borders
             });
     table.push(
-        [{colSpan:4,content:yellow('As of '+asof.toLocaleString()+' [Date:'+currentdate+']')}],
-        [magenta('Cases'), red('Deaths'), green('Recovered'), cyan('Active')],
-        [formatNumber(cases), formatNumber(deaths), formatNumber(recovered), formatNumber(active)],
-        [magentaBright('Today Cases'), redBright('Today Deaths'), redBright('Critical'), cyanBright('Cases Per Million')],
-        [formatNumber(todayCases), formatNumber(todayDeaths), formatNumber(critical), formatNumber(casesPerOneMillion)],
+        [{colSpan:5,content:yellow('As of '+asof.toLocaleString()+' [Date:'+currentdate+']')}],
+        [magenta('Cases'), red('Deaths'), green('Recovered'), cyan('Active'), cyanBright('Cases Per Million')],
+        [formatNumber(cases), formatNumber(deaths), formatNumber(recovered), formatNumber(active), formatNumber(casesPerOneMillion)],
+        [magentaBright('Today Cases'), redBright('Today Deaths'), redBright('Critical'), red('Mortality %'), green('Recovered %')],
+        [formatNumber(todayCases), formatNumber(todayDeaths), formatNumber(critical), mortalityPercentage.toFixed(2), recoveredPercentage.toFixed(2)],
         [sourceCountry],[repoCountry]
     );
     return table.toString()+'\n'+footer;