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

Remove "series" from display in UI and on reports.

Browse Source
This commit is contained in:
sawinglogz 2019-08-18 17:27:21 -04:00
parent 928e50fcc1
commit 31fc47a5c5
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oscar/Graphs/gdailysummary.cpp
View File

@ -1,5 +1,6 @@
/* gDailySummary Graph Implementation /* gDailySummary Graph Implementation
* *
* Copyright (c) 2019 The OSCAR Team
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public
@ -108,7 +109,7 @@ void gDailySummary::SetDay(Day *day)
info_background.append(QColor("orange")); info_background.append(QColor("orange"));
settings.append(cpap->brand()+ " " + cpap->series()); settings.append(cpap->brand());
settings.append(cpap->model()+ " " + cpap->modelnumber()); settings.append(cpap->model()+ " " + cpap->modelnumber());
settings.append(schema::channel[CPAP_Mode].option(mode)); settings.append(schema::channel[CPAP_Mode].option(mode));

2
oscar/SleepLib/machine.cpp
View File

@ -1013,7 +1013,7 @@ bool Machine::LoadSummary(ProgressDialog * progress)
progress->setProgressValue(sess_order.size()); progress->setProgressValue(sess_order.size());
QApplication::processEvents(); QApplication::processEvents();
qDebug() << "Loaded" << info.series.toLocal8Bit().data() << info.model.toLocal8Bit().data() << "data in" << time.elapsed() << "ms"; qDebug() << "Loaded" << info.model.toLocal8Bit().data() << "data in" << time.elapsed() << "ms";
return true; return true;
} }

3
oscar/daily.cpp
View File

@ -1,5 +1,6 @@
/* Daily Panel /* Daily Panel
* *
* Copyright (c) 2019 The OSCAR Team
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public
@ -1153,7 +1154,7 @@ QString Daily::getCPAPInformation(Day * day)
QString tooltip=tr("Model %1 - %2").arg(info.modelnumber).arg(info.serial); QString tooltip=tr("Model %1 - %2").arg(info.modelnumber).arg(info.serial);
tooltip=tooltip.replace(" ","&nbsp;"); tooltip=tooltip.replace(" ","&nbsp;");
html+="<tr><td align=center><p title=\""+tooltip+"\">"+info.brand + " "+ info.series+"<br/> "+info.model+"</p></td></tr>\n"; html+="<tr><td align=center><p title=\""+tooltip+"\">"+info.brand+"<br/>"+info.model+"</p></td></tr>\n";
html+="<tr><td align=center>"; html+="<tr><td align=center>";
html+=tr("PAP Mode: %1").arg(day->getCPAPMode())+"<br/>"; html+=tr("PAP Mode: %1").arg(day->getCPAPMode())+"<br/>";

3
oscar/profileselector.cpp
View File

@ -1,5 +1,6 @@
/* Profile Selector Implementation /* Profile Selector Implementation
* *
* Copyright (c) 2019 The OSCAR Team
* Copyright (c) 2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2018 Mark Watkins <mark@jedimark.net>
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public
@ -139,7 +140,7 @@ void ProfileSelector::updateProfileList()
model->setData(model->index(row, 5, QModelIndex()), usersname); model->setData(model->index(row, 5, QModelIndex()), usersname);
if (mach) { if (mach) {
model->setData(model->index(row, 1, QModelIndex()), mach->brand()); model->setData(model->index(row, 1, QModelIndex()), mach->brand());
model->setData(model->index(row, 2, QModelIndex()), mach->series()+" "+mach->model()); model->setData(model->index(row, 2, QModelIndex()), mach->model());
model->setData(model->index(row, 4, QModelIndex()), mach->lastImported().toString(Qt::SystemLocaleShortDate)); model->setData(model->index(row, 4, QModelIndex()), mach->lastImported().toString(Qt::SystemLocaleShortDate));
} }
QBrush bg = QColor(Qt::black); QBrush bg = QColor(Qt::black);

6
oscar/reports.cpp
View File

@ -1,5 +1,6 @@
/* Reports/Printing Module /* Reports/Printing Module
* *
* Copyright (c) 2019 The OSCAR Team
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public
@ -189,11 +190,10 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
cpapinfo += STR_TR_MaskTime + QObject::tr(": %1 hours, %2 minutes, %3 seconds\n").arg(h).arg(m).arg(s); cpapinfo += STR_TR_MaskTime + QObject::tr(": %1 hours, %2 minutes, %3 seconds\n").arg(h).arg(m).arg(s);
cpapinfo += STR_TR_BedTime + ": " + QDateTime::fromTime_t(f).time().toString("HH:mm:ss") + " "; cpapinfo += STR_TR_BedTime + ": " + QDateTime::fromTime_t(f).time().toString("HH:mm:ss") + " ";
cpapinfo += STR_TR_WakeUp + ": " + QDateTime::fromTime_t(l).time().toString("HH:mm:ss") + "\n\n"; cpapinfo += STR_TR_WakeUp + ": " + QDateTime::fromTime_t(l).time().toString("HH:mm:ss") + "\n\n";
QString submodel;
cpapinfo += STR_TR_Machine + ": "; cpapinfo += STR_TR_Machine + ": ";
cpapinfo += cpap->brand() + " " + cpap->series() + " " + cpap->model() + submodel + "\n"; cpapinfo += cpap->brand() + " " + cpap->model() + "\n";
cpapinfo += STR_TR_Mode + ": " + day->getCPAPMode() + "\n"; cpapinfo += STR_TR_Mode + ": " + day->getCPAPMode() + "\n";
cpapinfo += day->getPressureSettings() + "\n"; cpapinfo += day->getPressureSettings() + "\n";

7
oscar/statistics.cpp
View File

@ -1,5 +1,6 @@
/* Statistics Report Generator Implementation /* Statistics Report Generator Implementation
* *
* Copyright (c) 2019 The OSCAR Team
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public
@ -872,9 +873,8 @@ QString Statistics::GenerateMachineList()
html += "<thead>"; html += "<thead>";
html += "<tr bgcolor='"+heading_color+"'><th colspan=7 align=center><font size=+2>" + tr("Machine Information") + "</font></th></tr>"; html += "<tr bgcolor='"+heading_color+"'><th colspan=7 align=center><font size=+2>" + tr("Machine Information") + "</font></th></tr>";
html += QString("<tr><td><b>%1</b></td><td><b>%2</b></td><td><b>%3</b></td><td><b>%4</b></td><td><b>%5</b></td><td><b>%6</b></td></tr>") html += QString("<tr><td><b>%1</b></td><td><b>%2</b></td><td><b>%3</b></td><td><b>%4</b></td><td><b>%5</b></td></tr>")
.arg(STR_TR_Brand) .arg(STR_TR_Brand)
.arg(STR_TR_Series)
.arg(STR_TR_Model) .arg(STR_TR_Model)
.arg(STR_TR_Serial) .arg(STR_TR_Serial)
.arg(tr("First Use")) .arg(tr("First Use"))
@ -892,9 +892,8 @@ QString Statistics::GenerateMachineList()
QDate d1 = m->FirstDay(); QDate d1 = m->FirstDay();
QDate d2 = m->LastDay(); QDate d2 = m->LastDay();
QString mn = m->modelnumber(); QString mn = m->modelnumber();
html += QString("<tr><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td><td>%6</td></tr>") html += QString("<tr><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td></tr>")
.arg(m->brand()) .arg(m->brand())
.arg(m->series())
.arg(m->model() + .arg(m->model() +
(mn.isEmpty() ? "" : QString(" (") + mn + QString(")"))) (mn.isEmpty() ? "" : QString(" (") + mn + QString(")")))
.arg(m->serial()) .arg(m->serial())

5
oscar/welcome.cpp
View File

@ -1,5 +1,6 @@
/* Welcome page Implementation /* Welcome page Implementation
* *
* Copyright (c) 2019 The OSCAR Team
* Copyright (c) 2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2018 Mark Watkins <mark@jedimark.net>
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public
@ -173,7 +174,7 @@ QString Welcome::GenerateCPAPHTML()
ui->cpapIcon->setPixmap(QPixmap(cpapimage)); ui->cpapIcon->setPixmap(QPixmap(cpapimage));
html+= "<b>"+tr("The last time you used your %1...").arg(cpap->brand()+" "+cpap->series()+" "+cpap->model())+"</b><br/>"; html+= "<b>"+tr("The last time you used your %1...").arg(cpap->brand()+" "+cpap->model())+"</b><br/>";
int daysto = date.daysTo(QDate::currentDate()); int daysto = date.daysTo(QDate::currentDate());
QString daystring; QString daystring;