Devel #56

Merged
0xFEEDC0DE64 merged 84 commits from devel into master 2017-12-29 13:34:28 +01:00
117 changed files with 1111 additions and 1186 deletions
Showing only changes of commit 27164f42a1 - Show all commits

View File

@@ -7,10 +7,10 @@ CONFIG += shared c++14
DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungguilib
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib
INCLUDEPATH += $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungguilib
INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT

View File

@@ -7,10 +7,10 @@ CONFIG += shared c++14
DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungguilib
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib
INCLUDEPATH += $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungguilib
INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT

View File

@@ -7,10 +7,10 @@ CONFIG += shared c++14
DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungguilib
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib
INCLUDEPATH += $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungguilib
INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT

View File

@@ -7,10 +7,10 @@ CONFIG += shared c++14
DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungguilib
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib
INCLUDEPATH += $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungguilib
INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT

View File

@@ -7,10 +7,10 @@ CONFIG += shared c++14
DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungguilib
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib
INCLUDEPATH += $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungguilib
INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT

View File

@@ -7,10 +7,10 @@ CONFIG += shared c++14
DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungguilib
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib
INCLUDEPATH += $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungguilib
INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT

View File

@@ -2,7 +2,9 @@ TEMPLATE = subdirs
SUBDIRS += plugins \
zeiterfassung \
zeiterfassungcorelib \
zeiterfassungguilib
plugins.depends += zeiterfassungguilib
zeiterfassung.depends += zeiterfassungguilib
zeiterfassung.depends += zeiterfassungcorelib zeiterfassungguilib
zeiterfassungguilib.depends += zeiterfassungcorelib

View File

@@ -12,6 +12,8 @@ COMPILED_TRANSLATIONS += $$[QT_INSTALL_TRANSLATIONS]/qt_en.qm \
$$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_de.qm \
$${OUT_PWD}/translations/zeiterfassung_en.qm \
$${OUT_PWD}/translations/zeiterfassung_de.qm \
$${OUT_PWD}/../zeiterfassungcorelib/translations/zeiterfassungcorelib_en.qm \
$${OUT_PWD}/../zeiterfassungcorelib/translations/zeiterfassungcorelib_de.qm \
$${OUT_PWD}/../zeiterfassungguilib/translations/zeiterfassungguilib_en.qm \
$${OUT_PWD}/../zeiterfassungguilib/translations/zeiterfassungguilib_de.qm

View File

@@ -1,6 +1,7 @@
CONFIG(debug, release|debug): DEBUG_SIGN = d
LIBRARIES += win32/Qt.conf \
$$OUT_PWD/../lib/zeiterfassungcorelib.dll \
$$OUT_PWD/../lib/zeiterfassungguilib.dll \
$$[QT_INSTALL_BINS]/Qt5Core$${DEBUG_SIGN}.dll \
$$[QT_INSTALL_BINS]/Qt5Gui$${DEBUG_SIGN}.dll \

View File

@@ -8,10 +8,10 @@ CONFIG -= app_bundle
DESTDIR = $${OUT_PWD}/../bin
LIBS += -L$$OUT_PWD/../lib -lzeiterfassungguilib
LIBS += -L$$OUT_PWD/../lib -lzeiterfassungcorelib -lzeiterfassungguilib
INCLUDEPATH += $$PWD/../zeiterfassungguilib
DEPENDPATH += $$PWD/../zeiterfassungguilib
INCLUDEPATH += $$PWD/../zeiterfassungcorelib $$PWD/../zeiterfassungguilib
DEPENDPATH += $$PWD/../zeiterfassungcorelib $$PWD/../zeiterfassungguilib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT

View File

