feedc0de/QtZeiterfassung
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Improved error handling for longer Kontierung than Buchung

Browse Source
This commit is contained in:
0xFEEDC0DE64
2017-12-05 09:06:13 +01:00
parent ba4b289428
commit 7e83064c73
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mainwindow.cpp
View File

@@ -983,9 +983,18 @@ void MainWindow::validateEntries()
{ {
if(kontierungenIter == m_kontierungenModel->constEnd()) if(kontierungenIter == m_kontierungenModel->constEnd())
{ {
errorMessage = tr("Missing Kontierung! Time not filled: %0 - %1") errorMessage = tr("Missing Kontierung! Missing: %0h")
.arg(m_kontierungTime.toString("HH:mm:ss")) .arg(timeBetween(m_kontierungTime, buchungTimespan).toString("HH:mm:ss"));
.arg(buchungTimespan.toString("HH:mm:ss"));
{
auto label = new QLabel(errorMessage, ui->scrollAreaWidgetContents);
ui->verticalLayout2->addWidget(label);
label->setMinimumHeight(20);
label->setMaximumHeight(20);
}
ui->verticalLayout2->addWidget(new BuchungStrip(endBuchung.id, endBuchung.time, endBuchung.type, m_settings, ui->scrollAreaWidgetContents));
goto after; goto after;
} }
@@ -1035,7 +1044,11 @@ void MainWindow::validateEntries()
if(m_kontierungTime > buchungTimespan) if(m_kontierungTime > buchungTimespan)
{ {
auto label = new QLabel(tr("Kontierung timespan too long!"), ui->scrollAreaWidgetContents); errorMessage = tr("Kontierung time longer than Buchung time! Kontierung: %0 Buchung: %1")
.arg(m_kontierungTime.toString("HH:mm:ss"))
.arg(buchungTimespan.toString("HH:mm:ss"));
auto label = new QLabel(errorMessage, ui->scrollAreaWidgetContents);
ui->verticalLayout2->addWidget(label); ui->verticalLayout2->addWidget(label);
label->setMinimumHeight(20); label->setMinimumHeight(20);
label->setMaximumHeight(20); label->setMaximumHeight(20);
@@ -1044,13 +1057,7 @@ void MainWindow::validateEntries()
ui->verticalLayout2->addWidget(new BuchungStrip(endBuchung.id, endBuchung.time, endBuchung.type, m_settings, ui->scrollAreaWidgetContents)); ui->verticalLayout2->addWidget(new BuchungStrip(endBuchung.id, endBuchung.time, endBuchung.type, m_settings, ui->scrollAreaWidgetContents));
if(m_kontierungTime > buchungTimespan) if(m_kontierungTime > buchungTimespan)
{
errorMessage = tr("The Kontierung timespan is longer than the Kommen-Gehen timespan. "
"The tool does not support this yet!\nKontierung: %0\nBuchung: %1")
.arg(m_kontierungTime.toString("HH:mm:ss"))
.arg(buchungTimespan.toString("HH:mm:ss"));
goto after; goto after;
}
else else
ui->verticalLayout2->addSpacing(17); ui->verticalLayout2->addSpacing(17);
} }