mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 10:40:42 +00:00
Reenable Journal
This commit is contained in:
parent
b47572912e
commit
caeaa4b199
@ -109,6 +109,7 @@ const QString OXI_SPO2Drop="SPO2Drop";
|
||||
const QString OXI_Plethy="Plethy";
|
||||
|
||||
const QString CPAP_AHI="AHI";
|
||||
const QString Journal_Notes="Journal";
|
||||
|
||||
|
||||
#endif // MACHINE_COMMON_H
|
||||
|
16
daily.cpp
16
daily.cpp
@ -603,27 +603,27 @@ void Daily::Load(QDate date)
|
||||
|
||||
ui->webView->setHtml(html);
|
||||
|
||||
/*ui->JournalNotes->clear();
|
||||
ui->JournalNotes->clear();
|
||||
Session *journal=GetJournalSession(date);
|
||||
if (journal) {
|
||||
ui->JournalNotes->setHtml(journal->settings[JOURNAL_Notes].toString());
|
||||
}*/
|
||||
ui->JournalNotes->setHtml(journal->settings[Journal_Notes].toString());
|
||||
}
|
||||
|
||||
}
|
||||
void Daily::Unload(QDate date)
|
||||
{
|
||||
/*Session *journal=GetJournalSession(date);
|
||||
Session *journal=GetJournalSession(date);
|
||||
if (!ui->JournalNotes->toPlainText().isEmpty()) {
|
||||
QString jhtml=ui->JournalNotes->toHtml();
|
||||
if (journal) {
|
||||
if (journal->settings[JOURNAL_Notes]!=jhtml) {
|
||||
journal->settings[JOURNAL_Notes]=jhtml;
|
||||
if (journal->settings[Journal_Notes]!=jhtml) {
|
||||
journal->settings[Journal_Notes]=jhtml;
|
||||
journal->SetChanged(true);
|
||||
}
|
||||
|
||||
} else {
|
||||
journal=CreateJournalSession(date);
|
||||
journal->settings[JOURNAL_Notes]=jhtml;
|
||||
journal->settings[Journal_Notes]=jhtml;
|
||||
journal->SetChanged(true);
|
||||
}
|
||||
|
||||
@ -631,7 +631,7 @@ void Daily::Unload(QDate date)
|
||||
if (journal) {
|
||||
Machine *jm=profile->GetMachine(MT_JOURNAL);
|
||||
if (jm) jm->SaveSession(journal);
|
||||
} */
|
||||
}
|
||||
UpdateCalendarDay(date);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user