Added settings for Camp module. Changed Camp data model.

camp/data/addressitem.cpp

@@ -3,7 +3,8 @@
 
 AddressItem::AddressItem(QObject *parent) : QObject(parent)
 {
-
+    m_id = 0;
+    m_price = 0;
 }
 
 int AddressItem::id() const
@@ -65,3 +66,23 @@ void AddressItem::setCampData(const QWeakPointer<CampData> &campData)
 {
     m_campData = campData;
 }
+
+PersonPricePtr AddressItem::personPrice() const
+{
+    return m_personPrice;
+}
+
+void AddressItem::setPersonPrice(const PersonPricePtr &personPrice)
+{
+    m_personPrice = personPrice;
+}
+
+AddressbookDataPtr AddressItem::adbItem() const
+{
+    return m_adbItem;
+}
+
+void AddressItem::setAdbItem(const AddressbookDataPtr &adbItem)
+{
+    m_adbItem = adbItem;
+}

camp/data/addressitem.h

@@ -8,6 +8,8 @@
 #include <QDecDouble.hh>
 #include <odb/core.hxx>
 
+#include <addressbookdata.h>
+
 class CampData;
 
 #pragma db object
@@ -40,6 +42,12 @@ public:
     QWeakPointer<CampData> campData() const;
     void setCampData(const QWeakPointer<CampData> &campData);
 
+    PersonPricePtr personPrice() const;
+    void setPersonPrice(const PersonPricePtr &personPrice);
+
+    AddressbookDataPtr adbItem() const;
+    void setAdbItem(const AddressbookDataPtr &adbItem);
+
 private:
     friend class odb::access;
 #pragma db id auto
@@ -47,9 +55,11 @@ private:
     QString m_firstName;
     QString m_lastName;
     QString m_address;
+    AddressbookDataPtr m_adbItem;
     int m_price;
     #pragma db not_null
     QWeakPointer<CampData> m_campData;
+    PersonPricePtr m_personPrice;
 };
 
 #endif // ADDRESSITEM_H

camp/data/camp-data.h

@@ -6,13 +6,19 @@
 class CampData;
 class AddressItem;
 class ServiceItem;
+class Sale;
+class PersonPrice;
 
 typedef QSharedPointer<CampData> CampDataPtr;
 typedef QSharedPointer<ServiceItem> ServiceItemPtr;
 typedef QSharedPointer<AddressItem> AddressItemPtr;
+typedef QSharedPointer<Sale> SalePtr;
+typedef QSharedPointer<PersonPrice> PersonPricePtr;
 
 #include "campdata.h"
 #include "addressitem.h"
 #include "serviceitem.h"
+#include "sale.h"
+#include "personprice.h"
 
 #endif // CAMP_DATA_H

camp/data/campdata.cpp

@@ -3,7 +3,10 @@
 
 CampData::CampData(QObject *parent) : QObject(parent)
 {
-
+    m_id = 0;
+    m_totalPrice = 0;
+    m_sale = 0;
+    m_ownerFirstame = false;
 }
 
 int CampData::id() const
@@ -115,3 +118,33 @@ void CampData::setSeason(const SeasonPtr &season)
 {
     m_season = season;
 }
+
+QDecDouble CampData::sale() const
+{
+    return TO_DEC(m_sale);
+}
+
+void CampData::setSale(QDecDouble sale)
+{
+    m_sale = FROM_DEC(sale);
+}
+
+bool CampData::fixedSale() const
+{
+    return m_fixedSale;
+}
+
+void CampData::setFixedSale(bool fixedSale)
+{
+    m_fixedSale = fixedSale;
+}
+
+QString CampData::numSer() const
+{
+    return m_numSer;
+}
+
+void CampData::setNumSer(const QString &numSer)
+{
+    m_numSer = numSer;
+}

camp/data/campdata.h

@@ -14,12 +14,15 @@
 class CampData : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(QString numSer READ numSer WRITE setNumSer)
     Q_PROPERTY(QDate start READ start WRITE setStart)
     Q_PROPERTY(QDate end READ end WRITE setEnd)
     Q_PROPERTY(QString ownerFirstame READ ownerFirstame WRITE setOwnerFirstame)
     Q_PROPERTY(QString ownerLastname READ ownerLastname WRITE setOwnerLastname)
     Q_PROPERTY(QString ownerAddress READ ownerAddress WRITE setOwnerAddress)
     Q_PROPERTY(QDecDouble totalPrice READ totalPrice WRITE setTotalPrice)
+    Q_PROPERTY(QDecDouble sale READ sale WRITE setSale)
+    Q_PROPERTY(bool fixedSale READ fixedSale WRITE setFixedSale)
 
 public:
     explicit CampData(QObject *parent = 0);
@@ -56,10 +59,20 @@ public:
     SeasonPtr season() const;
     void setSeason(const SeasonPtr &season);
 
+    QDecDouble sale() const;
+    void setSale(QDecDouble sale);
+
+    bool fixedSale() const;
+    void setFixedSale(bool fixedSale);
+
+    QString numSer() const;
+    void setNumSer(const QString &numSer);
+
 private:
     friend class odb::access;
 #pragma db id auto
     int m_id;
+    QString m_numSer;
     QDate m_start;
     QDate m_end;
     QString m_ownerFirstame;
