work on favourite

 - created 'favourite' column in EVENT table
 - modified 'ormrecord' for setting record's elements
 - favourities view not implemented

diff --git a/src/fosdem.pro b/src/fosdem.pro
index 69179f80e892be85b0ce78dad413fb38c991f50f..5e72c0e0a2f1c1f94fd368163059aa1636bc9aa0 100644 (file)
--- a/src/fosdem.pro
+++ b/src/fosdem.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
-SUBDIRS  = orm mvc sql gui app test
+SUBDIRS  = orm mvc sql gui app
+#SUBDIRS += test
 CONFIG += ordered
 

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index c6174bf294f7a4672f2414f9d9089002d9d4ee94..71e967aa3791b82443781ee4c0ed649a3578a2e3 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -83,8 +83,11 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         }
 
         // draw Controls
-        painter->drawImage(mControls[FavouriteControl]->drawPoint(option.rect),*mControls[FavouriteControl]->image());
-        painter->drawImage(mControls[AlarmControl]->drawPoint(option.rect),*mControls[AlarmControl]->image());
+        if(static_cast<Event*>(index.internalPointer())->isFavourite())
+            painter->drawImage(mControls[FavouriteControlOn]->drawPoint(option.rect),*mControls[FavouriteControlOn]->image());
+        else
+            painter->drawImage(mControls[FavouriteControlOff]->drawPoint(option.rect),*mControls[FavouriteControlOff]->image());
+        painter->drawImage(mControls[AlarmControlOn]->drawPoint(option.rect),*mControls[AlarmControlOn]->image());
         painter->drawImage(mControls[MapControl]->drawPoint(option.rect),*mControls[MapControl]->image());
     }
     else // doesn't have parent - time-groups' elements (top items)
@@ -200,20 +203,30 @@ Delegate::ControlId Delegate::whichControlClicked(const QModelIndex &aIndex, con
 void Delegate::defineControls()
 {
     Control *control;
-    // FAVOURITE ICON
-    control = new Control(FavouriteControl,QString(":icons/favourite-on.png"));
+    // FAVOURITE ICONs
+    // on
+    control = new Control(FavouriteControlOn,QString(":icons/favourite-on.png"));
     control->setDrawPoint(QPoint(-control->image()->width()-SPACER,SPACER));
-    mControls.insert(FavouriteControl,control);
-
-    // ALARM ICON
-    control = new Control(AlarmControl,QString(":icons/alarm-on.png"));
-    control->setDrawPoint(QPoint(-mControls[FavouriteControl]->image()->width()-control->image()->width()-2*SPACER,SPACER));
-    mControls.insert(AlarmControl,control);
+    mControls.insert(FavouriteControlOn,control);
+    // off
+    control = new Control(FavouriteControlOff,QString(":icons/favourite-off.png"));
+    control->setDrawPoint(QPoint(-control->image()->width()-SPACER,SPACER));
+    mControls.insert(FavouriteControlOff,control);
+
+    // ALARM ICONs
+    // on
+    control = new Control(AlarmControlOn,QString(":icons/alarm-on.png"));
+    control->setDrawPoint(QPoint(-mControls[FavouriteControlOn]->image()->width()-control->image()->width()-2*SPACER,SPACER));
+    mControls.insert(AlarmControlOn,control);
+    // off
+    control = new Control(AlarmControlOff,QString(":icons/alarm-off.png"));
+    control->setDrawPoint(QPoint(-mControls[FavouriteControlOff]->image()->width()-control->image()->width()-2*SPACER,SPACER));
+    mControls.insert(AlarmControlOff,control);
 
     // MAP ICON
     control = new Control(MapControl,QString(":icons/compass.png"));
-    control->setDrawPoint(QPoint(-mControls[AlarmControl]->image()->width()-control->image()->width()
-                                 -mControls[FavouriteControl]->image()->width()-3*SPACER,SPACER));
+    control->setDrawPoint(QPoint(-mControls[AlarmControlOn]->image()->width()-control->image()->width()
+                                 -mControls[FavouriteControlOn]->image()->width()-3*SPACER,SPACER));
     mControls.insert(MapControl,control);
 }
 

diff --git a/src/mvc/delegate.h b/src/mvc/delegate.h
index a11cfabda8b9084796478d7000150a398e0ed084..63c74dc22536bb99e6c1e9483087ee4c83a66b26 100644 (file)
--- a/src/mvc/delegate.h
+++ b/src/mvc/delegate.h
@@ -14,8 +14,10 @@ class Delegate : public QItemDelegate
         enum ControlId
         {
             ControlNone = 0,
-            FavouriteControl,
-            AlarmControl,
+            FavouriteControlOn,
+            FavouriteControlOff,
+            AlarmControlOn,
+            AlarmControlOff,
             MapControl
         };
 

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index ffc805ad803302cb9d454b6be829dba647fbaad2..9caf2aba97a961b505692cf4ee718e8eee1a8980 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -7,7 +7,8 @@ QSqlRecord const Event::sColumns = Event::toRecord(QList<QSqlField>()
     << QSqlField("duration", QVariant::Int)
     << QSqlField("xid_activity", QVariant::Int)
     << QSqlField("type", QVariant::String)
-    << QSqlField("language", QVariant::String));
+    << QSqlField("language", QVariant::String)
+    << QSqlField("favourite", QVariant::Bool));
 
 QString const Event::sTableName = QString("event");
 
