From da29e5fbb8924ebd57a037a3f80002b8c7796b8e Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Wed, 10 Jan 2018 19:10:13 +0100
Subject: [PATCH] Fixed columns in AbsencesModel
---
plugins/absenceplugin/absencesmodel.cpp | 26 +++----
.../translations/absenceplugin_de.ts | 70 +++++++------------
.../translations/absenceplugin_en.ts | 68 +++++++-----------
3 files changed, 58 insertions(+), 106 deletions(-)
diff --git a/plugins/absenceplugin/absencesmodel.cpp b/plugins/absenceplugin/absencesmodel.cpp
index 77a0043..774bc41 100644
--- a/plugins/absenceplugin/absencesmodel.cpp
+++ b/plugins/absenceplugin/absencesmodel.cpp
@@ -26,7 +26,7 @@ int AbsencesModel::columnCount(const QModelIndex &parent) const
{
Q_UNUSED(parent)
- return 9;
+ return 5;
}
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:
switch(index.column())
{
- case 0: return absence.altRepresentative;
- case 1: return absence.compositeId;
+ case 0: return absence.compositeId;
+ case 1: return absence.start;
case 2: return absence.end;
case 3: return absence.hourCategory;
- case 4: return absence.openMarking;
- case 5: return absence.persNr;
- case 6: return absence.representative;
- case 7: return absence.start;
- case 8: return absence.text;
+ case 4: return absence.text;
}
}
@@ -66,15 +62,11 @@ QVariant AbsencesModel::headerData(int section, Qt::Orientation orientation, int
case Qt::EditRole:
switch(section)
{
- case 0: return tr("altRepresentative");
- case 1: return tr("compositeId");
- case 2: return tr("end");
- case 3: return tr("hourCategory");
- case 4: return tr("openMarking");
- case 5: return tr("persNr");
- case 6: return tr("representative");
- case 7: return tr("start");
- case 8: return tr("text");
+ case 0: return tr("Id");
+ case 1: return tr("Start");
+ case 2: return tr("End");
+ case 3: return tr("Hour Category");
+ case 4: return tr("Text");
}
}
default:
diff --git a/plugins/absenceplugin/translations/absenceplugin_de.ts b/plugins/absenceplugin/translations/absenceplugin_de.ts
index 8f0589b..847675b 100644
--- a/plugins/absenceplugin/translations/absenceplugin_de.ts
+++ b/plugins/absenceplugin/translations/absenceplugin_de.ts
@@ -9,17 +9,17 @@
Abwesenheiten
-
+
Absences for %0
Abwesenheiten für %0
-
+
dd.MM.yyyy
dd.MM.yyyy
-
+
Could not load absences!
Konnte Abwesenheiten nicht laden!
@@ -34,50 +34,30 @@
AbsencesModel
+
+
+ Id
+ Id
+
+
+
+ Start
+ Start
+
+
+
+ End
+ Ende
+
+
+
+ Hour Category
+ Stunden Kategorie
+
- altRepresentative
-
-
-
-
- compositeId
-
-
-
-
- end
-
-
-
-
- hourCategory
-
-
-
-
- openMarking
-
-
-
-
- persNr
-
-
-
-
- representative
-
-
-
-
- start
-
-
-
-
- text
-
+ Text
+ Text
diff --git a/plugins/absenceplugin/translations/absenceplugin_en.ts b/plugins/absenceplugin/translations/absenceplugin_en.ts
index b02f346..b16ff41 100644
--- a/plugins/absenceplugin/translations/absenceplugin_en.ts
+++ b/plugins/absenceplugin/translations/absenceplugin_en.ts
@@ -9,17 +9,17 @@
-
+
Absences for %0
-
+
dd.MM.yyyy
-
+
Could not load absences!
@@ -34,49 +34,29 @@
AbsencesModel
+
+
+ Id
+
+
+
+
+ Start
+
+
+
+
+ End
+
+
+
+
+ Hour Category
+
+
- altRepresentative
-
-
-
-
- compositeId
-
-
-
-
- end
-
-
-
-
- hourCategory
-
-
-
-
- openMarking
-
-
-
-
- persNr
-
-
-
-
- representative
-
-
-
-
- start
-
-
-
-
- text
+ Text