implement deleting a conference

pass event about it to mainwindow to update select control
fix Conference::activeConference() to work when first conference is removed

diff --git a/src/gui/importschedulewidget.cpp b/src/gui/importschedulewidget.cpp
index 55830282d0abfe1c38aca98d0c25008f6096e419..453ff12420047f8bf2bf275eaccb771d17b6e876 100644 (file)
--- a/src/gui/importschedulewidget.cpp
+++ b/src/gui/importschedulewidget.cpp
@@ -26,6 +26,7 @@
 #include <QNetworkProxy>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkProxy>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>

+#include <QMessageBox>

 #include <QDebug>
 #include <appsettings.h>
 
 #include <QDebug>
 #include <appsettings.h>
 


@@ -166,7 +167,21 @@ void ImportScheduleWidget::on_newFromUrl()
 
 void ImportScheduleWidget::on_delete()
 {
 
 void ImportScheduleWidget::on_delete()
 {

-    // TODO: implement
+    int active_id = Conference::activeConference();
+    Conference active_conference = Conference::getById(active_id);
+
+    QMessageBox::StandardButton answer = 
+        QMessageBox::question(0
+            , "Deletion confirmation"
+            , QString("Really delete the %1 conference").arg(active_conference.title())
+            , QMessageBox::Yes | QMessageBox::No
+            , QMessageBox::No);
+
+    if (answer == QMessageBox::Yes) {
+        QString title = active_conference.title();
+        Conference::deleteConference(active_id);
+        emit(scheduleDeleted(title));
+    }

 }
 
 void ImportScheduleWidget::importFromNetwork(const QString& url)
 }
 
 void ImportScheduleWidget::importFromNetwork(const QString& url)

diff --git a/src/gui/importschedulewidget.h b/src/gui/importschedulewidget.h
index 236e1fdb6fafdac5f3d02f1bbc56fd7c0b46fa5c..3e00d76020911abe581716f6a62b557d951ee653 100644 (file)
--- a/src/gui/importschedulewidget.h
+++ b/src/gui/importschedulewidget.h
@@ -43,6 +43,7 @@ class ImportScheduleWidget : public QWidget, Ui::ImportScheduleWidget
         void on_newFromUrl();
     signals:
         void scheduleImported(int confId);
         void on_newFromUrl();
     signals:
         void scheduleImported(int confId);

+        void scheduleDeleted(const QString& title);

     private:
         void importFromNetwork(const QString& url);
         void importData(const QByteArray &aData, const QString& url);
     private:
         void importFromNetwork(const QString& url);
         void importData(const QByteArray &aData, const QString& url);

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 552224aa9094ac1fb7d1857dd86117e380e4db51..b2d33d77fa7615b045e0b29c35b47361132ecf0d 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -74,6 +74,7 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
     int confId = Conference::activeConference();
 
     connect(importScheduleWidget, SIGNAL(scheduleImported(int)), SLOT(scheduleImported(int)));
     int confId = Conference::activeConference();
 
     connect(importScheduleWidget, SIGNAL(scheduleImported(int)), SLOT(scheduleImported(int)));

+    connect(importScheduleWidget, SIGNAL(scheduleDeleted(const QString&)), SLOT(scheduleDeleted(const QString&)));

 
     // event details have changed
     connect(dayTabContainer, SIGNAL(eventHasChanged(int,bool)), SLOT(eventHasChanged(int,bool)));
 
     // event details have changed
     connect(dayTabContainer, SIGNAL(eventHasChanged(int,bool)), SLOT(eventHasChanged(int,bool)));


@@ -160,6 +161,19 @@ void MainWindow::scheduleImported(int aConfId)
     }
 }
 
     }
 }
 

