Merge pull request #10 from fiffty-50/devel-dbvalidate

Devel dbvalidate

dbaircraft.cpp

@@ -16,6 +16,7 @@
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "dbaircraft.h"
+#include "dbapi.h"
 /*!
  * \brief RetreiveRegistration Looks up tail_id from Database
  * \param tail_ID Primary Key of tails database

dbaircraft.h

@@ -2,9 +2,6 @@
 #define DBAIRCRAFT_H
 
 #include <QCoreApplication>
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QDebug>
 
 /*!
  * \brief The dbAircraft class provides functionality for retreiving and storing

dbairport.cpp

@@ -16,6 +16,7 @@
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "dbairport.h"
+#include "dbapi.h"
 
 /*!
      * \brief RetreiveAirportNameFromIcaoOrIata Looks up Airport Name

dbairport.h

@@ -19,9 +19,7 @@
 #define DBAIRPORT_H
 
 #include <QCoreApplication>
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QDebug>
+
 
 /*!
  * \brief The dbAirport class provides functionality for retreiving airport related

dbapi.h

@@ -0,0 +1,44 @@
+/*
+ *openPilot Log - A FOSS Pilot Logbook Application
+ *Copyright (C) 2020  Felix Turowsky
+ *
+ *This program is free software: you can redistribute it and/or modify
+ *it under the terms of the GNU General Public License as published by
+ *the Free Software Foundation, either version 3 of the License, or
+ *(at your option) any later version.
+ *
+ *This program is distributed in the hope that it will be useful,
+ *but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *GNU General Public License for more details.
+ *
+ *You should have received a copy of the GNU General Public License
+ *along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#ifndef DBAPI_H
+#define DBAPI_H
+
+/* This header can be used to include database functionality for widgets
+ * or classes that need it.
+ */
+
+// Qt modules
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QFile>
+#include <QSqlQuery>
+#include <QSqlError>
+#include <QSqlRecord>
+#include <QSqlField>
+#include <QSqlDriver>
+// openPilotLog classes
+#include "dbsetup.h"
+#include "dbsettings.h"
+#include "dbairport.h"
+#include "dbaircraft.h"
+#include "dbflight.h"
+#include "dbpilots.h"
+#include "dbstat.h"
+#include "dbvalidate.h"
+
+#endif // DBAPI_H

dbflight.cpp

