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

Fixed columns in AbsencesModel

Browse Source
This commit is contained in:
0xFEEDC0DE64
2018-01-10 19:10:13 +01:00
parent 58ce7bb270
commit da29e5fbb8
3 changed files with 58 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/absenceplugin/absencesmodel.cpp
View File

@@ -26,7 +26,7 @@ int AbsencesModel::columnCount(const QModelIndex &parent) const
{ {
Q_UNUSED(parent) Q_UNUSED(parent)
return 9; return 5;
} }
QVariant AbsencesModel::data(const QModelIndex &index, int role) const QVariant AbsencesModel::data(const QModelIndex &index, int role) const
@@ -40,15 +40,11 @@ QVariant AbsencesModel::data(const QModelIndex &index, int role) const
case Qt::EditRole: case Qt::EditRole:
switch(index.column()) switch(index.column())
{ {
case 0: return absence.altRepresentative; case 0: return absence.compositeId;
case 1: return absence.compositeId; case 1: return absence.start;
case 2: return absence.end; case 2: return absence.end;
case 3: return absence.hourCategory; case 3: return absence.hourCategory;
case 4: return absence.openMarking; case 4: return absence.text;
case 5: return absence.persNr;
case 6: return absence.representative;
case 7: return absence.start;
case 8: return absence.text;
} }
} }
@@ -66,15 +62,11 @@ QVariant AbsencesModel::headerData(int section, Qt::Orientation orientation, int
case Qt::EditRole: case Qt::EditRole:
switch(section) switch(section)
{ {
case 0: return tr("altRepresentative"); case 0: return tr("Id");
case 1: return tr("compositeId"); case 1: return tr("Start");
case 2: return tr("end"); case 2: return tr("End");
case 3: return tr("hourCategory"); case 3: return tr("Hour Category");
case 4: return tr("openMarking"); case 4: return tr("Text");
case 5: return tr("persNr");
case 6: return tr("representative");
case 7: return tr("start");
case 8: return tr("text");
} }
} }
default: default:

70
plugins/absenceplugin/translations/absenceplugin_de.ts
View File

@@ -9,17 +9,17 @@
<translation>Abwesenheiten</translation> <translation>Abwesenheiten</translation>
</message> </message>
<message> <message>
<location filename="../absencedialog.cpp" line="22"/> <location filename="../absencedialog.cpp" line="16"/>
<source>Absences for %0</source> <source>Absences for %0</source>
<translation>Abwesenheiten für %0</translation> <translation>Abwesenheiten für %0</translation>
</message> </message>
<message> <message>
<location filename="../absencedialog.cpp" line="22"/> <location filename="../absencedialog.cpp" line="16"/>
<source>dd.MM.yyyy</source> <source>dd.MM.yyyy</source>
<translation>dd.MM.yyyy</translation> <translation>dd.MM.yyyy</translation>
</message> </message>
<message> <message>
<location filename="../absencedialog.cpp" line="39"/> <location filename="../absencedialog.cpp" line="33"/>
<source>Could not load absences!</source> <source>Could not load absences!</source>
<translation>Konnte Abwesenheiten nicht laden!</translation> <translation>Konnte Abwesenheiten nicht laden!</translation>
</message> </message>
@@ -34,50 +34,30 @@
</context> </context>
<context> <context>
<name>AbsencesModel</name> <name>AbsencesModel</name>
<message>
<location filename="../absencesmodel.cpp" line="65"/>
<source>Id</source>
<translation>Id</translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="66"/>
<source>Start</source>
<translation>Start</translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="67"/>
<source>End</source>
<translation>Ende</translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="68"/>
<source>Hour Category</source>
<translation>Stunden Kategorie</translation>
</message>
<message> <message>
<location filename="../absencesmodel.cpp" line="69"/> <location filename="../absencesmodel.cpp" line="69"/>
<source>altRepresentative</source> <source>Text</source>
<translation type="unfinished"></translation> <translation>Text</translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="70"/>
<source>compositeId</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="71"/>
<source>end</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="72"/>
<source>hourCategory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="73"/>
<source>openMarking</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="74"/>
<source>persNr</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="75"/>
<source>representative</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="76"/>
<source>start</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="77"/>
<source>text</source>
<translation type="unfinished"></translation>
</message> </message>
</context> </context>
</TS> </TS>

68
plugins/absenceplugin/translations/absenceplugin_en.ts
View File

@@ -9,17 +9,17 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../absencedialog.cpp" line="22"/> <location filename="../absencedialog.cpp" line="16"/>
<source>Absences for %0</source> <source>Absences for %0</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../absencedialog.cpp" line="22"/> <location filename="../absencedialog.cpp" line="16"/>
<source>dd.MM.yyyy</source> <source>dd.MM.yyyy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../absencedialog.cpp" line="39"/> <location filename="../absencedialog.cpp" line="33"/>
<source>Could not load absences!</source> <source>Could not load absences!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -34,49 +34,29 @@
</context> </context>
<context> <context>
<name>AbsencesModel</name> <name>AbsencesModel</name>
<message>
<location filename="../absencesmodel.cpp" line="65"/>
<source>Id</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="66"/>
<source>Start</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="67"/>
<source>End</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="68"/>
<source>Hour Category</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<location filename="../absencesmodel.cpp" line="69"/> <location filename="../absencesmodel.cpp" line="69"/>
<source>altRepresentative</source> <source>Text</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="70"/>
<source>compositeId</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="71"/>
<source>end</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="72"/>
<source>hourCategory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="73"/>
<source>openMarking</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="74"/>
<source>persNr</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="75"/>
<source>representative</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="76"/>
<source>start</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../absencesmodel.cpp" line="77"/>
<source>text</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>