feedc0de/DbZeiterfassung-advancedviewplugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed subproject fields

Browse Source
This commit is contained in:
0xFEEDC0DE64
2019-04-09 19:23:02 +02:00
parent 79df5b044d
commit 8cde992369
8 changed files with 45 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
advancedviewdialog.cpp
View File

@@ -175,7 +175,6 @@ void AdvancedViewDialog::contextMenuTimeAssignment(const QPoint &pos)
dialog.getTime(), dialog.getTime(),
dialog.getTimespan(), dialog.getTimespan(),
dialog.getProject(), dialog.getProject(),
dialog.getSubproject(),
dialog.getWorkpackage(), dialog.getWorkpackage(),
dialog.getText() dialog.getText()
); );
@@ -213,7 +212,6 @@ void AdvancedViewDialog::contextMenuTimeAssignment(const QPoint &pos)
dialog.setTime(timeAssignment.time); dialog.setTime(timeAssignment.time);
dialog.setTimespan(timeAssignment.timespan); dialog.setTimespan(timeAssignment.timespan);
dialog.setProject(timeAssignment.project); dialog.setProject(timeAssignment.project);
dialog.setSubproject(timeAssignment.subproject);
dialog.setWorkpackage(timeAssignment.workpackage); dialog.setWorkpackage(timeAssignment.workpackage);
dialog.setText(timeAssignment.text); dialog.setText(timeAssignment.text);
again1: again1:
@@ -226,7 +224,6 @@ void AdvancedViewDialog::contextMenuTimeAssignment(const QPoint &pos)
dialog.getTime(), dialog.getTime(),
dialog.getTimespan(), dialog.getTimespan(),
dialog.getProject(), dialog.getProject(),
dialog.getSubproject(),
dialog.getWorkpackage(), dialog.getWorkpackage(),
dialog.getText() dialog.getText()
); );

14
dialogs/timeassignmentdialog.cpp
View File

