added totalsWidget

main.cpp

@@ -61,6 +61,6 @@ int main(int argc, char *argv[])
     }
 
     MainWindow w;
-    w.show();
+    w.showMaximized();
     return openPilotLog.exec();
 }

mainwindow.cpp

@@ -28,6 +28,11 @@ MainWindow::MainWindow(QWidget *parent)
     // Set up Toolbar
     ui->toolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
     ui->toolBar->setIconSize(QSize(64,64));
+    auto buttons = ui->toolBar->findChildren<QWidget*>();
+    for (const auto& button : buttons) {
+        button->setMinimumWidth(128);
+    }
+
     ui->actionLogbook->setIcon(QIcon(":/icons/ionicon-icons/book-outline.png"));
     ui->actionHome->setIcon(QIcon(":/icons/ionicon-icons/home-outline.png"));
     ui->actionSettings->setIcon(QIcon(":/icons/ionicon-icons/settings-outline.png"));

openPilotLog.pro

@@ -34,7 +34,8 @@ SOURCES += \
     src/gui/widgets/homewidget.cpp \
     src/gui/widgets/logbookwidget.cpp \
     src/gui/widgets/pilotswidget.cpp \
-    src/gui/widgets/settingswidget.cpp
+    src/gui/widgets/settingswidget.cpp \
+    src/gui/widgets/totalswidget.cpp
 
 HEADERS += \
     mainwindow.h \
@@ -54,7 +55,8 @@ HEADERS += \
     src/gui/widgets/homewidget.h \
     src/gui/widgets/logbookwidget.h \
     src/gui/widgets/pilotswidget.h \
-    src/gui/widgets/settingswidget.h
+    src/gui/widgets/settingswidget.h \
+    src/gui/widgets/totalswidget.h
 
 FORMS += \
     mainwindow.ui \
@@ -64,7 +66,8 @@ FORMS += \
     src/gui/widgets/homewidget.ui \
     src/gui/widgets/logbookwidget.ui \
     src/gui/widgets/pilotswidget.ui \
-    src/gui/widgets/settingswidget.ui
+    src/gui/widgets/settingswidget.ui \
+    src/gui/widgets/totalswidget.ui
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin

openPilotLog.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2020-11-02T13:20:58. -->
+<!-- Written by QtCreator 4.11.0, 2020-11-02T20:58:32. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

src/classes/stat.cpp

@@ -85,3 +85,39 @@ QVector<QString> stat::currencyTakeOffLanding(int days)
     }
 
 }
+
+QVector<QPair<QString, QString>> stat::totals()
+{
+    QString statement = "SELECT"
+            " printf(SUM(tblk)/60)||':'||printf('%02d',SUM(tblk)%60),"
+            " printf(SUM(tSPSE)/60)||':'||printf('%02d',SUM(tSPSE)%60),"
+            " printf(SUM(tSPME)/60)||':'||printf('%02d',SUM(tSPME)%60),"
+            " printf(SUM(tNIGHT)/60)||':'||printf('%02d',SUM(tNIGHT)%60),"
+            " printf(SUM(tIFR)/60)||':'||printf('%02d',SUM(tIFR)%60),"
+            " printf(SUM(tPIC)/60)||':'||printf('%02d',SUM(tPIC)%60),"
+            " printf(SUM(tPICUS)/60)||':'||printf('%02d',SUM(tPICUS)%60),"
+            " printf(SUM(tSIC)/60)||':'||printf('%02d',SUM(tSIC)%60),"
+            " printf(SUM(tDual)/60)||':'||printf('%02d',SUM(tDual)%60),"
+            " printf(SUM(tFI)/60)||':'||printf('%02d',SUM(tFI)%60),"
+            " printf(SUM(tSIM)/60)||':'||printf('%02d',SUM(tSIM)%60),"
+            " printf(SUM(tMP)/60)||':'||printf('%02d',SUM(tMP)%60),"
+            " SUM(toDay) AS 'TO Day', SUM(toNight),"
+            " SUM(ldgDay) AS 'LDG Day', SUM(ldgNight)"
+            " FROM flights";
+    QVector<QString> columns = {"total","spse","spme" , "night", "ifr",
+                                "pic" , "picus", "sic", "dual", "fi", "sim","multipilot",
+                                "today", "tonight", "ldgday", "ldgnight"};
+    QSqlQuery q(statement);
+    QVector<QPair<QString, QString>> output;
+    QString value;
+    q.next();
+    for(const auto& column : columns){
+        value = q.value(columns.indexOf(column)).toString();
+        if(!value.isEmpty()){
+            output << QPair{column, value};
+        }else{
+            output << QPair{column,QString("00:00")};
+        }
+    }
+return output;
+}

src/classes/stat.h

@@ -36,6 +36,8 @@ public:
 
     static QVector<QString> currencyTakeOffLanding(int days);
 
+    static QVector<QPair<QString, QString>> totals();
+
 };
 
 #endif // STAT_H

src/gui/widgets/homewidget.cpp

