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

Absence plugin #54

Merged
0xFEEDC0DE64 merged 12 commits from absence-plugin into devel 2017-12-29 02:36:35 +01:00
Conversation 0 Commits 12 Files Changed 29 +587 -19
29 changed files with 587 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eaee8131cb - Show all commits

2
plugins/lunchmealplugin/lunchmealwidget.cpp
View File

@@ -35,8 +35,6 @@ void LunchMealWidget::pressedSlot()
void LunchMealWidget::dateChanged(const QDate &date) void LunchMealWidget::dateChanged(const QDate &date)
{ {
qDebug() << "called";
setEnabled(false); setEnabled(false);
setVisible(false); setVisible(false);

3
plugins/presenceplugin/presencewidget.cpp
View File

@@ -5,6 +5,7 @@
#include <QTimer> #include <QTimer>
#include <QMessageBox> #include <QMessageBox>
#include <QStringBuilder> #include <QStringBuilder>
#include <QDebug>
#include <QPushButton> #include <QPushButton>
@@ -71,7 +72,7 @@ void PresenceWidget::finished()
icon = QIcon(QStringLiteral(":zeiterfassung/plugins/presenceplugin/images/not-present.png")); icon = QIcon(QStringLiteral(":zeiterfassung/plugins/presenceplugin/images/not-present.png"));
} }
else else
qWarning() << "unknown presence" << status.firstName << status.lastName << status.presence; qCritical() << "unknown presence" << status.firstName << status.lastName << status.presence;
m_menu->addAction(icon, tr("%0 %1").arg(status.firstName).arg(status.lastName)); m_menu->addAction(icon, tr("%0 %1").arg(status.firstName).arg(status.lastName));
} }

1
plugins/reportsplugin/reportswidget.cpp
View File

@@ -4,6 +4,7 @@
#include <QMenu> #include <QMenu>
#include <QToolBar> #include <QToolBar>
#include <QMessageBox> #include <QMessageBox>
#include <QDebug>
#include <QStringBuilder> #include <QStringBuilder>
#include <QRegularExpression> #include <QRegularExpression>
#include <QTemporaryFile> #include <QTemporaryFile>

3
plugins/weatherplugin/weatherwidget.cpp
View File

@@ -3,8 +3,7 @@
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QUrl> #include <QUrl>
#include <QMessageBox> #include <QDebug>
#include <QStringBuilder>
#include <QJsonParseError> #include <QJsonParseError>
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonObject> #include <QJsonObject>

12
zeiterfassungcorelib/replies/getabsencesreply.h
View File

@@ -2,6 +2,8 @@
#include <memory> #include <memory>
#include <QString>
#include <QDate>
#include <QNetworkReply> #include <QNetworkReply>
#include <QVector> #include <QVector>
@@ -19,7 +21,15 @@ public:
struct Absence struct Absence
{ {
//TODO int altRepresentative;
QString compositeId;
QDate end;
QString hourCategory;
QString openMarking;
int persNr;
int representative;
QDate start;
QString text;
}; };
const QVector<Absence> &getAbsences() const; const QVector<Absence> &getAbsences() const;

1
zeiterfassungcorelib/replies/getbookingsreply.h
View File

@@ -2,6 +2,7 @@
#include <memory> #include <memory>
#include <QDate>
#include <QNetworkReply> #include <QNetworkReply>
#include <QVector> #include <QVector>

2
zeiterfassungcorelib/replies/gettimeassignmentsreply.h
View File

@@ -2,6 +2,8 @@
#include <memory> #include <memory>
#include <QDate>
#include <QTime>
#include <QNetworkReply> #include <QNetworkReply>
#include <QVector> #include <QVector>

2
zeiterfassungcorelib/replies/getuserinforeply.h
View File

@@ -2,6 +2,8 @@
#include <memory> #include <memory>
#include <QString>
#include <QDate>
#include <QNetworkReply> #include <QNetworkReply>
#include "zeiterfassungcorelib_global.h" #include "zeiterfassungcorelib_global.h"