From 856ddd3c2635a93553aa83d1dbc2225881fb0a0c Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Thu, 21 Dec 2017 20:24:42 +0100
Subject: [PATCH] Added new user data fields also into dialog
---
.../replies/getuserinforeply.cpp | 14 +-
.../replies/getuserinforeply.h | 14 +-
zeiterfassungguilib/dialogs/aboutmedialog.cpp | 12 +
zeiterfassungguilib/dialogs/aboutmedialog.ui | 371 +++++++++++++-----
.../translations/zeiterfassungguilib_de.ts | 80 +++-
.../translations/zeiterfassungguilib_en.ts | 80 +++-
6 files changed, 446 insertions(+), 125 deletions(-)
diff --git a/zeiterfassungcorelib/replies/getuserinforeply.cpp b/zeiterfassungcorelib/replies/getuserinforeply.cpp
index 60caed0..7feb964 100644
--- a/zeiterfassungcorelib/replies/getuserinforeply.cpp
+++ b/zeiterfassungcorelib/replies/getuserinforeply.cpp
@@ -148,14 +148,14 @@ void GetUserInfoReply::request1Finished()
if(!m_reply0)
setSuccess(true);
- m_userInfo.gemeinde = obj.value(QStringLiteral("gemeinde")).toString();
- m_userInfo.ort = obj.value(QStringLiteral("ort")).toString();
- m_userInfo.angFrom = QDate::fromString(QString::number(obj.value(QStringLiteral("angFrom")).toInt()), QStringLiteral("yyyyMMdd"));
- m_userInfo.angTill = QDate::fromString(QString::number(obj.value(QStringLiteral("angTill")).toInt()), QStringLiteral("yyyyMMdd"));
- m_userInfo.gebOrt = obj.value(QStringLiteral("gebOrt")).toString();
- m_userInfo.plz = obj.value(QStringLiteral("plz")).toString();
+ m_userInfo.street = obj.value(QStringLiteral("gemeinde")).toString();
+ m_userInfo.city = obj.value(QStringLiteral("ort")).toString();
+ m_userInfo.employedSince = QDate::fromString(QString::number(obj.value(QStringLiteral("angFrom")).toInt()), QStringLiteral("yyyyMMdd"));
+ m_userInfo.employedTill = QDate::fromString(QString::number(obj.value(QStringLiteral("angTill")).toInt()), QStringLiteral("yyyyMMdd"));
+ m_userInfo.placeOfBirth = obj.value(QStringLiteral("gebOrt")).toString();
+ m_userInfo.zipcode = obj.value(QStringLiteral("plz")).toString();
m_userInfo.religion = obj.value(QStringLiteral("religion")).toString();
- m_userInfo.bereich = obj.value(QStringLiteral("bereich")).toString();
+ m_userInfo.department = obj.value(QStringLiteral("bereich")).toString();
m_userInfo.verwendgr = obj.value(QStringLiteral("verwendgr")).toString();
m_userInfo.taetig = obj.value(QStringLiteral("taetig")).toString();
m_userInfo.arbverh = obj.value(QStringLiteral("arbverh")).toString();
diff --git a/zeiterfassungcorelib/replies/getuserinforeply.h b/zeiterfassungcorelib/replies/getuserinforeply.h
index 4be4278..7003506 100644
--- a/zeiterfassungcorelib/replies/getuserinforeply.h
+++ b/zeiterfassungcorelib/replies/getuserinforeply.h
@@ -24,14 +24,14 @@ public:
QString longUsername;
QString text;
QString username;
- QString gemeinde;
- QString ort;
- QDate angFrom;
- QDate angTill;
- QString gebOrt;
- QString plz;
+ QString street;
+ QString city;
+ QDate employedSince;
+ QDate employedTill;
+ QString placeOfBirth;
+ QString zipcode;
QString religion;
- QString bereich;
+ QString department;
QString verwendgr;
QString taetig;
QString arbverh;
diff --git a/zeiterfassungguilib/dialogs/aboutmedialog.cpp b/zeiterfassungguilib/dialogs/aboutmedialog.cpp
index 338a67b..473c1ac 100644
--- a/zeiterfassungguilib/dialogs/aboutmedialog.cpp
+++ b/zeiterfassungguilib/dialogs/aboutmedialog.cpp
@@ -12,6 +12,18 @@ AboutMeDialog::AboutMeDialog(const GetUserInfoReply::UserInfo &userInfo, QWidget
ui->lineEditLongUsername->setText(userInfo.longUsername);
ui->lineEditText->setText(userInfo.text);
ui->lineEditUsername->setText(userInfo.username);
+ ui->lineEditStreet->setText(userInfo.street);
+ ui->lineEditCity->setText(userInfo.city);
+ ui->lineEditEmployedSince->setText(userInfo.employedSince.toString(tr("dd.MM.yyyy")));
+ ui->lineEditEmployedTill->setText(userInfo.employedTill.toString(tr("dd.MM.yyyy")));
+ ui->lineEditPlaceOfBirth->setText(userInfo.placeOfBirth);
+ ui->lineEditZipcode->setText(userInfo.zipcode);
+ ui->lineEditReligion->setText(userInfo.religion);
+ ui->lineEditDepartment->setText(userInfo.department);
+ ui->lineEditVerwendgr->setText(userInfo.verwendgr);
+ ui->lineEditTaetig->setText(userInfo.taetig);
+ ui->lineEditArbverh->setText(userInfo.arbverh);
+ ui->lineEditBetriebsnr->setText(userInfo.betriebsnr);
}
AboutMeDialog::~AboutMeDialog()
diff --git a/zeiterfassungguilib/dialogs/aboutmedialog.ui b/zeiterfassungguilib/dialogs/aboutmedialog.ui
index 3564b77..d6f99d9 100644
--- a/zeiterfassungguilib/dialogs/aboutmedialog.ui
+++ b/zeiterfassungguilib/dialogs/aboutmedialog.ui
@@ -7,15 +7,9 @@
0
0
454
- 0
+ 281
-
-
- 16777215
- 0
-
-
About me
@@ -33,96 +27,279 @@
-
-
-
-
-
-
- User-ID:
-
-
- spinBoxUserId
-
-
-
- -
-
-
- E-Mail:
-
-
- lineEditEmail
-
-
-
- -
-
-
- Long username:
-
-
- lineEditLongUsername
-
-
-
- -
-
-
- Text:
-
-
- lineEditText
-
-
-
- -
-
-
- Username:
-
-
- lineEditUsername
-
-
-
- -
-
-
- true
-
-
- 16777215
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- true
-
-
-
-
+
+
+ true
+
+
+
+
+ 0
+ 0
+ 420
+ 540
+
+
+
+ -
+
+
+ User-ID:
+
+
+ spinBoxUserId
+
+
+
+ -
+
+
+ E-Mail:
+
+
+ lineEditEmail
+
+
+
+ -
+
+
+ Long username:
+
+
+ lineEditLongUsername
+
+
+
+ -
+
+
+ Text:
+
+
+ lineEditText
+
+
+
+ -
+
+
+ Username:
+
+
+ lineEditUsername
+
+
+
+ -
+
+
+ true
+
+
+ 16777215
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ Street:
+
+
+
+ -
+
+
+ City:
+
+
+
+ -
+
+
+ Employed since:
+
+
+
+ -
+
+
+ Employed till:
+
+
+
+ -
+
+
+ Place of birth:
+
+
+
+ -
+
+
+ Zipcode:
+
+
+
+ -
+
+
+ Religion:
+
+
+
+ -
+
+
+ Department:
+
+
+
+ -
+
+
+ Verwendgr:
+
+
+
+ -
+
+
+ Taetig:
+
+
+
+ -
+
+
+ Arbverh:
+
+
+
+ -
+
+
+ Betriebsnr:
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+
-
diff --git a/zeiterfassungguilib/translations/zeiterfassungguilib_de.ts b/zeiterfassungguilib/translations/zeiterfassungguilib_de.ts
index baf47aa..f2c1ce6 100644
--- a/zeiterfassungguilib/translations/zeiterfassungguilib_de.ts
+++ b/zeiterfassungguilib/translations/zeiterfassungguilib_de.ts
@@ -4,36 +4,102 @@
AboutMeDialog
-
-
+
+
About me
Über mich
-
+
User-ID:
Benutzer-ID:
-
+
E-Mail:
E-Mail:
-
+
Long username:
Langer Benutzername:
-
+
Text:
Text:
-
+
Username:
Benutzername:
+
+
+ Street:
+ Straße:
+
+
+
+ City:
+ Stadt:
+
+
+
+ Employed since:
+ Angestellt seit:
+
+
+
+ Employed till:
+ Angestellt bis:
+
+
+
+ Place of birth:
+ Geburtsort:
+
+
+
+ Zipcode:
+ Postleitzahl:
+
+
+
+ Religion:
+ Religion:
+
+
+
+ Department:
+ Abteilung:
+
+
+
+ Verwendgr:
+ Verwendgr:
+
+
+
+ Taetig:
+ Taetig:
+
+
+
+ Arbverh:
+ Arbverh:
+
+
+
+ Betriebsnr:
+ Betriebsnr:
+
+
+
+
+ dd.MM.yyyy
+ dd.MM.yyyy
+
AuthenticationDialog
diff --git a/zeiterfassungguilib/translations/zeiterfassungguilib_en.ts b/zeiterfassungguilib/translations/zeiterfassungguilib_en.ts
index 27f9a57..3c57104 100644
--- a/zeiterfassungguilib/translations/zeiterfassungguilib_en.ts
+++ b/zeiterfassungguilib/translations/zeiterfassungguilib_en.ts
@@ -4,36 +4,102 @@
AboutMeDialog
-
-
+
+
About me
-
+
User-ID:
-
+
E-Mail:
-
+
Long username:
-
+
Text:
-
+
Username:
+
+
+ Street:
+
+
+
+
+ City:
+
+
+
+
+ Employed since:
+
+
+
+
+ Employed till:
+
+
+
+
+ Place of birth:
+
+
+
+
+ Zipcode:
+
+
+
+
+ Religion:
+
+
+
+
+ Department:
+
+
+
+
+ Verwendgr:
+
+
+
+
+ Taetig:
+
+
+
+
+ Arbverh:
+
+
+
+
+ Betriebsnr:
+
+
+
+
+
+ dd.MM.yyyy
+
+
AuthenticationDialog