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

Implemented strip rendering with other booking types

Browse Source
This commit is contained in:
0xFEEDC0DE64
2018-04-18 18:47:17 +02:00
parent 0b1a6e6db5
commit 237ef7479c
3 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zeiterfassungguilib/mainwindow.cpp
View File

@@ -213,7 +213,9 @@ void MainWindow::pushButtonStartPressed()
}
if(m_currentStripWidget->bookings().rbegin() == m_currentStripWidget->bookings().rend() ||
m_currentStripWidget->bookings().rbegin()->type == QStringLiteral("G"))
m_currentStripWidget->bookings().rbegin()->type == QStringLiteral("G") ||
m_currentStripWidget->bookings().rbegin()->type == QStringLiteral("GA") ||
m_currentStripWidget->bookings().rbegin()->type == QStringLiteral("GM"))
{
auto reply = m_erfassung.doCreateBooking(m_userInfo.userId, ui->dateEditDate->date(),
timeNormalise(ui->timeEditTime->time()), QTime(0, 0),

50
zeiterfassungguilib/stripswidget.cpp
View File

@@ -298,7 +298,9 @@ bool StripsWidget::createStrips()
}
auto startBooking = *bookingsIter++;
if(startBooking.type != QStringLiteral("K"))
if(startBooking.type != QStringLiteral("K") &&
startBooking.type != QStringLiteral("KA") &&
startBooking.type != QStringLiteral("KM"))
{
errorMessage = tr("Expected start booking, instead got type %0\nBooking ID: %1")
.arg(startBooking.type)
@@ -316,7 +318,7 @@ bool StripsWidget::createStrips()
lastBooking = &startBooking;
lastTimeAssignmentStart = startBooking.time;
appendBookingStartStrip(startBooking.id, startBooking.time);
appendBookingStartStrip(startBooking.id, startBooking.time, startBooking.type);
if(timeAssignmentsIter == m_timeAssignments.constEnd())
{
@@ -397,7 +399,9 @@ bool StripsWidget::createStrips()
else
{
auto endBooking = *bookingsIter++;
if(endBooking.type != QStringLiteral("G"))
if(endBooking.type != QStringLiteral("G") &&
endBooking.type != QStringLiteral("GA") &&
endBooking.type != QStringLiteral("GM"))
{
errorMessage = tr("Expected end booking, instead got type %0\nBooking ID: %1")
.arg(endBooking.type)
@@ -418,7 +422,7 @@ bool StripsWidget::createStrips()
errorMessage = tr("Missing time assignment! Missing: %0")
.arg(tr("%0h").arg(QLocale().toString(timeBetween(timeAssignmentTime, bookingTimespan), QLocale::ShortFormat)));
appendBookingEndStrip(endBooking.id, endBooking.time, currBookingDuration);
appendBookingEndStrip(endBooking.id, endBooking.time, currBookingDuration, endBooking.type);
goto after;
}
@@ -464,7 +468,7 @@ bool StripsWidget::createStrips()
.arg(QLocale().toString(bookingTimespan, QLocale::ShortFormat));
}
appendBookingEndStrip(endBooking.id, endBooking.time, currBookingDuration);
appendBookingEndStrip(endBooking.id, endBooking.time, currBookingDuration, endBooking.type);
if(timeAssignmentTime > bookingTimespan)
goto after;
@@ -593,7 +597,7 @@ QString StripsWidget::buildProjectString(const QString &project) const
}
}
QWidget *StripsWidget::appendBookingStartStrip(int id, const QTime &time)
QWidget *StripsWidget::appendBookingStartStrip(int id, const QTime &time, const QString &type)
{
auto widget = m_mainWindow.stripFactory().createBookingStartStrip(this).release();
@@ -602,6 +606,22 @@ QWidget *StripsWidget::appendBookingStartStrip(int id, const QTime &time)
else
qWarning() << "no labelTime found!";
if(type != QStringLiteral("K"))
{
QString textToAppend;
if(type == QStringLiteral("KA"))
textToAppend = tr("Doctor");
else if(type == QStringLiteral("KM"))
textToAppend = tr("Government");
else
textToAppend = tr("Unknown");
if(auto labelType = widget->findChild<QWidget*>(QStringLiteral("labelType")))
labelType->setProperty("text", QString(labelType->property("text").toString() % " (" % textToAppend % ')'));
else
qWarning() << "no labelType found!";
}
if(auto labelId = widget->findChild<QWidget*>(QStringLiteral("labelId")))
labelId->setProperty("text", QString::number(id));
else
@@ -612,7 +632,7 @@ QWidget *StripsWidget::appendBookingStartStrip(int id, const QTime &time)
return widget;
}
QWidget *StripsWidget::appendBookingEndStrip(int id, const QTime &time, const QTime &duration)
QWidget *StripsWidget::appendBookingEndStrip(int id, const QTime &time, const QTime &duration, const QString &type)
{
auto widget = m_mainWindow.stripFactory().createBookingEndStrip(this).release();
@@ -621,6 +641,22 @@ QWidget *StripsWidget::appendBookingEndStrip(int id, const QTime &time, const QT
else
qWarning() << "no labelTime found!";
if(type != QStringLiteral("G"))
{
QString textToAppend;
if(type == QStringLiteral("GA"))
textToAppend = tr("Doctor");
else if(type == QStringLiteral("GM"))
textToAppend = tr("Government");
else
textToAppend = tr("Unknown");
if(auto labelType = widget->findChild<QWidget*>(QStringLiteral("labelType")))
labelType->setProperty("text", QString(labelType->property("text").toString() % " (" % textToAppend % ')'));
else
qWarning() << "no labelType found!";
}
if(auto labelDuration = widget->findChild<QWidget*>(QStringLiteral("labelDuration")))
labelDuration->setProperty("text", tr("%0h").arg(QLocale().toString(duration, QLocale::ShortFormat)));
else

4
zeiterfassungguilib/stripswidget.h
View File

@@ -85,8 +85,8 @@ private:
void invalidateValues();
QString buildProjectString(const QString &project) const;
QWidget *appendBookingStartStrip(int id, const QTime &time);
QWidget *appendBookingEndStrip(int id, const QTime &time, const QTime &duration);
QWidget *appendBookingStartStrip(int id, const QTime &time, const QString &type);
QWidget *appendBookingEndStrip(int id, const QTime &time, const QTime &duration, const QString &type);
QWidget *appendTimeAssignmentStrip(int id, const QTime &duration, const QString &project, const QString &subproject,
const QString &workpackage, const QString &text);