UI functions on Save receipt form.

2016-06-03 15:55:21 +02:00
parent 5035c4ce05
commit 4593161261
9 changed files with 278 additions and 104 deletions
@@ -1,108 +1,119 @@
 #include "addressbookdata.h"

 AddressbookData::AddressbookData(QObject * parent)
-    :QObject(parent)
+    :ComboItem(parent)
 {
 }

-    QString AddressbookData::title() const
-    {
-        return m_title;
-    }
+QString AddressbookData::title() const
+{
+    return m_title;
+}

-    void AddressbookData::setTitle(const QString &title)
-    {
-        m_title = title;
-    }
-    QString AddressbookData::firstName() const
-    {
-        return m_firstName;
-    }
+void AddressbookData::setTitle(const QString &title)
+{
+    m_title = title;
+}
+QString AddressbookData::firstName() const
+{
+    return m_firstName;
+}

-    void AddressbookData::setFirstName(const QString &firstName)
-    {
-        m_firstName = firstName;
-    }
-    QString AddressbookData::lastName() const
-    {
-        return m_lastName;
-    }
+void AddressbookData::setFirstName(const QString &firstName)
+{
+    m_firstName = firstName;
+}
+QString AddressbookData::lastName() const
+{
+    return m_lastName;
+}

-    void AddressbookData::setLastName(const QString &lastName)
-    {
-        m_lastName = lastName;
-    }
-    QDate AddressbookData::birthDate() const
-    {
-        return m_birthDate;
-    }
+void AddressbookData::setLastName(const QString &lastName)
+{
+    m_lastName = lastName;
+}
+QDate AddressbookData::birthDate() const
+{
+    return m_birthDate;
+}

-    void AddressbookData::setBirthDate(const QDate &birthDate)
-    {
-        m_birthDate = birthDate;
-    }
-    QString AddressbookData::idCardNumber() const
-    {
-        return m_idCardNumber;
-    }
+void AddressbookData::setBirthDate(const QDate &birthDate)
+{
+    m_birthDate = birthDate;
+}
+QString AddressbookData::idCardNumber() const
+{
+    return m_idCardNumber;
+}

-    void AddressbookData::setIdCardNumber(const QString &idCardNumber)
-    {
-        m_idCardNumber = idCardNumber;
-    }
-    bool AddressbookData::ztp() const
-    {
-        return m_ztp;
-    }
+void AddressbookData::setIdCardNumber(const QString &idCardNumber)
+{
+    m_idCardNumber = idCardNumber;
+}
+bool AddressbookData::ztp() const
+{
+    return m_ztp;
+}

-    void AddressbookData::setZtp(bool ztp)
-    {
-        m_ztp = ztp;
-    }
-    QString AddressbookData::addressCity() const
-    {
-        return m_addressCity;
-    }
+void AddressbookData::setZtp(bool ztp)
+{
+    m_ztp = ztp;
+}
+QString AddressbookData::addressCity() const
+{
+    return m_addressCity;
+}

-    void AddressbookData::setAddressCity(const QString &addressCity)
-    {
-        m_addressCity = addressCity;
-    }
-    QString AddressbookData::addressStreet() const
-    {
-        return m_addressStreet;
-    }
+void AddressbookData::setAddressCity(const QString &addressCity)
+{
+    m_addressCity = addressCity;
+}
+QString AddressbookData::addressStreet() const
+{
+    return m_addressStreet;
+}

-    void AddressbookData::setAddressStreet(const QString &addressStreet)
-    {
-        m_addressStreet = addressStreet;
-    }
-    QString AddressbookData::addressHouseNumber() const
-    {
-        return m_addressHouseNumber;
-    }
+void AddressbookData::setAddressStreet(const QString &addressStreet)
+{
+    m_addressStreet = addressStreet;
+}
+QString AddressbookData::addressHouseNumber() const
+{
+    return m_addressHouseNumber;
+}

-    void AddressbookData::setAddressHouseNumber(const QString &addressHouseNumber)
-    {
-        m_addressHouseNumber = addressHouseNumber;
-    }
-    QString AddressbookData::addressZipCode() const
-    {
-        return m_addressZipCode;
-    }
+void AddressbookData::setAddressHouseNumber(const QString &addressHouseNumber)
+{
+    m_addressHouseNumber = addressHouseNumber;
+}
+QString AddressbookData::addressZipCode() const
+{
+    return m_addressZipCode;
+}

-    void AddressbookData::setAddressZipCode(const QString &addressZipCode)
-    {
-        m_addressZipCode = addressZipCode;
-    }
-    int AddressbookData::id() const
-    {
-        return m_id;
-    }
+void AddressbookData::setAddressZipCode(const QString &addressZipCode)
+{
+    m_addressZipCode = addressZipCode;
+}
+int AddressbookData::id() const
+{
+    return m_id;
+}

-    void AddressbookData::setId(int id)
-    {
-        m_id = id;
-    }
+void AddressbookData::setId(int id)
+{
+    m_id = id;
+}
+
+bool AddressbookData::eq(ComboItem *other)
+{
+    AddressbookData *adb = qobject_cast<AddressbookData*>(other);
+    return adb != NULL && adb->id() == this->id();
+}
+
+QString AddressbookData::toString()
+{
+    return m_firstName + " " + m_lastName + ", " + m_addressStreet + " " + m_addressHouseNumber + ", " + m_addressCity;
+}


@@ -7,6 +7,8 @@
 #include <odb/core.hxx>
 #include <QtCore/qglobal.h>

+#include <data/comboitem.h>
+
 #if defined(ADDRESSBOOK_LIBRARY)
 #  define ADDRESSBOOKSHARED_EXPORT Q_DECL_EXPORT
 #else
@@ -14,7 +16,7 @@
 #endif

 #pragma db object
-class ADDRESSBOOKSHARED_EXPORT AddressbookData : public QObject
+class ADDRESSBOOKSHARED_EXPORT AddressbookData : public ComboItem
 {
    Q_OBJECT
    Q_PROPERTY(QString title READ title WRITE setTitle)
@@ -77,6 +79,11 @@ private:
    QString m_addressStreet;
    QString m_addressHouseNumber;
    QString m_addressZipCode;
+
+    // ComboItem interface
+public:
+    virtual bool eq(ComboItem *other);
+    virtual QString toString();
 };

 #endif // ADDRESSBOOKDATA_H