@@ -36,10 +36,6 @@ TimeAssignmentDialog::TimeAssignmentDialog(const QMap<QString, QString> &project
} }
} }
for(const auto &subproject : settings.subprojects())
ui->comboBoxSubproject->addItem(subproject);
ui->comboBoxSubproject->clearEditText();
for(const auto &workpackage : settings.workpackages()) for(const auto &workpackage : settings.workpackages())
ui->comboBoxWorkpackage->addItem(workpackage); ui->comboBoxWorkpackage->addItem(workpackage);
ui->comboBoxWorkpackage->clearEditText(); ui->comboBoxWorkpackage->clearEditText();
@@ -88,16 +84,6 @@ void TimeAssignmentDialog::setProject(const QString &project)
qWarning() << "could not find project" << project; qWarning() << "could not find project" << project;
} }
QString TimeAssignmentDialog::getSubproject() const
{
return ui->comboBoxSubproject->currentText();
}
void TimeAssignmentDialog::setSubproject(const QString &subproject)
{
ui->comboBoxSubproject->setCurrentText(subproject);
}
QString TimeAssignmentDialog::getWorkpackage() const QString TimeAssignmentDialog::getWorkpackage() const
{ {
return ui->comboBoxWorkpackage->currentText(); return ui->comboBoxWorkpackage->currentText();

3
dialogs/timeassignmentdialog.h
View File

@@ -28,9 +28,6 @@ public:
QString getProject() const; QString getProject() const;
void setProject(const QString &project); void setProject(const QString &project);
QString getSubproject() const;
void setSubproject(const QString &subproject);
QString getWorkpackage() const; QString getWorkpackage() const;
void setWorkpackage(const QString &workpackage); void setWorkpackage(const QString &workpackage);

21
dialogs/timeassignmentdialog.ui
View File

@@ -65,20 +65,13 @@
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="labelSubproject">
<property name="text">
<string>Subproject:</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="labelWorkpackage"> <widget class="QLabel" name="labelWorkpackage">
<property name="text"> <property name="text">
<string>Workpackage:</string> <string>Workpackage:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="4" column="0">
<widget class="QLabel" name="labelText"> <widget class="QLabel" name="labelText">
<property name="text"> <property name="text">
<string>Text:</string> <string>Text:</string>
@@ -103,16 +96,6 @@
<widget class="QComboBox" name="comboBoxProject"/> <widget class="QComboBox" name="comboBoxProject"/>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QComboBox" name="comboBoxSubproject">
<property name="editable">
<bool>true</bool>
</property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="comboBoxWorkpackage"> <widget class="QComboBox" name="comboBoxWorkpackage">
<property name="editable"> <property name="editable">
<bool>true</bool> <bool>true</bool>
@@ -122,7 +105,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="4" column="1">
<widget class="QComboBox" name="comboBoxText"> <widget class="QComboBox" name="comboBoxText">
<property name="editable"> <property name="editable">
<bool>true</bool> <bool>true</bool>

28
models/timeassignmentsmodel.cpp
View File

@@ -31,7 +31,7 @@ int TimeAssignmentsModel::columnCount(const QModelIndex &parent) const
{ {
Q_UNUSED(parent) Q_UNUSED(parent)
return 7; return Columns::Count;
} }
QVariant TimeAssignmentsModel::data(const QModelIndex &index, int role) const QVariant TimeAssignmentsModel::data(const QModelIndex &index, int role) const
@@ -45,13 +45,12 @@ QVariant TimeAssignmentsModel::data(const QModelIndex &index, int role) const
case Qt::EditRole: case Qt::EditRole:
switch(index.column()) switch(index.column())
{ {
case 0: return timeAssignment.id; case Columns::Id: return timeAssignment.id;
case 1: return timeAssignment.time; case Columns::Time: return timeAssignment.time;
case 2: return timeAssignment.timespan; case Columns::Timespan: return timeAssignment.timespan;
case 3: return timeAssignment.project; case Columns::Project: return timeAssignment.project;
case 4: return timeAssignment.subproject; case Columns::Workpackage: return timeAssignment.workpackage;
case 5: return timeAssignment.workpackage; case Columns::Text: return timeAssignment.text;
case 6: return timeAssignment.text;
} }
} }
@@ -69,13 +68,12 @@ QVariant TimeAssignmentsModel::headerData(int section, Qt::Orientation orientati
case Qt::EditRole: case Qt::EditRole:
switch(section) switch(section)
{ {
case 0: return tr("ID"); case Columns::Id: return tr("ID");
case 1: return tr("Time"); case Columns::Time: return tr("Time");
case 2: return tr("Timespan"); case Columns::Timespan: return tr("Timespan");
case 3: return tr("Project"); case Columns::Project: return tr("Project");
case 4: return tr("Subproject"); case Columns::Workpackage: return tr("Workpackage");
case 5: return tr("Workpackage"); case Columns::Text: return tr("Text");
case 6: return tr("Text");
} }
} }
default: default:

4
models/timeassignmentsmodel.h
View File

@@ -12,6 +12,10 @@ class TimeAssignmentsModel : public QAbstractListModel
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool enabled READ enabled NOTIFY enabledChanged) Q_PROPERTY(bool enabled READ enabled NOTIFY enabledChanged)
enum Columns {
Id, Time, Timespan, Project, Workpackage, Text, Count
};
public: public:
explicit TimeAssignmentsModel(StripsWidget &stripsWidget, QObject *parent = Q_NULLPTR); explicit TimeAssignmentsModel(StripsWidget &stripsWidget, QObject *parent = Q_NULLPTR);

36
translations/advancedviewplugin_de.ts
View File

