Merge

README.md

@@ -1 +1,3 @@
-# QtDB
+# QtDB
+
+![alt text](https://github.com/Corailla20/QtDB/blob/master/data/img/uml.PNG)

src/Model/DBInteractor.cpp

@@ -20,42 +20,42 @@ const string DBInteractor::QSQL_DATABASE = "QSQLITE";
 * Methode for get or create a database instance access
 * Return a database instance
 */
-DBInteractor* DBInteractor::getInstance() 
+DBInteractor* DBInteractor::getInstance()
 {
-	if(!instanceFlag) 
-	{
-		db_instance = new DBInteractor();
-		instanceFlag = true;
-		return db_instance;
-	} 
-	else 
-	{
-		return db_instance;
-	}
+    if(!instanceFlag)
+    {
+        db_instance = new DBInteractor();
+        instanceFlag = true;
+        return db_instance;
+    }
+    else
+    {
+        return db_instance;
+    }
 }
 
 /**
 * Methode to create and instantiate a database interaction singleton
 */
 DBInteractor::DBInteractor()
 {
-	cout<<"Creation of the database instance"<<endl;
+    cout<<"Creation of the database instance"<<endl;
     db = QSqlDatabase::addDatabase(QSQL_DATABASE.c_str());
     db.setHostName(HOST_NAME.c_str());
     db.setDatabaseName(DATABASE_NAME.c_str());
     db.setUserName(USER_NAME.c_str());
     db.setPassword(PASSWORD.c_str());
-	error = db.open();
+    error = db.open();
 
-	QSqlQuery query(db);
+    QSqlQuery query(db);
 
-	if (!query.exec("PRAGMA foreign_keys = ON")){
-		std::cout << "Impossible d'activer les clés étrangères" << std::endl;
-		instanceFlag = false;
-	}
-	if(instanceFlag == false){
-		std::cout << "Errors" << std::endl;
-	}
+    if (!query.exec("PRAGMA foreign_keys = ON")){
+        std::cout << "Impossible d'activer les clés étrangères" << std::endl;
+        instanceFlag = false;
+    }
+    if(instanceFlag == false){
+        std::cout << "Errors" << std::endl;
+    }
 }
 
 /**
@@ -126,7 +126,6 @@ void DBInteractor::PrepareAndExecuteQueryInsert(string tableName, map<string, st
         }
     }
     insertSQLBuilder << ")";
-
     cout << insertSQLBuilder.str() << endl;
     //return insertSQLBuilder.toString();
 }
@@ -186,6 +185,7 @@ void DBInteractor::PrepareAndExecuteQueryUpdate(string tableName, map<string, st
  * @param columnValueMappingForCondition List of Column & Value pair for WHERE clause.
  * @return Final generated DELETE SQL Statement.
  */
+
 void DBInteractor::PrepareAndExecuteQueryDelete(string tableName, map<string, string> columnValueMappingForCondition)
 {
     std::stringstream deleteSQLBuilder;
@@ -201,7 +201,6 @@ void DBInteractor::PrepareAndExecuteQueryDelete(string tableName, map<string, st
     //return deleteSQLBuilder.toString(); 
 }
 
-
 /**
  * Methode for execute SQL query String
  * It is a generic function.
@@ -215,7 +214,7 @@ void DBInteractor::ExecuteQuery(string sqlQueryString)
         std::cout << "Une erreur s'est produite" << std::endl;
     }
 
-	while (query.next()) {
+    while (query.next()) {
         QString test = query.value(0).toString();
         std::cout << "Il y a " << test.toStdString() << std::endl;
     }
@@ -226,7 +225,7 @@ void DBInteractor::ExecuteQuery(string sqlQueryString)
  * It is a function to execute each line of a sql document into the databse
  * @param pathFileName the path of the file
  */
-void DBInteractor::InsertDefaultData(string pathFileName) 
+void DBInteractor::InsertDefaultData(string pathFileName)
 {
 	ifstream file(pathFileName, ios::in);
     if(file) {

src/View/mainwindow.cpp

@@ -1,5 +1,12 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
+#include "Model/DBInteractor.h"
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QSqlError>
+#include <qvariant.h>
+
+using namespace std;
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
@@ -13,9 +20,74 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
-void MainWindow::on_pushButton_clicked()
+void MainWindow::initialization()
+{
+    ui->CB_Pathologie->addItem("");
+    ui->CB_Modalite->addItem("");
+    ui->CB_Patient->addItem("");
+    ui->CB_Region->addItem("");
+}
+
+void MainWindow::getDataFromDB()
 {
+    QSqlDatabase db;
+
+    const string HOST_NAME = "localhost";
+    const string DATABASE_NAME = "tech_pax";
+    const string USER_NAME = "techmed";
+    const string PASSWORD = "master";
+    const string QSQL_DATABASE = "QSQLITE";
+
+    db = QSqlDatabase::addDatabase(QSQL_DATABASE.c_str());
+    db.setHostName(HOST_NAME.c_str());
+    db.setDatabaseName(DATABASE_NAME.c_str());
+    db.setUserName(USER_NAME.c_str());
+    db.setPassword(PASSWORD.c_str());
+    bool ok = db.open();
 
+    QSqlQuery query("SELECT nom FROM patient", db);
+
+    while (query.next()) {
+        QString name = query.value(0).toString();
+        ui->CB_Patient->addItem(name);
+    }
 }
 
+void MainWindow::on_Button_Rechercher_clicked()
+{
+    string patient_text = ui->CB_Patient->currentText();
+    string modalite_text = ui->CB_Modalite->currentText();
+    string pathologie_text = ui->CB_Pathologie->currentText();
+    string region_text = ui->CB_Region->currentText();
+
+    cout << "Patient : " << patient_text << endl;
+    cout << "Modalite : " << modalite_text << endl;
+    cout << "Pathologie : " << pathologie_text << endl;
+    cout << "Region : " << region_text << endl;
 
+    map<string, string> columnValueMappingForCondition;
+
+    if(patient_text != "")
+    {
+        columnValueMappingForCondition.put("patient.nom", patient_text);
+    }
+    if(modalite_text != "")
+    {
+        columnValueMappingForCondition.put("type_acquisition.modalite", modalite_text);
+    }
+    if(pathologie_text != "")
+    {
+        //columnValueMappingForCondition.put("Pathologie.nom", pathologie_text);
+    }
+    if(region_text != "")
+    {
+        columnValueMappingForCondition.put("region_anatomique.nom", region_text);
+    }
+
+    columnValueMappingForCondition.put("patient.patient_id", "etude.patient_id");
+    columnValueMappingForCondition.put("region.region_id", "etude.region_id");
+    columnValueMappingForCondition.put("serie.type_acquisition_id", "type_acquisition.type_acquisition_id");
+    columnValueMappingForCondition.put("serie.etude_id", "etude.etude_id");
+    // SELECT
+    //DBInteractor::getInstance()->PrepareAndExecuteQuerySelect("patient", columnValueMappingForCondition);
+}

src/View/mainwindow.h

@@ -14,9 +14,11 @@ class MainWindow : public QMainWindow
 public:
     explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
+    void getDataFromDB();
+    void initialization();
 
 private slots:
-    void on_pushButton_clicked();
+
 
 private:
     Ui::MainWindow *ui;

src/View/mainwindow.ui

@@ -7,11 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>546</width>
-    <height>456</height>
+    <height>244</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>Gestionnaire de base de données</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout_2">

src/main.cpp

@@ -2,12 +2,28 @@
 #include <string>
 #include <map>
 #include "Model/DBInteractor.h"
+#include <QApplication>
+#include "View/mainwindow.h"
 
 using namespace std;
 
-int main()
+int main(int argc, char** argv)
 {
-
+
+    // Affichage de la fenetre
+    QApplication app(argc, argv);
+
+    MainWindow mywindow;
+
+    // Remplissage des combobox
+    mywindow.initialization();
+    mywindow.getDataFromDB();
+
+    mywindow.show();
+
+    return app.exec();
+
+    /*
 	//1) INSERT DATA
     //DBInteractor::getInstance()->InsertDefaultData("../data/data.sql");
 
@@ -26,8 +42,6 @@ int main()
 
     DBInteractor::getInstance()->PrepareAndExecuteQueryUpdate("TEST", columnValueMappingForSet, columnValueMappingForCondition);
 
-    */
-
 	// EXAMPLE UPDATE
 
     map<string, string> columnValueMappingForSet;
@@ -41,4 +55,7 @@ int main()
 
     DBInteractor::getInstance()->PrepareAndExecuteQueryUpdate("TEST", columnValueMappingForSet, columnValueMappingForCondition);
 
+    */
+
+
 }