@@ -30,3 +31,4 @@ QList<Event> Event::getByDate(const QDate& date, int conferenceId)
 
     return load(query);
 }
+

diff --git a/src/mvc/event.h b/src/mvc/event.h
index 05c74a87b85e37cac1f24d4211a11dd9d613637a..76216e7db2b66c886d432a301c7441ba1aaf8659 100644 (file)
--- a/src/mvc/event.h
+++ b/src/mvc/event.h
@@ -7,7 +7,6 @@
 
 #include <ormrecord.h>
 
-
 /**
   NoSuchEventException is thrown when required event does not exist.
 */
@@ -33,6 +32,7 @@ public:
     int activityId() const { return value("xid_activity").toInt(); }
     QString type() const { return value("type").toString(); }
     QString language() const { return value("language").toString(); }
+    bool isFavourite() const { return value("favourite").toBool(); }
 
     void setId(int id) { setValue("id", id); }
     void setConferenceId(int conferenceId) { setValue("xid_conference", conferenceId); }
@@ -41,10 +41,10 @@ public:
     void setActivityId(int activityId) { setValue("xid_activity", activityId); }
     void setType(const QString& type) { setValue("type", type); }
     void setLanguage(const QString& language) { setValue("language", language); }
+    void setFavourite(bool favourite) { setValue("favourite", favourite); }
 
 friend class EventTest;
 };
 
-
-
 #endif // EVENT_H
+

diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index c8127d02c982996b3339d89a20d7c9ee4fba12f9..e872d14ea0300156cef295ab0a524a78d1062b19 100644 (file)
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -2,6 +2,7 @@
 
 #include "treeview.h"
 #include "delegate.h"
+#include "event.h"
 
 #include <QDebug>
 
