Devel #56

Merged
0xFEEDC0DE64 merged 84 commits from devel into master 2017-12-29 13:34:28 +01:00
119 changed files with 1621 additions and 1375 deletions
Showing only changes of commit 856ddd3c26 - Show all commits

View File

@@ -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();

View File

@@ -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;

View File

@@ -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()

View File

@@ -7,15 +7,9 @@
<x>0</x>
<y>0</y>
<width>454</width>
<height>0</height>
<height>281</height>
</rect>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>0</height>
</size>
</property>
<property name="windowTitle">
<string>About me</string>
</property>
@@ -33,96 +27,279 @@
</widget>
</item>
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="labelUserId">
<property name="text">
<string>User-ID:</string>
</property>
<property name="buddy">
<cstring>spinBoxUserId</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelEmail">
<property name="text">
<string>E-Mail:</string>
</property>
<property name="buddy">
<cstring>lineEditEmail</cstring>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelLongUsername">
<property name="text">
<string>Long username:</string>
</property>
<property name="buddy">
<cstring>lineEditLongUsername</cstring>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="labelText">
<property name="text">
<string>Text:</string>
</property>
<property name="buddy">
<cstring>lineEditText</cstring>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="labelUsername">
<property name="text">
<string>Username:</string>
</property>
<property name="buddy">
<cstring>lineEditUsername</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="spinBoxUserId">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="maximum">
<number>16777215</number>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEditEmail">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineEditLongUsername">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lineEditText">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="lineEditUsername">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>420</width>
<height>540</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="labelUserId">
<property name="text">
<string>User-ID:</string>
</property>
<property name="buddy">
<cstring>spinBoxUserId</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelEmail">
<property name="text">
<string>E-Mail:</string>
</property>
<property name="buddy">
<cstring>lineEditEmail</cstring>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelLongUsername">
<property name="text">
<string>Long username:</string>
</property>
<property name="buddy">
<cstring>lineEditLongUsername</cstring>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="labelText">
<property name="text">
<string>Text:</string>
</property>
<property name="buddy">
<cstring>lineEditText</cstring>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="labelUsername">
<property name="text">
<string>Username:</string>
</property>
<property name="buddy">
<cstring>lineEditUsername</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="spinBoxUserId">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="maximum">
<number>16777215</number>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEditEmail">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineEditLongUsername">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lineEditText">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="lineEditUsername">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="labelStreet">
<property name="text">
<string>Street:</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="labelCity">
<property name="text">
<string>City:</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="labelEmployedSince">
<property name="text">
<string>Employed since:</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="labelEmployedTill">
<property name="text">
<string>Employed till:</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="labelPlaceOfBirth">
<property name="text">
<string>Place of birth:</string>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QLabel" name="labelZipcode">
<property name="text">
<string>Zipcode:</string>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="labelReligion">
<property name="text">
<string>Religion:</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="labelDepartment">
<property name="text">
<string>Department:</string>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="labelVerwendgr">
<property name="text">
<string>Verwendgr:</string>
</property>
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="labelTaetig">
<property name="text">
<string>Taetig:</string>
</property>
</widget>
</item>
<item row="15" column="0">
<widget class="QLabel" name="labelArbverh">
<property name="text">
<string>Arbverh:</string>
</property>
</widget>
</item>
<item row="16" column="0">
<widget class="QLabel" name="labelBetriebsnr">
<property name="text">
<string>Betriebsnr:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="lineEditStreet">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLineEdit" name="lineEditCity">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLineEdit" name="lineEditEmployedSince">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLineEdit" name="lineEditEmployedTill">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLineEdit" name="lineEditPlaceOfBirth">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QLineEdit" name="lineEditZipcode">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="11" column="1">
<widget class="QLineEdit" name="lineEditReligion">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QLineEdit" name="lineEditDepartment">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="13" column="1">
<widget class="QLineEdit" name="lineEditVerwendgr">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="14" column="1">
<widget class="QLineEdit" name="lineEditTaetig">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="15" column="1">
<widget class="QLineEdit" name="lineEditArbverh">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="16" column="1">
<widget class="QLineEdit" name="lineEditBetriebsnr">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">