+void MainWindow::scheduleDeleted(const QString& title)
+{
+    int idx = selectConference->findText(title);
+
+    if (idx == -1) {
+        // should not happen
+        qWarning() << __PRETTY_FUNCTION__ << "removed non-existent item:" << title;
+    } else {
+        // will it signal "changed"?
+        selectConference->removeItem(idx);
+    }
+}
+

 void MainWindow::aboutApp()
 {
     QDialog dialog(this);
 void MainWindow::aboutApp()
 {
     QDialog dialog(this);

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 4309915cc7469cdc8fcf190cf9b4662202390ae1..7740b8557aea21e80f7225a2bf294b19048dc152 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -33,6 +33,7 @@ public:
     ~MainWindow() {}
 private slots:
     void scheduleImported(int aConfId);
     ~MainWindow() {}
 private slots:
     void scheduleImported(int aConfId);

+    void scheduleDeleted(const QString& title);

     void aboutApp();
     void conferenceMapClicked();
     void eventHasChanged(int aEventId, bool aReloadModel);
     void aboutApp();
     void conferenceMapClicked();
     void eventHasChanged(int aEventId, bool aReloadModel);

diff --git a/src/mvc/conference.cpp b/src/mvc/conference.cpp
index 23c4cc204c536418897f1efdb9f2691e124eb0d3..6c00f5e314e4158cbab8c0a68f6b3a452138027a 100644 (file)
--- a/src/mvc/conference.cpp
+++ b/src/mvc/conference.cpp
@@ -17,6 +17,7 @@
  * fosdem-schedule.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "conference.h"
  * fosdem-schedule.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "conference.h"

+#include "../sql/sqlengine.h"

 
 QSqlRecord const Conference::sColumns = Conference::toRecord(QList<QSqlField>()
     << QSqlField("id", QVariant::Int)
 
 QSqlRecord const Conference::sColumns = Conference::toRecord(QList<QSqlField>()
     << QSqlField("id", QVariant::Int)


@@ -51,20 +52,27 @@ QList<Conference> Conference::getAll()
 
 int Conference::activeConference()
 {
 
 int Conference::activeConference()
 {

-    QSqlQuery query("SELECT id FROM conference WHERE active = 1");
-    query.exec();
+    {
+        QSqlQuery query("SELECT id FROM conference WHERE active = 1");
+        query.exec();

 
 

-    QList<int> activeConfs;
-    while(query.next())
-        activeConfs.append(query.record().value("id").toInt());
+        // TODO: change it so that it will select somw existing ID

 
 

-    qDebug() << __PRETTY_FUNCTION__
-        << "activeConfs.count()" << activeConfs.count()
-        ;
+        if (query.next()) {
+            return query.record().value("id").toInt();
+        }
+    }

 
 

-    if(activeConfs.count()==0) // no active DB
-        return 1;
-    else // even if there are more active confs, the first from the list is confidered active
-        return activeConfs[0];
+    QSqlQuery query2("SELECT id FROM conference ORDER BY id");
+    if (query2.next()) {
+        return query2.record().value("id").toInt();
+    }
+
+    return -1;
+}
+
+void Conference::deleteConference(int id)
+{
+    SqlEngine::deleteConference(id);

 }
 
 }
 

diff --git a/src/mvc/conference.h b/src/mvc/conference.h
index c16ac747023a916a568e7496a7c774f2e0b2e48d..8e32c65d70dbfa713fc4a5d772796ffa5ced9b99 100644 (file)
--- a/src/mvc/conference.h
+++ b/src/mvc/conference.h
@@ -35,6 +35,7 @@ public:
     static Conference getById(int id);
     static QList<Conference> getAll();
     static int activeConference();
     static Conference getById(int id);
     static QList<Conference> getAll();
     static int activeConference();

+    static void deleteConference(int id);

 
 public:
     int id() const { return value("id").toInt(); }
 
 public:
     int id() const { return value("id").toInt(); }

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index cc7122f94315b1d7698a4c963e603412efe7ffe1..28344b9d224cd0c5f3b6fc77d05ce9033f8f9bdc 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -320,6 +320,29 @@ bool SqlEngine::commitTransaction()
     return execQuery(db, "COMMIT");
 }
 
     return execQuery(db, "COMMIT");
 }
 

+void SqlEngine::deleteConference(int id)
+{
+    QSqlDatabase db = QSqlDatabase::database();
+
+    if ( !db.isValid() || !db.isOpen()) {
+        return;
+    }
+
+    beginTransaction();
+
+    QHash<QString, QVariant> params;
+    params["xid_conference"] = id;
+    execQueryWithParameter(db, "DELETE FROM LINK WHERE xid_conference = :xid_conference", params);
+    execQueryWithParameter(db, "DELETE FROM EVENT_ROOM WHERE xid_conference = :xid_conference", params);
+    execQueryWithParameter(db, "DELETE FROM EVENT_PERSON WHERE xid_conference = :xid_conference", params);
+    execQueryWithParameter(db, "DELETE FROM EVENT WHERE xid_conference = :xid_conference", params);
+    execQueryWithParameter(db, "DELETE FROM CONFERENCE WHERE id = :xid_conference", params);
+    execQuery(db, "DELETE FROM ROOM WHERE NOT EXISTS(SELECT * FROM EVENT_ROOM WHERE xid_room = ROOM.id)");
+    execQuery(db, "DELETE FROM PERSON WHERE NOT EXISTS(SELECT * FROM EVENT_PERSON WHERE xid_person = PERSON.id)");
+
+    commitTransaction();
+}
+

 bool SqlEngine::execQuery(QSqlDatabase &aDatabase, const QString &aQuery)
 {
     //qDebug() << "\nSQL: " << aQuery;
 bool SqlEngine::execQuery(QSqlDatabase &aDatabase, const QString &aQuery)
 {
     //qDebug() << "\nSQL: " << aQuery;


@@ -335,3 +358,22 @@ bool SqlEngine::execQuery(QSqlDatabase &aDatabase, const QString &aQuery)
     }
 }
 
     }
 }
 

