Build system changed to Cmake, ORM changed to QxORM, Qt6 compatibility.
This commit is contained in:
+25
-50
@@ -4,7 +4,7 @@
|
||||
#include <numberseriesservice.h>
|
||||
#include "campshopitem.h"
|
||||
#include "campseller.h"
|
||||
#include <math.h>
|
||||
#include <cmath>
|
||||
|
||||
#ifdef _WIN32
|
||||
double round(double value) { return value < 0 ? -std::floor(0.5 - value) : std::floor(0.5 + value); }
|
||||
@@ -16,7 +16,7 @@ CampService::CampService()
|
||||
m_seller = new CampSeller(this);
|
||||
}
|
||||
|
||||
void CampService::addPerson(CampDataPtr data, AddressbookDataPtr address)
|
||||
void CampService::addPerson(const CampDataPtr& data, const AddressbookDataPtr& address)
|
||||
{
|
||||
AddressItemPtr addrItem(new AddressItem);
|
||||
|
||||
@@ -34,7 +34,7 @@ void CampService::addPerson(CampDataPtr data, AddressbookDataPtr address)
|
||||
data->addPerson(addrItem);
|
||||
}
|
||||
|
||||
void CampService::addService(CampDataPtr data, AccServicePtr service)
|
||||
void CampService::addService(const CampDataPtr& data, const AccServicePtr& service)
|
||||
{
|
||||
ServiceItemPtr serviceItem(new ServiceItem);
|
||||
|
||||
@@ -47,14 +47,14 @@ void CampService::addService(CampDataPtr data, AccServicePtr service)
|
||||
data->addServiceItem(serviceItem);
|
||||
}
|
||||
|
||||
void CampService::addService(CampDataPtr data, AccServicePtr service, QDecDouble price, QString description)
|
||||
void CampService::addService(CampDataPtr data, AccServicePtr service, QDecDouble price, const QString& description)
|
||||
{
|
||||
ServiceItemPtr item = addServiceInt(data, service);
|
||||
item->setPrice(price);
|
||||
item->setDescription(description);
|
||||
}
|
||||
|
||||
void CampService::setOwner(CampDataPtr data, AddressItemPtr person)
|
||||
void CampService::setOwner(const CampDataPtr& data, const AddressItemPtr& person)
|
||||
{
|
||||
foreach (AddressItemPtr p, data->people()) {
|
||||
p->setOwner(false);
|
||||
@@ -76,7 +76,7 @@ CampDataPtr CampService::create()
|
||||
return data;
|
||||
}
|
||||
|
||||
void CampService::calculate(CampDataPtr data)
|
||||
void CampService::calculate(const CampDataPtr& data)
|
||||
{
|
||||
SettingsService srv("CAMP");
|
||||
m_settings = srv.loadSettings<CampSettings>();
|
||||
@@ -86,7 +86,7 @@ void CampService::calculate(CampDataPtr data)
|
||||
calcPrice(data);
|
||||
}
|
||||
|
||||
void CampService::saveCamp(CampDataPtr data)
|
||||
void CampService::saveCamp(const CampDataPtr& data)
|
||||
{
|
||||
if (!checkPermission(PERM_ADD))
|
||||
{
|
||||
@@ -97,39 +97,16 @@ void CampService::saveCamp(CampDataPtr data)
|
||||
SeasonPtr season = seasonSrv.active();
|
||||
data->setSeason(season);
|
||||
|
||||
Transaction tr;
|
||||
try
|
||||
{
|
||||
odb::database *db = Context::instance().db();
|
||||
qx::QxSession session;
|
||||
|
||||
NumberSeriesService numSrv;
|
||||
data->setNumSer(numSrv.nextStrForPlugin("CAMP"));
|
||||
NumberSeriesService numSrv;
|
||||
data->setNumSer(numSrv.nextStrForPlugin("CAMP", &session));
|
||||
|
||||
addDateAndUser(data, true);
|
||||
|
||||
db->persist(data);
|
||||
|
||||
foreach (ServiceItemPtr item, data->services()) {
|
||||
item->setCampData(data.toWeakRef());
|
||||
db->persist(item);
|
||||
}
|
||||
|
||||
foreach (AddressItemPtr item, data->people()) {
|
||||
item->setCampData(data.toWeakRef());
|
||||
db->persist(item);
|
||||
}
|
||||
|
||||
tr.commit();
|
||||
}
|
||||
catch (const odb::exception &ex)
|
||||
{
|
||||
emit dbError(ex.what());
|
||||
emit dbErrorInsert(ex.what());
|
||||
return;
|
||||
}
|
||||
addDateAndUser(data, true);
|
||||
save(data, &session);
|
||||
}
|
||||
|
||||
void CampService::updateCamp(CampDataPtr data)
|
||||
/*void CampService::updateCamp(CampDataPtr data)
|
||||
{
|
||||
if (!checkPermission(PERM_EDIT))
|
||||
{
|
||||
@@ -166,9 +143,9 @@ void CampService::updateCamp(CampDataPtr data)
|
||||
emit dbErrorUpdate(ex.what());
|
||||
return;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
void CampService::eraseCamp(CampDataPtr data)
|
||||
/*void CampService::eraseCamp(CampDataPtr data)
|
||||
{
|
||||
if (!checkPermission(PERM_DELETE))
|
||||
{
|
||||
@@ -193,16 +170,16 @@ void CampService::eraseCamp(CampDataPtr data)
|
||||
emit dbErrorDelete(ex.what());
|
||||
return;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
void CampService::loadItems(CampDataPtr data)
|
||||
/*void CampService::loadItems(CampDataPtr data)
|
||||
{
|
||||
Service<AddressItem> srv;
|
||||
data->setPeople(srv.all(QString("campData = %1").arg(data->id())));
|
||||
|
||||
Service<ServiceItem> srvService;
|
||||
data->setServices(srvService.all(QString("campData = %1").arg(data->id())));
|
||||
}
|
||||
}*/
|
||||
|
||||
QList<CampDataPtr> CampService::allForSeason()
|
||||
{
|
||||
@@ -278,7 +255,7 @@ void CampService::calcPeople(CampDataPtr data)
|
||||
}
|
||||
}
|
||||
|
||||
void CampService::calcServices(CampDataPtr data)
|
||||
void CampService::calcServices(const CampDataPtr& data)
|
||||
{
|
||||
QDecDouble sale = data->sale();
|
||||
bool fixedSale = data->fixedSale();
|
||||
@@ -301,7 +278,7 @@ void CampService::calcServices(CampDataPtr data)
|
||||
}
|
||||
}
|
||||
|
||||
void CampService::calcPrice(CampDataPtr data)
|
||||
void CampService::calcPrice(const CampDataPtr& data)
|
||||
{
|
||||
QDecDouble totalPrice(0);
|
||||
QDecDouble sale(0);
|
||||
@@ -340,7 +317,7 @@ void CampService::calcPrice(CampDataPtr data)
|
||||
data->setTotalSale(sale);
|
||||
}
|
||||
|
||||
void CampService::addAccFee(CampDataPtr data, AddressItemPtr item, int startAge, int endAge, int days)
|
||||
void CampService::addAccFee(const CampDataPtr& data, const AddressItemPtr& item, int startAge, int endAge, int days)
|
||||
{
|
||||
if (item->adbItem()->ztp())
|
||||
{
|
||||
@@ -380,24 +357,23 @@ void CampService::addAccFee(CampDataPtr data, AddressItemPtr item, int startAge,
|
||||
}
|
||||
}
|
||||
|
||||
QList<ShopItemPtr> CampService::shopItems()
|
||||
QList<IShopItemPtr> CampService::shopItems()
|
||||
{
|
||||
CampShopItemPtr item(new CampShopItem);
|
||||
|
||||
QList<ShopItemPtr> items;
|
||||
QList<IShopItemPtr> items;
|
||||
items.append(item);
|
||||
|
||||
return items;
|
||||
}
|
||||
|
||||
ShopItemPtr CampService::shopItem(int )
|
||||
IShopItemPtr CampService::shopItem(int )
|
||||
{
|
||||
return CampShopItemPtr(new CampShopItem);
|
||||
}
|
||||
|
||||
void CampService::addedToVoucher(int itemId, int countAdded)
|
||||
{
|
||||
Transaction tx;
|
||||
CampDataPtr data = loadById(itemId);
|
||||
|
||||
if (countAdded > 0)
|
||||
@@ -410,7 +386,6 @@ void CampService::addedToVoucher(int itemId, int countAdded)
|
||||
}
|
||||
|
||||
this->update(data);
|
||||
tx.commit();
|
||||
}
|
||||
|
||||
ISeller *CampService::seller()
|
||||
@@ -418,7 +393,7 @@ ISeller *CampService::seller()
|
||||
return m_seller;
|
||||
}
|
||||
|
||||
ServiceItemPtr CampService::addServiceInt(CampDataPtr data, AccServicePtr service)
|
||||
ServiceItemPtr CampService::addServiceInt(const CampDataPtr& data, const AccServicePtr& service)
|
||||
{
|
||||
ServiceItemPtr serviceItem(new ServiceItem);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user