Added auswertung to statusBar
This commit is contained in:
@@ -13,6 +13,7 @@
|
|||||||
#include <QDir>
|
#include <QDir>
|
||||||
#include <QTemporaryFile>
|
#include <QTemporaryFile>
|
||||||
#include <QDesktopServices>
|
#include <QDesktopServices>
|
||||||
|
#include <QRegularExpression>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
#include "eventloopwithstatus.h"
|
#include "eventloopwithstatus.h"
|
||||||
@@ -58,8 +59,6 @@ MainWindow::MainWindow(QSettings &settings, Zeiterfassung &erfassung, const Zeit
|
|||||||
file.write(m_auswertung);
|
file.write(m_auswertung);
|
||||||
file.close();
|
file.close();
|
||||||
|
|
||||||
qDebug() << file.fileName();
|
|
||||||
|
|
||||||
if(!QDesktopServices::openUrl(QUrl::fromLocalFile(file.fileName())))
|
if(!QDesktopServices::openUrl(QUrl::fromLocalFile(file.fileName())))
|
||||||
{
|
{
|
||||||
QMessageBox::warning(this, tr("Could not open auswertung!"), tr("Could not open default PDF viewer!"));
|
QMessageBox::warning(this, tr("Could not open auswertung!"), tr("Could not open default PDF viewer!"));
|
||||||
@@ -102,6 +101,8 @@ MainWindow::MainWindow(QSettings &settings, Zeiterfassung &erfassung, const Zeit
|
|||||||
connect(ui->treeViewKontierungen, &QWidget::customContextMenuRequested,
|
connect(ui->treeViewKontierungen, &QWidget::customContextMenuRequested,
|
||||||
this, &MainWindow::contextMenuKontierung);
|
this, &MainWindow::contextMenuKontierung);
|
||||||
|
|
||||||
|
ui->statusbar->addPermanentWidget(m_auswertungLabel = new QLabel(ui->statusbar));
|
||||||
|
|
||||||
updateAuswertung();
|
updateAuswertung();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -210,7 +211,45 @@ void MainWindow::getAuswertungFinished(bool success, const QString &message, con
|
|||||||
ui->actionAuswertung->setEnabled(true);
|
ui->actionAuswertung->setEnabled(true);
|
||||||
m_auswertung = content;
|
m_auswertung = content;
|
||||||
|
|
||||||
//TODO: parse content
|
QString normalArbeitszeit = QStringLiteral("???");
|
||||||
|
QString urlaubsAnspruch = QStringLiteral("???");
|
||||||
|
QString gleitzeit = QStringLiteral("???");
|
||||||
|
|
||||||
|
{
|
||||||
|
static QRegularExpression regex("Normalarbeitsze +([0-9]+\\:[0-9]+\\-?) +([0-9]+\\:[0-9]+\\-?)");
|
||||||
|
auto match = regex.match(content);
|
||||||
|
if(match.hasMatch())
|
||||||
|
{
|
||||||
|
normalArbeitszeit = match.captured(2);
|
||||||
|
qDebug() << "Normalarbeitszeit" << match.captured(1) << match.captured(2);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
qWarning() << "Normalarbeitszeit not found";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
static QRegularExpression regex("Urlaubsanspruch +([0-9]+\\.[0-9]+\\-?) +([0-9]+\\.[0-9]+\\-?)");
|
||||||
|
auto match = regex.match(content);
|
||||||
|
if(match.hasMatch())
|
||||||
|
{
|
||||||
|
urlaubsAnspruch = match.captured(2);
|
||||||
|
qDebug() << "Urlaubsanspruch" << match.captured(1) << match.captured(2);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
qWarning() << "Urlaubsanspruch not found";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
static QRegularExpression regex("Gleitzeit +([0-9]+\\:[0-9]+\\-?) +([0-9]+\\:[0-9]+\\-?)");
|
||||||
|
auto match = regex.match(content);
|
||||||
|
if(match.hasMatch())
|
||||||
|
{
|
||||||
|
gleitzeit = match.captured(2);
|
||||||
|
qDebug() << "Gleitzeit" << match.captured(1) << match.captured(2);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
qWarning() << "Gleitzeit not found";
|
||||||
|
}
|
||||||
|
|
||||||
|
m_auswertungLabel->setText(tr("Urlaubsanspruch: %0 Gleitzeit: %1").arg(urlaubsAnspruch).arg(gleitzeit));
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::refreshBuchungenFinished(bool success, const QString &message)
|
void MainWindow::refreshBuchungenFinished(bool success, const QString &message)
|
||||||
@@ -1103,6 +1142,10 @@ void MainWindow::updateComboboxes()
|
|||||||
|
|
||||||
void MainWindow::updateAuswertung()
|
void MainWindow::updateAuswertung()
|
||||||
{
|
{
|
||||||
|
m_auswertungLabel->setText(tr("Urlaubsanspruch: %0 Gleitzeit: %1")
|
||||||
|
.arg(QStringLiteral("???"))
|
||||||
|
.arg(QStringLiteral("???")));
|
||||||
|
|
||||||
ui->actionAuswertung->setEnabled(false);
|
ui->actionAuswertung->setEnabled(false);
|
||||||
m_auswertung.clear();
|
m_auswertung.clear();
|
||||||
|
|
||||||
|
@@ -5,12 +5,13 @@
|
|||||||
|
|
||||||
#include "zeiterfassung.h"
|
#include "zeiterfassung.h"
|
||||||
|
|
||||||
|
class QSettings;
|
||||||
|
class QLabel;
|
||||||
|
|
||||||
namespace Ui { class MainWindow; }
|
namespace Ui { class MainWindow; }
|
||||||
class BuchungenModel;
|
class BuchungenModel;
|
||||||
class KontierungenModel;
|
class KontierungenModel;
|
||||||
|
|
||||||
class QSettings;
|
|
||||||
|
|
||||||
class MainWindow : public QMainWindow
|
class MainWindow : public QMainWindow
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
@@ -49,6 +50,7 @@ private:
|
|||||||
const Zeiterfassung::UserInfo &m_userInfo;
|
const Zeiterfassung::UserInfo &m_userInfo;
|
||||||
QVector<Zeiterfassung::Projekt> m_projekte;
|
QVector<Zeiterfassung::Projekt> m_projekte;
|
||||||
QByteArray m_auswertung;
|
QByteArray m_auswertung;
|
||||||
|
QLabel *m_auswertungLabel;
|
||||||
|
|
||||||
BuchungenModel *m_buchungenModel;
|
BuchungenModel *m_buchungenModel;
|
||||||
KontierungenModel *m_kontierungenModel;
|
KontierungenModel *m_kontierungenModel;
|
||||||
|
Reference in New Issue
Block a user