@@ -30,13 +31,32 @@ void TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
     Delegate *delegate = static_cast<Delegate*>(itemDelegate(aIndex));
     switch(delegate->whichControlClicked(aIndex,aPoint))
     {
-        case Delegate::FavouriteControl:
+        case Delegate::FavouriteControlOn:
+        case Delegate::FavouriteControlOff:
             {
                 // handle Favourite Control clicked
-                qDebug() << "FAVOURITE CLICKED: " << qVariantValue<QString>(aIndex.data());
+                Event event = Event::getById(aIndex.data().toInt(),1);
+                if(event.isFavourite())
+                {
+                    static_cast<Event*>(aIndex.internalPointer())->setFavourite(false); // list of events
+                    event.setFavourite(false); // update DB
+                }
+                else
+                {
+                    static_cast<Event*>(aIndex.internalPointer())->setFavourite(true); // list of events
+                    event.setFavourite(true);
+                }
+                qDebug() << " FAVOURITE [" << qVariantValue<QString>(aIndex.data()) << "] -> " << event.isFavourite();
+                event.update("favourite");
+                // TODO: since the Favourite icon has changed, update TreeView accordingly
+                // not really working solution is the following
+                // maybe the call to MainWindow->update() fix the problem ???
+                QTreeView::update();
+                update();
             }
             break;
-        case Delegate::AlarmControl:
+        case Delegate::AlarmControlOn:
+        case Delegate::AlarmControlOff:
             {
                 // handle Alarm Control clicked
                 qDebug() << "ALARM CLICKED: " << qVariantValue<QString>(aIndex.data());

diff --git a/src/orm/ormrecord.h b/src/orm/ormrecord.h
index 00179212ac74fc3b9eab0e8b4cbb3adcb82c326e..8d4212a12cc4e31ab7c631d431afcc8c87f9ca40 100644 (file)
--- a/src/orm/ormrecord.h
+++ b/src/orm/ormrecord.h
@@ -33,6 +33,7 @@ class OrmRecord : protected QSqlRecord
 public:
     OrmRecord();
     static T hydrate(const QSqlRecord& record);
+    void update(QString col, QVariant value = QVariant()); // updates specified column 'col'
 
 protected:
     QVariant value(QString col) const;
@@ -44,6 +45,7 @@ protected:
     // auxiliary methods
     static QString columnsForSelect(const QString& prefix = QString());
     static QString selectQuery();
+    static QString updateQuery();
     static QSqlRecord toRecord(const QList<QSqlField> & columnList);
 
     static QVariant convertToC(QVariant value, QVariant::Type colType);
@@ -64,6 +66,24 @@ T OrmRecord<T>::hydrate(const QSqlRecord& record)
     return object;
 }
 
+// updates specified column 'col'
+// if the value is not specified  as an argument,
+// it's taken from the reford itself
+// see also: setValue() method for more details
+template <typename T>
+void OrmRecord<T>::update(QString col, QVariant value)
+{
+    QSqlQuery query;
+    query.prepare(QString(updateQuery() + "SET %1 = :col WHERE id = :id").arg(col));
+    if(value.isValid()) // take 'col' value from the method's arguments
+        query.bindValue(":col", value);
+    else // take 'col' value from the record; see setValue()
+        query.bindValue(":col", convertToDb(this->value(col), this->value(col).type()));
+    query.bindValue(":id", this->value("id"));
+    //query.bindValue(":id", convertToDb(value("id"), QVariant::Int));
+    query.exec();
+}
+
 template <typename T>
 QVariant OrmRecord<T>::value(QString col) const
 {
@@ -102,12 +122,6 @@ QList<T> OrmRecord<T>::load(QSqlQuery query)
     {
         if (!query.exec())
         {
-            //TODO Palo: exception handling !
-               QString start = "START\n";
-               QString end = "\nEND\n";
-               QString message = start + query.lastError().text() + end;
-                const char *data = message.toLatin1().data();
-                qDebug(data);
             throw new OrmSqlException(query.lastError().text());
         }
     }
@@ -140,6 +154,12 @@ QString OrmRecord<T>::selectQuery()
     return QString("SELECT %1 FROM %2 ").arg(columnsForSelect(), T::sTableName);
 }
 
+template <typename T>
+QString OrmRecord<T>::updateQuery()
+{
+    return QString("UPDATE %1 ").arg(T::sTableName);
+}
+
 template <typename T>
 QSqlRecord OrmRecord<T>::toRecord(const QList<QSqlField> & columnList)
 {

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index a7cd62657488b725d0b7645e6ac25a12382de463..87c245cb555a0fc9add4180ee5ac710af25a8ee9 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -90,16 +90,17 @@ void SqlEngine::addEventToDB(QHash<QString,QString> &aEvent)
         // The items of the Event are divided into the two tables EVENT and VIRTUAL_EVENT
         // VIRTUAL_EVENT is for Full-Text-Serach Support
         QDateTime startDateTime = QDateTime(QDate::fromString(aEvent["date"],DATE_FORMAT),QTime::fromString(aEvent["start"],TIME_FORMAT));
-        QString values = QString("'%1', '%2', '%3', '%4', '%5', '%6', '%7'") \
+        QString values = QString("'%1', '%2', '%3', '%4', '%5', '%6', '%7', '%8'") \
                          .arg(aEvent["conference_id"]) \
                          .arg(aEvent["id"]) \
                          .arg(QString::number(startDateTime.toTime_t())) \
                          .arg(-QTime::fromString(aEvent["duration"],TIME_FORMAT).secsTo(QTime(0,0))) \
                          .arg("123456") \
                          .arg(aEvent["type"]) \
-                         .arg(aEvent["language"]);
+                         .arg(aEvent["language"]) \
+                         .arg("0"); // not favourite when added
 
-        QString query = QString("INSERT INTO EVENT (xid_conference, id, start, duration, xid_activity, type, language) VALUES (%1)").arg(values);
+        QString query = QString("INSERT INTO EVENT (xid_conference, id, start, duration, xid_activity, type, language, favourite) VALUES (%1)").arg(values);
         QSqlQuery result (query, db);
         //LOG_AUTOTEST(query);
 
@@ -226,6 +227,7 @@ bool SqlEngine::createTables(QSqlDatabase &aDatabase)
             xid_activity INTEGER NOT NULL REFERENCES ACTIVITY(id), \
             type VARCHAR, \
             language VARCHAR, \
+            favourite INTEGER DEFAULT 0, \
             PRIMARY KEY (xid_conference,id), \
             FOREIGN KEY(xid_conference) REFERENCES CONFERENCE(id) \
             FOREIGN KEY(xid_activity) REFERENCES ACTIVITY(id))");