Merge lp:~frankencode/ubuntu-calendar-app/data-service into lp:ubuntu-calendar-app

[Frank Mertens]

Added a data model for the local store, some simulation data and thin API on top, which is called DataService.

Added a data model for the local store, some simulation data and thin API on top, which is called DataService. The idea behind: abstract away the access to events, contacts and places. Especially the last two will be delivered by some system service in a later version. For now this is only simulated. But the user of the DataService API shouldn't need to worry about.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:10
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/4/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-quantal-amd64-ci/4/console
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-raring-amd64-ci/4/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/4/rebuild

review: Approve (continuous-integration)

[lp:~frankencode/ubuntu-calendar-app/data-service]

11. By Frank Mertens on 2013-03-22

Added more complex test case in preparation for integration of the diary view.

To run the tests and load the test data run 'qmlscene calendarTest.qml' once.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:11
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/5/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-quantal-amd64-ci/5/console
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-raring-amd64-ci/5/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/5/rebuild

review: Approve (continuous-integration)

[lp:~frankencode/ubuntu-calendar-app/data-service]

12. By Frank Mertens on 2013-03-23

Use singleton pattern to improve startup performance

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:12
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/6/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-quantal-amd64-ci/6/console
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-raring-amd64-ci/6/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/6/rebuild

review: Approve (continuous-integration)

[lp:~frankencode/ubuntu-calendar-app/data-service]

13. By Frank Mertens on 2013-03-26

Extended the database model by an events category and added a basic diary view.

The events category allows to use section headers.
The basic diary view uses the standard Ubuntu component ListItem.Standard to show
the events of the current day.

14. By Frank Mertens on 2013-03-26

Removed testing icon and added new icons needed for the diary view.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:14
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/7/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-quantal-amd64-ci/7/console
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-raring-amd64-ci/7/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/7/rebuild

review: Approve (continuous-integration)

[lp:~frankencode/ubuntu-calendar-app/data-service]

15. By Frank Mertens on 2013-03-27

Missing file.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:15
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/8/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-quantal-amd64-ci/8/console
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-raring-amd64-ci/8/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/8/rebuild

review: Approve (continuous-integration)

[lp:~frankencode/ubuntu-calendar-app/data-service]

16. By Frank Mertens on 2013-03-27

Allow proper interactions with the compressed event view.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:16
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/9/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/ubuntu-calendar-app-quantal-amd64-ci/9/console
    FAILURE: http://91.189.93.125:8080/job/ubuntu-calendar-app-raring-amd64-ci/9/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/9/rebuild

review: Needs Fixing (continuous-integration)

=== added file 'DiaryView.qml'
--- DiaryView.qml	1970-01-01 00:00:00 +0000
+++ DiaryView.qml	2013-03-27 23:13:20 +0000
@@ -0,0 +1,82 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import "dateExt.js" as DateExt
+import "colorUtils.js" as Color
+
+ListView {
+    id: diaryView
+
+    property var dayStart: new Date()
+
+    property bool expanded: false
+
+    property bool expanding: false
+    property bool compressing: false
+
+    signal expand()
+    signal compress()
+
+    clip: true
+
+    model: EventListModel {
+        termStart: dayStart
+        termLength: Date.msPerDay
+    }
+
+    section {
+        property: "category"
+        // labelPositioning: ViewSection.CurrentLabelAtStart // FIXME, unreliable
+        delegate: ListItem.Header {
+            text: i18n.tr(section)
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    if (expanded)
+                        compress()
+                    else
+                        expand()
+                }
+            }
+        }
+    }
+
+    delegate: ListItem.Standard {
+        text: startTime.toLocaleTimeString(Qt.locale(i18n.language), Locale.ShortFormat) + "   " + title
+    }
+
+    footer: ListItem.Standard {
+        text: i18n.tr("(+) New Event / Todo")
+    }
+
+    onContentYChanged: {
+        // console.log(expanded, expanding, compressing, dragging, flicking, moving, contentY)
+        if (expanding || compressing || !dragging) return
+
+        if (expanded) {
+            if (contentY < -units.gu(0.5)) {
+                compressing = true
+                expanding = false
+            }
+        }
+        else {
+            if (contentY < -units.gu(0.5)) {
+                expanding = true
+                compressing = false
+            }
+        }
+    }
+
+    onDraggingChanged: {
+        if (dragging) return
+
+        if (expanding) {
+            expanding = false
+            expand()
+        }
+        else if (compressing) {
+            compressing = false
+            compress()
+        }
+    }
+}