@@ -70,6 +83,8 @@ private:
     #pragma db value_not_null inverse(m_campData)
     QOdbList<AddressItemPtr> m_people;
     int m_totalPrice;
+    int m_sale;
+    bool m_fixedSale;
     SeasonPtr m_season;
 };
 

camp/data/personprice.cpp

@@ -0,0 +1,71 @@
+#include "personprice.h"
+#include <define.h>
+
+PersonPrice::PersonPrice(QObject *parent) : QObject(parent)
+{
+    m_id = 0;
+    m_fromAge = 0;
+    m_toAge = 0;
+    m_price = 0;
+    m_active = true;
+}
+
+int PersonPrice::id() const
+{
+    return m_id;
+}
+
+void PersonPrice::setId(int id)
+{
+    m_id = id;
+}
+
+QString PersonPrice::description() const
+{
+    return m_description;
+}
+
+void PersonPrice::setDescription(const QString &description)
+{
+    m_description = description;
+}
+
+int PersonPrice::fromAge() const
+{
+    return m_fromAge;
+}
+
+void PersonPrice::setFromAge(int fromAge)
+{
+    m_fromAge = fromAge;
+}
+
+int PersonPrice::toAge() const
+{
+    return m_toAge;
+}
+
+void PersonPrice::setToAge(int toAge)
+{
+    m_toAge = toAge;
+}
+
+QDecDouble PersonPrice::price() const
+{
+    return TO_DEC(m_price);
+}
+
+void PersonPrice::setPrice(QDecDouble price)
+{
+    m_price = FROM_DEC(price);
+}
+
+bool PersonPrice::active() const
+{
+    return m_active;
+}
+
+void PersonPrice::setActive(bool active)
+{
+    m_active = active;
+}

camp/data/personprice.h

@@ -0,0 +1,50 @@
+#ifndef PERSONPRICE_H
+#define PERSONPRICE_H
+
+#include <QObject>
+#include <QDecDouble.hh>
+#include <odb/core.hxx>
+
+#pragma db object
+class PersonPrice : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString description READ description WRITE setDescription)
+    Q_PROPERTY(int fromAge READ fromAge WRITE setFromAge)
+    Q_PROPERTY(int toAge READ toAge WRITE setToAge)
+    Q_PROPERTY(QDecDouble price READ price WRITE setPrice)
+    Q_PROPERTY(bool active READ active WRITE setActive)
+
+public:
+    explicit PersonPrice(QObject *parent = 0);
+
+    int id() const;
+    void setId(int id);
+
+    QString description() const;
+    void setDescription(const QString &description);
+
+    int fromAge() const;
+    void setFromAge(int fromAge);
+
+    int toAge() const;
+    void setToAge(int toAge);
+
+    QDecDouble price() const;
+    void setPrice(QDecDouble price);
+
+    bool active() const;
+    void setActive(bool active);
+
+private:
+    friend class odb::access;
+#pragma db id auto
+    int m_id;
+    QString m_description;
+    int m_fromAge;
+    int m_toAge;
+    int m_price;
+    bool m_active;
+};
+
+#endif // PERSONPRICE_H

camp/data/sale.cpp

@@ -0,0 +1,49 @@
+#include "sale.h"
+#include <define.h>
+
+Sale::Sale(QObject *parent) : QObject(parent)
+{
+    m_id = 0;
+    m_sale = 0;
+    m_fixed = false;
+}
+
+int Sale::id() const
+{
+    return m_id;
+}
+
+void Sale::setId(int id)
+{
+    m_id = id;
+}
+
+QDecDouble Sale::sale() const
+{
+    return TO_DEC(m_sale);
+}
+
+void Sale::setSale(QDecDouble sale)
+{
+    m_sale = FROM_DEC(sale);
+}
+
+bool Sale::fixed() const
+{
+    return m_fixed;
+}
+
+void Sale::setFixed(bool fixed)
+{
+    m_fixed = fixed;
+}
+
+QString Sale::description() const
+{
+    return m_description;
+}
+
+void Sale::setDescription(const QString &description)
+{
+    m_description = description;
+}

camp/data/sale.h

@@ -0,0 +1,40 @@
+#ifndef SALE_H
+#define SALE_H
+
+#include <QObject>
+#include <odb/core.hxx>
+#include <QDecDouble.hh>
+
+#pragma db object
+class Sale : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString description READ description WRITE setDescription)
+    Q_PROPERTY(QDecDouble sale READ sale WRITE setSale)
+    Q_PROPERTY(bool fixed READ fixed WRITE setFixed)
+
+public:
+    explicit Sale(QObject *parent = 0);
+
+    int id() const;
+    void setId(int id);
+
+    QDecDouble sale() const;
+    void setSale(QDecDouble sale);
+
+    bool fixed() const;
+    void setFixed(bool fixed);
+
+    QString description() const;
+    void setDescription(const QString &description);
+
+private:
+    friend class odb::access;
+#pragma db id auto
+    int m_id;
+    QString m_description;
+    int m_sale;
+    bool m_fixed;
+};
+
+#endif // SALE_H

camp/data/serviceitem.cpp

@@ -3,7 +3,10 @@
 
 ServiceItem::ServiceItem(QObject *parent) : QObject(parent)
 {
-
+    m_id = 0;
+    m_salePossible = false;
+    m_price = 0;
+    m_type = AccService::OTHER;
 }
 
 int ServiceItem::id() const