Skip to content

Added Mortality and Recovered Percentage. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
warengonzaga merged 4 commits into from
Mar 22, 2020
Merged

Added Mortality and Recovered Percentage. #2

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27580f1
Added Mortality and Recovered Percentage.
mmixx Mar 22, 2020
d33df23
Reverted back the codes.
mmixx Mar 22, 2020
704febb
Merge pull request #2 from WarenGonzaga/master
mmixx Mar 22, 2020
ea27c99
Added Mortality and Recovered Percentage.
mmixx Mar 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Added Mortality and Recovered Percentage.
  • Loading branch information
@mmixx
mmixx committed Mar 22, 2020
commit 27580f13ccd7aa6f1a110620434ee391f73632ca
30 changes: 16 additions & 14 deletions lib/cli/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`,
Expand All @@ -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;
};
Expand All @@ -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}`,
Expand All @@ -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;
Expand Down