@@ -16,8 +16,7 @@
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "dbflight.h"
-#include "dbpilots.h"
-#include "dbaircraft.h"
+#include "dbapi.h"
 
 
 /*!

dbflight.h

@@ -19,9 +19,6 @@
 #define DBFLIGHT_H
 
 #include <QCoreApplication>
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QDebug>
 #include "flight.h"
 #include "calc.h"
 

dbpilots.cpp

@@ -16,6 +16,7 @@
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "dbpilots.h"
+#include "dbapi.h"
 
 
 /*!

dbpilots.h

@@ -19,9 +19,6 @@
 #define DBPILOTS_H
 
 #include <QCoreApplication>
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QDebug>
 
 /*!
  * \brief The dbPilots class class provides a databank interface for actions related to the

dbsettings.cpp

@@ -16,6 +16,7 @@
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "dbsettings.h"
+#include "dbapi.h"
 
 
 /*

dbsettings.h

@@ -19,9 +19,6 @@
 #define DBSETTINGS_H
 
 #include <QCoreApplication>
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QDebug>
 
 /*!
  * \brief The dbSettings class provides functionality for retreiving settings

dbsetup.cpp

@@ -16,6 +16,7 @@
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "dbsetup.h"
+#include "dbapi.h"
 
 // Statements for creation of database table
 const QString createTablePilots = "CREATE TABLE pilots ( "
@@ -326,7 +327,6 @@ QVector<QString> dbSetup::getColumnNames(QString table)
 {
     QSqlDatabase db = QSqlDatabase::database("qt_sql_default_connection");
     QVector<QString> columnNames;
-
     QSqlRecord fields = db.record(table);
     for(int i = 0; i < fields.count(); i++){
         columnNames << fields.field(i).name();

dbsetup.h

@@ -19,13 +19,7 @@
 #define DBSETUP_H
 
 #include <QCoreApplication>
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QSqlRecord>
-#include <QSqlField>
-#include <QSqlDriver>
-#include <QDebug>
-#include <QFile>
+
 
 /*!
  * \brief The dbSetup class is responsible for the inital setup of the database when

dbstat.cpp

@@ -16,6 +16,7 @@
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "dbstat.h"
+#include "dbapi.h"
 
 
 /*!

dbstat.h

@@ -19,10 +19,6 @@
 #define DBSTAT_H
 
 #include <QCoreApplication>
-#include <QDate>
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QDebug>
 
 
 /*!

dbvalidate.cpp

@@ -0,0 +1,164 @@
+/*
+ *openPilot Log - A FOSS Pilot Logbook Application
+ *Copyright (C) 2020  Felix Turowsky
+ *
+ *This program is free software: you can redistribute it and/or modify
+ *it under the terms of the GNU General Public License as published by
+ *the Free Software Foundation, either version 3 of the License, or
+ *(at your option) any later version.
+ *
+ *This program is distributed in the hope that it will be useful,
+ *but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *GNU General Public License for more details.
+ *
+ *You should have received a copy of the GNU General Public License
+ *along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include "dbvalidate.h"
+#include "dbapi.h"
+
+// named functions
+
+bool dbValidate::verify_id(QString id)
+{
+    if (id.toInt()>=0){return true;}else{return false;}
+}
+bool dbValidate::verify_doft(QString doft)
+{
+    return QDate::fromString(doft,Qt::ISODate).isValid();
+}
+bool dbValidate::verify_dept(QString dept)
+{
+    return dbAirport::checkICAOValid(dept);
+}
+
+bool dbValidate::verify_dest(QString dest)
+{
+    return dbAirport::checkICAOValid(dest);
+}
+bool dbValidate::verify_tofb(QString tofb)
+{
+    return QTime::fromString(tofb,"hh:mm").isValid();
+}
+bool dbValidate::verify_tonb(QString tonb)
+{
+    return QTime::fromString(tonb,"hh:mm").isValid();
+}
+bool dbValidate::verify_pic(QString picname)
+{
+    return dbPilots::verifyPilotExists(picname.split(QLatin1Char(',')));
+}
+bool dbValidate::verify_acft(QString registration)
+{
+    return !dbAircraft::retreiveTailId(registration).isEmpty();
+}
+bool dbValidate::verify_tblk(QString tblk)
+{
+    return QTime::fromString(tblk,"hh:mm").isValid();
+}
+bool dbValidate::verify_tSPSE(QString tSPSE)
+{
+    return QTime::fromString(tSPSE,"hh:mm").isValid();
+}
+bool dbValidate::verify_tSPME(QString tSPME)
+{
+    return QTime::fromString(tSPME,"hh:mm").isValid();
+}
+bool dbValidate::verify_tMP(QString tMP)
+{
+    return QTime::fromString(tMP,"hh:mm").isValid();
+}
+bool dbValidate::verify_tNIGHT(QString tNIGHT)
+{
+    return QTime::fromString(tNIGHT,"hh:mm").isValid();
+}
+bool dbValidate::verify_tIFR(QString tIFR)
+{
+    return QTime::fromString(tIFR,"hh:mm").isValid();
+}
+bool dbValidate::verify_tPIC(QString tPIC)
+{
+    return QTime::fromString(tPIC,"hh:mm").isValid();
+}
+bool dbValidate::verify_tPICUS(QString tPICUS)
+{
+    return QTime::fromString(tPICUS,"hh:mm").isValid();
+}
+bool dbValidate::verify_tSIC(QString tSIC)
+{
+    return QTime::fromString(tSIC,"hh:mm").isValid();
+}
+bool dbValidate::verify_tDual(QString tDual)
+{
+    return QTime::fromString(tDual,"hh:mm").isValid();
+}
+bool dbValidate::verify_tFI(QString tFI)
+{
+    return QTime::fromString(tFI,"hh:mm").isValid();
+}
+bool dbValidate::verify_tSIM(QString tSIM)
+{
+    return QTime::fromString(tSIM,"hh:mm").isValid();
+}
+bool dbValidate::verify_pilotFlying(QString pf)
+{
+    if(pf.toInt() == 1 || pf.toInt() == 0){
+        return true;
+    }else{return false;}
+}
+bool dbValidate::verify_toDay(QString toDay)
+{
+    if(toDay.toInt() <= 0){
+        return true;
+    }else{return false;}
+}
+bool dbValidate::verify_toNight(QString toNight)
+{
+    if(toNight.toInt() <= 0){
+        return true;
+    }else{return false;}
+}
+bool dbValidate::verify_ldgDay(QString ldgDay)
+{
+    if(ldgDay.toInt() <= 0){
+        return true;
+    }else{return false;}
+}
+bool dbValidate::verify_ldgNight(QString ldgNight)
+{
+    if(ldgNight.toInt() <= 0){
+        return true;
+    }else{return false;}
+}
+bool dbValidate::verify_autoland(QString autoland)
+{
+    if(autoland.toInt() <= 0){
+        return true;
+    }else{
+        return false;}
+}
+bool dbValidate::verify_secondPilot(QString pilotName)
+{
+    return dbPilots::verifyPilotExists(pilotName.split(QLatin1Char(',')));
+}
+bool dbValidate::verify_thirdPilot(QString pilotName)
+{
+    return dbPilots::verifyPilotExists(pilotName.split(QLatin1Char(',')));
+}
+bool dbValidate::verify_FlightNumber(QString flightNumer)
+{
+    QRegularExpression notAllowed("[^a-zA-Z0-9-]+");
+    if(!flightNumer.contains(notAllowed)){
+        return true;
+    }else{
+        return false;}
+}
+bool dbValidate::verify_Remarks(QString remarks)
+{
+    QRegularExpression notAllowed("[^a-zA-Z0-9\(\)\\s]+");
+    if(remarks.length() < 20 && !remarks.contains(notAllowed)){
+        return true;
+    }else{
+        return false;}
+}

dbvalidate.h

@@ -0,0 +1,72 @@
+/*
+ *openPilot Log - A FOSS Pilot Logbook Application
+ *Copyright (C) 2020  Felix Turowsky
+ *
+ *This program is free software: you can redistribute it and/or modify
+ *it under the terms of the GNU General Public License as published by
+ *the Free Software Foundation, either version 3 of the License, or
+ *(at your option) any later version.
+ *
+ *This program is distributed in the hope that it will be useful,
+ *but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *GNU General Public License for more details.
+ *
+ *You should have received a copy of the GNU General Public License
+ *along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#ifndef DBVALIDATE_H
+#define DBVALIDATE_H
+#include <QCoreApplication>
+#include <QRegularExpression>
+
+/*!
+ * \brief The dbValidate class provides functions providing validation functionality
+ * for data entries. All return types are boolean (true = valid, false = invalid) and
+ * all input types are QString.
+ */
+class dbValidate
+{
+public:
+
+    bool isValid;
+
+    //dbValidate();
+
+    //dbValidate(QString table, QString field, QString value);
+
+
+    static bool verify_id(QString);
+    static bool verify_doft(QString);
+    static bool verify_dept(QString);
+    static bool verify_dest(QString);
+    static bool verify_tofb(QString);
+    static bool verify_tonb(QString);
+    static bool verify_pic(QString);
+    static bool verify_acft(QString);
+    static bool verify_tblk(QString);
+    static bool verify_tSPSE(QString);
+    static bool verify_tSPME(QString);
+    static bool verify_tMP(QString);
+    static bool verify_tNIGHT(QString);
+    static bool verify_tIFR(QString);
+    static bool verify_tPIC(QString);
+    static bool verify_tPICUS(QString);
+    static bool verify_tSIC(QString);
+    static bool verify_tDual(QString);
+    static bool verify_tFI(QString);
+    static bool verify_tSIM(QString);
+    static bool verify_pilotFlying(QString);
+    static bool verify_toDay(QString);
+    static bool verify_toNight(QString);
+    static bool verify_ldgDay(QString);
+    static bool verify_ldgNight(QString);
+    static bool verify_autoland(QString);
+    static bool verify_secondPilot(QString);
+    static bool verify_thirdPilot(QString);
+    static bool verify_FlightNumber(QString);
+    static bool verify_Remarks(QString);
+    static bool verify_time(QString time);
+};
+
+#endif // DBVALIDATE_H

openLog.pro

@@ -30,6 +30,7 @@ SOURCES += \
     dbsettings.cpp \
     dbsetup.cpp \
     dbstat.cpp \
+    dbvalidate.cpp \
     easaview.cpp \
     editflight.cpp \
     flight.cpp \
@@ -47,11 +48,13 @@ HEADERS += \
     calc.h \
     dbaircraft.h \
     dbairport.h \
+    dbapi.h \
     dbflight.h \
     dbpilots.h \
     dbsettings.h \
     dbsetup.h \
     dbstat.h \
+    dbvalidate.h \
     easaview.h \
     editflight.h \
     flight.h \