@@ -28,6 +28,7 @@ homeWidget::homeWidget(QWidget *parent) :
     ui(new Ui::homeWidget)
 {
     ui->setupUi(this);
+    showTotals();
     /*ui->totalTimeThisYearDisplay->setText(
                 calc::minutes_to_string(
                 stat::totalTime(stat::calendarYear)));
@@ -55,11 +56,13 @@ void homeWidget::on_pushButton_clicked()
     auto pl = new pilot("pilots",498);
     auto np = new NewPilot(*pl,db::editExisting,this);
     np->show();
+}
 
-    //auto ob = db(db::pilots,34);
-
-    //auto np = new NewPilot(db::editExisting,ob,this);
-    //np->show();
-
+void homeWidget::showTotals()
+{
+    auto tw = new totalsWidget(this);
+    ui->stackedWidget->addWidget(tw);
+    ui->stackedWidget->setCurrentWidget(tw);
+    ui->stackedWidget->show();
 
 }

src/gui/widgets/homewidget.h

@@ -19,6 +19,9 @@
 #define HOMEWIDGET_H
 
 #include <QWidget>
+#include <QStackedLayout>
+#include <QLabel>
+#include <QLineEdit>
 #include "src/database/db.h"
 #include "src/classes/stat.h"
 #include "src/classes/calc.h"
@@ -26,6 +29,8 @@
 #include "src/gui/dialogues/newtail.h"
 #include "src/classes/aircraft.h"
 #include "src/gui/dialogues/newpilot.h"
+#include "src/database/entry.h"
+#include "src/gui/widgets/totalswidget.h"
 
 
 namespace Ui {
@@ -45,6 +50,8 @@ private slots:
 
 private:
     Ui::homeWidget *ui;
+
+    void showTotals();
 };
 
 #endif // HOMEWIDGET_H

src/gui/widgets/homewidget.ui

@@ -14,75 +14,75 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <layout class="QGridLayout" name="gridLayout_2">
-     <item row="0" column="0">
-      <widget class="QLabel" name="totalTimeThisYearLabel">
-       <property name="text">
-        <string>Total Time This Year</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignBottom|Qt::AlignHCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QLabel" name="totalTimeThisYearDisplay">
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="totalTime365DaysLabel">
-       <property name="text">
-        <string>Total Time Last 365 days</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QLabel" name="totalTime365DaysDisplay">
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="ToLdgLabel">
-       <property name="text">
-        <string>TO/LDG last 90 days</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignHCenter|Qt::AlignTop</set>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QLabel" name="ToLdgDisplay">
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
+   <item row="0" column="2">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>205</height>
+      </size>
+     </property>
+    </spacer>
    </item>
    <item row="1" column="0">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>414</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="1" colspan="2">
+    <widget class="QStackedWidget" name="stackedWidget">
+     <property name="currentIndex">
+      <number>1</number>
+     </property>
+     <widget class="QWidget" name="page"/>
+     <widget class="QWidget" name="page_2"/>
+    </widget>
+   </item>
+   <item row="1" column="3">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>414</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="2">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>205</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="1">
     <widget class="QPushButton" name="pushButton">
      <property name="text">
       <string>Debug</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
+   <item row="4" column="1">
     <widget class="QLineEdit" name="lineEdit"/>
    </item>
   </layout>

src/gui/widgets/totalswidget.cpp

@@ -0,0 +1,23 @@
+#include "totalswidget.h"
+#include "ui_totalswidget.h"
+// Debug Makro
+#define DEB(expr) \
+    qDebug() << __PRETTY_FUNCTION__ << "\t" << expr
+
+totalsWidget::totalsWidget(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::totalsWidget)
+{
+    ui->setupUi(this);
+    auto data = stat::totals();
+    DEB("Filling Totals Line Edits...");
+    for(const auto& field : data){
+        auto line_edit = parent->findChild<QLineEdit*>(field.first+"LineEdit");
+        line_edit->setText(field.second);
+    }
+}
+
+totalsWidget::~totalsWidget()
+{
+    delete ui;
+}

src/gui/widgets/totalswidget.h

@@ -0,0 +1,27 @@
+#ifndef TOTALSWIDGET_H
+#define TOTALSWIDGET_H
+
+#include <QWidget>
+#include <QStackedLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include "src/database/db.h"
+#include "src/classes/stat.h"
+
+namespace Ui {
+class totalsWidget;
+}
+
+class totalsWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit totalsWidget(QWidget *parent = nullptr);
+    ~totalsWidget();
+
+private:
+    Ui::totalsWidget *ui;
+};
+
+#endif // TOTALSWIDGET_H

src/gui/widgets/totalswidget.ui

@@ -0,0 +1,477 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>totalsWidget</class>
+ <widget class="QWidget" name="totalsWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>604</width>
+    <height>386</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_17">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Your Totals</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>65</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="totalLabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Total</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="totalLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QLabel" name="picusLabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>PICus</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <widget class="QLineEdit" name="picusLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="spseLabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>SP SE</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="spseLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QLabel" name="ifrLabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>IFR</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QLineEdit" name="ifrLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="spmeLabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>SP ME</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="spmeLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2">
+      <widget class="QLabel" name="nightLabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Night</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="3">
+      <widget class="QLineEdit" name="nightLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="multipilotLabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Multi Pilot</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLineEdit" name="multipilotLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="2">
+      <widget class="QLabel" name="simLabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Simulator</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="3">
+      <widget class="QLineEdit" name="simLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="piclabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>PIC</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QLineEdit" name="picLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="2">
+      <widget class="QLabel" name="todayLabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>TO Day</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="3">
+      <widget class="QLineEdit" name="todayLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="sicLabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>SIC</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QLineEdit" name="sicLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="2">
+      <widget class="QLabel" name="tonightLabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>TO Night</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="3">
+      <widget class="QLineEdit" name="tonightLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="0">
+      <widget class="QLabel" name="dualLabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>DUAL</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QLineEdit" name="dualLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="2">
+      <widget class="QLabel" name="ldgdayLabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>LDG Day</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="3">
+      <widget class="QLineEdit" name="ldgdayLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="0">
+      <widget class="QLabel" name="fiLabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>FI</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="2">
+      <widget class="QLabel" name="ldgnightLabel">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>LDG Night</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="3">
+      <widget class="QLineEdit" name="ldgnightLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1">
+      <widget class="QLineEdit" name="fiLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>