diff --git a/plugins/absenceplugin/absencedialog.ui b/plugins/absenceplugin/absencedialog.ui index a33709b..c546651 100644 --- a/plugins/absenceplugin/absencedialog.ui +++ b/plugins/absenceplugin/absencedialog.ui @@ -1,38 +1,117 @@ + - - - AbsenceDialog - + 0 0 400 - 300 + 354 Dialog - - - - 30 - 240 - 341 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - + + + + + + 20 + + + + Absence + + + + + + + + + Start: + + + + + + + End: + + + + + + + + + + + + + Hour category: + + + + + + + + + + Open marking: + + + + + + + + + + Representative: + + + + + + + Alt representative: + + + + + + + + + + + + + Text: + + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + - diff --git a/zeiterfassungcorelib/replies/getabsencesreply.cpp b/zeiterfassungcorelib/replies/getabsencesreply.cpp index 84c8ea5..143ba62 100644 --- a/zeiterfassungcorelib/replies/getabsencesreply.cpp +++ b/zeiterfassungcorelib/replies/getabsencesreply.cpp @@ -57,12 +57,10 @@ void GetAbsencesReply::requestFinished() auto obj = val.toObject(); m_absences.append({ - obj.value(QStringLiteral("altRepresentative")).toInt(), obj.value(QStringLiteral("compositeId")).toString(), parseDate(obj.value(QStringLiteral("end"))), obj.value(QStringLiteral("hourCategory")).toString(), obj.value(QStringLiteral("openMarking")).toString(), - obj.value(QStringLiteral("persNr")).toInt(), obj.value(QStringLiteral("representative")).toInt(), parseDate(obj.value(QStringLiteral("start"))), obj.value(QStringLiteral("text")).toString() diff --git a/zeiterfassungcorelib/replies/getabsencesreply.h b/zeiterfassungcorelib/replies/getabsencesreply.h index 1a8cbf4..23e6068 100644 --- a/zeiterfassungcorelib/replies/getabsencesreply.h +++ b/zeiterfassungcorelib/replies/getabsencesreply.h @@ -21,14 +21,14 @@ public: struct Absence { - int altRepresentative; QString compositeId; + int persNr; + QDate start; QDate end; QString hourCategory; QString openMarking; - int persNr; int representative; - QDate start; + int altRepresentative; QString text; };