View File

@@ -4,36 +4,102 @@
<context>
<name>AboutMeDialog</name>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="20"/>
<location filename="../dialogs/aboutmedialog.ui" line="31"/>
<location filename="../dialogs/aboutmedialog.ui" line="14"/>
<location filename="../dialogs/aboutmedialog.ui" line="25"/>
<source>About me</source>
<translation>Über mich</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="40"/>
<location filename="../dialogs/aboutmedialog.ui" line="47"/>
<source>User-ID:</source>
<translation>Benutzer-ID:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="50"/>
<location filename="../dialogs/aboutmedialog.ui" line="57"/>
<source>E-Mail:</source>
<translation>E-Mail:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="60"/>
<location filename="../dialogs/aboutmedialog.ui" line="67"/>
<source>Long username:</source>
<translation>Langer Benutzername:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="70"/>
<location filename="../dialogs/aboutmedialog.ui" line="77"/>
<source>Text:</source>
<translation>Text:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="80"/>
<location filename="../dialogs/aboutmedialog.ui" line="87"/>
<source>Username:</source>
<translation>Benutzername:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="135"/>
<source>Street:</source>
<translation>Straße:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="142"/>
<source>City:</source>
<translation>Stadt:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="149"/>
<source>Employed since:</source>
<translation>Angestellt seit:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="156"/>
<source>Employed till:</source>
<translation>Angestellt bis:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="163"/>
<source>Place of birth:</source>
<translation>Geburtsort:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="170"/>
<source>Zipcode:</source>
<translation>Postleitzahl:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="177"/>
<source>Religion:</source>
<translation>Religion:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="184"/>
<source>Department:</source>
<translation>Abteilung:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="191"/>
<source>Verwendgr:</source>
<translation>Verwendgr:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="198"/>
<source>Taetig:</source>
<translation>Taetig:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="205"/>
<source>Arbverh:</source>
<translation>Arbverh:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="212"/>
<source>Betriebsnr:</source>
<translation>Betriebsnr:</translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.cpp" line="17"/>
<location filename="../dialogs/aboutmedialog.cpp" line="18"/>
<source>dd.MM.yyyy</source>
<translation>dd.MM.yyyy</translation>
</message>
</context>
<context>
<name>AuthenticationDialog</name>

View File

@@ -4,36 +4,102 @@
<context>
<name>AboutMeDialog</name>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="20"/>
<location filename="../dialogs/aboutmedialog.ui" line="31"/>
<location filename="../dialogs/aboutmedialog.ui" line="14"/>
<location filename="../dialogs/aboutmedialog.ui" line="25"/>
<source>About me</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="40"/>
<location filename="../dialogs/aboutmedialog.ui" line="47"/>
<source>User-ID:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="50"/>
<location filename="../dialogs/aboutmedialog.ui" line="57"/>
<source>E-Mail:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="60"/>
<location filename="../dialogs/aboutmedialog.ui" line="67"/>
<source>Long username:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="70"/>
<location filename="../dialogs/aboutmedialog.ui" line="77"/>
<source>Text:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="80"/>
<location filename="../dialogs/aboutmedialog.ui" line="87"/>
<source>Username:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="135"/>
<source>Street:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="142"/>
<source>City:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="149"/>
<source>Employed since:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="156"/>
<source>Employed till:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="163"/>
<source>Place of birth:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="170"/>
<source>Zipcode:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="177"/>
<source>Religion:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="184"/>
<source>Department:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="191"/>
<source>Verwendgr:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="198"/>
<source>Taetig:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="205"/>
<source>Arbverh:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.ui" line="212"/>
<source>Betriebsnr:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/aboutmedialog.cpp" line="17"/>
<location filename="../dialogs/aboutmedialog.cpp" line="18"/>
<source>dd.MM.yyyy</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AuthenticationDialog</name>