Write temporary file only when viewed in PDF viewer

reportswidget.cpp

@@ -1,5 +1,6 @@
 #include "reportswidget.h"
 
+// Qt includes
 #include <QStatusBar>
 #include <QMenu>
 #include <QToolBar>
@@ -11,7 +12,13 @@
 #include <QDir>
 #include <QDesktopServices>
 
+// dbcorelib includes
+#include "utils/timeutils.h"
+
+// zeiterfassungguilib includes
 #include "mainwindow.h"
+
+// zeiterfassungnetworklib includes
 #include "zeiterfassungapi.h"
 
 ReportsWidget::ReportsWidget(MainWindow &mainWindow) :
@@ -47,7 +54,7 @@ void ReportsWidget::dateChanged(const QDate &date)
         return;
     }
 
-    auto monthBegin = QDate(date.year(), date.month(), 1);
+    const auto monthBegin = beginOfMonth(date);
     if(monthBegin != m_date)
     {
         m_date = monthBegin;
@@ -65,6 +72,7 @@ void ReportsWidget::refresh()
 
     setText(tr("Balance: %0, Holidays: %1").arg(tr("???")).arg(tr("???")));
 
+    m_content.clear();
     m_actionRefreshReport->setEnabled(false);
     m_actionOpenReport->setEnabled(false);
 
@@ -74,21 +82,15 @@ void ReportsWidget::refresh()
 
 void ReportsWidget::finished()
 {
-    if(!m_reply->success())
+    if(m_reply->success())
     {
-        m_date = QDate();
+        m_content = m_reply->content();
-        QMessageBox::warning(this, tr("Could not load report!"), tr("Could not load report!") % "\n\n" % m_reply->message());
-        goto after;
-    }
-
-    {
-        auto content = m_reply->content();
 
         QString balance;
 
         {
-            static QRegularExpression regex(QStringLiteral("Gleitzeit +([0-9]+\\:[0-9]+\\-?) +([0-9]+\\:[0-9]+\\-?)"));
+            static const QRegularExpression regex(QStringLiteral("Gleitzeit +([0-9]+\\:[0-9]+\\-?) +([0-9]+\\:[0-9]+\\-?)"));
-            auto match = regex.match(content);
+            const auto match = regex.match(m_content);
             if(match.hasMatch())
             {
                 balance = match.captured(2);
@@ -108,8 +110,8 @@ void ReportsWidget::finished()
         QString holidays;
 
         {
-            static QRegularExpression regex(QStringLiteral("Urlaubsanspruch +(\\-?[0-9]+\\.[0-9]+) +(\\-?[0-9]+\\.[0-9]+)"));
+            static const QRegularExpression regex(QStringLiteral("Urlaubsanspruch +(\\-?[0-9]+\\.[0-9]+) +(\\-?[0-9]+\\.[0-9]+)"));
-            auto match = regex.match(content);
+            const auto match = regex.match(m_content);
             if(match.hasMatch())
                 holidays = match.captured(2);
             else
@@ -120,6 +122,18 @@ void ReportsWidget::finished()
         }
 
         setText(tr("Balance: %0, Holidays: %1").arg(balance).arg(holidays));
+        m_actionOpenReport->setEnabled(true);
+    }
+    else
+        QMessageBox::warning(this, tr("Could not load report!"), tr("Could not load report!") % "\n\n" % m_reply->message());
+
+    m_actionRefreshReport->setEnabled(true);
+    m_reply = Q_NULLPTR;
+}
+
+void ReportsWidget::openReport()
+{
+    QUrl url;
 
     {
         QTemporaryFile file(QDir::temp().absoluteFilePath(QStringLiteral("reportXXXXXX.pdf")));
@@ -127,24 +141,14 @@ void ReportsWidget::finished()
         if(!file.open())
         {
             QMessageBox::warning(this, tr("Could not write report!"), tr("Could not write report!") % "\n\n" % file.errorString());
-                goto after;
+            return;
         }
 
-            file.write(content);
+        file.write(m_content);
 
-            m_url = QUrl::fromLocalFile(file.fileName());
+        url = QUrl::fromLocalFile(file.fileName());
-        }
     }
 
-    m_actionOpenReport->setEnabled(true);
+    if(!QDesktopServices::openUrl(url))
-
-    after:
-    m_actionRefreshReport->setEnabled(true);
-    m_reply = Q_NULLPTR;
-}
-
-void ReportsWidget::openReport()
-{
-    if(!QDesktopServices::openUrl(m_url))
         QMessageBox::warning(this, tr("Could not launch your default PDF viewer!"), tr("Could not launch your default PDF viewer!"));
 }

reportswidget.h

@@ -2,7 +2,7 @@
 
 #include <QLabel>
 #include <QDate>
-#include <QUrl>
+#include <QByteArray>
 
 #include "replies/getreportreply.h"
 
@@ -30,7 +30,7 @@ private:
     QAction *m_actionRefreshReport;
 
     QDate m_date;
-    QUrl m_url;
+    QByteArray m_content;
 
     std::unique_ptr<GetReportReply> m_reply;
 };

translations/reportsplugin_de.ts

@@ -4,44 +4,44 @@
 <context>
     <name>ReportsWidget</name>
     <message>
-        <location filename="../reportswidget.cpp" line="28"/>
+        <location filename="../reportswidget.cpp" line="35"/>
         <source>Refresh report</source>
         <translation>Auswertung aktualisieren</translation>
     </message>
     <message>
-        <location filename="../reportswidget.cpp" line="33"/>
+        <location filename="../reportswidget.cpp" line="40"/>
         <source>Open report</source>
         <translation>Auswertung öffnen</translation>
     </message>
     <message>
-        <location filename="../reportswidget.cpp" line="66"/>
+        <location filename="../reportswidget.cpp" line="73"/>
         <source>???</source>
         <translation>???</translation>
     </message>
     <message>
-        <location filename="../reportswidget.cpp" line="66"/>
+        <location filename="../reportswidget.cpp" line="73"/>
-        <location filename="../reportswidget.cpp" line="122"/>
+        <location filename="../reportswidget.cpp" line="124"/>
         <source>Balance: %0, Holidays: %1</source>
         <translation>Gleitzeit: %0, Urlaub: %1</translation>
     </message>
     <message>
-        <location filename="../reportswidget.cpp" line="80"/>
+        <location filename="../reportswidget.cpp" line="128"/>
         <source>Could not load report!</source>
         <translation>Konnte Auswertung nicht laden!</translation>
     </message>
     <message>
-        <location filename="../reportswidget.cpp" line="103"/>
+        <location filename="../reportswidget.cpp" line="105"/>
-        <location filename="../reportswidget.cpp" line="117"/>
+        <location filename="../reportswidget.cpp" line="119"/>
         <source>n/a</source>
         <translation>n/v</translation>
     </message>
     <message>
-        <location filename="../reportswidget.cpp" line="129"/>
+        <location filename="../reportswidget.cpp" line="143"/>
         <source>Could not write report!</source>
         <translation>Konnte Auswertung nicht abspeichern!</translation>
     </message>
     <message>
-        <location filename="../reportswidget.cpp" line="149"/>
+        <location filename="../reportswidget.cpp" line="153"/>
         <source>Could not launch your default PDF viewer!</source>
         <translation>Konnte Standard-PDF-Viewer nicht öffnen!</translation>
     </message>

translations/reportsplugin_en.ts

@@ -4,44 +4,44 @@
 <context>
     <name>ReportsWidget</name>
     <message>
-        <location filename="../reportswidget.cpp" line="28"/>
+        <location filename="../reportswidget.cpp" line="35"/>
         <source>Refresh report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../reportswidget.cpp" line="33"/>
+        <location filename="../reportswidget.cpp" line="40"/>
         <source>Open report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../reportswidget.cpp" line="66"/>
+        <location filename="../reportswidget.cpp" line="73"/>
         <source>???</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../reportswidget.cpp" line="66"/>
+        <location filename="../reportswidget.cpp" line="73"/>
-        <location filename="../reportswidget.cpp" line="122"/>
+        <location filename="../reportswidget.cpp" line="124"/>
         <source>Balance: %0, Holidays: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../reportswidget.cpp" line="80"/>
+        <location filename="../reportswidget.cpp" line="128"/>
         <source>Could not load report!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../reportswidget.cpp" line="103"/>
+        <location filename="../reportswidget.cpp" line="105"/>
-        <location filename="../reportswidget.cpp" line="117"/>
+        <location filename="../reportswidget.cpp" line="119"/>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../reportswidget.cpp" line="129"/>
+        <location filename="../reportswidget.cpp" line="143"/>
         <source>Could not write report!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../reportswidget.cpp" line="149"/>
+        <location filename="../reportswidget.cpp" line="153"/>
         <source>Could not launch your default PDF viewer!</source>
         <translation type="unfinished"></translation>
     </message>