@@ -59,32 +59,32 @@
<translation>Kontierungen aktualisieren</translation> <translation>Kontierungen aktualisieren</translation>
</message> </message>
<message> <message>
<location filename="../advancedviewdialog.cpp" line="191"/> <location filename="../advancedviewdialog.cpp" line="190"/>
<source>Could not create time assignment!</source> <source>Could not create time assignment!</source>
<translation>Konnte Kontierung nicht erstellen!</translation> <translation>Konnte Kontierung nicht erstellen!</translation>
</message> </message>
<message> <message>
<location filename="../advancedviewdialog.cpp" line="206"/> <location filename="../advancedviewdialog.cpp" line="205"/>
<source>Edit time assignment</source> <source>Edit time assignment</source>
<translation>Kontierung bearbeiten</translation> <translation>Kontierung bearbeiten</translation>
</message> </message>
<message> <message>
<location filename="../advancedviewdialog.cpp" line="207"/> <location filename="../advancedviewdialog.cpp" line="206"/>
<source>Delete time assignment</source> <source>Delete time assignment</source>
<translation>Kontierung löschen</translation> <translation>Kontierung löschen</translation>
</message> </message>
<message> <message>
<location filename="../advancedviewdialog.cpp" line="242"/> <location filename="../advancedviewdialog.cpp" line="239"/>
<source>Could not edit time assignment!</source> <source>Could not edit time assignment!</source>
<translation>Konnte Kontierung nicht bearbeiten!</translation> <translation>Konnte Kontierung nicht bearbeiten!</translation>
</message> </message>
<message> <message>
<location filename="../advancedviewdialog.cpp" line="250"/> <location filename="../advancedviewdialog.cpp" line="247"/>
<source>Do you really want to delete the time assignment?</source> <source>Do you really want to delete the time assignment?</source>
<translation>Möchten Sie die Kontierung wirklich löschen?</translation> <translation>Möchten Sie die Kontierung wirklich löschen?</translation>
</message> </message>
<message> <message>
<location filename="../advancedviewdialog.cpp" line="264"/> <location filename="../advancedviewdialog.cpp" line="261"/>
<source>Could not delete time assignment!</source> <source>Could not delete time assignment!</source>
<translation>Konnte Kontierung nicht löschen!</translation> <translation>Konnte Kontierung nicht löschen!</translation>
</message> </message>
@@ -179,16 +179,11 @@
</message> </message>
<message> <message>
<location filename="../dialogs/timeassignmentdialog.ui" line="70"/> <location filename="../dialogs/timeassignmentdialog.ui" line="70"/>
<source>Subproject:</source>
<translation>Subprojekt:</translation>
</message>
<message>
<location filename="../dialogs/timeassignmentdialog.ui" line="77"/>
<source>Workpackage:</source> <source>Workpackage:</source>
<translation>Arbeitspaket:</translation> <translation>Arbeitspaket:</translation>
</message> </message>
<message> <message>
<location filename="../dialogs/timeassignmentdialog.ui" line="84"/> <location filename="../dialogs/timeassignmentdialog.ui" line="77"/>
<source>Text:</source> <source>Text:</source>
<translation>Text:</translation> <translation>Text:</translation>
</message> </message>
@@ -202,37 +197,32 @@
<context> <context>
<name>TimeAssignmentsModel</name> <name>TimeAssignmentsModel</name>
<message> <message>
<location filename="../models/timeassignmentsmodel.cpp" line="72"/> <location filename="../models/timeassignmentsmodel.cpp" line="71"/>
<source>ID</source> <source>ID</source>
<translation>ID</translation> <translation>ID</translation>
</message> </message>
<message> <message>
<location filename="../models/timeassignmentsmodel.cpp" line="73"/> <location filename="../models/timeassignmentsmodel.cpp" line="72"/>
<source>Time</source> <source>Time</source>
<translation>Zeit</translation> <translation>Zeit</translation>
</message> </message>
<message> <message>
<location filename="../models/timeassignmentsmodel.cpp" line="74"/> <location filename="../models/timeassignmentsmodel.cpp" line="73"/>
<source>Timespan</source> <source>Timespan</source>
<translation>Zeitspanne</translation> <translation>Zeitspanne</translation>
</message> </message>
<message> <message>
<location filename="../models/timeassignmentsmodel.cpp" line="75"/> <location filename="../models/timeassignmentsmodel.cpp" line="74"/>
<source>Project</source> <source>Project</source>
<translation>Projekt</translation> <translation>Projekt</translation>
</message> </message>
<message> <message>
<location filename="../models/timeassignmentsmodel.cpp" line="76"/> <location filename="../models/timeassignmentsmodel.cpp" line="75"/>
<source>Subproject</source>
<translation>Subprojekt</translation>
</message>
<message>
<location filename="../models/timeassignmentsmodel.cpp" line="77"/>
<source>Workpackage</source> <source>Workpackage</source>
<translation>Arbeitspaket</translation> <translation>Arbeitspaket</translation>
</message> </message>
<message> <message>
<location filename="../models/timeassignmentsmodel.cpp" line="78"/> <location filename="../models/timeassignmentsmodel.cpp" line="76"/>
<source>Text</source> <source>Text</source>
<translation>Text</translation> <translation>Text</translation>
</message> </message>