@@ -4,10 +4,10 @@
#include <QNetworkReply>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
#include "zeiterfassungreply.h"
class ZEITERFASSUNGGUILIBSHARED_EXPORT CreateBookingReply : public ZeiterfassungReply
class ZEITERFASSUNGCORELIBSHARED_EXPORT CreateBookingReply : public ZeiterfassungReply
{
Q_OBJECT

View File

@@ -4,10 +4,10 @@
#include <QNetworkReply>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
#include "zeiterfassungreply.h"
class ZEITERFASSUNGGUILIBSHARED_EXPORT CreateTimeAssignmentReply : public ZeiterfassungReply
class ZEITERFASSUNGCORELIBSHARED_EXPORT CreateTimeAssignmentReply : public ZeiterfassungReply
{
Q_OBJECT

View File

@@ -4,10 +4,10 @@
#include <QNetworkReply>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
#include "zeiterfassungreply.h"
class ZEITERFASSUNGGUILIBSHARED_EXPORT DeleteBookingReply : public ZeiterfassungReply
class ZEITERFASSUNGCORELIBSHARED_EXPORT DeleteBookingReply : public ZeiterfassungReply
{
Q_OBJECT

View File

@@ -4,10 +4,10 @@
#include <QNetworkReply>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
#include "zeiterfassungreply.h"
class ZEITERFASSUNGGUILIBSHARED_EXPORT DeleteTimeAssignmentReply : public ZeiterfassungReply
class ZEITERFASSUNGCORELIBSHARED_EXPORT DeleteTimeAssignmentReply : public ZeiterfassungReply
{
Q_OBJECT

View File

@@ -5,12 +5,12 @@
#include <QNetworkReply>
#include <QVector>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
#include "zeiterfassungreply.h"
class ZeiterfassungApi;
class ZEITERFASSUNGGUILIBSHARED_EXPORT GetBookingsReply : public ZeiterfassungReply
class ZEITERFASSUNGCORELIBSHARED_EXPORT GetBookingsReply : public ZeiterfassungReply
{
Q_OBJECT

View File

@@ -4,12 +4,12 @@
#include <QNetworkReply>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
#include "zeiterfassungreply.h"
class ZeiterfassungApi;
class ZEITERFASSUNGGUILIBSHARED_EXPORT GetPresenceStatusReply : public ZeiterfassungReply
class ZEITERFASSUNGCORELIBSHARED_EXPORT GetPresenceStatusReply : public ZeiterfassungReply
{
Q_OBJECT

View File

@@ -5,12 +5,12 @@
#include <QNetworkReply>
#include <QVector>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
#include "zeiterfassungreply.h"
class ZeiterfassungApi;
class ZEITERFASSUNGGUILIBSHARED_EXPORT GetProjectsReply : public ZeiterfassungReply
class ZEITERFASSUNGCORELIBSHARED_EXPORT GetProjectsReply : public ZeiterfassungReply
{
Q_OBJECT

View File

@@ -5,10 +5,10 @@
#include <QNetworkReply>
#include <QByteArray>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
#include "zeiterfassungreply.h"
class ZEITERFASSUNGGUILIBSHARED_EXPORT GetReportReply : public ZeiterfassungReply
class ZEITERFASSUNGCORELIBSHARED_EXPORT GetReportReply : public ZeiterfassungReply
{
Q_OBJECT

View File

@@ -5,12 +5,12 @@
#include <QNetworkReply>
#include <QVector>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
#include "zeiterfassungreply.h"
class ZeiterfassungApi;
class ZEITERFASSUNGGUILIBSHARED_EXPORT GetTimeAssignmentsReply : public ZeiterfassungReply
class ZEITERFASSUNGCORELIBSHARED_EXPORT GetTimeAssignmentsReply : public ZeiterfassungReply
{
Q_OBJECT

View File

@@ -4,12 +4,12 @@
#include <QNetworkReply>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
#include "zeiterfassungreply.h"
class ZeiterfassungApi;
class ZEITERFASSUNGGUILIBSHARED_EXPORT GetUserInfoReply : public ZeiterfassungReply
class ZEITERFASSUNGCORELIBSHARED_EXPORT GetUserInfoReply : public ZeiterfassungReply
{
Q_OBJECT

View File

@@ -4,10 +4,10 @@
#include <QNetworkReply>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
#include "zeiterfassungreply.h"
class ZEITERFASSUNGGUILIBSHARED_EXPORT LoginPageReply : public ZeiterfassungReply
class ZEITERFASSUNGCORELIBSHARED_EXPORT LoginPageReply : public ZeiterfassungReply
{
Q_OBJECT

View File

@@ -4,10 +4,10 @@
#include <QNetworkReply>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
#include "zeiterfassungreply.h"
class ZEITERFASSUNGGUILIBSHARED_EXPORT LoginReply : public ZeiterfassungReply
class ZEITERFASSUNGCORELIBSHARED_EXPORT LoginReply : public ZeiterfassungReply
{
Q_OBJECT

View File

@@ -4,10 +4,10 @@
#include <QNetworkReply>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
#include "zeiterfassungreply.h"
class ZEITERFASSUNGGUILIBSHARED_EXPORT UpdateBookingReply : public ZeiterfassungReply
class ZEITERFASSUNGCORELIBSHARED_EXPORT UpdateBookingReply : public ZeiterfassungReply
{
Q_OBJECT

View File

@@ -4,10 +4,10 @@
#include <QNetworkReply>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
#include "zeiterfassungreply.h"
class ZEITERFASSUNGGUILIBSHARED_EXPORT UpdateTimeAssignmentReply : public ZeiterfassungReply
class ZEITERFASSUNGCORELIBSHARED_EXPORT UpdateTimeAssignmentReply : public ZeiterfassungReply
{
Q_OBJECT

View File

@@ -2,11 +2,11 @@
#include <QObject>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
class ZeiterfassungApi;
class ZEITERFASSUNGGUILIBSHARED_EXPORT ZeiterfassungReply : public QObject
class ZEITERFASSUNGCORELIBSHARED_EXPORT ZeiterfassungReply : public QObject
{
Q_OBJECT

View File

@@ -0,0 +1,10 @@
#pragma once
#include <QTime>
#include "zeiterfassungcorelib_global.h"
int ZEITERFASSUNGCORELIBSHARED_EXPORT timeToSeconds(const QTime &time);
QTime ZEITERFASSUNGCORELIBSHARED_EXPORT timeBetween(const QTime &l, const QTime &r);
QTime ZEITERFASSUNGCORELIBSHARED_EXPORT timeAdd(const QTime &l, const QTime &r);
QTime ZEITERFASSUNGCORELIBSHARED_EXPORT timeNormalise(const QTime &time);

View File

@@ -0,0 +1,277 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="de_DE">
<context>
<name>CreateBookingReply</name>
<message>
<location filename="../replies/createbookingreply.cpp" line="15"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateTimeAssignmentReply</name>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="26"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="36"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="43"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="52"/>
<source>JSON does not contain bookingNr!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DeleteBookingReply</name>
<message>
<location filename="../replies/deletebookingreply.cpp" line="15"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DeleteTimeAssignmentReply</name>
<message>
<location filename="../replies/deletetimeassignmentreply.cpp" line="15"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetBookingsReply</name>
<message>
<location filename="../replies/getbookingsreply.cpp" line="28"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getbookingsreply.cpp" line="38"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getbookingsreply.cpp" line="45"/>
<source>JSON document is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetPresenceStatusReply</name>
<message>
<location filename="../replies/getpresencestatusreply.cpp" line="28"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getpresencestatusreply.cpp" line="38"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getpresencestatusreply.cpp" line="45"/>
<source>JSON document is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetProjectsReply</name>
<message>
<location filename="../replies/getprojectsreply.cpp" line="28"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="38"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="45"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="54"/>
<source>JSON does not contain elements!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="63"/>
<source>elements is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetReportReply</name>
<message>
<location filename="../replies/getreportreply.cpp" line="22"/>
<location filename="../replies/getreportreply.cpp" line="40"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetTimeAssignmentsReply</name>
<message>
<location filename="../replies/gettimeassignmentsreply.cpp" line="29"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/gettimeassignmentsreply.cpp" line="39"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/gettimeassignmentsreply.cpp" line="46"/>
<source>JSON document is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetUserInfoReply</name>
<message>
<location filename="../replies/getuserinforeply.cpp" line="34"/>
<source>Request 0 error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="45"/>
<source>Parsing JSON 0 failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="53"/>
<source>JSON document 0 is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="63"/>
<source>JSON 0 does not contain evoAppsUser!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="73"/>
<source>evoAppsUser is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="102"/>
<source>Request 1 error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="113"/>
<source>Parsing JSON 1 failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="121"/>
<source>JSON document 1 is not an array!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="131"/>
<source>JSON array 1 is empty!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="141"/>
<source>JSON array value is not an object!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LoginPageReply</name>
<message>
<location filename="../replies/loginpagereply.cpp" line="17"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginpagereply.cpp" line="24"/>
<source>Could not find necessary keywords in login page!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LoginReply</name>
<message>
<location filename="../replies/loginreply.cpp" line="17"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginreply.cpp" line="24"/>
<source>Response did not contain a Location header.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginreply.cpp" line="39"/>
<source>Authentication failure. Please check username and password.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginreply.cpp" line="45"/>
<source>An unknown authentication failure occured. Redirected to: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>UpdateBookingReply</name>
<message>
<location filename="../replies/updatebookingreply.cpp" line="21"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatebookingreply.cpp" line="31"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatebookingreply.cpp" line="38"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatebookingreply.cpp" line="47"/>
<source>JSON does not contain bookingNr!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>UpdateTimeAssignmentReply</name>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="26"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="36"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="43"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="52"/>
<source>JSON does not contain bookingNr!</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

View File

@@ -0,0 +1,277 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="en_US">
<context>
<name>CreateBookingReply</name>
<message>
<location filename="../replies/createbookingreply.cpp" line="15"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateTimeAssignmentReply</name>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="26"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="36"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="43"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="52"/>
<source>JSON does not contain bookingNr!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DeleteBookingReply</name>
<message>
<location filename="../replies/deletebookingreply.cpp" line="15"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DeleteTimeAssignmentReply</name>
<message>
<location filename="../replies/deletetimeassignmentreply.cpp" line="15"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetBookingsReply</name>
<message>
<location filename="../replies/getbookingsreply.cpp" line="28"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getbookingsreply.cpp" line="38"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getbookingsreply.cpp" line="45"/>
<source>JSON document is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetPresenceStatusReply</name>
<message>
<location filename="../replies/getpresencestatusreply.cpp" line="28"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getpresencestatusreply.cpp" line="38"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getpresencestatusreply.cpp" line="45"/>
<source>JSON document is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetProjectsReply</name>
<message>
<location filename="../replies/getprojectsreply.cpp" line="28"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="38"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="45"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="54"/>
<source>JSON does not contain elements!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="63"/>
<source>elements is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetReportReply</name>
<message>
<location filename="../replies/getreportreply.cpp" line="22"/>
<location filename="../replies/getreportreply.cpp" line="40"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetTimeAssignmentsReply</name>
<message>
<location filename="../replies/gettimeassignmentsreply.cpp" line="29"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/gettimeassignmentsreply.cpp" line="39"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/gettimeassignmentsreply.cpp" line="46"/>
<source>JSON document is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetUserInfoReply</name>
<message>
<location filename="../replies/getuserinforeply.cpp" line="34"/>
<source>Request 0 error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="45"/>
<source>Parsing JSON 0 failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="53"/>
<source>JSON document 0 is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="63"/>
<source>JSON 0 does not contain evoAppsUser!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="73"/>
<source>evoAppsUser is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="102"/>
<source>Request 1 error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="113"/>
<source>Parsing JSON 1 failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="121"/>
<source>JSON document 1 is not an array!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="131"/>
<source>JSON array 1 is empty!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="141"/>
<source>JSON array value is not an object!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LoginPageReply</name>
<message>
<location filename="../replies/loginpagereply.cpp" line="17"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginpagereply.cpp" line="24"/>
<source>Could not find necessary keywords in login page!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LoginReply</name>
<message>
<location filename="../replies/loginreply.cpp" line="17"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginreply.cpp" line="24"/>
<source>Response did not contain a Location header.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginreply.cpp" line="39"/>
<source>Authentication failure. Please check username and password.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginreply.cpp" line="45"/>
<source>An unknown authentication failure occured. Redirected to: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>UpdateBookingReply</name>
<message>
<location filename="../replies/updatebookingreply.cpp" line="21"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatebookingreply.cpp" line="31"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatebookingreply.cpp" line="38"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatebookingreply.cpp" line="47"/>
<source>JSON does not contain bookingNr!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>UpdateTimeAssignmentReply</name>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="26"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="36"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="43"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="52"/>
<source>JSON does not contain bookingNr!</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

View File

@@ -7,7 +7,7 @@
#include <QDate>
#include <QTime>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
class QNetworkAccessManager;
@@ -26,7 +26,7 @@ class GetProjectsReply;
class GetReportReply;
class GetPresenceStatusReply;
class ZEITERFASSUNGGUILIBSHARED_EXPORT ZeiterfassungApi : public QObject
class ZEITERFASSUNGCORELIBSHARED_EXPORT ZeiterfassungApi : public QObject
{
Q_OBJECT

View File

@@ -0,0 +1,65 @@
QT += core network
TARGET = zeiterfassungcorelib
TEMPLATE = lib
CONFIG += c++14
DESTDIR = $${OUT_PWD}/../lib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT
DEFINES += ZEITERFASSUNGCORELIB_LIBRARY
SOURCES += timeutils.cpp \
zeiterfassungapi.cpp \
zeiterfassungsettings.cpp \
replies/createbookingreply.cpp \
replies/createtimeassignmentreply.cpp \
replies/deletebookingreply.cpp \
replies/deletetimeassignmentreply.cpp \
replies/getbookingsreply.cpp \
replies/getpresencestatusreply.cpp \
replies/getprojectsreply.cpp \
replies/getreportreply.cpp \
replies/gettimeassignmentsreply.cpp \
replies/getuserinforeply.cpp \
replies/loginpagereply.cpp \
replies/loginreply.cpp \
replies/updatebookingreply.cpp \
replies/updatetimeassignmentreply.cpp \
replies/zeiterfassungreply.cpp
HEADERS += cpp14polyfills.h \
timeutils.h \
zeiterfassungapi.h \
zeiterfassungcorelib_global.h \
zeiterfassungsettings.h \
replies/createbookingreply.h \
replies/createtimeassignmentreply.h \
replies/deletebookingreply.h \
replies/deletetimeassignmentreply.h \
replies/getbookingsreply.h \
replies/getpresencestatusreply.h \
replies/getprojectsreply.h \
replies/getreportreply.h \
replies/gettimeassignmentsreply.h \
replies/getuserinforeply.h \
replies/loginpagereply.h \
replies/loginreply.h \
replies/updatebookingreply.h \
replies/updatetimeassignmentreply.h \
replies/zeiterfassungreply.h
FORMS +=
RESOURCES +=
TRANSLATIONS += translations/zeiterfassungcorelib_en.ts \
translations/zeiterfassungcorelib_de.ts
include(../lrelease.pri)
# unix {
# target.path = /usr/lib
# INSTALLS += target
# }

View File

@@ -0,0 +1,9 @@
#pragma once
#include <QtGlobal>
#if defined(ZEITERFASSUNGCORELIB_LIBRARY)
# define ZEITERFASSUNGCORELIBSHARED_EXPORT Q_DECL_EXPORT
#else
# define ZEITERFASSUNGCORELIBSHARED_EXPORT Q_DECL_IMPORT
#endif

View File

@@ -6,9 +6,9 @@
#include <QStringList>
#include <QDate>
#include "zeiterfassungguilib_global.h"
#include "zeiterfassungcorelib_global.h"
class ZEITERFASSUNGGUILIBSHARED_EXPORT ZeiterfassungSettings : public QSettings
class ZEITERFASSUNGCORELIBSHARED_EXPORT ZeiterfassungSettings : public QSettings
{
Q_OBJECT

View File

@@ -1,10 +0,0 @@
#pragma once
#include <QTime>
#include "zeiterfassungguilib_global.h"
int ZEITERFASSUNGGUILIBSHARED_EXPORT timeToSeconds(const QTime &time);
QTime ZEITERFASSUNGGUILIBSHARED_EXPORT timeBetween(const QTime &l, const QTime &r);
QTime ZEITERFASSUNGGUILIBSHARED_EXPORT timeAdd(const QTime &l, const QTime &r);
QTime ZEITERFASSUNGGUILIBSHARED_EXPORT timeNormalise(const QTime &time);

View File

@@ -54,187 +54,6 @@
<translation>Passwort:</translation>
</message>
</context>
<context>
<name>CreateBookingReply</name>
<message>
<location filename="../replies/createbookingreply.cpp" line="26"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createbookingreply.cpp" line="36"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createbookingreply.cpp" line="43"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createbookingreply.cpp" line="52"/>
<source>JSON does not contain bookingNr!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateTimeAssignmentReply</name>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="26"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="36"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="43"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="52"/>
<source>JSON does not contain bookingNr!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DeleteBookingReply</name>
<message>
<location filename="../replies/deletebookingreply.cpp" line="15"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DeleteTimeAssignmentReply</name>
<message>
<location filename="../replies/deletetimeassignmentreply.cpp" line="15"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetBookingsReply</name>
<message>
<location filename="../replies/getbookingsreply.cpp" line="28"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getbookingsreply.cpp" line="38"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getbookingsreply.cpp" line="45"/>
<source>JSON document is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetPresenceStatusReply</name>
<message>
<location filename="../replies/getpresencestatusreply.cpp" line="28"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getpresencestatusreply.cpp" line="38"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getpresencestatusreply.cpp" line="45"/>
<source>JSON document is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetProjectsReply</name>
<message>
<location filename="../replies/getprojectsreply.cpp" line="28"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="38"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="45"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="54"/>
<source>JSON does not contain elements!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="63"/>
<source>elements is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetReportReply</name>
<message>
<location filename="../replies/getreportreply.cpp" line="22"/>
<location filename="../replies/getreportreply.cpp" line="40"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetTimeAssignmentsReply</name>
<message>
<location filename="../replies/gettimeassignmentsreply.cpp" line="29"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/gettimeassignmentsreply.cpp" line="39"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/gettimeassignmentsreply.cpp" line="46"/>
<source>JSON document is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetUserInfoReply</name>
<message>
<location filename="../replies/getuserinforeply.cpp" line="27"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="37"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="44"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="53"/>
<source>JSON does not contain evoAppsUser!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="62"/>
<source>evoAppsUser is not an object!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LanguageSelectionDialog</name>
<message>
@@ -264,42 +83,6 @@
<translation>Deutsch</translation>
</message>
</context>
<context>
<name>LoginPageReply</name>
<message>
<location filename="../replies/loginpagereply.cpp" line="17"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginpagereply.cpp" line="24"/>
<source>Could not find necessary keywords in login page!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LoginReply</name>
<message>
<location filename="../replies/loginreply.cpp" line="17"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginreply.cpp" line="24"/>
<source>Response did not contain a Location header.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginreply.cpp" line="39"/>
<source>Authentication failure. Please check username and password.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginreply.cpp" line="45"/>
<source>An unknown authentication failure occured. Redirected to: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindow</name>
<message>
@@ -544,7 +327,7 @@ Booking ID: %1</source>
</message>
<message>
<location filename="../stripswidget.cpp" line="257"/>
<location filename="../stripswidget.cpp" line="448"/>
<location filename="../stripswidget.cpp" line="424"/>
<source>%0: %1</source>
<translation>%0: %1</translation>
</message>
@@ -555,17 +338,17 @@ Booking ID: %1</source>
</message>
<message>
<location filename="../stripswidget.cpp" line="257"/>
<location filename="../stripswidget.cpp" line="379"/>
<location filename="../stripswidget.cpp" line="450"/>
<location filename="../stripswidget.cpp" line="363"/>
<location filename="../stripswidget.cpp" line="426"/>
<source>%0h</source>
<translation>%0h</translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="257"/>
<location filename="../stripswidget.cpp" line="450"/>
<location filename="../stripswidget.cpp" line="565"/>
<location filename="../stripswidget.cpp" line="584"/>
<location filename="../stripswidget.cpp" line="603"/>
<location filename="../stripswidget.cpp" line="426"/>
<location filename="../stripswidget.cpp" line="541"/>
<location filename="../stripswidget.cpp" line="560"/>
<location filename="../stripswidget.cpp" line="579"/>
<source>HH:mm</source>
<translation>HH:mm</translation>
</message>
@@ -575,62 +358,48 @@ Booking ID: %1</source>
<translation>Kontierung fehlend!</translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="275"/>
<location filename="../stripswidget.cpp" line="326"/>
<location filename="../stripswidget.cpp" line="389"/>
<source>Expected %0 but received %1 in time assignment.
Time assignment ID: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="276"/>
<location filename="../stripswidget.cpp" line="277"/>
<location filename="../stripswidget.cpp" line="327"/>
<location filename="../stripswidget.cpp" line="328"/>
<location filename="../stripswidget.cpp" line="379"/>
<location filename="../stripswidget.cpp" line="390"/>
<location filename="../stripswidget.cpp" line="391"/>
<location filename="../stripswidget.cpp" line="431"/>
<location filename="../stripswidget.cpp" line="432"/>
<location filename="../stripswidget.cpp" line="363"/>
<location filename="../stripswidget.cpp" line="407"/>
<location filename="../stripswidget.cpp" line="408"/>
<source>HH:mm:ss</source>
<translation>HH:mm:ss</translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="289"/>
<location filename="../stripswidget.cpp" line="403"/>
<location filename="../stripswidget.cpp" line="281"/>
<location filename="../stripswidget.cpp" line="379"/>
<source>There is another booking after an unfinished time assignment.
Booking ID: %0
Time assignment ID: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="297"/>
<location filename="../stripswidget.cpp" line="340"/>
<location filename="../stripswidget.cpp" line="412"/>
<location filename="../stripswidget.cpp" line="289"/>
<location filename="../stripswidget.cpp" line="324"/>
<location filename="../stripswidget.cpp" line="388"/>
<source>There is another time assignment after an unfinished time assignment.
Time assignment ID: %0
Time assignment ID: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="318"/>
<location filename="../stripswidget.cpp" line="310"/>
<source>The last time assignment is finished without end booking
Time assignment ID: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="363"/>
<location filename="../stripswidget.cpp" line="347"/>
<source>Expected end booking, instead got type %0
Booking ID: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="378"/>
<location filename="../stripswidget.cpp" line="362"/>
<source>Missing time assignment! Missing: %0</source>
<translation>Kontierung fehlend! %0 nicht kontiert</translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="449"/>
<location filename="../stripswidget.cpp" line="425"/>
<source>Assigned time</source>
<translation>Kontierte Zeit</translation>
</message>
@@ -645,14 +414,14 @@ Booking ID: %1</source>
<translation>%0 (%1)</translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="430"/>
<location filename="../stripswidget.cpp" line="406"/>
<source>Time assignment time longer than booking time!
Time assignment: %0
Booking: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="461"/>
<location filename="../stripswidget.cpp" line="437"/>
<source>Strip rendering aborted due error.
Your bookings and time assignments for this day are in an illegal state!</source>
<translation type="unfinished"></translation>
@@ -698,55 +467,9 @@ Your bookings and time assignments for this day are in an illegal state!</source
<translation>Ungültig</translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="603"/>
<location filename="../stripswidget.cpp" line="579"/>
<source>Open</source>
<translation>Offen</translation>
</message>
</context>
<context>
<name>UpdateBookingReply</name>
<message>
<location filename="../replies/updatebookingreply.cpp" line="21"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatebookingreply.cpp" line="31"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatebookingreply.cpp" line="38"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatebookingreply.cpp" line="47"/>
<source>JSON does not contain bookingNr!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>UpdateTimeAssignmentReply</name>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="26"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="36"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="43"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="52"/>
<source>JSON does not contain bookingNr!</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

View File

@@ -54,187 +54,6 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateBookingReply</name>
<message>
<location filename="../replies/createbookingreply.cpp" line="26"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createbookingreply.cpp" line="36"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createbookingreply.cpp" line="43"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createbookingreply.cpp" line="52"/>
<source>JSON does not contain bookingNr!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateTimeAssignmentReply</name>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="26"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="36"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="43"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/createtimeassignmentreply.cpp" line="52"/>
<source>JSON does not contain bookingNr!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DeleteBookingReply</name>
<message>
<location filename="../replies/deletebookingreply.cpp" line="15"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DeleteTimeAssignmentReply</name>
<message>
<location filename="../replies/deletetimeassignmentreply.cpp" line="15"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetBookingsReply</name>
<message>
<location filename="../replies/getbookingsreply.cpp" line="28"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getbookingsreply.cpp" line="38"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getbookingsreply.cpp" line="45"/>
<source>JSON document is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetPresenceStatusReply</name>
<message>
<location filename="../replies/getpresencestatusreply.cpp" line="28"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getpresencestatusreply.cpp" line="38"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getpresencestatusreply.cpp" line="45"/>
<source>JSON document is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetProjectsReply</name>
<message>
<location filename="../replies/getprojectsreply.cpp" line="28"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="38"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="45"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="54"/>
<source>JSON does not contain elements!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getprojectsreply.cpp" line="63"/>
<source>elements is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetReportReply</name>
<message>
<location filename="../replies/getreportreply.cpp" line="22"/>
<location filename="../replies/getreportreply.cpp" line="40"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetTimeAssignmentsReply</name>
<message>
<location filename="../replies/gettimeassignmentsreply.cpp" line="29"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/gettimeassignmentsreply.cpp" line="39"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/gettimeassignmentsreply.cpp" line="46"/>
<source>JSON document is not an array!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GetUserInfoReply</name>
<message>
<location filename="../replies/getuserinforeply.cpp" line="27"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="37"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="44"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="53"/>
<source>JSON does not contain evoAppsUser!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/getuserinforeply.cpp" line="62"/>
<source>evoAppsUser is not an object!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LanguageSelectionDialog</name>
<message>
@@ -264,42 +83,6 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LoginPageReply</name>
<message>
<location filename="../replies/loginpagereply.cpp" line="17"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginpagereply.cpp" line="24"/>
<source>Could not find necessary keywords in login page!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LoginReply</name>
<message>
<location filename="../replies/loginreply.cpp" line="17"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginreply.cpp" line="24"/>
<source>Response did not contain a Location header.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginreply.cpp" line="39"/>
<source>Authentication failure. Please check username and password.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/loginreply.cpp" line="45"/>
<source>An unknown authentication failure occured. Redirected to: %0</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindow</name>
<message>
@@ -544,7 +327,7 @@ Booking ID: %1</source>
</message>
<message>
<location filename="../stripswidget.cpp" line="257"/>
<location filename="../stripswidget.cpp" line="448"/>
<location filename="../stripswidget.cpp" line="424"/>
<source>%0: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -555,17 +338,17 @@ Booking ID: %1</source>
</message>
<message>
<location filename="../stripswidget.cpp" line="257"/>
<location filename="../stripswidget.cpp" line="379"/>
<location filename="../stripswidget.cpp" line="450"/>
<location filename="../stripswidget.cpp" line="363"/>
<location filename="../stripswidget.cpp" line="426"/>
<source>%0h</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="257"/>
<location filename="../stripswidget.cpp" line="450"/>
<location filename="../stripswidget.cpp" line="565"/>
<location filename="../stripswidget.cpp" line="584"/>
<location filename="../stripswidget.cpp" line="603"/>
<location filename="../stripswidget.cpp" line="426"/>
<location filename="../stripswidget.cpp" line="541"/>
<location filename="../stripswidget.cpp" line="560"/>
<location filename="../stripswidget.cpp" line="579"/>
<source>HH:mm</source>
<translation type="unfinished"></translation>
</message>
@@ -575,74 +358,60 @@ Booking ID: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="275"/>
<location filename="../stripswidget.cpp" line="326"/>
<location filename="../stripswidget.cpp" line="389"/>
<source>Expected %0 but received %1 in time assignment.
Time assignment ID: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="276"/>
<location filename="../stripswidget.cpp" line="277"/>
<location filename="../stripswidget.cpp" line="327"/>
<location filename="../stripswidget.cpp" line="328"/>
<location filename="../stripswidget.cpp" line="379"/>
<location filename="../stripswidget.cpp" line="390"/>
<location filename="../stripswidget.cpp" line="391"/>
<location filename="../stripswidget.cpp" line="431"/>
<location filename="../stripswidget.cpp" line="432"/>
<location filename="../stripswidget.cpp" line="363"/>
<location filename="../stripswidget.cpp" line="407"/>
<location filename="../stripswidget.cpp" line="408"/>
<source>HH:mm:ss</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="289"/>
<location filename="../stripswidget.cpp" line="403"/>
<location filename="../stripswidget.cpp" line="281"/>
<location filename="../stripswidget.cpp" line="379"/>
<source>There is another booking after an unfinished time assignment.
Booking ID: %0
Time assignment ID: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="297"/>
<location filename="../stripswidget.cpp" line="340"/>
<location filename="../stripswidget.cpp" line="412"/>
<location filename="../stripswidget.cpp" line="289"/>
<location filename="../stripswidget.cpp" line="324"/>
<location filename="../stripswidget.cpp" line="388"/>
<source>There is another time assignment after an unfinished time assignment.
Time assignment ID: %0
Time assignment ID: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="318"/>
<location filename="../stripswidget.cpp" line="310"/>
<source>The last time assignment is finished without end booking
Time assignment ID: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="363"/>
<location filename="../stripswidget.cpp" line="347"/>
<source>Expected end booking, instead got type %0
Booking ID: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="378"/>
<location filename="../stripswidget.cpp" line="362"/>
<source>Missing time assignment! Missing: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="430"/>
<location filename="../stripswidget.cpp" line="406"/>
<source>Time assignment time longer than booking time!
Time assignment: %0
Booking: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="449"/>
<location filename="../stripswidget.cpp" line="425"/>
<source>Assigned time</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="461"/>
<location filename="../stripswidget.cpp" line="437"/>
<source>Strip rendering aborted due error.
Your bookings and time assignments for this day are in an illegal state!</source>
<translation type="unfinished"></translation>
@@ -698,55 +467,9 @@ Your bookings and time assignments for this day are in an illegal state!</source
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../stripswidget.cpp" line="603"/>
<location filename="../stripswidget.cpp" line="579"/>
<source>Open</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>UpdateBookingReply</name>
<message>
<location filename="../replies/updatebookingreply.cpp" line="21"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatebookingreply.cpp" line="31"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatebookingreply.cpp" line="38"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatebookingreply.cpp" line="47"/>
<source>JSON does not contain bookingNr!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>UpdateTimeAssignmentReply</name>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="26"/>
<source>Request error occured: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="36"/>
<source>Parsing JSON failed: %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="43"/>
<source>JSON document is not an object!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../replies/updatetimeassignmentreply.cpp" line="52"/>
<source>JSON does not contain bookingNr!</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

View File

@@ -7,64 +7,32 @@ CONFIG += c++14
DESTDIR = $${OUT_PWD}/../lib
LIBS += -L$$OUT_PWD/../lib -lzeiterfassungcorelib
INCLUDEPATH += $$PWD/../zeiterfassungcorelib
DEPENDPATH += $$PWD/../zeiterfassungcorelib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT
DEFINES += ZEITERFASSUNGGUILIB_LIBRARY
SOURCES += mainwindow.cpp \
stripfactory.cpp \
stripswidget.cpp \
timeutils.cpp \
zeiterfassungapi.cpp \
zeiterfassungplugin.cpp \
zeiterfassungsettings.cpp \
dialogs/aboutmedialog.cpp \
dialogs/authenticationdialog.cpp \
dialogs/languageselectiondialog.cpp \
dialogs/settingsdialog.cpp \
replies/createbookingreply.cpp \
replies/createtimeassignmentreply.cpp \
replies/deletebookingreply.cpp \
replies/deletetimeassignmentreply.cpp \
replies/getbookingsreply.cpp \
replies/getpresencestatusreply.cpp \
replies/getprojectsreply.cpp \
replies/gettimeassignmentsreply.cpp \
replies/loginpagereply.cpp \
replies/loginreply.cpp \
replies/updatebookingreply.cpp \
replies/updatetimeassignmentreply.cpp \
replies/zeiterfassungreply.cpp \
replies/getuserinforeply.cpp \
replies/getreportreply.cpp
dialogs/settingsdialog.cpp
HEADERS += cpp14polyfills.h \
mainwindow.h \
HEADERS += mainwindow.h \
stripfactory.h \
stripswidget.h \
timeutils.h \
zeiterfassungapi.h \
zeiterfassungguilib_global.h \
zeiterfassungplugin.h \
zeiterfassungsettings.h \
dialogs/aboutmedialog.h \
dialogs/authenticationdialog.h \
dialogs/languageselectiondialog.h \
dialogs/settingsdialog.h \
replies/createbookingreply.h \
replies/createtimeassignmentreply.h \
replies/deletebookingreply.h \
replies/deletetimeassignmentreply.h \
replies/getbookingsreply.h \
replies/getpresencestatusreply.h \
replies/getprojectsreply.h \
replies/gettimeassignmentsreply.h \
replies/loginpagereply.h \
replies/loginreply.h \
replies/updatebookingreply.h \
replies/updatetimeassignmentreply.h \
replies/zeiterfassungreply.h \
replies/getuserinforeply.h \
replies/getreportreply.h
dialogs/settingsdialog.h
FORMS += mainwindow.ui \
dialogs/settingsdialog.ui \

View File

@@ -1,6 +1,6 @@
#pragma once
#include <QtCore/qglobal.h>
#include <QtGlobal>
#if defined(ZEITERFASSUNGGUILIB_LIBRARY)
# define ZEITERFASSUNGGUILIBSHARED_EXPORT Q_DECL_EXPORT