chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into vAuto-Settings

Browse Source
This commit is contained in:
Phil Olynyk 2023-06-11 18:39:29 -04:00
commit 812c0dd8fd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oscar/statistics.cpp
View File

@ -998,9 +998,11 @@ struct Period {
} else {
start = qMax(last.addDays(advance),first);
}
name = name + "<br>" + start.toString("ddMMMyy") ;
name = name + "<br>" + start.toString(Qt::SystemLocaleShortDate) ;
//name = name + "<br>" + start.toString(Qt::RFC2822Date) ;
if (advance!=0) {
name = name + " - " + last.toString("ddMMMyy");
//name = name + " - " + last.toString(Qt::RFC2822Date);
name = name + " - " + last.toString(Qt::SystemLocaleShortDate);
}
this->header = name;
this->start = start ;
@ -1771,7 +1773,7 @@ QString Statistics::UpdateRecordsBox()
if (list.size() >= 2) {
html += "<b>"+tr("Best RX Setting")+"</b><br>";
html += "<b>"+tr("Best Device Setting")+"</b><br>";
const RXItem & rxbest = *list.at(0);
html += QString("<a href='overview=%1,%2'>").arg(rxbest.start.toString(Qt::ISODate)).arg(rxbest.end.toString(Qt::ISODate)) +
tr("Date: %1 - %2").arg(rxbest.start.toString(Qt::SystemLocaleShortDate)).arg(rxbest.end.toString(Qt::SystemLocaleShortDate)) + "</a><br>";
@ -1783,7 +1785,7 @@ QString Statistics::UpdateRecordsBox()
html += QString("%1").arg(formatRelief(rxbest.relief)) + "<br>";
html += "<br>";
html += "<b>"+tr("Worst RX Setting")+"</b><br>";
html += "<b>"+tr("Worst Device Setting")+"</b><br>";
const RXItem & rxworst = *list.at(list.size() -1);
html += QString("<a href='overview=%1,%2'>").arg(rxworst.start.toString(Qt::ISODate)).arg(rxworst.end.toString(Qt::ISODate)) +
tr("Date: %1 - %2").arg(rxworst.start.toString(Qt::SystemLocaleShortDate)).arg(rxworst.end.toString(Qt::SystemLocaleShortDate)) + "</a><br>";