+bool SqlEngine::execQueryWithParameter(QSqlDatabase &aDatabase, const QString &aQuery, const QHash<QString, QVariant>& params)
+{
+    qDebug() << "SQL:" << aQuery << "params:" << params;
+
+    QSqlQuery sqlQuery(aDatabase);
+    sqlQuery.prepare(aQuery);
+    foreach (QString param_key, params.keys()) {
+        sqlQuery.bindValue(param_key, params[param_key]);
+    }
+    if( !sqlQuery.exec() ){
+       qDebug() << "SQL ERR: " << sqlQuery.lastError().number() << ", " << sqlQuery.lastError().text();
+       return false;
+    }
+    else{
+       //qDebug() << "SQL OK.\n";
+       return true;
+    }
+}
+

diff --git a/src/sql/sqlengine.h b/src/sql/sqlengine.h
index b17556812bdc5200cd30f1baf1c7bb64d9020029..9bee26845e1455d499aaa7d60150653bae13ddfb 100644 (file)
--- a/src/sql/sqlengine.h
+++ b/src/sql/sqlengine.h
@@ -36,6 +36,7 @@ class SqlEngine : public QObject
         static void addPersonToDB(QHash<QString,QString> &aPerson);
         static void addLinkToDB(QHash<QString,QString> &aLink);
         static void addRoomToDB(QHash<QString,QString> &aRoom);
         static void addPersonToDB(QHash<QString,QString> &aPerson);
         static void addLinkToDB(QHash<QString,QString> &aLink);
         static void addRoomToDB(QHash<QString,QString> &aRoom);

+        static void deleteConference(int id);

 
         static bool beginTransaction();
         static bool commitTransaction();
 
         static bool beginTransaction();
         static bool commitTransaction();


@@ -45,6 +46,7 @@ class SqlEngine : public QObject
     private:
         static QString login(const QString &aDatabaseType, const QString &aDatabaseName);
         static bool execQuery(QSqlDatabase &aDatabase, const QString &aQuery);
     private:
         static QString login(const QString &aDatabaseType, const QString &aDatabaseName);
         static bool execQuery(QSqlDatabase &aDatabase, const QString &aQuery);

+        static bool execQueryWithParameter(QSqlDatabase &aDatabase, const QString &aQuery, const QHash<QString, QVariant>& params);

 };
 
 #endif /* SQLENGINE_H */
 };
 
 #endif /* SQLENGINE_H */