Skip to content
Closed
Changes from all commits
Commits
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
17 changes: 12 additions & 5 deletions lib/cli/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@ const formatNumber = (value) => {
return value.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
};

const formatDate = (value) => {
return value.toLocaleString('en-US', {
timeZone: 'UTC',
timeZoneName: 'short'
})
}

// time data
let ts = Date.now(),
date_ob = new Date(ts),
Expand Down Expand Up @@ -152,7 +159,7 @@ exports.covid19globaltracker = (c, d, r, u) => {
chars: borders
});
table.push(
[{colSpan:5,content:yellow('As of '+asof.toLocaleString()+' [Date:'+currentdate+']')}],
[{colSpan:5,content:yellow('As of ' + formatDate(asof) + ' [Date:'+currentdate+']')}],
[magenta('Cases'), red('Deaths'), green('Recovered'), red('Mortality %'), green('Recovered %')],
[formatNumber(cases), formatNumber(deaths), formatNumber(recovered), mortalityPercentage.toFixed(2), recoveredPercentage.toFixed(2)],
[helpInfo],[sourceInfo],[repoInfo]
Expand All @@ -173,7 +180,7 @@ exports.covid19countrytracker = (n, c, tC, d, tD, r, a, cl, cPOM, u) => {
chars: borders
});
table.push(
[{colSpan:5,content:yellow('As of '+asof.toLocaleString()+' [Date:'+currentdate+']')}],
[{colSpan:5,content:yellow('As of ' + formatDate(asof) + ' [Date:'+currentdate+']')}],
[magenta('Cases'), red('Deaths'), green('Recovered'), cyan('Active'), cyanBright('Cases/Million')],
[formatNumber(cases), formatNumber(deaths), formatNumber(recovered), formatNumber(active), formatNumber(casesPerOneMillion)],
[magentaBright('Today Cases'), redBright('Today Deaths'), redBright('Critical'), red('Mortality %'), greenBright('Recovery %')],
Expand All @@ -195,7 +202,7 @@ exports.plainglobaltracker = (c, d, r, u) => {
${line}
COVID-19 Tracker CLI v${pkg.version} - Global Update
${line}
As of ${asof.toLocaleString()} [Date: ${currentdate}]
As of ${formatDate(asof)} [Date: ${currentdate}]
${line}
Cases | ${formatNumber(cases)}
Deaths | ${formatNumber(deaths)}
Expand Down Expand Up @@ -232,7 +239,7 @@ exports.plaincountrytracker = (n, c, tC, d, tD, r, a, cl, cPOM, u) => {
${line}
COVID-19 Tracker CLI v${pkg.version} - ${name} Update
${line}
As of ${asof.toLocaleString()} [Date: ${currentdate}]
As of ${formatDate(asof)} [Date: ${currentdate}]
${line}
Cases | ${formatNumber(cases)}
Today Cases | ${formatNumber(todayCases)}
Expand Down Expand Up @@ -284,7 +291,7 @@ exports.historyCountryTracker = (n, c, tC, d, tD, r, a, cl, cPOM, u, h, chartTyp
chartData = chart.generate(h, chartType);

table.push(
[{colSpan: 5, content: yellow(`As of ${asof.toLocaleString()} Date: [${currentdate}]`)}],
[{colSpan: 5, content: yellow(`As of ${formatDate(asof)} Date: [${currentdate}]`)}],
[magenta('Cases'), red('Deaths'), green('Recovered'), cyan('Active'), cyanBright('Cases/Million')],
[formatNumber(cases), formatNumber(deaths), formatNumber(recovered), formatNumber(active), formatNumber(casesPerOneMillion)],
[magentaBright('Today Cases'), redBright('Today Deaths'), redBright('Critical'), red('Mortality %'), greenBright('Recovery %')],
Expand Down