=== added file 'EventListModel.qml'
--- EventListModel.qml	1970-01-01 00:00:00 +0000
+++ EventListModel.qml	2013-03-27 23:13:20 +0000
@@ -0,0 +1,26 @@
+import QtQuick 2.0
+import "dateExt.js" as DateExt
+import "dataService.js" as DataService
+
+ListModel {
+    id: model
+
+    property var termStart: new Date()
+    property var termLength: Date.msPerDay
+
+    signal reload
+
+    onReload: {
+        var t0 = termStart.getTime()
+        var t1 = t0 + termLength
+        model.clear()
+        DataService.getEvents(t0, t1, model)
+        // for (var i = 0; i < model.count; ++i)
+        //     DataService.printEvent(model.get(i))
+    }
+    Component.onCompleted: {
+        reload()
+        DataService.eventsNotifier().dataChanged.connect(reload)
+        termStartChanged.connect(reload)
+    }
+}

=== modified file 'EventView.qml'
--- EventView.qml	2013-03-07 00:13:06 +0000
+++ EventView.qml	2013-03-27 23:13:20 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import "DateLib.js" as DateLib
+import "dateExt.js" as DateExt
 
 PathView {
     id: eventView
@@ -10,6 +10,11 @@
     signal incrementCurrentDay
     signal decrementCurrentDay
 
+    property bool expanded: false
+
+    signal compress()
+    signal expand()
+
     readonly property real visibleHeight: parent.height - y
 
     QtObject {
@@ -43,7 +48,7 @@
 
     path: Path {
         startX: -eventView.width; startY: eventView.height / 2
-        PathLine { relativeX: eventView.width; relativeY: 0  }
+        PathLine { relativeX: eventView.width; relativeY: 0 }
         PathLine { relativeX: eventView.width; relativeY: 0 }
         PathLine { relativeX: eventView.width; relativeY: 0 }
     }
@@ -52,21 +57,22 @@
 
     model: 3
 
-    delegate: Rectangle {
-        property var dayStart: {
+    delegate: DiaryView {
+        id: diaryView
+
+        width: eventView.width
+        height: eventView.height
+
+        dayStart: {
             if (index == intern.currentIndex) return intern.currentDayStart
             var previousIndex = intern.currentIndex > 0 ? intern.currentIndex - 1 : 2
             if (index == previousIndex) return intern.currentDayStart.addDays(-1)
             return intern.currentDayStart.addDays(1)
         }
-        width: eventView.width
-        height: eventView.height
-        color: index == 0 ? "#FFFFFF" : index == 1 ? "#EEEEEE" : "#DDDDDD"
-        Label {
-            anchors.horizontalCenter: parent.horizontalCenter
-            y: units.gu(4)
-            text: i18n.tr("No events for") + "\n" + Qt.formatDate(dayStart)
-            fontSize: "large"
-        }
+
+        expanded: eventView.expanded
+
+        onExpand: eventView.expand()
+        onCompress: eventView.compress()
     }
 }

=== modified file 'MonthView.qml'
--- MonthView.qml	2013-03-18 20:39:06 +0000
+++ MonthView.qml	2013-03-27 23:13:20 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import "DateLib.js" as DateLib
+import "dateExt.js" as DateExt
 import "colorUtils.js" as Color
 
 ListView {
@@ -11,7 +11,8 @@
     readonly property var currentDayStart: intern.currentDayStart
 
     property bool compressed: false
-    property real compressedHeight: intern.squareUnit + intern.verticalMargin * 2
+    readonly property real compressedHeight: intern.squareUnit + intern.verticalMargin * 2
+    readonly property real expandedHeight: intern.squareUnit * 6 + intern.verticalMargin * 2
 
     signal incrementCurrentDay
     signal decrementCurrentDay
@@ -90,7 +91,7 @@
 
         property int squareUnit: monthView.width / 8
         property int verticalMargin: units.gu(1)
-        property int weekstartDay: Qt.locale().firstDayOfWeek
+        property int weekstartDay: Qt.locale(i18n.language).firstDayOfWeek
         property int monthCount: 49 // months for +-2 years
 
         property var today: (new Date()).midnight() // TODO: update at midnight
@@ -99,8 +100,13 @@
         property var monthStart0: today.monthStart()
     }
 
+<<<<<<< TREE
     width: parent.width > 0 ? parent.width : 1
     height: intern.squareUnit * 6 + intern.verticalMargin * 2
+=======
+    width: parent.width
+    height: compressed ? compressedHeight : expandedHeight
+>>>>>>> MERGE-SOURCE
 
     interactive: !compressed
     clip: true

=== added file '[e-mail]'
Binary files [e-mail]	1970-01-01 00:00:00 +0000 and [e-mail]	2013-03-27 23:13:20 +0000 differ
=== removed file '[e-mail]'
Binary files [e-mail]	2013-02-12 16:18:48 +0000 and [e-mail]	1970-01-01 00:00:00 +0000 differ
=== modified file 'calendar.qml'
--- calendar.qml	2013-03-18 11:39:23 +0000
+++ calendar.qml	2013-03-27 23:13:20 +0000
@@ -31,55 +31,47 @@
         onSelectedTabIndexChanged: monthView.gotoNextMonth(selectedTabIndex)
     }
 
+    Rectangle {
+        anchors.fill: monthView
+        color: "white"
+    }
+
     MonthView {
         id: monthView
         onMonthStartChanged: tabs.selectedTabIndex = monthStart.getMonth()
         y: pageArea.y
+        onMovementEnded: eventView.currentDayStart = currentDayStart
+        onCurrentDayStartChanged: if (!(dragging || flicking)) eventView.currentDayStart = currentDayStart
+        Component.onCompleted: eventView.currentDayStart = currentDayStart
     }
 
     EventView {
         id: eventView
+
         property real minY: pageArea.y + monthView.compressedHeight
-        property real maxY: pageArea.y + monthView.height
+        property real maxY: pageArea.y + monthView.expandedHeight
+
         y: maxY
         width: mainView.width
-        height: parent.height - monthView.compressedHeight
-        currentDayStart: monthView.currentDayStart
+        height: parent.height - y
+
+        expanded: monthView.compressed
+
         Component.onCompleted: {
             incrementCurrentDay.connect(monthView.incrementCurrentDay)
             decrementCurrentDay.connect(monthView.decrementCurrentDay)
         }
-        MouseArea {
-            id: drawer
-            property bool compression: true
-            anchors.fill: parent
-            drag {
-                axis: Drag.YAxis
-                target: eventView
-                minimumY: monthView.y + monthView.compressedHeight
-                maximumY: monthView.y + monthView.height
-                onActiveChanged: {
-                    if (compression) {
-                        if (drag.active) {
-                            monthView.compressed = true
-                        }
-                        else {
-                            yBehavior.enabled = true
-                            eventView.y =  Qt.binding(function() { return eventView.minY })
-                            compression = false
-                        }
-                    }
-                    else {
-                        if (drag.active) {}
-                        else{
-                            eventView.y =  Qt.binding(function() { return eventView.maxY })
-                            monthView.compressed = false
-                            compression = true
-                        }
-                    }
-                }
-            }
-        }
+
+        onExpand: {
+            monthView.compressed = true
+            yBehavior.enabled = true
+            y = minY
+        }
+        onCompress: {
+            monthView.compressed = false
+            y = maxY
+        }
+
         Behavior on y {
             id: yBehavior
             enabled: false

=== added file 'calendarTests.qml'
--- calendarTests.qml	1970-01-01 00:00:00 +0000
+++ calendarTests.qml	2013-03-27 23:13:20 +0000
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "dataServiceTests.js" as DataServiceTests
+
+MainView {
+    width: units.gu(20)
+    height: units.gu(20)
+    Button {
+        anchors.fill: parent
+        anchors.margins: units.gu(5)
+        text: "Close"
+        onClicked: Qt.quit()
+    }
+}

=== added file 'dataService.js'
--- dataService.js	1970-01-01 00:00:00 +0000
+++ dataService.js	2013-03-27 23:13:20 +0000
@@ -0,0 +1,361 @@
+.pragma library
+
+.import QtQuick.LocalStorage 2.0 as LS
+
+Array.prototype.append = function(x) { this.push(x) }
+
+var CATEGORY_EVENT = 0
+var CATEGORY_TODO = 1
+
+function getEvents(termStart, termEnd, events)
+{
+    var result = null
+
+    db().readTransaction(
+        function(tx) {
+            result = tx.executeSql('\
+select * from Event \
+where (? <= startTime and startTime < ?) or \
+      (? < endTime and endTime <= ?) or \
+      (startTime <= ? and ? <= endTime) \
+order by startTime',
+                [ termStart, termEnd, termStart, termEnd, termStart, termEnd ]
+            )
+        }
+    )
+
+    events = events || []
+
+    for (var i = 0; i < result.rows.length; ++i) {
+        var e = result.rows.item(i)
+        e.startTime = new Date(e.startTime)
+        e.endTime = new Date(e.endTime)
+        events.append(e)
+    }
+
+    return events
+}
+
+function getAttendees(event, attendees)
+{
+    var result = null;
+
+    db().readTransaction(
+        function(tx) {
+            result = tx.executeSql('\
+select c.* from Attendance a, Contact c \
+where a.eventId = ? and a.contactId = c.id \
+order by c.name',
+                [ event.id ]
+            )
+        }
+    )
+
+    attendees = attendees || []
+
+    for (var i = 0; i < result.rows.length; ++i)
+        attendees.append(result.rows.item(i))
+
+    return attendees
+}
+
+function addEvent(event)
+{
+    var result = null
+
+    db().transaction(
+        function(tx) {
+            result = tx.executeSql('\
+insert into Event(title, message, startTime, endTime) \
+values (?, ?, ?, ?)',
+                [ event.title, event.message, event.startTime, event.endTime ]
+            )
+        }
+    )
+
+    event.id = result.insertId
+
+    eventsNotifier().dataChanged()
+
+    return event
+}
+
+function removeEvent(event)
+{
+    db().transaction(
+        function(tx) {
+            tx.executeSql(
+                'delete from Event where id = ?',
+                [ event.id ]
+            )
+            tx.executeSql(
+                'delete from Attendance where eventId = ?',
+                [ event.id ]
+            )
+            tx.executeSql(
+                'delete from Venue where eventId = ?',
+                [ event.id ]
+            )
+        }
+    )
+
+    delete event.id
+
+    eventsNotifier().dataChanged()
+}
+
+function getContacts(contacts)
+{
+    var result = null
+
+    db().readTransaction(
+        function(tx) {
+            result = tx.executeSql('select * from Contact order by name')
+        }
+    )
+
+    contacts = contacts || []
+
+    for (var i = 0; i < result.rows.length; ++i)
+        contacts.append(result.rows.item(i))
+
+    return contacts
+}
+
+function addAttendee(event, contact)
+{
+    db().transaction(
+        function(tx) {
+            tx.executeSql(
+                'insert into Attendance(eventId, contactId) values (?, ?)',
+                [ event.id, contact.id ]
+            )
+        }
+    )
+}
+
+function removeAttendee(event, contact)
+{
+    db().transaction(
+        function(tx) {
+            tx.executeSql(
+                'delete from Attendance where eventId = ? and contactId = ?',
+                [ event.id, contact.id ]
+            )
+        }
+    )
+}
+
+function getPlaces(places)
+{
+    var result = null
+
+    db().readTransaction(
+        function(tx) {
+            result = tx.executeSql('select * from Place')
+        }
+    )
+
+    places = places || []
+
+    for (var i = 0; i < result.rows.length; ++i)
+        places.append(result.rows.item(i))
+
+    return places
+}
+
+function addPlace(place)
+{
+    var result = null
+
+    if (typeof place.address == 'undefined') place.address = null
+    if (typeof place.latitude == 'undefined') place.latitude = null
+    if (typeof place.longitude == 'undefined') place.longitude = null
+
+    db().transaction(
+        function(tx) {
+            result = tx.executeSql(
+                'insert into Place(name, address, latitude, longitude) values(?, ?, ?, ?)',
+                [ place.name, place.address, place.latitude, place.longitude ]
+            )
+        }
+    )
+
+    place.id = result.insertId
+
+    return place
+}
+
+function removePlace(place)
+{
+    db().transaction(
+        function(tx) {
+            tx.executeSql(
+                'delete from Place where id = ?',
+                [ place.id ]
+            )
+            tx.executeSql(
+                'delete from Venue where placeId = ?',
+                [ place.id ]
+            )
+        }
+    )
+
+    delete place.id
+}
+
+function addVenue(event, place)
+{
+    db().transaction(
+        function(tx) {
+            tx.executeSql(
+                'insert into Venue(eventId, placeId) values(?, ?)',
+                [ event.id, place.id ]
+            )
+        }
+    )
+}
+
+function removeVenue(event, place)
+{
+    db().transaction(
+        function(tx) {
+            tx.executeSql(
+                'delete from Venue where eventId = ? and placeId = ?',
+                [ event.id, place.id ]
+            )
+        }
+    )
+}
+
+function getVenues(event, venues)
+{
+    var result = null
+
+    db().readTransaction(
+        function(tx) {
+            result = tx.executeSql('\
+select p.* \
+from Venue v, Place p \
+where v.eventId = ? and p.id = v.placeId \
+order by p.name',
+                [ event.id ]
+            )
+        }
+    )
+
+    venues = venues || []
+
+    for (var i = 0; i < result.rows.length; ++i)
+        venues.append(result.rows.item(i))
+
+    return venues
+}
+
+function printEvent(event)
+{
+    console.log('Event', event)
+    console.log('  id:', event.id)
+    console.log('  title:', event.title)
+    console.log('  message:', event.message)
+    console.log('  startTime:', new Date(event.startTime).toLocaleString())
+    console.log('  endTime:', new Date(event.endTime).toLocaleString())
+
+    var attendees = []
+    var venues = []
+    getAttendees(event, attendees)
+    getVenues(event, venues)
+    for (var j = 0; j < attendees.length; ++j)
+        printContact(attendees[j])
+    for (var j = 0; j < venues.length; ++j)
+        printPlace(venues[j])
+    console.log('')
+}
+
+function printContact(contact)
+{
+    console.log('Contact', contact)
+    console.log('  id:', contact.id)
+    console.log('  name:', contact.name)
+    console.log('  surname:', contact.surname)
+    console.log('  avatar:', contact.avatar)
+}
+
+function printPlace(place)
+{
+    console.log('Place', place)
+    console.log('  name:', place.name)
+    console.log('  address:', place.address)
+    console.log('  latitude:', place.latitude)
+    console.log('  longitude:', place.longitude)
+}
+
+function __createFirstTime(tx)
+{
+    var schema = '\
+create table Event(\
+    id integer primary key,\
+    title text,\
+    message text,\
+    startTime integer,\
+    endTime integer,\
+    category text default "Events"\
+);\
+\
+create index EventStartTimeIndex on Event(startTime);\
+create index EventEndTimeIndex on Event(endTime);\
+\
+create table Place(\
+    id integer primary key,\
+    name text,\
+    address text,\
+    latitude real,\
+    longitude real\
+);\
+\
+create table Contact(\
+    id integer primary key,\
+    name text,\
+    surname text,\
+    avatar text\
+);\
+\
+create table Attendance(\
+    id integer primary key,\
+    eventId integer references Event(id) on delete cascade,\
+    contactId integer references Contact(id) on delete cascade,\
+    placeId integer references Place(id) on delete set null\
+);\
+\
+create table Venue(\
+    id integer primary key,\
+    eventId integer references Event(id) on delete cascade,\
+    placeId integer references Place(id) on delete cascade\
+);\
+\
+'.split(';')
+
+    for (var i = 0; i < schema.length; ++i) {
+        var sql = schema[i]
+        if (sql != "") {
+            console.log(sql)
+            tx.executeSql(sql)
+        }
+    }
+}
+
+function eventsNotifier()
+{
+    if (!eventsNotifier.hasOwnProperty("instance"))
+        eventsNotifier.instance = Qt.createQmlObject('import QtQuick 2.0; QtObject { signal dataChanged }', Qt.application, 'DataService.eventsNotifier()')
+    return eventsNotifier.instance
+}
+
+function db()
+{
+    if (!db.hasOwnProperty("instance")) {
+        db.instance = LS.LocalStorage.openDatabaseSync("Calendar", "", "Offline Calendar", 100000)
+        if (db.instance.version == "") db.instance.changeVersion("", "0.1", __createFirstTime)
+    }
+    return db.instance
+}

=== added file 'dataServiceTests.js'
--- dataServiceTests.js	1970-01-01 00:00:00 +0000
+++ dataServiceTests.js	2013-03-27 23:13:20 +0000
@@ -0,0 +1,192 @@
+.pragma library
+.import "dateExt.js" as DateExt
+.import "dataService.js" as DataService
+
+function clearData(tx) {
+    var deletes = '\
+delete from Event;\
+delete from Place;\
+delete from Contact;\
+delete from Attendance;\
+delete from Venue\
+'.split(';')
+    for (var i = 0; i < deletes.length; ++i)
+        tx.executeSql(deletes[i])
+}
+
+function loadTestDataSimple(tx)
+{
+    clearData(tx)
+
+    var inserts = '\
+insert into Contact(id, name, surname) values (1, "John", "Smith");\
+insert into Contact(id, name, surname) values (2, "Jane", "Smith");\
+insert into Contact(id, name, surname, avatar) values (3, "Frank", "Mertens", "http://www.gravatar.com/avatar/6d96fd4a98bba7b8779661d5db391ab6");\
+insert into Contact(id, name, surname) values (4, "Kunal", "Parmar");\
+insert into Contact(id, name, surname) values (5, "Mario", "Boikov");\
+insert into Place(id, name, address) values (1, "Quan Sen", "Pasing Arcaden, München");\
+insert into Place(id, name, address) values (2, "Jashan", "Landsberger Straße 84, 82110 Germering");\
+insert into Place(id, name, latitude, longitude) values (3, "Café Moskau", 52.521339, 13.42279);\
+insert into Place(id, name, address) values (4, "Santa Clara Marriott", "2700 Mission College Boulevard, Santa Clara, California");\
+insert into Place(id, name, address) values (5, "embeddedworld", "Messezentrum, 90471 Nürnberg");\
+insert into Event(id, title, message, startTime, endTime) values (1, "Team Meeting", "Bring your gear...", 1364648400000, 1364650200000);\
+insert into Event(id, title, message, startTime, endTime) values (2, "Jane\'s Birthday Party", "this year: southern wine", 1364061600000, 1364068800000);\
+insert into Event(id, title, startTime, endTime) values (3, "embeddedworld 2013", 1361836800000, 1362009600000);\
+insert into Attendance(eventId, contactId, placeId) values (1, 1, 1);\
+insert into Attendance(eventId, contactId, placeId) values (1, 2, 1);\
+insert into Attendance(eventId, contactId, placeId) values (1, 3, 1);\
+insert into Attendance(eventId, contactId, placeId) values (1, 4, 3);\
+insert into Attendance(eventId, contactId, placeId) values (1, 5, 3);\
+insert into Attendance(eventId, contactId) values (2, 1);\
+insert into Attendance(eventId, contactId) values (2, 2);\
+insert into Attendance(eventId, contactId) values (2, 3);\
+insert into Venue(eventId, placeId) values (2, 3);\
+insert into Venue(eventId, placeId) values (3, 5)\
+'.split(';')
+
+    for (var i = 0; i < inserts.length; ++i) {
+        var sql = inserts[i]
+        if (sql != "") {
+            console.log(sql)
+            tx.executeSql(sql)
+        }
+    }
+}
+
+function loadTestDataComplex(tx)
+{
+    clearData(tx)
+
+    function t(d, h, m) {
+        if (typeof t.today == "undefined") t.today = new Date().midnight()
+        return t.today.addDays(d).setHours(h, m)
+    }
+
+    var places = [
+        { id: 1, name: "Moskau A" },
+        { id: 2, name: "Moskau B" },
+        { id: 3, name: "Bischkek" },
+        { id: 4, name: "Asgabat A" },
+        { id: 5, name: "Asgabat B" },
+        { id: 6, name: "Vilnius" },
+        { id: 7, name: "Riga" }
+    ]
+
+    var speaker = [
+        { id: 1, name: "Sean", surname: "Harmer" },
+        { id: 2, name: "Marc", surname: "Lutz" },
+        { id: 3, name: "David", surname: "Faure" },
+        { id: 4, name: "Volker", surname: "Krause" },
+        { id: 5, name: "Kevin", surname: "Krammer" },
+        { id: 6, name: "Tobias", surname: "Nätterlund" },
+        { id: 7, name: "Steffen", surname: "Hansen" },
+        { id: 8, name: "Tommi", surname: "Laitinen" },
+        { id: 9, name: "Lars", surname: "Knoll" },
+        { id: 10, name: "Roland", surname: "Krause" },
+        { id: 11, name: "Jens", surname: "Bache-Wiig" },
+        { id: 12, name: "Michael", surname: "Wagner" },
+        { id: 13, name: "Helmut", surname: "Sedding" },
+        { id: 14, name: "Jeff", surname: "Tranter" },
+        { id: 15, name: "Simon", surname: "Hausmann" },
+        { id: 16, name: "Stephen", surname: "Kelly" },
+        { id: 17, name: "Tam", surname: "Hanna" },
+        { id: 18, name: "Mirko", surname: "Boehm" },
+        { id: 19, name: "Till", surname: "Adam" },
+        { id: 20, name: "Thomas", surname: "Senyk" }
+    ]
+
+    var events = [
+        { id: 1, room: 1, speaker: [ 1 ], title: "Modern OpenGL with Qt5", message: "hands-on training", startTime: t(0, 10, 00), endTime: t(0, 12 ,00) },
+        { id: 2, room: 2, speaker: [ 2 ], title: "What's new in C++11", message: "focus on Qt5", startTime: t(0, 13, 00), endTime: t(0, 14, 30) },
+        { id: 3, room: 3, speaker: [ 3 ], title: "Model/view Programming using Qt", message: "hands-on training", startTime: t(0, 14, 45), endTime: t(0, 16, 15) },
+        { id: 4, room: 4, speaker: [ 4 ], title: "Introduction to Qt Quick", message: "hands-on training", startTime: t(0, 16, 30), endTime: t(0, 17, 45) },
+        { id: 5, room: 1, speaker: [ 8 ], title: "Keynote: Qt – Gearing up for the Future", message: "", startTime: t(1, 9, 15), endTime: t(1, 9, 30) },
+        { id: 6, room: 1, speaker: [ 9 ], title: "Keynote: Qt 5 Roadmap", message: "", startTime: t(1, 9, 30), endTime: t(1, 10, 30) },
+        { id: 7, room: 3, speaker: [ 10 ], title: "Qt and the Google APIs", message: "", startTime: t(1, 10, 45), endTime: t(1, 11, 45) },
+        { id: 8, room: 7, speaker: [ 11 ], title: "Desktop Components for QtQuick", message: "", startTime: t(1, 10, 45), endTime: t(1, 11, 45) },
+        { id: 9, room: 2, speaker: [ 9 ], title: "The Future of Qt on Embedded Linux", message: "", startTime: t(1, 12, 45), endTime: t(1, 13, 45) },
+        { id: 10, room: 7, speaker: [ 12, 13 ], title: "QML for desktop apps", message: "", startTime: t(1, 12, 45), endTime: t(1, 13, 34) },
+        { id: 11, room: 2, speaker: [ 14 ], title: "Qt on Raspberry Pi", message: "", startTime: t(1, 14, 00), endTime: t(1, 15, 00) },
+        { id: 12, room: 3, speaker: [ 15 ], title: "What's new in QtWebKit in 5.0", message: "", startTime: t(1, 14, 00), endTime: t(1, 15, 00) },
+        { id: 13, room: 1, speaker: [ 16 ], title: "In Depth – QMetaType and QMetaObject", message: "", startTime: t(1, 15, 30), endTime: t(1, 16, 30) },
+        { id: 14, room: 2, speaker: [ 17 ], title: "Using Qt as mobile cross-platform system", message: "", startTime: t(1, 15, 30), endTime: t(1, 16, 30) },
+        { id: 15, room: 1, speaker: [ 18, 19 ], title: "Intentions good, warranty void: Using Qt in unexpected ways", message: "", startTime: t(1, 16, 45), endTime: t(1, 17, 45) },
+        { id: 16, room: 2, speaker: [ 20 ], title: "Porting Qt 5 to embedded hardware", message: "", startTime: t(1, 16, 45), endTime: t(1, 17, 45) }
+    ]
+
+    for (var i = 0; i < places.length; ++i) {
+        var p = places[i]
+        tx.executeSql(
+            'insert into Place(id, name, address) values (?, ?, ?)',
+            [ p.id, p.name, "Cafe Moskau, Berlin, Germany" ]
+        )
+    }
+
+    for (var i = 0; i < speaker.length; ++i) {
+        var s = speaker[i]
+        tx.executeSql(
+            'insert into Contact(id, name, surname) values (?, ?, ?)',
+            [ s.id, s.name, s.surname ]
+        )
+    }
+
+    for (var i = 0; i < events.length; ++i) {
+        var e = events[i]
+        tx.executeSql(
+            'insert into Event(id, title, message, startTime, endTime) values (?, ?, ?, ?, ?)',
+            [ e.id, e.title, e.message, e.startTime, e.endTime ]
+        )
+        tx.executeSql(
+            'insert into Venue(eventId, placeId) values (?, ?)',
+            [ e.id, e.room ]
+        )
+        for (var j = 0; j < e.speaker.length; ++j) {
+            tx.executeSql(
+                'insert into Attendance(eventId, contactId) values (?, ?)',
+                [ e.id, e.speaker[j] ]
+            )
+        }
+    }
+}
+
+function runTestSimple(tx)
+{
+    loadTestDataSimple(tx)
+
+    var contacts = []
+    DataService.getContacts(contacts)
+    for (var i = 0; i < contacts.length; ++i)
+        DataService.printContact(contacts[i])
+    console.log('')
+
+    var testEvent = DataService.addEvent({
+        title: 'Critical Review',
+        message: '',
+        startTime: new Date(2013, 2, 30, 10, 00).getTime(),
+        endTime: new Date(2013, 2, 30, 10, 30).getTime()
+    })
+    DataService.addAttendee(testEvent, contacts[1])
+    DataService.addAttendee(testEvent, contacts[2])
+    DataService.addAttendee(testEvent, contacts[0])
+    DataService.removeAttendee(testEvent, contacts[0])
+    var testPlace = DataService.addPlace({ name: 'Jane\'s bar' })
+    DataService.addVenue(testEvent, testPlace)
+    console.log('Added new event with id', testEvent.id)
+    console.log('')
+
+    var events = []
+    var dayStart = new Date(2013, 2, 30)
+    DataService.getEvents(dayStart.getTime(), dayStart.addDays(1).getTime(), events)
+    for (var i = 0; i < events.length; ++i)
+        DataService.printEvent(events[i])
+
+    DataService.removeEvent(testEvent)
+    DataService.removePlace(testPlace)
+}
+
+DataService.db().transaction(
+    function (tx) {
+        runTestSimple(tx)
+        loadTestDataComplex(tx)
+    }
+)

=== renamed file 'DateLib.js' => 'dateExt.js'
=== added file '[e-mail]'
Binary files [e-mail]	1970-01-01 00:00:00 +0000 and [e-mail]	2013-03-27 23:13:20 +0000 differ
=== added file '[e-mail]'
Binary files [e-mail]	1970-01-01 00:00:00 +0000 and [e-mail]	2013-03-27 23:13:20 +0000 differ