3 files changed, 50 insertions, 4 deletions

diff --git a/framework/src/domain/contactcontroller.cpp b/framework/src/domain/contactcontroller.cpp
index effe96e8..e27c4a3b 100644
--- a/framework/src/domain/contactcontroller.cpp
+++ b/framework/src/domain/contactcontroller.cpp
@@ -19,6 +19,8 @@
 #include "contactcontroller.h"
 
 #include <sink/applicationdomaintype.h>
+#include <sink/store.h>
+#include <sink/log.h>
 #include <KContacts/VCardConverter>
 
 class MailsController : public Kube::ListPropertyController
@@ -64,22 +66,54 @@ ContactController::ContactController()
     updateSaveAction();
 }
 
-void ContactController::save() {
-    qWarning() << "Saving is not implemented";
+void ContactController::save()
+{
+    using namespace Sink;
+    using namespace Sink::ApplicationDomain;
+    Query query;
+    query.containsFilter<SinkResource::Capabilities>(ResourceCapabilities::Contact::storage);
+    auto job = Store::fetchAll<SinkResource>(query)
+        .then([=](const QList<SinkResource::Ptr> &resources) {
+            if (!resources.isEmpty()) {
+                auto resourceId = resources[0]->identifier();
+                KContacts::Addressee addressee;
+                addressee.setGivenName(getFirstName());
+                addressee.setFamilyName(getLastName());
+                addressee.setFormattedName(getFirstName() + " " + getLastName());
+                KContacts::VCardConverter converter;
+                const auto vcard = converter.createVCard(addressee, KContacts::VCardConverter::v3_0);
+
+                Contact contact(resourceId);
+                contact.setVcard(vcard);
+
+                return Store::create(contact);
+            }
+            SinkWarning() << "Failed to find a resource for the contact";
+            return KAsync::error<void>(0, "Failed to find a contact resource.");
+        })
+        .then([&] (const KAsync::Error &error) {
+            SinkLog() << "Failed to save the contact: " << error;
+            emit done();
+        });
+    run(job);
 }
 
 void ContactController::updateSaveAction()
 {
-    saveAction()->setEnabled(!getName().isEmpty());
+    saveAction()->setEnabled(!getFirstName().isEmpty());
 }
 
 void ContactController::loadContact(const QVariant &contact)
 {
     if (auto c = contact.value<Sink::ApplicationDomain::Contact::Ptr>()) {
-        setName(c->getFn());
         const auto &vcard = c->getVcard();
         KContacts::VCardConverter converter;
         const auto addressee = converter.parseVCard(vcard);
+
+        setName(c->getFn());
+        setFirstName(addressee.givenName());
+        setLastName(addressee.familyName());
+
         static_cast<MailsController*>(mailsController())->set(addressee.emails());
 
         QStringList numbers;
diff --git a/framework/src/domain/contactcontroller.h b/framework/src/domain/contactcontroller.h
index 5b49c77b..852a003f 100644
--- a/framework/src/domain/contactcontroller.h
+++ b/framework/src/domain/contactcontroller.h
@@ -34,6 +34,9 @@ class KUBE_EXPORT ContactController : public Kube::Controller
     Q_PROPERTY(QVariant contact READ contact WRITE loadContact)
 
     //Interface properties
+    KUBE_CONTROLLER_PROPERTY(QByteArray, AccountId, accountId)
+    KUBE_CONTROLLER_PROPERTY(QString, FirstName, firstName)
+    KUBE_CONTROLLER_PROPERTY(QString, LastName, lastName)
     KUBE_CONTROLLER_PROPERTY(QString, Name, name)
     KUBE_CONTROLLER_PROPERTY(QString, Street, street)
     KUBE_CONTROLLER_PROPERTY(QString, City, city)
diff --git a/views/people/qml/PersonComposer.qml b/views/people/qml/PersonComposer.qml
index bd469e47..f56532f8 100644
--- a/views/people/qml/PersonComposer.qml
+++ b/views/people/qml/PersonComposer.qml
@@ -121,12 +121,16 @@ Flickable {
                     width: Kube.Units.gridUnit * 15
                     placeholderText: qsTr("First Name")
                     backgroundColor: "white"
+                    text: contactController.firstName
+                    onTextChanged: contactController.firstName = text
                 }
 
                 Kube.TextField {
                     width: Kube.Units.gridUnit * 15
                     placeholderText: qsTr("Last Name")
                     backgroundColor: "white"
+                    text: contactController.lastName
+                    onTextChanged: contactController.lastName = text
                 }
             }
 
@@ -142,6 +146,7 @@ Flickable {
 
                 width: Kube.Units.gridUnit * 20
                 text: contactController.jobTitle
+                onTextChanged: contactController.jobTitle = text
                 placeholderText: qsTr("Job Title")
                 backgroundColor: "white"
             }
@@ -158,6 +163,7 @@ Flickable {
 
                 placeholderText: qsTr("Company")
                 text: contactController.company
+                onTextChanged: contactController.company = text
                 backgroundColor: "white"
             }
         }
@@ -201,18 +207,21 @@ Flickable {
             Kube.TextField {
                 width: Kube.Units.gridUnit * 20
                 text: contactController.street
+                onTextChanged: contactController.stree = text
                 placeholderText: qsTr("Street")
                 backgroundColor: "white"
             }
             Kube.TextField {
                 width: Kube.Units.gridUnit * 20
                 text: contactController.city
+                onTextChanged: contactController.city = text
                 placeholderText: qsTr("City")
                 backgroundColor: "white"
             }
             Kube.TextField {
                 width: Kube.Units.gridUnit * 20
                 text: contactController.country
+                onTextChanged: contactController.country = text
                 placeholderText: qsTr("Country")
                 backgroundColor: "white"
             }