map-name to map-path implemented

 - correct map is displayed

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 051fdedf91cb8e0532f81198d9b48d9c17653931..8682e5a6758f95ed8228663f3ed58e9a8dfa2b66 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -198,7 +198,9 @@ void MainWindow::itemDoubleClicked(const QModelIndex &aIndex)
 
 void MainWindow::displayMap(const QModelIndex &aIndex)
 {
-    QPixmap map(":/maps/rooms/janson.png");
+    Event *event = static_cast<Event*>(aIndex.internalPointer());
+    QString mapPath = QString(":/maps/rooms/%1.png").arg(event->room());
+    QPixmap map(mapPath);
     MapWindow window(map,this);
     window.exec();
 }

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index 0a196f576e9650887b85e489c54bc1fec5665986..007a04cfc63cc87a8e19229893fbe38d85eb15ef 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -69,4 +69,28 @@ QList<Event> Event::getFavByDate(const QDate& date, int conferenceId)
     return load(query);
 }
 
+QString Event::room() const
+{
+    QSqlQuery query;
+    query.prepare("SELECT name FROM room WHERE id = (SELECT xid_room FROM event_room WHERE xid_event = :id)");
+    query.bindValue(":id", id());
+    query.exec();
+    // TODO: handle qeury error
+    //qDebug() << query.lastError();
+    if(query.next())
+    {
+        QString map = query.record().value("name").toString();
+        map=map.toLower(); // room names are stored in lower-case format
+        map=map.remove("."); // room names are stored without dots in the name, eg. "aw.1124.png" -> "aw1124.png"
+        return map;
+    }
+    else
+        return QString("not-available");
+}
+
+void Event::setRoom(const QString &room)
+{
+    qWarning("WARINING: setRoom() is NOT IMPLEMENTED YET");
+    // TODO: implement
+}
 

diff --git a/src/mvc/event.h b/src/mvc/event.h
index 4bd696c5a2735774851f54bee3165f68c2f816dc..781345de2479a1eeffa4e05567da47f4ad9a1398 100644 (file)
--- a/src/mvc/event.h
+++ b/src/mvc/event.h
@@ -46,6 +46,8 @@ public:
     QString subtitle() const { return value("subtitle").toString(); }
     QString abstract() const { return value("abstract").toString(); }
     QString description() const { return value("description").toString(); }
+    // records from other tables associated with 'id'
+    QString room() const;
 
     // Table 1
     void setId(int id) { setValue("id", id); }
@@ -63,6 +65,8 @@ public:
     void setSubtitle(const QString& subtitle) { setValue("subtitle", subtitle); }
     void setAbstract(const QString& abstract) { setValue("abstract", abstract); }
     void setDescription(const QString& description) { setValue("description", description); }
+    // records from other tables associated with 'id'
+    void setRoom(const QString& room);
 
 friend class EventTest;
 };