36
translations/advancedviewplugin_en.ts
View File

@@ -59,32 +59,32 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../advancedviewdialog.cpp" line="191"/> <location filename="../advancedviewdialog.cpp" line="190"/>
<source>Could not create time assignment!</source> <source>Could not create time assignment!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../advancedviewdialog.cpp" line="206"/> <location filename="../advancedviewdialog.cpp" line="205"/>
<source>Edit time assignment</source> <source>Edit time assignment</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../advancedviewdialog.cpp" line="207"/> <location filename="../advancedviewdialog.cpp" line="206"/>
<source>Delete time assignment</source> <source>Delete time assignment</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../advancedviewdialog.cpp" line="242"/> <location filename="../advancedviewdialog.cpp" line="239"/>
<source>Could not edit time assignment!</source> <source>Could not edit time assignment!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../advancedviewdialog.cpp" line="250"/> <location filename="../advancedviewdialog.cpp" line="247"/>
<source>Do you really want to delete the time assignment?</source> <source>Do you really want to delete the time assignment?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../advancedviewdialog.cpp" line="264"/> <location filename="../advancedviewdialog.cpp" line="261"/>
<source>Could not delete time assignment!</source> <source>Could not delete time assignment!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -179,16 +179,11 @@
</message> </message>
<message> <message>
<location filename="../dialogs/timeassignmentdialog.ui" line="70"/> <location filename="../dialogs/timeassignmentdialog.ui" line="70"/>
<source>Subproject:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dialogs/timeassignmentdialog.ui" line="77"/>
<source>Workpackage:</source> <source>Workpackage:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../dialogs/timeassignmentdialog.ui" line="84"/> <location filename="../dialogs/timeassignmentdialog.ui" line="77"/>
<source>Text:</source> <source>Text:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -202,37 +197,32 @@
<context> <context>
<name>TimeAssignmentsModel</name> <name>TimeAssignmentsModel</name>
<message> <message>
<location filename="../models/timeassignmentsmodel.cpp" line="72"/> <location filename="../models/timeassignmentsmodel.cpp" line="71"/>
<source>ID</source> <source>ID</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../models/timeassignmentsmodel.cpp" line="73"/> <location filename="../models/timeassignmentsmodel.cpp" line="72"/>
<source>Time</source> <source>Time</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../models/timeassignmentsmodel.cpp" line="74"/> <location filename="../models/timeassignmentsmodel.cpp" line="73"/>
<source>Timespan</source> <source>Timespan</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../models/timeassignmentsmodel.cpp" line="75"/> <location filename="../models/timeassignmentsmodel.cpp" line="74"/>
<source>Project</source> <source>Project</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../models/timeassignmentsmodel.cpp" line="76"/> <location filename="../models/timeassignmentsmodel.cpp" line="75"/>
<source>Subproject</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../models/timeassignmentsmodel.cpp" line="77"/>
<source>Workpackage</source> <source>Workpackage</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../models/timeassignmentsmodel.cpp" line="78"/> <location filename="../models/timeassignmentsmodel.cpp" line="76"/>
<source>Text</source> <source>Text</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>