diff --git a/zeiterfassungclient/strips/timeassignmentstrip.ui b/zeiterfassungclient/strips/timeassignmentstrip.ui index e64d910..ec06a8d 100644 --- a/zeiterfassungclient/strips/timeassignmentstrip.ui +++ b/zeiterfassungclient/strips/timeassignmentstrip.ui @@ -95,23 +95,7 @@ - - - - - - 80 - 0 - - - - background-color: rgba(0,0,0,30); - - - Subproject - - - + diff --git a/zeiterfassungcorelib/zeiterfassungsettings.cpp b/zeiterfassungcorelib/zeiterfassungsettings.cpp index fef3adf..d212e8e 100644 --- a/zeiterfassungcorelib/zeiterfassungsettings.cpp +++ b/zeiterfassungcorelib/zeiterfassungsettings.cpp @@ -7,7 +7,6 @@ const QString ZeiterfassungSettings::m_url("url"); const QString ZeiterfassungSettings::m_username("username"); const QString ZeiterfassungSettings::m_password("password"); const QString ZeiterfassungSettings::m_projects("projects"); -const QString ZeiterfassungSettings::m_subprojects("subprojects"); const QString ZeiterfassungSettings::m_workpackages("workpackages"); const QString ZeiterfassungSettings::m_texts("texte"); const QString ZeiterfassungSettings::m_theme("theme"); @@ -180,37 +179,6 @@ bool ZeiterfassungSettings::prependProject(const QString &project) return setProjects(prependItem(projects(), project)); } -QStringList ZeiterfassungSettings::subprojects() const -{ - return value(m_subprojects).toStringList(); -} - -bool ZeiterfassungSettings::setSubprojects(const QStringList &subprojects) -{ - if(this->subprojects() == subprojects) - return true; - - if(subprojects.isEmpty()) - remove(m_subprojects); - else - setValue(m_subprojects, subprojects); - - sync(); - - const auto success = status() == QSettings::NoError; - if(success) - Q_EMIT subprojectsChanged(subprojects); - else - Q_EMIT saveErrorOccured(); - - return success; -} - -bool ZeiterfassungSettings::prependSubproject(const QString &subproject) -{ - return setSubprojects(prependItem(subprojects(), subproject)); -} - QStringList ZeiterfassungSettings::workpackages() const { return value(m_workpackages).toStringList(); diff --git a/zeiterfassungcorelib/zeiterfassungsettings.h b/zeiterfassungcorelib/zeiterfassungsettings.h index b1b58d7..8dc9e7c 100644 --- a/zeiterfassungcorelib/zeiterfassungsettings.h +++ b/zeiterfassungcorelib/zeiterfassungsettings.h @@ -17,7 +17,6 @@ class ZEITERFASSUNGCORELIB_EXPORT ZeiterfassungSettings : public QSettings Q_PROPERTY(QString username READ username WRITE setUsername NOTIFY usernameChanged) Q_PROPERTY(QString password READ password WRITE setPassword NOTIFY passwordChanged) Q_PROPERTY(QStringList projects READ projects WRITE setProjects NOTIFY projectsChanged) - Q_PROPERTY(QStringList subprojects READ subprojects WRITE setSubprojects NOTIFY subprojectsChanged) Q_PROPERTY(QStringList workpackages READ workpackages WRITE setWorkpackages NOTIFY workpackagesChanged) Q_PROPERTY(QStringList texts READ texts WRITE setTexts NOTIFY textsChanged) Q_PROPERTY(QString theme READ theme WRITE setTheme NOTIFY themeChanged) @@ -48,10 +47,6 @@ public: bool setProjects(const QStringList &projects); bool prependProject(const QString &project); - QStringList subprojects() const; - bool setSubprojects(const QStringList &subprojects); - bool prependSubproject(const QString &subproject); - QStringList workpackages() const; bool setWorkpackages(const QStringList &workpackages); bool prependWorkpackage(const QString &workpackage); @@ -71,7 +66,6 @@ Q_SIGNALS: void usernameChanged(const QString &username); void passwordChanged(const QString &password); void projectsChanged(const QStringList &projects); - void subprojectsChanged(const QStringList &subprojects); void workpackagesChanged(const QStringList &workpackages); void textsChanged(const QStringList &texts); void themeChanged(const QString &theme); @@ -84,7 +78,6 @@ private: static const QString m_username; static const QString m_password; static const QString m_projects; - static const QString m_subprojects; static const QString m_workpackages; static const QString m_texts; static const QString m_theme; diff --git a/zeiterfassungguilib/mainwindow.cpp b/zeiterfassungguilib/mainwindow.cpp index 7b8249d..32b8dbc 100644 --- a/zeiterfassungguilib/mainwindow.cpp +++ b/zeiterfassungguilib/mainwindow.cpp @@ -78,7 +78,6 @@ MainWindow::MainWindow(ZeiterfassungSettings &settings, ZeiterfassungApi &erfass m_getProjectsReply = erfassung.doGetProjects(userInfo.userId, QDate::currentDate()); connect(m_getProjectsReply.get(), &ZeiterfassungReply::finished, this, &MainWindow::getProjectsFinished); - ui->comboBoxSubproject->lineEdit()->setPlaceholderText(tr("Subproject")); ui->comboBoxWorkpackage->lineEdit()->setPlaceholderText(tr("Workpackage")); ui->comboBoxText->lineEdit()->setPlaceholderText(tr("Text")); @@ -241,8 +240,7 @@ void MainWindow::pushButtonStartPressed() auto reply = m_erfassung.doUpdateTimeAssignment(timeAssignment.id, m_userInfo.userId, timeAssignment.date, timeAssignment.time, timespan, - timeAssignment.project, timeAssignment.subproject, - timeAssignment.workpackage, timeAssignment.text); + timeAssignment.project, timeAssignment.workpackage, timeAssignment.text); reply->waitForFinished(); @@ -260,8 +258,9 @@ void MainWindow::pushButtonStartPressed() { auto reply = m_erfassung.doCreateTimeAssignment(m_userInfo.userId, ui->dateEditDate->date(), timeAssignmentTime, QTime(0, 0), - ui->comboBoxProject->currentData().toString(), ui->comboBoxSubproject->currentText(), - ui->comboBoxWorkpackage->currentText(), ui->comboBoxText->currentText()); + ui->comboBoxProject->currentData().toString(), + ui->comboBoxWorkpackage->currentText(), + ui->comboBoxText->currentText()); reply->waitForFinished(); @@ -275,7 +274,6 @@ void MainWindow::pushButtonStartPressed() } m_settings.prependProject(ui->comboBoxProject->currentData().toString()); - m_settings.prependSubproject(ui->comboBoxSubproject->currentText()); m_settings.prependWorkpackage(ui->comboBoxWorkpackage->currentText()); m_settings.prependText(ui->comboBoxText->currentText()); @@ -305,8 +303,7 @@ void MainWindow::pushButtonEndPressed() auto reply = m_erfassung.doUpdateTimeAssignment(timeAssignment.id, m_userInfo.userId, timeAssignment.date, timeAssignment.time, timespan, - timeAssignment.project, timeAssignment.subproject, - timeAssignment.workpackage, timeAssignment.text); + timeAssignment.project, timeAssignment.workpackage, timeAssignment.text); reply->waitForFinished(); @@ -392,7 +389,6 @@ void MainWindow::startEnabledChanged() ui->pushButtonNow->setEnabled(startEnabled || endEnabled); ui->comboBoxProject->setEnabled(startEnabled); - ui->comboBoxSubproject->setEnabled(startEnabled); ui->comboBoxWorkpackage->setEnabled(startEnabled); ui->comboBoxText->setEnabled(startEnabled); @@ -440,16 +436,6 @@ void MainWindow::updateComboboxes() } } - ui->comboBoxSubproject->clear(); - - { - auto subprojects = m_settings.subprojects(); - for(const auto &subproject : subprojects) - ui->comboBoxSubproject->addItem(subproject); - if(subprojects.count()) - ui->comboBoxSubproject->setCurrentText(QString()); - } - ui->comboBoxWorkpackage->clear(); { diff --git a/zeiterfassungguilib/mainwindow.ui b/zeiterfassungguilib/mainwindow.ui index 4e3720f..91a2c16 100644 --- a/zeiterfassungguilib/mainwindow.ui +++ b/zeiterfassungguilib/mainwindow.ui @@ -117,22 +117,6 @@ - - - - - 200 - 0 - - - - true - - - QComboBox::NoInsert - - - @@ -211,7 +195,7 @@ 0 0 1393 - 428 + 444 @@ -226,7 +210,7 @@ 0 0 1411 - 26 + 20 diff --git a/zeiterfassungguilib/stripswidget.cpp b/zeiterfassungguilib/stripswidget.cpp index da53887..4c97d06 100644 --- a/zeiterfassungguilib/stripswidget.cpp +++ b/zeiterfassungguilib/stripswidget.cpp @@ -327,7 +327,7 @@ bool StripsWidget::createStrips() auto timeAssignment = *timeAssignmentsIter++; appendTimeAssignmentStrip(timeAssignment.id, timeAssignment.timespan, buildProjectString(timeAssignment.project), - timeAssignment.subproject, timeAssignment.workpackage, timeAssignment.text); + timeAssignment.workpackage, timeAssignment.text); if(timeAssignment.timespan == QTime(0, 0)) { @@ -370,7 +370,7 @@ bool StripsWidget::createStrips() timeAssignment = *timeAssignmentsIter++; appendTimeAssignmentStrip(timeAssignment.id, timeAssignment.timespan, buildProjectString(timeAssignment.project), - timeAssignment.subproject, timeAssignment.workpackage, timeAssignment.text); + timeAssignment.workpackage, timeAssignment.text); if(timeAssignment.timespan == QTime(0, 0)) { @@ -426,7 +426,7 @@ bool StripsWidget::createStrips() timeAssignment = *timeAssignmentsIter++; appendTimeAssignmentStrip(timeAssignment.id, timeAssignment.timespan, buildProjectString(timeAssignment.project), - timeAssignment.subproject, timeAssignment.workpackage, timeAssignment.text); + timeAssignment.workpackage, timeAssignment.text); if(timeAssignment.timespan == QTime(0, 0)) { @@ -636,7 +636,7 @@ QWidget *StripsWidget::appendBookingEndStrip(int id, const QTime &time, const QT return widget; } -QWidget *StripsWidget::appendTimeAssignmentStrip(int id, const QTime &duration, const QString &project, const QString &subproject, const QString &workpackage, const QString &text) +QWidget *StripsWidget::appendTimeAssignmentStrip(int id, const QTime &duration, const QString &project, const QString &workpackage, const QString &text) { auto widget = m_mainWindow.stripFactory().createTimeAssignmentStrip(this).release(); @@ -655,11 +655,6 @@ QWidget *StripsWidget::appendTimeAssignmentStrip(int id, const QTime &duration, else qWarning() << "no labelId found!"; - if(auto labelSubproject = widget->findChild(QStringLiteral("labelSubproject"))) - labelSubproject->setProperty("text", subproject); - else - qWarning() << "no labelSubproject found!"; - if(auto labelWorkpackage = widget->findChild(QStringLiteral("labelWorkpackage"))) labelWorkpackage->setProperty("text", workpackage); else diff --git a/zeiterfassungguilib/stripswidget.h b/zeiterfassungguilib/stripswidget.h index 67ce629..650db4e 100644 --- a/zeiterfassungguilib/stripswidget.h +++ b/zeiterfassungguilib/stripswidget.h @@ -87,8 +87,7 @@ private: QWidget *appendBookingStartStrip(int id, const QTime &time); QWidget *appendBookingEndStrip(int id, const QTime &time, const QTime &duration); - QWidget *appendTimeAssignmentStrip(int id, const QTime &duration, const QString &project, const QString &subproject, - const QString &workpackage, const QString &text); + QWidget *appendTimeAssignmentStrip(int id, const QTime &duration, const QString &project, const QString &workpackage, const QString &text); MainWindow &m_mainWindow; diff --git a/zeiterfassungguilib/translations/zeiterfassungguilib_de.ts b/zeiterfassungguilib/translations/zeiterfassungguilib_de.ts index 34ebc7b..86d284b 100644 --- a/zeiterfassungguilib/translations/zeiterfassungguilib_de.ts +++ b/zeiterfassungguilib/translations/zeiterfassungguilib_de.ts @@ -77,74 +77,74 @@ Jetzt - - - + + + Start Kommen - + End Gehen - + &File &Datei - + &About &Über - + &View &Ansicht - + &Tools &Werkzeuge - + &Quit &Beenden - + About &Me Über &mich - + About &zeiterfassung Über &zeiterfassung - + About &Qt Über &Qt - + &Today &Heute - + &Refresh everything Alles &neu laden - + &Settings &Einstellungen - + Help Hilfe @@ -155,51 +155,46 @@ - Subproject - Subprojekt - - - Workpackage Arbeitspaket - + Text Text + - Could not load bookings! Konnte Buchungen nicht laden! - - + + Could not create booking! Konnte Buchung nicht erstellen! - - + + Could not edit time assignment! Konnte Kontierung nicht bearbeiten! - - + + %0 (%1) %0 (%1) - + Could not create time assignment! Konnte Kontierung nicht erstellen! - - + + Switch Wechseln diff --git a/zeiterfassungguilib/translations/zeiterfassungguilib_en.ts b/zeiterfassungguilib/translations/zeiterfassungguilib_en.ts index e34f5b1..5692874 100644 --- a/zeiterfassungguilib/translations/zeiterfassungguilib_en.ts +++ b/zeiterfassungguilib/translations/zeiterfassungguilib_en.ts @@ -77,74 +77,74 @@ - - - + + + Start - + End - + &File - + &About - + &View - + &Tools - + &Quit - + About &Me - + About &zeiterfassung - + About &Qt - + &Today - + &Refresh everything - + &Settings - + Help @@ -155,51 +155,46 @@ - Subproject - - - - Workpackage - + Text + - Could not load bookings! - - + + Could not create booking! - + Could not create time assignment! - - + + Could not edit time assignment! - - + + Switch - - + + %0 (%1) diff --git a/zeiterfassungnetworklib/replies/gettimeassignmentsreply.cpp b/zeiterfassungnetworklib/replies/gettimeassignmentsreply.cpp index 57b272c..f49c778 100644 --- a/zeiterfassungnetworklib/replies/gettimeassignmentsreply.cpp +++ b/zeiterfassungnetworklib/replies/gettimeassignmentsreply.cpp @@ -59,14 +59,13 @@ void GetTimeAssignmentsReply::requestFinished() auto koWertList = obj.value(QStringLiteral("koWertList")).toArray(); m_timeAssignments.append({ - obj.value(QStringLiteral("bookingNr")).toInt(), - parseDate(obj.value(QStringLiteral("bookingDate"))), - parseTime(obj.value(QStringLiteral("bookingTime"))), - parseTime(obj.value(QStringLiteral("bookingTimespan"))), - obj.value(QStringLiteral("text")).toString(), - koWertList.at(0).toObject().value(QStringLiteral("value")).toString(), - koWertList.at(1).toObject().value(QStringLiteral("value")).toString(), - koWertList.at(2).toObject().value(QStringLiteral("value")).toString() + .id = obj.value(QStringLiteral("bookingNr")).toInt(), + .date = parseDate(obj.value(QStringLiteral("bookingDate"))), + .time = parseTime(obj.value(QStringLiteral("bookingTime"))), + .timespan = parseTime(obj.value(QStringLiteral("bookingTimespan"))), + .text = obj.value(QStringLiteral("text")).toString(), + .project = koWertList.at(0).toObject().value(QStringLiteral("value")).toString(), + .workpackage = koWertList.at(1).toObject().value(QStringLiteral("value")).toString() }); } } diff --git a/zeiterfassungnetworklib/replies/gettimeassignmentsreply.h b/zeiterfassungnetworklib/replies/gettimeassignmentsreply.h index a1e70cf..6ab7e21 100644 --- a/zeiterfassungnetworklib/replies/gettimeassignmentsreply.h +++ b/zeiterfassungnetworklib/replies/gettimeassignmentsreply.h @@ -27,7 +27,6 @@ public: QTime timespan; QString text; QString project; - QString subproject; QString workpackage; }; diff --git a/zeiterfassungnetworklib/zeiterfassungapi.cpp b/zeiterfassungnetworklib/zeiterfassungapi.cpp index 78f2803..621c9f6 100644 --- a/zeiterfassungnetworklib/zeiterfassungapi.cpp +++ b/zeiterfassungnetworklib/zeiterfassungapi.cpp @@ -164,8 +164,7 @@ std::unique_ptr ZeiterfassungApi::doGetTimeAssignments( std::unique_ptr ZeiterfassungApi::doCreateTimeAssignment(int userId, const QDate &date, const QTime &time, const QTime ×pan, const QString &project, - const QString &subproject, const QString &workpackage, - const QString &text) + const QString &workpackage, const QString &text) { QNetworkRequest request(QUrl(m_url.toString() % "json/azebooking")); request.setHeader(QNetworkRequest::ContentTypeHeader, QByteArrayLiteral("application/json")); @@ -185,11 +184,6 @@ std::unique_ptr ZeiterfassungApi::doCreateTimeAssignm obj[QStringLiteral("value")] = project; koWertList << obj; } - { - QJsonObject obj; - obj[QStringLiteral("value")] = subproject; - koWertList << obj; - } { QJsonObject obj; obj[QStringLiteral("value")] = workpackage; @@ -205,8 +199,7 @@ std::unique_ptr ZeiterfassungApi::doCreateTimeAssignm std::unique_ptr ZeiterfassungApi::doUpdateTimeAssignment(int timeAssignmentId, int userId, const QDate &date, const QTime &time, const QTime ×pan, const QString &project, - const QString &subproject, const QString &workpackage, - const QString &text) + const QString &workpackage, const QString &text) { QNetworkRequest request(QUrl(QStringLiteral("%0json/azebooking/%1").arg(m_url.toString()).arg(timeAssignmentId))); request.setHeader(QNetworkRequest::ContentTypeHeader, QByteArrayLiteral("application/json")); @@ -231,11 +224,6 @@ std::unique_ptr ZeiterfassungApi::doUpdateTimeAssignm obj[QStringLiteral("value")] = project; koWertList << obj; } - { - QJsonObject obj; - obj[QStringLiteral("value")] = subproject; - koWertList << obj; - } { QJsonObject obj; obj[QStringLiteral("value")] = workpackage; diff --git a/zeiterfassungnetworklib/zeiterfassungapi.h b/zeiterfassungnetworklib/zeiterfassungapi.h index a86d104..fca8ce2 100644 --- a/zeiterfassungnetworklib/zeiterfassungapi.h +++ b/zeiterfassungnetworklib/zeiterfassungapi.h @@ -55,12 +55,10 @@ public: std::unique_ptr doGetTimeAssignments(int userId, const QDate &start, const QDate &end); std::unique_ptr doCreateTimeAssignment(int userId, const QDate &date, const QTime &time, const QTime ×pan, const QString &project, - const QString &subproject, const QString &workpackage, - const QString &text); + const QString &workpackage, const QString &text); std::unique_ptr doUpdateTimeAssignment(int timeAssignmentId, int userId, const QDate &date, const QTime &time, const QTime ×pan, const QString &project, - const QString &subproject, const QString &workpackage, - const QString &text); + const QString &workpackage, const QString &text); std::unique_ptr doDeleteTimeAssignment(int timeAssignmentId); std::unique_ptr doGetProjects(int userId, const QDate &date);