Added Mortality and Recovered Percentage.

Author: mmixx

lib/cli/index.js

@@ -30,8 +30,9 @@ let ts = Date.now(),
 // 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:`${style.white.open}COVID-19 Tracker CLI v`+pkg.version+` - Global Update${style.white.close}`}],
+                head: [{colSpan:5,content:`${style.white.open}COVID-19 Tracker CLI v`+pkg.version+` - Global Update${style.white.close}`}],
                 chars: {    'top': `${tblopn}═${tblcls}`,
                             'top-mid': `${tblopn}╤${tblcls}`,
                             'top-left': `${tblopn}╔${tblcls}`, 
@@ -50,11 +51,11 @@ exports.covid19globaltracker = (c, d, r, u) => {
             });
 
     table.push(
-        [{colSpan:3,content:style.gray.open+'As of '+asof.toLocaleString()+' [Date:'+currentdate+']'+style.gray.close}],
-        [`${style.magenta.open}Cases${style.magenta.close}`, `${style.red.open}Deaths${style.red.close}`, `${style.green.open}Recovered${style.green.close}`],
-        [formatNumber(cases), formatNumber(deaths), formatNumber(recovered)],
-        [{colSpan:3,content:style.gray.open+`Source: https://www.worldometers.info/coronavirus/`+style.gray.close}],
-        [{colSpan:3,content:style.gray.open+`Code: https://github.com/warengonzaga/covid19-tracker-cli`+style.gray.close}]
+        [{colSpan:5,content:style.gray.open+'As of '+asof.toLocaleString()+' [Date:'+currentdate+']'+style.gray.close}],
+        [`${style.magenta.open}Cases${style.magenta.close}`, `${style.red.open}Deaths${style.red.close}`, `${style.green.open}Recovered${style.green.close}`,`${style.red.open}Mortality %${style.red.close}`,`${style.green.open}Recovered %${style.green.close}`],
+        [formatNumber(cases), formatNumber(deaths), formatNumber(recovered), mortalityPercentage.toFixed(2), recoveredPercentage.toFixed(2)],
+        [{colSpan:5,content:style.gray.open+`Source: https://www.worldometers.info/coronavirus/`+style.gray.close}],
+        [{colSpan:5,content:style.gray.open+`Code: https://github.com/warengonzaga/covid19-tracker-cli`+style.gray.close}]
     );
     return table.toString()+'\n'+footer;
 };
@@ -70,9 +71,10 @@ 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:`${style.white.open}COVID-19 Tracker CLI v`+pkg.version+` - ${name} Update${style.white.close}`}],
+                head: [{colSpan:5,content:`${style.white.open}COVID-19 Tracker CLI v`+pkg.version+` - ${name} Update${style.white.close}`}],
                 chars: {    'top': `${tblopn}═${tblcls}`,
                             'top-mid': `${tblopn}╤${tblcls}`,
                             'top-left': `${tblopn}╔${tblcls}`, 
@@ -91,13 +93,13 @@ exports.covid19countrytracker = (n, c, tC, d, tD, r, a, cl, cPOM, u) => {
             });
 
     table.push(
-        [{colSpan:4,content:style.gray.open+'As of '+asof.toLocaleString()+' [Date:'+currentdate+']'+style.gray.close}],
-        [`${style.magenta.open}Cases${style.magenta.close}`, `${style.red.open}Deaths${style.red.close}`, `${style.green.open}Recovered${style.green.close}`,`${style.cyan.open}Active${style.cyan.close}`],
-        [formatNumber(cases), formatNumber(deaths), formatNumber(recovered), formatNumber(active)],
-        [`${style.magentaBright.open}Today Cases${style.magentaBright.close}`, `${style.redBright.open}Today Deaths${style.red.close}`, `${style.redBright.open}Critical${style.redBright.close}`,`${style.cyanBright.open}Cases Per Million${style.cyanBright.close}`],
-        [formatNumber(todayCases), formatNumber(todayDeaths), formatNumber(critical), formatNumber(casesPerOneMillion)],
-        [{colSpan:4,content:style.gray.open+`Source: https://www.worldometers.info/coronavirus/`+style.gray.close}],
-        [{colSpan:4,content:style.gray.open+`Code: https://github.com/warengonzaga/covid19-tracker-cli`+style.gray.close}]
+        [{colSpan:5,content:style.gray.open+'As of '+asof.toLocaleString()+' [Date:'+currentdate+']'+style.gray.close}],
+        [`${style.magenta.open}Cases${style.magenta.close}`, `${style.red.open}Deaths${style.red.close}`, `${style.green.open}Recovered${style.green.close}`,`${style.cyan.open}Active${style.cyan.close}`,`${style.cyanBright.open}Cases Per Million${style.cyanBright.close}`],
+        [formatNumber(cases), formatNumber(deaths), formatNumber(recovered), formatNumber(active), formatNumber(casesPerOneMillion)],
+        [`${style.magentaBright.open}Today Cases${style.magentaBright.close}`, `${style.redBright.open}Today Deaths${style.red.close}`, `${style.redBright.open}Critical${style.redBright.close}`,`${style.red.open}Mortality %${style.red.close}`,`${style.green.open}Recovered %${style.green.close}`],
+        [formatNumber(todayCases), formatNumber(todayDeaths), formatNumber(critical), mortalityPercentage.toFixed(2), recoveredPercentage.toFixed(2)],
+        [{colSpan:5,content:style.gray.open+`Source: https://www.worldometers.info/coronavirus/`+style.gray.close}],
+        [{colSpan:5,content:style.gray.open+`Code: https://github.com/warengonzaga/covid19-tracker-cli`+style.gray.close}]
     );
 
     return table.toString()+'\n'+footer;