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

Added fields to AbsenceDialog

Browse Source
This commit is contained in:
0xFEEDC0DE64
2018-05-25 21:01:44 +02:00
parent 078a5f639a
commit e5a5b42cd5
3 changed files with 104 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
plugins/absenceplugin/absencedialog.ui
View File

@@ -1,38 +1,117 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<author/>
<comment/>
<exportmacro/>
<class>AbsenceDialog</class> <class>AbsenceDialog</class>
<widget name="AbsenceDialog" class="QDialog"> <widget class="QDialog" name="AbsenceDialog">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>400</width>
<height>300</height> <height>354</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Dialog</string>
</property> </property>
<widget name="buttonBox" class="QDialogButtonBox"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0">
<property name="geometry"> <item>
<rect> <widget class="QLabel" name="labelTitle">
<x>30</x> <property name="font">
<y>240</y> <font>
<width>341</width> <pointsize>20</pointsize>
<height>32</height> </font>
</rect> </property>
</property> <property name="text">
<property name="orientation"> <string>Absence</string>
<enum>Qt::Horizontal</enum> </property>
</property> </widget>
<property name="standardButtons"> </item>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <item>
</property> <layout class="QFormLayout" name="formLayout">
</widget> <item row="0" column="0">
<widget class="QLabel" name="labelStart">
<property name="text">
<string>Start:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelEnd">
<property name="text">
<string>End:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDateEdit" name="dateEditStart"/>
</item>
<item row="1" column="1">
<widget class="QDateEdit" name="dateEditEnd"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelHourCategory">
<property name="text">
<string>Hour category:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="comboBoxHourCategory"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="labelOpenMarking">
<property name="text">
<string>Open marking:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lineEditOpenMarking"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="labelRepresentative">
<property name="text">
<string>Representative:</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="labelAltRepresentative">
<property name="text">
<string>Alt representative:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="comboBoxRepresentative"/>
</item>
<item row="5" column="1">
<widget class="QComboBox" name="comboBoxAltRepresentative"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="labelText">
<property name="text">
<string>Text:</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLineEdit" name="lineEditText"/>
</item>
</layout>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget> </widget>
<pixmapfunction/>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>

2
zeiterfassungcorelib/replies/getabsencesreply.cpp
View File

@@ -57,12 +57,10 @@ void GetAbsencesReply::requestFinished()
auto obj = val.toObject(); auto obj = val.toObject();
m_absences.append({ m_absences.append({
obj.value(QStringLiteral("altRepresentative")).toInt(),
obj.value(QStringLiteral("compositeId")).toString(), obj.value(QStringLiteral("compositeId")).toString(),
parseDate(obj.value(QStringLiteral("end"))), parseDate(obj.value(QStringLiteral("end"))),
obj.value(QStringLiteral("hourCategory")).toString(), obj.value(QStringLiteral("hourCategory")).toString(),
obj.value(QStringLiteral("openMarking")).toString(), obj.value(QStringLiteral("openMarking")).toString(),
obj.value(QStringLiteral("persNr")).toInt(),
obj.value(QStringLiteral("representative")).toInt(), obj.value(QStringLiteral("representative")).toInt(),
parseDate(obj.value(QStringLiteral("start"))), parseDate(obj.value(QStringLiteral("start"))),
obj.value(QStringLiteral("text")).toString() obj.value(QStringLiteral("text")).toString()

6
zeiterfassungcorelib/replies/getabsencesreply.h
View File

@@ -21,14 +21,14 @@ public:
struct Absence struct Absence
{ {
int altRepresentative;
QString compositeId; QString compositeId;
int persNr;
QDate start;
QDate end; QDate end;
QString hourCategory; QString hourCategory;
QString openMarking; QString openMarking;
int persNr;
int representative; int representative;
QDate start; int altRepresentative;
QString text; QString text;
}; };