Compare commits
66 Commits
Author | SHA1 | Date | |
---|---|---|---|
24a1390a11
|
|||
c8508a0c62
|
|||
fbfbe3d243
|
|||
cbc0dd0ad6
|
|||
1abd6bfa90
|
|||
a03dfe87a5
|
|||
03b192fb60
|
|||
e8b3bb1aa0
|
|||
8fe705f49b
|
|||
bf1bdc34bb
|
|||
73ae01573d
|
|||
bc595e1c7e
|
|||
18104b7271
|
|||
d720c7190f
|
|||
3fff6a0ebe
|
|||
bacee366b8
|
|||
acf3e143c1
|
|||
c84050091b
|
|||
9be2841187
|
|||
3e4db6cfcc
|
|||
5898be8807
|
|||
f20957c14a
|
|||
1bcdb5ba21
|
|||
a43af8ab86
|
|||
d7443974e2
|
|||
346c953175
|
|||
8cf6897a21
|
|||
69eb87e358
|
|||
8eab11479c
|
|||
ac93e9e631
|
|||
c1dd20ec4f
|
|||
2d60a7bd5c
|
|||
6d7d9ade70
|
|||
72dbc8b858
|
|||
32d70abf44
|
|||
c076090e03
|
|||
6c2717c56b
|
|||
816182c87b
|
|||
492d3a107a
|
|||
962cd01eac
|
|||
d66363da46
|
|||
7b25f86d6b
|
|||
5a999a0494
|
|||
ec18ac45e4
|
|||
560b6d3221
|
|||
b946dc5a92
|
|||
ea7542a248
|
|||
4541699ec3
|
|||
87d50a05dd
|
|||
379a5d4e3e
|
|||
6a08cf0b62
|
|||
849305bc8f
|
|||
a5c900b9fe
|
|||
70b488de66
|
|||
58f50b0ea6
|
|||
bc5beb4b96
|
|||
2a0aa2abe2
|
|||
f94f33862f
|
|||
b7cedf5444
|
|||
f81369944c
|
|||
6072970bf0
|
|||
8659627171
|
|||
d5786aa5ab
|
|||
ba7d801330
|
|||
19ce57e680
|
|||
d0ee6d175e
|
@@ -87,7 +87,9 @@ HEADERS += \
|
||||
src/ATBAPP/support/DBusControllerInterface.h \
|
||||
src/ATBAPP/support/JSON.h \
|
||||
src/ATBAPP/support/PTUSystem.h \
|
||||
src/ATBAPP/support/PersistentData.h
|
||||
src/ATBAPP/support/PersistentData.h \
|
||||
src/ATBAPP/support/Ticket.h \
|
||||
src/ATBAPP/support/TicketUtils.h
|
||||
|
||||
SOURCES += \
|
||||
src/ATBAPP/ATBHealthEvent.cpp \
|
||||
@@ -99,7 +101,9 @@ SOURCES += \
|
||||
src/ATBAPP/support/DBusControllerInterface.cpp \
|
||||
src/ATBAPP/support/JSON.cpp \
|
||||
src/ATBAPP/support/PTUSystem.cpp \
|
||||
src/ATBAPP/support/PersistentData.cpp
|
||||
src/ATBAPP/support/PersistentData.cpp \
|
||||
src/ATBAPP/support/Ticket.cpp \
|
||||
src/ATBAPP/support/TicketUtils.cpp
|
||||
|
||||
DISTFILES += \
|
||||
generate-version.sh
|
||||
|
@@ -6,6 +6,7 @@
|
||||
#include "src/ATBAPP/support/DBusControllerInterface.h"
|
||||
#include "src/ATBAPP/support/PTUSystem.h"
|
||||
#include "src/ATBAPP/support/CashUtils.h"
|
||||
#include "src/ATBAPP/support/TicketUtils.h"
|
||||
|
||||
#include <QTimer>
|
||||
#include <QThread>
|
||||
@@ -30,13 +31,32 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
|
||||
this->setParent(parent);
|
||||
|
||||
this->pluginInfo = QString::fromUtf8(pluginInfoString.c_str());
|
||||
}
|
||||
|
||||
if (!this->private_loadCashAgentLib("")) {
|
||||
return;
|
||||
}
|
||||
ATBDeviceControllerPlugin::~ATBDeviceControllerPlugin() {}
|
||||
|
||||
PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, const QSettings & settings)
|
||||
{
|
||||
this->eventReceiver = eventReceiver;
|
||||
|
||||
// read variables from setting
|
||||
this->serialPortName = settings.value("ATBDeviceControllerPlugin/serialPort", "ttymxc2").toString();
|
||||
QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "ISO 8859-2").toString().toLatin1();
|
||||
QString printerLocaleString = settings.value("ATBDeviceControllerPlugin/printerLocale", "de_DE").toString().toLatin1();
|
||||
this->printerLocale = QLocale(printerLocaleString);
|
||||
|
||||
this->initTicketTemplateList(&settings);
|
||||
|
||||
this->init_sc_dbus();
|
||||
|
||||
QString persistentDataFile = "/mnt/system_data/dc_persistentData.dat";
|
||||
this->persistentData = new PersistentData(persistentDataFile);
|
||||
|
||||
|
||||
// setup libCA:
|
||||
if (!this->private_loadCashAgentLib("")) {
|
||||
return PLUGIN_STATE::NOT_INITIALIZED;
|
||||
}
|
||||
|
||||
//connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_templatePrintFinished_OK()), this, SLOT(onPrintFinishedOK()), Qt::QueuedConnection);
|
||||
//connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_templatePrintFinished_Err()), this, SLOT(onPrintFinishedERR()), Qt::QueuedConnection);
|
||||
@@ -61,29 +81,20 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
|
||||
dynamic_cast<QObject*>(hw)->moveToThread(hwThread);
|
||||
hwThread->start();
|
||||
|
||||
QString persistentDataFile = "/mnt/system_data/dc_persistentData.dat";
|
||||
this->persistentData = new PersistentData(persistentDataFile);
|
||||
|
||||
this->diag = new DeviceControllerDiag(this->persistentData, this);
|
||||
connect(this->diag, &DeviceControllerDiag::newVoltage, this, &ATBDeviceControllerPlugin::onNewVoltage);
|
||||
|
||||
int diagTimeout = settings.value("ATBDeviceControllerPlugin/diagTimeout", "45").toInt();
|
||||
this->diag->setTimeout(diagTimeout);
|
||||
|
||||
// currentSelectedTicketType - number of used "Kombiticket" (deprecated) use TICKET_VARIANT in future
|
||||
this->currentSelectedTicketType = 0;
|
||||
this->currentTicket = new Ticket(TICKET_VARIANT::PARKING_TICKET, this);
|
||||
|
||||
this->currentCashState = CASH_STATE::CACHE_EMPTY;
|
||||
|
||||
this->cashStartAmountInt = 0;
|
||||
}
|
||||
|
||||
ATBDeviceControllerPlugin::~ATBDeviceControllerPlugin() {}
|
||||
|
||||
PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, const QSettings & settings)
|
||||
{
|
||||
this->eventReceiver = eventReceiver;
|
||||
|
||||
// read variables from setting
|
||||
this->serialPortName = settings.value("ATBDeviceControllerPlugin/serialPort", "ttymxc2").toString();
|
||||
QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "ISO 8859-2").toString().toLatin1();
|
||||
QString printerLocaleString = settings.value("ATBDeviceControllerPlugin/printerLocale", "de_DE").toString().toLatin1();
|
||||
this->printerLocale = QLocale(printerLocaleString);
|
||||
|
||||
|
||||
if (this->isMaster) {
|
||||
@@ -130,6 +141,89 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
|
||||
}
|
||||
|
||||
|
||||
void ATBDeviceControllerPlugin::initTicketTemplateList(const QSettings * settings)
|
||||
{
|
||||
QList<quint8> templateList;
|
||||
QString templateListString;
|
||||
|
||||
|
||||
QMetaEnum metaTicketVariants = QMetaEnum::fromType<nsDeviceControllerInterface::TICKET_VARIANT>();
|
||||
for (int i = 0; i < metaTicketVariants.keyCount(); i++) {
|
||||
const char* ticketVariant_char = metaTicketVariants.key(i);
|
||||
quint8 intValue = metaTicketVariants.value(i);
|
||||
|
||||
// DEBUG
|
||||
//qCritical() << " processing TICKET_VARIANT::" << ticketVariant_char;
|
||||
|
||||
QString configKey = QString("TICKET_TEMPLATES/") + ticketVariant_char;
|
||||
QVariant raw_templateList = settings->value(configKey, "");
|
||||
if (raw_templateList.type() == QVariant::StringList) {
|
||||
templateListString = raw_templateList.toStringList().join(",");
|
||||
} else {
|
||||
templateListString = raw_templateList.toString();
|
||||
}
|
||||
|
||||
// DEBUG
|
||||
//qCritical() << " configKey: " << configKey;
|
||||
//qCritical() << " templateListString: " << templateListString;
|
||||
|
||||
QStringList templateListStringList = templateListString.split(",", QString::SplitBehavior::SkipEmptyParts);
|
||||
|
||||
quint8 templateEntry;
|
||||
bool ok;
|
||||
for (const auto & ListEntry : templateListStringList) {
|
||||
templateEntry = ListEntry.toInt(&ok);
|
||||
if (ok) {
|
||||
templateList.append(templateEntry);
|
||||
}
|
||||
}
|
||||
|
||||
// DEBUG
|
||||
/*
|
||||
QStringList elements;
|
||||
for (const auto &item : templateList) {
|
||||
elements << QString::number(item);
|
||||
}
|
||||
qCritical() << " template list: " << elements.join(',');
|
||||
*/
|
||||
|
||||
this->ticketTemplateList.insert(static_cast<nsDeviceControllerInterface::TICKET_VARIANT>(intValue), templateList);
|
||||
templateList.clear();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void ATBDeviceControllerPlugin::sendDeviceParameter(const QJsonObject &jsonObject)
|
||||
{
|
||||
|
||||
qCritical() << "ATBDeviceControllerPlugin::sendDeviceParameter:";
|
||||
|
||||
|
||||
// extract location info and store location info in persistent data:
|
||||
QJsonValue jsonSubVal;
|
||||
jsonSubVal = jsonObject["Location"];
|
||||
|
||||
QString locationString = jsonSubVal.toString("");
|
||||
|
||||
if (locationString == "") {
|
||||
|
||||
qCritical() << " --> locationString NULL";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
uint16_t customerNr = PTUSystem::readCustomerNumber();
|
||||
uint16_t machineNr = PTUSystem::readMachineNumber();
|
||||
uint16_t borough = PTUSystem::readZoneNumber();
|
||||
uint16_t zone = PTUSystem::readGroupNumber();
|
||||
uint16_t alias = 0;
|
||||
QByteArray locationBa = locationString.toLocal8Bit();
|
||||
|
||||
this->hw->sendMachineID(customerNr, machineNr, borough, zone, alias, locationBa.data());
|
||||
}
|
||||
|
||||
|
||||
|
||||
void ATBDeviceControllerPlugin::startPhysicalLayer()
|
||||
{
|
||||
if (!this->isMaster) return;
|
||||
@@ -192,20 +286,20 @@ void ATBDeviceControllerPlugin::reset()
|
||||
// Handle Mode-Changes --------------------------------------------------------
|
||||
|
||||
void ATBDeviceControllerPlugin::onChangedProgramModeToSELL()
|
||||
{
|
||||
{
|
||||
hw->dc_autoRequest(true);
|
||||
hw->rtc_setDateTime();
|
||||
hw->mdb_switchWake(0); // wakeup MDB components
|
||||
}
|
||||
|
||||
void ATBDeviceControllerPlugin::onChangedProgramModeToSERVICE()
|
||||
{
|
||||
{
|
||||
hw->dc_autoRequest(true);
|
||||
hw->mdb_switchWake(0); // wakeup MDB components
|
||||
}
|
||||
|
||||
void ATBDeviceControllerPlugin::onChangedProgramModeToIDLE()
|
||||
{
|
||||
{
|
||||
hw->dc_autoRequest(true);
|
||||
this->diag->diagRequest();
|
||||
hw->mdb_switchWake(1);
|
||||
@@ -270,6 +364,73 @@ void ATBDeviceControllerPlugin::cashCollect()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void ATBDeviceControllerPlugin::cashCollect(const QString & amount)
|
||||
{
|
||||
if (this->coinProcessor() != nsDeviceControllerInterface::COIN_PROCESSOR::CHANGER) {
|
||||
this->cashCollect();
|
||||
return;
|
||||
}
|
||||
|
||||
// check if we must change coins:
|
||||
|
||||
// inserted amount
|
||||
uint32_t amountInsertedInt = this->hw->getInsertedAmount();
|
||||
|
||||
bool ok;
|
||||
uint32_t amountToPayInt = amount.toInt(&ok);
|
||||
|
||||
// check if we must change coins:
|
||||
if (amountInsertedInt > amountToPayInt) {
|
||||
|
||||
uint32_t amountToChangeInt = amountInsertedInt - amountToPayInt;
|
||||
|
||||
qCritical() << "cashCollect(" << amount << ")";
|
||||
qCritical() << " amount to change: " << QString::number(amountToChangeInt);
|
||||
|
||||
|
||||
// trigger changer:
|
||||
emit this->cashPaymentChanging(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
|
||||
QString::number(amountToChangeInt),
|
||||
"", // ErrorCode
|
||||
""); // ErrorDescription
|
||||
|
||||
// change
|
||||
hw->changer_returnCoins(amountToChangeInt);
|
||||
|
||||
QTimer::singleShot(1000, this, &ATBDeviceControllerPlugin::onCashChangerState);
|
||||
|
||||
}
|
||||
else {
|
||||
// nothing to change:
|
||||
|
||||
qCritical() << "cashCollect(" << amount << ")";
|
||||
qCritical() << " nothing to change. ";
|
||||
|
||||
|
||||
hw->vend_success();
|
||||
|
||||
QString amountString = QString::number(amountInsertedInt);
|
||||
|
||||
// inserted coins
|
||||
uint32_t amountCoinsInt = CashUtils::getAmountOfInsertedCoins(this->hw);
|
||||
QString amountCoinsString = QString::number(amountCoinsInt);
|
||||
|
||||
// inserted notes
|
||||
uint32_t amountNotesInt = CashUtils::getAmountOfInsertedNotes(this->hw);
|
||||
QString amountNotesString = QString::number(amountNotesInt);
|
||||
|
||||
emit this->cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
|
||||
amountString,
|
||||
amountCoinsString, // coins
|
||||
amountNotesString, // notes
|
||||
0, // proposed change
|
||||
"",
|
||||
"");
|
||||
this->currentCashState = CASH_STATE::CACHE_EMPTY;
|
||||
}
|
||||
}
|
||||
|
||||
void ATBDeviceControllerPlugin::cashAbort()
|
||||
{
|
||||
hw->vend_failed();
|
||||
@@ -502,6 +663,8 @@ void ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()
|
||||
{
|
||||
qCritical() << "ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()";
|
||||
|
||||
this->diag->diagReInit();
|
||||
|
||||
QTimer::singleShot(2000, this, SIGNAL(requestModeIDLE()));
|
||||
|
||||
this->dbus->finishedBackgroundTask("DOOR_OPEN");
|
||||
@@ -515,10 +678,14 @@ void ATBDeviceControllerPlugin::onAllDoorsClosed()
|
||||
{
|
||||
qCritical() << "ATBDeviceControllerPlugin::onAllDoorsClosed()";
|
||||
|
||||
emit this->requestModeIDLE();
|
||||
this->dbus->finishedBackgroundTask("DOOR_OPEN");
|
||||
if (this->diag->isErrorState()) {
|
||||
emit this->requestModeOOO();
|
||||
}
|
||||
else {
|
||||
emit this->requestModeIDLE();
|
||||
}
|
||||
|
||||
// TODO: check for errors and create a machine event
|
||||
this->dbus->finishedBackgroundTask("DOOR_OPEN");
|
||||
}
|
||||
|
||||
void ATBDeviceControllerPlugin::onNewVoltage(uint32_t voltage)
|
||||
@@ -533,7 +700,7 @@ void ATBDeviceControllerPlugin::onNewVoltage(uint32_t voltage)
|
||||
json = JSON::objectBuilder()
|
||||
->set("Name", "batt")
|
||||
->set("Value", voltageString)
|
||||
->set("Unit", "V")
|
||||
->set("Unit", "mV")
|
||||
->create();
|
||||
|
||||
|
||||
@@ -554,86 +721,46 @@ void ATBDeviceControllerPlugin::onNewVoltage(uint32_t voltage)
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @brief ATBDeviceControllerPlugin::requestPrintTicket
|
||||
* @param ticketVariant
|
||||
* @param printingData
|
||||
*
|
||||
* Setup (initNew()) Ticket-Object
|
||||
*
|
||||
*/
|
||||
void ATBDeviceControllerPlugin::requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData)
|
||||
{
|
||||
struct T_dynDat *dynTicketData = new T_dynDat;
|
||||
memset(dynTicketData, 0, sizeof(*dynTicketData));
|
||||
|
||||
QDateTime parkingEndDateTime = QDateTime::fromString(printingData["parkingEnd"].toString(), Qt::ISODate);
|
||||
QDateTime currentDateTime = QDateTime::fromString(printingData["currentDateTime"].toString(), Qt::ISODate);
|
||||
|
||||
QString parkingEndDateString = this->printerLocale.toString(parkingEndDateTime.date(), QLocale::ShortFormat);
|
||||
QString currentDateString = this->printerLocale.toString(currentDateTime.date(), QLocale::ShortFormat);
|
||||
|
||||
|
||||
// set dynamic printer data:
|
||||
QByteArray ba_licenseplate = codec->fromUnicode(printingData["licenseplate"].toString());
|
||||
memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
|
||||
|
||||
QByteArray ba_amount = codec->fromUnicode(printingData["amount"].toString());
|
||||
memcpy((char*)dynTicketData->vendingPrice, ba_amount.data(), std::min(ba_amount.size(),8)); // Szeged
|
||||
memcpy((char*)dynTicketData->dynDat6, ba_amount.data(), std::min(ba_amount.size(),8)); // Schoenau
|
||||
|
||||
QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
|
||||
memcpy((char*)dynTicketData->parkingEnd, ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
|
||||
|
||||
QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateString);
|
||||
memcpy((char*)dynTicketData->currentTime, ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
|
||||
// ! and yes... 'ParkingEndDate' is 'currentTime'
|
||||
|
||||
QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
|
||||
memcpy((char*)dynTicketData->currentDate, ba_currentDate.data(), std::min(ba_currentDate.size(),8));
|
||||
|
||||
// STAN for Szeged Start/Stop: must be 9 digits
|
||||
// --------------------------------------------------------------------------------------
|
||||
QString stan = codec->fromUnicode(printingData["STAN"].toString());
|
||||
qCritical() << " requestPrintTicket() STAN = " << stan;
|
||||
QString stan1;
|
||||
QString stan2;
|
||||
if (stan.length() == 9) {
|
||||
stan1 = " " + stan.mid(0,3);
|
||||
stan2 = stan.mid(3,3) + " " + stan.mid(6,3);
|
||||
}
|
||||
else {
|
||||
qCritical() << "ASSERT: ATBDeviceControllerPlugin::requestPrintTicket() invalid STAN: " << stan;
|
||||
stan1 = " 000";
|
||||
stan2 = "000 000";
|
||||
}
|
||||
QByteArray ba_stan1 = codec->fromUnicode(stan1);
|
||||
QByteArray ba_stan2 = codec->fromUnicode(stan2);
|
||||
// --------------------------------------------------------------------------------------
|
||||
|
||||
this->templateList.clear();
|
||||
|
||||
switch (ticketVariant) {
|
||||
case nsDeviceControllerInterface::TICKET_VARIANT::START_RECEIPT:
|
||||
qCritical() << " -> TICKET_VARIANT::START_RECEIPT";
|
||||
memcpy((char*)dynTicketData->dynDat6, ba_stan1.data(), std::min(ba_stan1.size(),8));
|
||||
memcpy((char*)dynTicketData->dynDat7, ba_stan2.data(), std::min(ba_stan2.size(),8));
|
||||
this->templateList << 21 << 22 << 23;
|
||||
break;
|
||||
case nsDeviceControllerInterface::TICKET_VARIANT::STOP_RECEIPT:
|
||||
qCritical() << " -> TICKET_VARIANT::STOP_RECEIPT";
|
||||
memcpy((char*)dynTicketData->dynDat6, ba_stan1.data(), std::min(ba_stan1.size(),8));
|
||||
memcpy((char*)dynTicketData->dynDat7, ba_stan2.data(), std::min(ba_stan2.size(),8));
|
||||
this->templateList << 24 << 25 << 26;
|
||||
break;
|
||||
case nsDeviceControllerInterface::TICKET_VARIANT::RECEIPT:
|
||||
break;
|
||||
case nsDeviceControllerInterface::TICKET_VARIANT::ERROR_RECEIPT:
|
||||
break;
|
||||
case nsDeviceControllerInterface::TICKET_VARIANT::PARKING_TICKET:
|
||||
break;
|
||||
}
|
||||
QList<quint8> templateList = this->ticketTemplateList[ticketVariant];
|
||||
|
||||
// DEBUG
|
||||
qCritical() << "------------------------------------------------------------------------";
|
||||
qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket()";
|
||||
for (int i =0; i < this->templateList.size(); ++i) {
|
||||
qCritical() << " template: " << this->templateList.at(i);
|
||||
qCritical() << " TICKET_VARIANT: " << ticketVariant;
|
||||
if (ticketVariant == nsDeviceControllerInterface::TICKET_VARIANT::FOOD_STAMP) {
|
||||
qCritical() << " dyn1_list: " << printingData["dyn1_list"].toStringList();
|
||||
qCritical() << " dyn2_list: " << printingData["dyn2_list"].toStringList();
|
||||
}
|
||||
QStringList listElements;
|
||||
for (const auto &item : templateList) {
|
||||
listElements << QString::number(item);
|
||||
}
|
||||
qCritical() << " template list: " << listElements.join(',');
|
||||
|
||||
|
||||
qCritical() << "------------------------------------------------------------------------";
|
||||
|
||||
|
||||
if (!this->currentTicket->initNew(ticketVariant, templateList, printingData)) {
|
||||
this->errorCode = this->currentTicket->getErrorCode();
|
||||
this->errorDescription = this->currentTicket->getErrorCode();
|
||||
|
||||
qCritical() << "ERROR: ticket->initNew: " << ticketVariant;
|
||||
|
||||
this->onPrintFinishedERR();
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
if (!this->hw->dc_isPortOpen()) {
|
||||
qCritical() << " ... serial port is not open!";
|
||||
@@ -642,26 +769,7 @@ void ATBDeviceControllerPlugin::requestPrintTicket(nsDeviceControllerInterface::
|
||||
}
|
||||
*/
|
||||
|
||||
// TODO: wird hier nur 'licensePlate' gedruckt?
|
||||
if (!this->hw->prn_sendDynamicPrnValues(dynTicketData->licensePlate)) {
|
||||
this->errorCode = "hwapi::prn_sendDynamicPrnValues";
|
||||
this->errorDescription = "hwapi method 'hwapi::prn_sendDynamicPrnValues' result is false";
|
||||
|
||||
qCritical() << "ERROR:";
|
||||
qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket( " << endl
|
||||
<< " licenseplate = " << printingData["licenseplate"] << endl
|
||||
<< " amount = " << printingData["amount"] << endl
|
||||
<< " parkingEnd = " << printingData["parkingEnd"] << endl
|
||||
<< " currentTime = " << printingData["currentTime"] << endl
|
||||
<< " currentDate = " << printingData["currentDate"] << endl
|
||||
<< " stan = " << printingData["STAN"] << endl;
|
||||
|
||||
this->onPrintFinishedERR();
|
||||
return;
|
||||
}
|
||||
|
||||
QTimer::singleShot(1000, this, SLOT(onPrinterDataPreparedForTemplates()));
|
||||
|
||||
this->prepareDynTemplateData();
|
||||
}
|
||||
|
||||
void ATBDeviceControllerPlugin::requestPrintReceipt(const QHash<QString, QVariant> & printingData)
|
||||
@@ -673,10 +781,22 @@ void ATBDeviceControllerPlugin::requestPrintReceipt(const QHash<QString, QVarian
|
||||
|
||||
void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingString)
|
||||
{
|
||||
QByteArray ba = printingString.toUtf8();
|
||||
QByteArray ba_receipt = this->codec->fromUnicode(printingString);
|
||||
|
||||
//QByteArray ba = printingString.toUtf8();
|
||||
hw->prn_switchPower(true);
|
||||
hw->prn_setFonts(8,12,0,0);
|
||||
hw->prn_sendText(&ba);
|
||||
hw->prn_sendText(&ba_receipt);
|
||||
|
||||
// DEBUG
|
||||
//qCritical() << "---------------------------------------------------------------";
|
||||
//qCritical() << "ATBDeviceControllerPlugin::requestPrintReceipt()";
|
||||
//qCritical() << " receipt data:";
|
||||
//qCritical() << QString(ba_receipt);
|
||||
//qCritical() << "---------------------------------------------------------------";
|
||||
|
||||
|
||||
this->printResultCheckCounter = 0;
|
||||
QTimer::singleShot(4000, this, SLOT(onPrinterWaitForPrintingReceipt()));
|
||||
|
||||
//QTimer::singleShot(2000, this, [this](){ hw->prn_cut(3); } );
|
||||
@@ -725,20 +845,37 @@ void ATBDeviceControllerPlugin::onPrinterWaitForPrintingReceipt()
|
||||
|
||||
void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant> & printingData)
|
||||
{
|
||||
struct T_dynDat *dynTicketData = new T_dynDat;
|
||||
struct T_dynDat dynamicTicketData;
|
||||
struct T_dynDat *dynTicketData = &dynamicTicketData;
|
||||
memset(dynTicketData, 0, sizeof(*dynTicketData));
|
||||
|
||||
qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket( " << endl
|
||||
<< " licenseplate = " << printingData["licenseplate"] << endl
|
||||
<< " productText = " << printingData["productText"] << endl
|
||||
<< " amount = " << printingData["amount"] << endl
|
||||
<< " parkingEnd = " << printingData["parkingEnd"] << endl
|
||||
<< " currentDateTime = " << printingData["currentDateTime"] << endl;
|
||||
<< " currentDateTime = " << printingData["currentDateTime"] << endl
|
||||
<< " ticketNumber = " << printingData["ticketNumber"] << endl;
|
||||
|
||||
QDateTime parkingEndDateTime = QDateTime::fromString(printingData["parkingEnd"].toString(), Qt::ISODate);
|
||||
QDateTime parkingEndDateTime = QDateTime::fromString(printingData["parkingEnd"].toString(), Qt::ISODate);
|
||||
QDateTime currentDateTime = QDateTime::fromString(printingData["currentDateTime"].toString(), Qt::ISODate);
|
||||
|
||||
QString parkingEndDateString = this->printerLocale.toString(parkingEndDateTime.date(), QLocale::ShortFormat);
|
||||
QString currentDateString = this->printerLocale.toString(currentDateTime.date(), QLocale::ShortFormat);
|
||||
QString parkingEndDateString = TicketUtils::getLocaleDateString(this->printerLocale, parkingEndDateTime.date());
|
||||
QString currentDateString = TicketUtils::getLocaleDateString(this->printerLocale, currentDateTime.date());
|
||||
|
||||
/*******************************************************************************************
|
||||
* TEST date formate strings:
|
||||
QLocale ltLocale("lt_LT");
|
||||
QLocale deLocale("de_DE");
|
||||
|
||||
QString ltShortDate = ltLocale.toString(currentDateTime.date(), QLocale::ShortFormat);
|
||||
QString deShortDate = deLocale.toString(currentDateTime.date(), QLocale::ShortFormat);
|
||||
|
||||
qCritical() << "*********************************************************************";
|
||||
qCritical() << " ltShortDate = " << ltShortDate;
|
||||
qCritical() << " deShortDate = " << deShortDate;
|
||||
qCritical() << "*********************************************************************";
|
||||
*/
|
||||
|
||||
/* -----------------------------------------------------------------------------------------
|
||||
* note: the following highly depends on printer template files!
|
||||
@@ -764,6 +901,13 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
|
||||
QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
|
||||
memcpy((char*)dynTicketData->currentDate, ba_currentDate.data(), std::min(ba_currentDate.size(),8));
|
||||
|
||||
// Product-Text
|
||||
QByteArray ba_productText = codec->fromUnicode(printingData["productText"].toString());
|
||||
memcpy((char*)dynTicketData->dynDat5, ba_productText.data(), std::min(ba_productText.size(),8));
|
||||
|
||||
// Ticket-Number
|
||||
QByteArray ba_ticketNumber = codec->fromUnicode(printingData["ticketNumber"].toString());
|
||||
memcpy((char*)dynTicketData->dynDat7, ba_ticketNumber.data(), std::min(ba_ticketNumber.size(),8));
|
||||
|
||||
// DEBUG
|
||||
/*
|
||||
@@ -797,7 +941,8 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
|
||||
<< " amount = " << printingData["amount"] << endl
|
||||
<< " parkingEnd = " << printingData["parkingEnd"] << endl
|
||||
<< " currentTime = " << printingData["currentTime"] << endl
|
||||
<< " currentDate = " << printingData["currentDate"] << endl;
|
||||
<< " currentDate = " << printingData["currentDate"] << endl
|
||||
<< " ticketNumber = " << printingData["ticketNumber"] << endl;
|
||||
|
||||
|
||||
this->onPrintFinishedERR();
|
||||
@@ -810,24 +955,57 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
|
||||
// 2 - Card / ShortTimeParking
|
||||
// 3 - Cash / DayTicket
|
||||
// 4 - Card / DayTicket
|
||||
// 00744 - NeuhauserVT/NAZ:
|
||||
// 1 - Erwachsene
|
||||
// 2 - Jugendliche
|
||||
// 00741 - NeuhauserVT/Linsinger Maschinenbau
|
||||
// t.b.d.
|
||||
QString paymentType = printingData["paymentType"].toString(); // must be "CASH" | "CARD"
|
||||
QString productName = printingData["product"].toString(); // must be "ShortTimeParking" | "DayTicket"
|
||||
|
||||
if ( (paymentType == "CASH") && (productName == "SHORT_TERM_PARKING") ) {
|
||||
if ( (paymentType == "CASH") && ( (productName == "SHORT_TERM_PARKING") ||
|
||||
(productName == "SHORT_TERM_PARKING_CAR") ||
|
||||
(productName == "SHORT_TERM_PARKING_VAN") ||
|
||||
(productName == "SHORT_TERM_PARKING_CAMPER")
|
||||
))
|
||||
{
|
||||
this->currentSelectedTicketType = 1; // "Kombiticket #1"
|
||||
}
|
||||
else
|
||||
if ( (paymentType == "CARD") && ( (productName == "SHORT_TERM_PARKING") ||
|
||||
(productName == "SHORT_TERM_PARKING_CAR") ||
|
||||
(productName == "SHORT_TERM_PARKING_VAN") ||
|
||||
(productName == "SHORT_TERM_PARKING_CAMPER")
|
||||
))
|
||||
{
|
||||
this->currentSelectedTicketType = 2; // "Kombiticket #2"
|
||||
}
|
||||
else
|
||||
if ( (paymentType == "CASH") && ( (productName == "DAY_TICKET") ||
|
||||
(productName == "DAY_TICKET_CAR") ||
|
||||
(productName == "DAY_TICKET_VAN") ||
|
||||
(productName == "DAY_TICKET_CAMPER")
|
||||
))
|
||||
{
|
||||
this->currentSelectedTicketType = 3; // "Kombiticket #3"
|
||||
}
|
||||
else
|
||||
if ( (paymentType == "CARD") && ( (productName == "DAY_TICKET") ||
|
||||
(productName == "DAY_TICKET_CAR") ||
|
||||
(productName == "DAY_TICKET_VAN") ||
|
||||
(productName == "DAY_TICKET_CAMPER")
|
||||
))
|
||||
{
|
||||
this->currentSelectedTicketType = 4; // "Kombiticket #4"
|
||||
}
|
||||
else
|
||||
if ( productName == "DAY_TICKET_ADULT") {
|
||||
this->currentSelectedTicketType = 1;
|
||||
}
|
||||
else
|
||||
if ( (paymentType == "CARD") && (productName == "SHORT_TERM_PARKING") ) {
|
||||
if ( productName == "DAY_TICKET_TEEN") {
|
||||
this->currentSelectedTicketType = 2;
|
||||
}
|
||||
else
|
||||
if ( (paymentType == "CASH") && (productName == "DAY_TICKET") ) {
|
||||
this->currentSelectedTicketType = 3;
|
||||
}
|
||||
else
|
||||
if ( (paymentType == "CARD") && (productName == "DAY_TICKET") ) {
|
||||
this->currentSelectedTicketType = 4;
|
||||
}
|
||||
else {
|
||||
qCritical() << "ERROR: requestPrintTicket(): invalid payment data:";
|
||||
qCritical() << " paymentType = " << paymentType << endl
|
||||
@@ -842,7 +1020,7 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
|
||||
|
||||
void ATBDeviceControllerPlugin::onPrinterDataPreparedForTemplates()
|
||||
{
|
||||
if (this->templateList.isEmpty()) return;
|
||||
if (this->currentTicket->templateList()->isEmpty()) return;
|
||||
|
||||
this->onPrinterPrintNextTemplate();
|
||||
}
|
||||
@@ -853,6 +1031,7 @@ void ATBDeviceControllerPlugin::onPrinterDataPrepared()
|
||||
|
||||
// note: calling prn_getPrintResult() immediately may result in wrong answer!
|
||||
// We have to wait "about some seconds" until calling this function!
|
||||
this->printResultCheckCounter = 0;
|
||||
QTimer::singleShot(4000, this, SLOT(onPrinterWaitForPrintingTicket()));
|
||||
|
||||
// old: use printer templates:
|
||||
@@ -876,8 +1055,17 @@ void ATBDeviceControllerPlugin::onPrinterWaitForPrintingTicket()
|
||||
this->onPrintFinishedERR();
|
||||
break;
|
||||
default:
|
||||
qCritical() << "DC Error: wait for printing";
|
||||
this->onPrintFinishedERR();
|
||||
// result value is not defined (-> workaround for DC misbehaviour)
|
||||
if (this->printResultCheckCounter < 10) {
|
||||
this->printResultCheckCounter++;
|
||||
qCritical() << "DC print result undefined: " << printerResult;
|
||||
QTimer::singleShot(1000, this, SLOT(onPrinterWaitForPrintingTicket()));
|
||||
}
|
||||
else {
|
||||
qCritical() << "DC Error: wait for printing";
|
||||
this->onPrintFinishedERR();
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -887,30 +1075,38 @@ void ATBDeviceControllerPlugin::onPrinterWaitForPrintingTicket()
|
||||
void ATBDeviceControllerPlugin::onPrinterPrintNextTemplate()
|
||||
{
|
||||
// template list must not be empty
|
||||
if (this->templateList.isEmpty()) {
|
||||
if (this->currentTicket->templateList()->isEmpty()) {
|
||||
this->onPrintFinishedERR();
|
||||
return;
|
||||
}
|
||||
|
||||
qCritical() << " ... print template " << this->templateList.first();
|
||||
qCritical() << " ... print template " << this->currentTicket->templateList()->first();
|
||||
|
||||
if (!this->hw->prn_printTemplate(this->templateList.first())) {
|
||||
if (!this->hw->prn_printTemplate(this->currentTicket->templateList()->first())) {
|
||||
this->errorCode = "hwapi::prn_printTemplate";
|
||||
this->errorDescription = QString("hwapi method 'hwapi::onPrinterPrintNextTemplate(%1)' result is false").arg(this->templateList.first());
|
||||
this->errorDescription = QString("hwapi method 'hwapi::onPrinterPrintNextTemplate(%1)' result is false").arg(this->currentTicket->templateList()->first());
|
||||
this->onPrintFinishedERR();
|
||||
return;
|
||||
}
|
||||
this->templateList.removeFirst();
|
||||
this->currentTicket->templateList()->removeFirst();
|
||||
this->currentTicket->setCurrentTemplateProcessed();
|
||||
|
||||
if (templateList.isEmpty()) {
|
||||
if (this->currentTicket->templateList()->isEmpty()) {
|
||||
// all templates are printed
|
||||
this->printResultCheckCounter = 0;
|
||||
QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingTicket()));
|
||||
}
|
||||
else {
|
||||
// print next template
|
||||
QTimer::singleShot(2000, this, SLOT(onPrinterPrintNextTemplate()));
|
||||
}
|
||||
|
||||
if (this->currentTicket->hasTemplateDynData()) {
|
||||
// set new dyn data:
|
||||
QTimer::singleShot(2000, this, SLOT(onPrinterPrepareDynTemplateData()));
|
||||
}
|
||||
else {
|
||||
// print next template
|
||||
QTimer::singleShot(2000, this, SLOT(onPrinterPrintNextTemplate()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/************************************************************************************************
|
||||
@@ -943,6 +1139,244 @@ void ATBDeviceControllerPlugin::onPrintFinishedERR()
|
||||
|
||||
|
||||
|
||||
void ATBDeviceControllerPlugin::onPrinterPrepareDynTemplateData()
|
||||
{
|
||||
this->prepareDynTemplateData();
|
||||
}
|
||||
void ATBDeviceControllerPlugin::prepareDynTemplateData()
|
||||
{
|
||||
struct T_dynDat dynamicTicketData;
|
||||
struct T_dynDat *dynTicketData = &dynamicTicketData;
|
||||
memset(dynTicketData, 0, sizeof(*dynTicketData));
|
||||
|
||||
// setup dynTicketData dependent on currentTicket
|
||||
|
||||
// DEBUG:
|
||||
qCritical() << "---------------------------------------------------";
|
||||
qCritical() << "ATBDeviceControllerPlugin::prepareDynTemplateData():";
|
||||
qCritical() << " -> currentProcessedTemplateNumber: " << this->currentTicket->getCurrentProcessedTemplateNumber();
|
||||
qCritical() << " -> this->currentTicket->variant(): " << this->currentTicket->variant();
|
||||
qCritical() << "---------------------------------------------------";
|
||||
|
||||
switch (this->currentTicket->variant()) {
|
||||
case nsDeviceControllerInterface::TICKET_VARIANT::START_RECEIPT:
|
||||
private_setupDynTemplateData_START_RECEIPT(dynTicketData, this->currentTicket);
|
||||
break;
|
||||
case nsDeviceControllerInterface::TICKET_VARIANT::STOP_RECEIPT:
|
||||
private_setupDynTemplatData_STOP_RECEIPT(dynTicketData, this->currentTicket);
|
||||
break;
|
||||
case nsDeviceControllerInterface::TICKET_VARIANT::FINE_PAYMENT:
|
||||
private_setupDynTemplatData_FINE_PAYMENT(dynTicketData, this->currentTicket);
|
||||
break;
|
||||
case nsDeviceControllerInterface::TICKET_VARIANT::RECEIPT:
|
||||
private_setupDynTemplateData_DEFAULT(dynTicketData, this->currentTicket);
|
||||
break;
|
||||
case nsDeviceControllerInterface::TICKET_VARIANT::ERROR_RECEIPT:
|
||||
private_setupDynTemplateData_DEFAULT(dynTicketData, this->currentTicket);
|
||||
break;
|
||||
case nsDeviceControllerInterface::TICKET_VARIANT::PARKING_TICKET:
|
||||
private_setupDynTemplateData_DEFAULT(dynTicketData, this->currentTicket);
|
||||
break;
|
||||
case nsDeviceControllerInterface::TICKET_VARIANT::FREE_TICKET:
|
||||
private_setupDynTemplatData_FREE_TICKET(dynTicketData, this->currentTicket);
|
||||
break;
|
||||
case nsDeviceControllerInterface::TICKET_VARIANT::FOOD_STAMP:
|
||||
private_setupDynTemplatData_FOOD_STAMP(dynTicketData, this->currentTicket);
|
||||
break;
|
||||
default:
|
||||
private_setupDynTemplateData_DEFAULT(dynTicketData, this->currentTicket);
|
||||
break;
|
||||
}
|
||||
|
||||
// C-Programmierung: wird hier nur 'licensePlate' gedruckt?
|
||||
if (!this->hw->prn_sendDynamicPrnValues(dynTicketData->licensePlate)) {
|
||||
this->errorCode = "hwapi::prn_sendDynamicPrnValues";
|
||||
this->errorDescription = "hwapi method 'hwapi::prn_sendDynamicPrnValues' result is false";
|
||||
|
||||
qCritical() << "ERROR: hw->prn_sendDynamicPrnValues";
|
||||
|
||||
this->onPrintFinishedERR();
|
||||
return;
|
||||
}
|
||||
|
||||
QTimer::singleShot(1000, this, SLOT(onPrinterDataPreparedForTemplates()));
|
||||
}
|
||||
|
||||
|
||||
void ATBDeviceControllerPlugin::private_setupDynTemplateData_START_RECEIPT(struct T_dynDat *dynTicketData, Ticket *ticket)
|
||||
{
|
||||
QDateTime parkingEndDateTime = QDateTime::fromString(ticket->getPrintingData()["parkingEnd"].toString(), Qt::ISODate);
|
||||
QDateTime currentDateTime = QDateTime::fromString(ticket->getPrintingData()["currentDateTime"].toString(), Qt::ISODate);
|
||||
|
||||
QString parkingEndDateString = TicketUtils::getLocaleDateString(this->printerLocale, parkingEndDateTime.date());
|
||||
QString currentDateString = TicketUtils::getLocaleDateString(this->printerLocale, currentDateTime.date());
|
||||
|
||||
// set dynamic printer data:
|
||||
QByteArray ba_licenseplate = codec->fromUnicode(ticket->getPrintingData()["licenseplate"].toString());
|
||||
memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
|
||||
|
||||
QByteArray ba_amount = codec->fromUnicode(ticket->getPrintingData()["amount"].toString());
|
||||
memcpy((char*)dynTicketData->vendingPrice, ba_amount.data(), std::min(ba_amount.size(),8)); // Szeged
|
||||
memcpy((char*)dynTicketData->dynDat6, ba_amount.data(), std::min(ba_amount.size(),8)); // Schoenau
|
||||
|
||||
QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
|
||||
memcpy((char*)dynTicketData->parkingEnd, ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
|
||||
|
||||
QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateString);
|
||||
memcpy((char*)dynTicketData->currentTime, ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
|
||||
// ! and yes... 'ParkingEndDate' is 'currentTime'
|
||||
|
||||
QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
|
||||
memcpy((char*)dynTicketData->currentDate, ba_currentDate.data(), std::min(ba_currentDate.size(),8));
|
||||
// STAN for Szeged Start/Stop: must be 9 digits
|
||||
// --------------------------------------------------------------------------------------
|
||||
QString stan = codec->fromUnicode(ticket->getPrintingData()["STAN"].toString());
|
||||
qCritical() << " requestPrintTicket() STAN = " << stan;
|
||||
QString stan1;
|
||||
QString stan2;
|
||||
if (stan.length() == 9) {
|
||||
stan1 = " " + stan.mid(0,3);
|
||||
stan2 = stan.mid(3,3) + " " + stan.mid(6,3);
|
||||
}
|
||||
else {
|
||||
qCritical() << "ASSERT: ATBDeviceControllerPlugin::requestPrintTicket() invalid STAN: " << stan;
|
||||
stan1 = " 000";
|
||||
stan2 = "000 000";
|
||||
}
|
||||
QByteArray ba_stan1 = codec->fromUnicode(stan1);
|
||||
QByteArray ba_stan2 = codec->fromUnicode(stan2);
|
||||
|
||||
|
||||
// --------------------------------------------------------------------------------------
|
||||
|
||||
memcpy((char*)dynTicketData->dynDat6, ba_stan1.data(), std::min(ba_stan1.size(),8));
|
||||
memcpy((char*)dynTicketData->dynDat7, ba_stan2.data(), std::min(ba_stan2.size(),8));
|
||||
}
|
||||
|
||||
void ATBDeviceControllerPlugin::private_setupDynTemplatData_STOP_RECEIPT(struct T_dynDat *dynTicketData, Ticket *ticket)
|
||||
{
|
||||
// same as START_RECEIPT
|
||||
this->private_setupDynTemplateData_START_RECEIPT(dynTicketData, ticket);
|
||||
}
|
||||
|
||||
void ATBDeviceControllerPlugin::private_setupDynTemplatData_FOOD_STAMP(struct T_dynDat *dynTicketData, Ticket *ticket)
|
||||
{
|
||||
quint8 currentProcessedTemplateNumber = ticket->getCurrentProcessedTemplateNumber();
|
||||
|
||||
// TODO: check DynXList size / or ensure that DynXList has value
|
||||
|
||||
// "Mitarbeiter-Nummer": dynPr1 -> licenceplate
|
||||
QString currentEMP_Nr = ticket->getDyn1List().at(currentProcessedTemplateNumber);
|
||||
QByteArray ba_licenseplate = codec->fromUnicode(currentEMP_Nr);
|
||||
memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
|
||||
|
||||
// "Lauf.Nr": dynPr2 -> vendingPrice
|
||||
QString currentStampNumber = ticket->getDyn2List().at(currentProcessedTemplateNumber);
|
||||
QByteArray ba_amount = codec->fromUnicode(currentStampNumber);
|
||||
memcpy((char*)dynTicketData->vendingPrice, ba_amount.data(), std::min(ba_amount.size(),8));
|
||||
|
||||
// DEBUG
|
||||
qCritical() << "-------------------------------------------------------";
|
||||
qCritical() << "private_setupDynTemplatData_FOOD_STAMP()";
|
||||
qCritical() << " currentProcessedTemplateNumber: " << currentProcessedTemplateNumber;
|
||||
qCritical() << " currentEMP_Nr: " << currentEMP_Nr;
|
||||
qCritical() << " currentStampNumber: " << currentStampNumber;
|
||||
qCritical() << "-------------------------------------------------------";
|
||||
}
|
||||
|
||||
void ATBDeviceControllerPlugin::private_setupDynTemplatData_FINE_PAYMENT(struct T_dynDat *dynTicketData, Ticket *ticket)
|
||||
{
|
||||
QDateTime currentDateTime = QDateTime::fromString(ticket->getPrintingData()["currentDateTime"].toString(), Qt::ISODate);
|
||||
|
||||
QString currentDateString = this->printerLocale.toString(currentDateTime.date(), QLocale::ShortFormat);
|
||||
|
||||
|
||||
// set dynamic printer data:
|
||||
QByteArray ba_licenseplate = codec->fromUnicode(ticket->getPrintingData()["licenseplate"].toString());
|
||||
memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
|
||||
|
||||
QByteArray ba_amount = codec->fromUnicode(ticket->getPrintingData()["amount"].toString());
|
||||
memcpy((char*)dynTicketData->vendingPrice, ba_amount.data(), std::min(ba_amount.size(),8)); // Szeged
|
||||
memcpy((char*)dynTicketData->dynDat6, ba_amount.data(), std::min(ba_amount.size(),8)); // Schoenau
|
||||
|
||||
QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
|
||||
memcpy((char*)dynTicketData->currentDate, ba_currentDate.data(), std::min(ba_currentDate.size(),8));
|
||||
|
||||
QByteArray ba_ticketId = codec->fromUnicode(ticket->getPrintingData()["ticketId"].toString());
|
||||
memcpy((char*)dynTicketData->dynDat7, ba_ticketId.data(), std::min(ba_ticketId.size(),8));
|
||||
}
|
||||
|
||||
|
||||
|
||||
void ATBDeviceControllerPlugin::private_setupDynTemplatData_FREE_TICKET(struct T_dynDat *dynTicketData, Ticket *ticket)
|
||||
{
|
||||
QDateTime currentDateTime = QDateTime::fromString(ticket->getPrintingData()["currentDateTime"].toString(), Qt::ISODate);
|
||||
|
||||
QString currentDateString = this->printerLocale.toString(currentDateTime.date(), QLocale::ShortFormat);
|
||||
|
||||
|
||||
// set dynamic printer data:
|
||||
QByteArray ba_licenseplate = codec->fromUnicode(ticket->getPrintingData()["licenseplate"].toString());
|
||||
memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
|
||||
|
||||
QByteArray ba_amount = codec->fromUnicode(ticket->getPrintingData()["amount"].toString());
|
||||
memcpy((char*)dynTicketData->vendingPrice, ba_amount.data(), std::min(ba_amount.size(),8)); // Szeged
|
||||
memcpy((char*)dynTicketData->dynDat6, ba_amount.data(), std::min(ba_amount.size(),8)); // Schoenau
|
||||
|
||||
QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
|
||||
memcpy((char*)dynTicketData->currentDate, ba_currentDate.data(), std::min(ba_currentDate.size(),8));
|
||||
|
||||
|
||||
// FREE_TICKET needs parking endtime:
|
||||
|
||||
QDateTime parkingEndDateTime = QDateTime::fromString(ticket->getPrintingData()["parkingEnd"].toString(), Qt::ISODate);
|
||||
|
||||
QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
|
||||
memcpy((char*)dynTicketData->parkingEnd, ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
|
||||
|
||||
QString parkingEndDateString = TicketUtils::getLocaleDateString(this->printerLocale, parkingEndDateTime.date());
|
||||
|
||||
QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateString);
|
||||
memcpy((char*)dynTicketData->currentTime, ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
|
||||
// ! and yes... 'ParkingEndDate' is 'currentTime'
|
||||
}
|
||||
|
||||
void ATBDeviceControllerPlugin::private_setupDynTemplateData_DEFAULT(struct T_dynDat *dynTicketData, Ticket *ticket)
|
||||
{
|
||||
QDateTime parkingEndDateTime = QDateTime::fromString(ticket->getPrintingData()["parkingEnd"].toString(), Qt::ISODate);
|
||||
QDateTime currentDateTime = QDateTime::fromString(ticket->getPrintingData()["currentDateTime"].toString(), Qt::ISODate);
|
||||
|
||||
QString parkingEndDateString = TicketUtils::getLocaleDateString(this->printerLocale, parkingEndDateTime.date());
|
||||
QString currentDateString = TicketUtils::getLocaleDateString(this->printerLocale, currentDateTime.date());
|
||||
|
||||
|
||||
// set dynamic printer data:
|
||||
QByteArray ba_licenseplate = codec->fromUnicode(ticket->getPrintingData()["licenseplate"].toString());
|
||||
memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
|
||||
|
||||
QByteArray ba_amount = codec->fromUnicode(ticket->getPrintingData()["amount"].toString());
|
||||
memcpy((char*)dynTicketData->vendingPrice, ba_amount.data(), std::min(ba_amount.size(),8)); // Szeged
|
||||
memcpy((char*)dynTicketData->dynDat6, ba_amount.data(), std::min(ba_amount.size(),8)); // Schoenau
|
||||
|
||||
QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
|
||||
memcpy((char*)dynTicketData->parkingEnd, ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
|
||||
|
||||
QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateString);
|
||||
memcpy((char*)dynTicketData->currentTime, ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
|
||||
// ! and yes... 'ParkingEndDate' is 'currentTime'
|
||||
|
||||
QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
|
||||
memcpy((char*)dynTicketData->currentDate, ba_currentDate.data(), std::min(ba_currentDate.size(),8));
|
||||
|
||||
// Product-Text
|
||||
QByteArray ba_productText = codec->fromUnicode(ticket->getPrintingData()["productText"].toString());
|
||||
memcpy((char*)dynTicketData->dynDat5, ba_productText.data(), std::min(ba_productText.size(),8));
|
||||
|
||||
// Ticket-Number
|
||||
QByteArray ba_ticketNumber = codec->fromUnicode(ticket->getPrintingData()["ticketNumber"].toString());
|
||||
memcpy((char*)dynTicketData->dynDat7, ba_ticketNumber.data(), std::min(ba_ticketNumber.size(),8));
|
||||
}
|
||||
|
||||
/************************************************************************************************
|
||||
* cash payment
|
||||
*/
|
||||
@@ -999,8 +1433,8 @@ void ATBDeviceControllerPlugin::onCashPayStopByEscrow()
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"");
|
||||
"CashPayStopByEscrow",
|
||||
"CashPayStopByEscrow");
|
||||
}
|
||||
|
||||
void ATBDeviceControllerPlugin::onCashPayStopByError()
|
||||
@@ -1017,8 +1451,8 @@ void ATBDeviceControllerPlugin::onCashPayStopByError()
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"");
|
||||
"onCashPayStopByError",
|
||||
"onCashPayStopByError");
|
||||
}
|
||||
|
||||
void ATBDeviceControllerPlugin::onCashPayStopByTimeout()
|
||||
@@ -1035,8 +1469,8 @@ void ATBDeviceControllerPlugin::onCashPayStopByTimeout()
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"");
|
||||
"CashPayStopByTimeout",
|
||||
"CashPayStopByTimeout");
|
||||
}
|
||||
|
||||
void ATBDeviceControllerPlugin::onCashPayStopedSuccess()
|
||||
@@ -1181,6 +1615,10 @@ void ATBDeviceControllerPlugin::onCashChangerState()
|
||||
"");
|
||||
changerStateRequestCounter = 0;
|
||||
lastChangerResult = 0;
|
||||
|
||||
// finalize vending:
|
||||
hw->vend_success();
|
||||
|
||||
return;
|
||||
}
|
||||
else
|
||||
@@ -1235,6 +1673,10 @@ void ATBDeviceControllerPlugin::onCashChangerState()
|
||||
errorDescription);
|
||||
changerStateRequestCounter = 0;
|
||||
lastChangerResult = 0;
|
||||
|
||||
// finalize vending:
|
||||
hw->vend_success();
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1372,8 +1814,9 @@ int ATBDeviceControllerPlugin::init_sc_dbus()
|
||||
|
||||
void ATBDeviceControllerPlugin::onWokeUp(uchar source)
|
||||
{
|
||||
if (source == 0x01) {
|
||||
if (source == 0x01 || source == 0xFE) {
|
||||
// woke up from device controller
|
||||
hw->dc_autoRequest(true);
|
||||
this->diag->diagRequest();
|
||||
}
|
||||
}
|
||||
|
@@ -7,6 +7,7 @@
|
||||
#include "src/ATBAPP/DeviceControllerInterface.h"
|
||||
#include "src/ATBAPP/ATBAPPplugin.h"
|
||||
#include "src/ATBAPP/DeviceControllerDiag.h"
|
||||
#include "src/ATBAPP/support/Ticket.h"
|
||||
|
||||
#include "version.h"
|
||||
|
||||
@@ -20,11 +21,11 @@
|
||||
class DBusControllerInterface;
|
||||
class QTextCodec;
|
||||
|
||||
|
||||
using namespace nsDeviceControllerInterface;
|
||||
|
||||
class QSettings;
|
||||
|
||||
|
||||
class ATBDeviceControllerPlugin :
|
||||
public DeviceControllerInterface
|
||||
{
|
||||
@@ -43,10 +44,13 @@ public:
|
||||
// interface:
|
||||
PLUGIN_STATE initDCPlugin(QObject *eventReceiver, const QSettings & settings);
|
||||
|
||||
void sendDeviceParameter(const QJsonObject & jsonObject);
|
||||
|
||||
// TASKS: Cash handling -------------------------------------------------------
|
||||
void requestStartCashInput(const QString & amount);
|
||||
void requestStopCashInput();
|
||||
void cashCollect();
|
||||
void cashCollect(const QString & amount);
|
||||
void cashAbort();
|
||||
|
||||
// read coin/cash processing variants -----------------------------------------
|
||||
@@ -94,8 +98,6 @@ private:
|
||||
QString errorDescription;
|
||||
QString pluginInfo;
|
||||
|
||||
QList<int> templateList;
|
||||
|
||||
QString serialPortName;
|
||||
|
||||
bool useDebug;
|
||||
@@ -128,11 +130,29 @@ private:
|
||||
// counts failed hw->log_chkIfVaultRecordAvailable()
|
||||
int accountCheckCounter;
|
||||
|
||||
// counts faild hw->prn-getPrintResult()
|
||||
int printResultCheckCounter;
|
||||
|
||||
// dbus
|
||||
int init_sc_dbus();
|
||||
|
||||
// printer privates ----------------------------------------------------------------------------
|
||||
Ticket * currentTicket;
|
||||
QLocale printerLocale;
|
||||
|
||||
QHash<TICKET_VARIANT, QList<quint8>> ticketTemplateList;
|
||||
|
||||
void initTicketTemplateList(const QSettings * settings);
|
||||
void prepareDynTemplateData();
|
||||
|
||||
void private_setupDynTemplateData_DEFAULT(struct T_dynDat *dynTicketData, Ticket *ticket);
|
||||
void private_setupDynTemplateData_START_RECEIPT(struct T_dynDat *dynTicketData, Ticket *ticket);
|
||||
void private_setupDynTemplatData_STOP_RECEIPT(struct T_dynDat *dynTicketData, Ticket *ticket);
|
||||
void private_setupDynTemplatData_FOOD_STAMP(struct T_dynDat *dynTicketData, Ticket *ticket);
|
||||
void private_setupDynTemplatData_FINE_PAYMENT(struct T_dynDat *dynTicketData, Ticket *ticket);
|
||||
void private_setupDynTemplatData_FREE_TICKET(struct T_dynDat *dynTicketData, Ticket *ticket);
|
||||
// ---------------------------------------------------------------------------------------------
|
||||
|
||||
private slots:
|
||||
// printer
|
||||
|
||||
@@ -142,6 +162,8 @@ private slots:
|
||||
void onPrinterWaitForPrintingTicket();
|
||||
void onPrinterWaitForPrintingReceipt();
|
||||
|
||||
void onPrinterPrepareDynTemplateData();
|
||||
|
||||
void onPrintFinishedOK();
|
||||
void onPrintFinishedERR();
|
||||
|
||||
|
@@ -15,7 +15,7 @@ class ATBMachineEvent : public QEvent
|
||||
public:
|
||||
explicit ATBMachineEvent(const QString & id,
|
||||
const QString & deviceName, // PTU/PRINTER/DC/...
|
||||
EVENT_CLASS eventClass, // reason of event: Error/Warning/Alarm
|
||||
EVENT_CLASS eventClass, // reason of event: Error/Warning/Alarm
|
||||
const QString & name, // 'Event': "E001", "W003"
|
||||
const int state,
|
||||
const QString & parameter,
|
||||
|
@@ -5,6 +5,11 @@
|
||||
#include <QUuid>
|
||||
#include <QDebug>
|
||||
|
||||
#include <QProcess>
|
||||
|
||||
#include "support/JSON.h"
|
||||
|
||||
|
||||
DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *parent)
|
||||
: QObject(parent)
|
||||
, coinProcessorType(nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW)
|
||||
@@ -12,10 +17,13 @@ DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *paren
|
||||
, eventReceiver(nullptr)
|
||||
, isRequestRunning(false)
|
||||
, flagInterruptDiag(false)
|
||||
, lastState(DeviceController::State::INITIAL_STATE)
|
||||
, _isErrorState(false)
|
||||
, pData(pData)
|
||||
, E255counter(0)
|
||||
{
|
||||
diagRequestTimeoutTimer = new QTimer(this);
|
||||
diagRequestTimeoutTimer->setInterval(1000*20); // 20s
|
||||
diagRequestTimeoutTimer->setInterval(1000*45);
|
||||
diagRequestTimeoutTimer->setSingleShot(true);
|
||||
connect(diagRequestTimeoutTimer, &QTimer::timeout, this, &DeviceControllerDiag::onDiagRequestTimeoutTimerTimeout);
|
||||
}
|
||||
@@ -31,6 +39,17 @@ void DeviceControllerDiag::init(hwinf *hw, QObject* eventReceiver)
|
||||
}
|
||||
|
||||
|
||||
void DeviceControllerDiag::diagReInit()
|
||||
{
|
||||
this->machineEventSet.clear();
|
||||
this->_isErrorState = false;
|
||||
}
|
||||
|
||||
void DeviceControllerDiag::setTimeout(int timeout)
|
||||
{
|
||||
this->diagRequestTimeoutTimer->setInterval(1000 * timeout);
|
||||
}
|
||||
|
||||
void DeviceControllerDiag::diagRequest()
|
||||
{
|
||||
qCritical() << "DeviceControllerDiag::diagRequest()";
|
||||
@@ -62,6 +81,24 @@ void DeviceControllerDiag::onDiagRequestTimeoutTimerTimeout()
|
||||
this->flagInterruptDiag = true;
|
||||
}
|
||||
|
||||
|
||||
bool DeviceControllerDiag::isErrorState()
|
||||
{
|
||||
return this->_isErrorState;
|
||||
}
|
||||
|
||||
bool DeviceControllerDiag::isOperatingState()
|
||||
{
|
||||
return !this->_isErrorState;
|
||||
}
|
||||
|
||||
QSet<DeviceController::State> DeviceControllerDiag::getCurrentMachineState()
|
||||
{
|
||||
return this->machineEventSet;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void DeviceControllerDiag::private_startDiag()
|
||||
{
|
||||
// check for DiagRequestTimeoutTimerTimeout:
|
||||
@@ -70,6 +107,20 @@ void DeviceControllerDiag::private_startDiag()
|
||||
this->private_sendDiagEvent(DeviceController::State::E255);
|
||||
this->isRequestRunning = false;
|
||||
this->flagInterruptDiag = false;
|
||||
if (this->E255counter > 5) {
|
||||
this->restartCArun();
|
||||
}
|
||||
else {
|
||||
this->E255counter++;
|
||||
|
||||
// try it again, until success:
|
||||
QTimer::singleShot(400, this, &DeviceControllerDiag::diagRequest);
|
||||
/**
|
||||
* But please note:
|
||||
* - diag does currently not stop suspend (start a background task)
|
||||
* - diag is called again in ModeOOO wokeup()
|
||||
*/
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -84,6 +135,7 @@ void DeviceControllerDiag::private_startDiag()
|
||||
qCritical() << "DeviceControllerDiag::private_startDiag() DCdata is +++not+++ valid";
|
||||
|
||||
// try it again
|
||||
hw->dc_autoRequest(true);
|
||||
QTimer::singleShot(200, this, &DeviceControllerDiag::private_startDiag);
|
||||
}
|
||||
}
|
||||
@@ -91,8 +143,8 @@ void DeviceControllerDiag::private_startDiag()
|
||||
void DeviceControllerDiag::sys_superviseSystem()
|
||||
{ // this function proofs if vending is possible depending of doors state
|
||||
|
||||
struct T_dynamicCondition dynMaCond;
|
||||
struct T_moduleCondition modCond;
|
||||
struct T_dynamicCondition dynMaCond = {};
|
||||
struct T_moduleCondition modCond = {};
|
||||
|
||||
|
||||
qCritical() << " sys_superviseSystem()";
|
||||
@@ -104,6 +156,8 @@ void DeviceControllerDiag::sys_superviseSystem()
|
||||
this->private_sendDiagEvent(DeviceController::State::E255);
|
||||
this->flagInterruptDiag = false;
|
||||
this->isRequestRunning = false;
|
||||
if (this->E255counter > 5) { this->restartCArun(); }
|
||||
else { this->E255counter++; }
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -111,9 +165,12 @@ void DeviceControllerDiag::sys_superviseSystem()
|
||||
{
|
||||
// es gibt keinerlei gültige Daten vom DC
|
||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() no valid data!";
|
||||
this->private_sendDiagEvent(DeviceController::State::E254);
|
||||
hw->dc_autoRequest(true);
|
||||
this->private_sendDiagEvent(DeviceController::State::M0254);
|
||||
this->diagRequestTimeoutTimer->stop();
|
||||
this->isRequestRunning = false;
|
||||
if (this->E255counter > 5) { this->restartCArun(); }
|
||||
else { this->E255counter++; }
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -126,7 +183,7 @@ void DeviceControllerDiag::sys_superviseSystem()
|
||||
{
|
||||
// noch keine Testergebnisse
|
||||
if (dynMaCond.startupTestIsRunning) {
|
||||
// TODO?
|
||||
qCritical() << " startupTestIsRunning --> call again";
|
||||
}
|
||||
|
||||
|
||||
@@ -136,18 +193,6 @@ void DeviceControllerDiag::sys_superviseSystem()
|
||||
return;
|
||||
}
|
||||
|
||||
// all doors: 99: undefined 0:closed 1:open
|
||||
if (dynMaCond.lowerDoor || dynMaCond.upperDoor) {
|
||||
// Service or battery door is open, goto INTRUSION MODE
|
||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() Service or battery door is open, goto INTRUSION MODE";
|
||||
this->private_sendDiagEvent(DeviceController::State::E253);
|
||||
}
|
||||
if (dynMaCond.middleDoor) {
|
||||
// vault door is open, goto INTRUSION MODE
|
||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() vault door is open, goto INTRUSION MODE";
|
||||
this->private_sendDiagEvent(DeviceController::State::E252);
|
||||
}
|
||||
|
||||
qCritical() << " --> call sub_componentAssessment()";
|
||||
|
||||
sub_componentAssessment();
|
||||
@@ -159,13 +204,13 @@ void DeviceControllerDiag::sub_componentAssessment()
|
||||
{
|
||||
bool flag_sendOperate = true;
|
||||
|
||||
struct T_moduleCondition modCond;
|
||||
struct T_moduleCondition modCond = {};
|
||||
hw->sys_getDeviceConditions(&modCond);
|
||||
|
||||
struct T_dynamicCondition dynMaCond;
|
||||
struct T_dynamicCondition dynMaCond = {};
|
||||
hw->sys_getDynMachineConditions(&dynMaCond);
|
||||
|
||||
struct T_devices devPara;
|
||||
struct T_devices devPara = {};
|
||||
hw->sys_restoreDeviceParameter(&devPara);
|
||||
|
||||
// store some interesting results:
|
||||
@@ -181,6 +226,21 @@ void DeviceControllerDiag::sub_componentAssessment()
|
||||
this->private_sendDiagEvent(DeviceController::State::A000);
|
||||
}
|
||||
|
||||
// check for open doors
|
||||
// all doors: 99: undefined 0:closed 1:open
|
||||
if (dynMaCond.lowerDoor || dynMaCond.upperDoor) {
|
||||
// Service or battery door is open
|
||||
flag_sendOperate = false;
|
||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() Service or battery door is open, goto INTRUSION MODE";
|
||||
this->private_sendDiagEvent(DeviceController::State::M0253);
|
||||
}
|
||||
if (dynMaCond.middleDoor) {
|
||||
// vault door is open
|
||||
flag_sendOperate = false;
|
||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() vault door is open, goto INTRUSION MODE";
|
||||
this->private_sendDiagEvent(DeviceController::State::M0252);
|
||||
}
|
||||
|
||||
// check for invalid states:
|
||||
|
||||
if (modCond.rtc>=200) {
|
||||
@@ -224,12 +284,16 @@ void DeviceControllerDiag::sub_componentAssessment()
|
||||
}
|
||||
if (modCond.coinEscrow>=200) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E010);
|
||||
// coinEscrow>200 is considered a warning:
|
||||
this->private_sendDiagEvent(DeviceController::State::W010);
|
||||
}
|
||||
}
|
||||
// -----------------------------------------------------------------------------------------------
|
||||
|
||||
switch (devPara.kindOfCoinChecker) {
|
||||
case 0:
|
||||
this->coinProcessorType = nsDeviceControllerInterface::COIN_PROCESSOR::NONE;
|
||||
break;
|
||||
case 1:
|
||||
case 2:
|
||||
this->coinProcessorType = nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW;
|
||||
@@ -243,7 +307,8 @@ void DeviceControllerDiag::sub_componentAssessment()
|
||||
{
|
||||
if (modCond.coinEscrow>=200) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E010);
|
||||
// coinEscrow>200 is considered a warning:
|
||||
this->private_sendDiagEvent(DeviceController::State::W010);
|
||||
}
|
||||
if (modCond.coinSafe==201) { // full
|
||||
flag_sendOperate = false;
|
||||
@@ -301,12 +366,12 @@ void DeviceControllerDiag::sub_componentAssessment()
|
||||
|
||||
if (dynMaCond.nowCardTest>0) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E072);
|
||||
this->private_sendDiagEvent(DeviceController::State::M0072);
|
||||
}
|
||||
|
||||
if (dynMaCond.startupTestIsRunning>0) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E073);
|
||||
this->private_sendDiagEvent(DeviceController::State::M0073);
|
||||
}
|
||||
|
||||
if (modCond.voltage>=200) {
|
||||
@@ -315,7 +380,7 @@ void DeviceControllerDiag::sub_componentAssessment()
|
||||
}
|
||||
if (modCond.temper>=200) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E004);
|
||||
this->private_sendDiagEvent(DeviceController::State::W004);
|
||||
}
|
||||
|
||||
// check for warnings
|
||||
@@ -362,7 +427,6 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
|
||||
{
|
||||
qCritical() << "DeviceControllerDiag::private_sendDiagEvent() result: " << result;
|
||||
|
||||
|
||||
if (this->eventReceiver == nullptr) {
|
||||
qCritical() << "DeviceControllerDiag: no eventReceiver";
|
||||
return;
|
||||
@@ -385,99 +449,124 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
|
||||
QString parameter;
|
||||
switch (result) {
|
||||
|
||||
case DeviceController::State::INITIAL_STATE:
|
||||
break;
|
||||
case DeviceController::State::A000: // alarm / intrusion
|
||||
eventClass = EVENT_CLASS::ALARM;
|
||||
parameter = "alarm / intrusion";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E002: // real time clock error
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "real time clock error";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E003: // voltage error
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "voltage error";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E004: // temperature error
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "temperature error";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E007: // coin safe full
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "coin safe full";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E008: // bill acceptor full
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "bill acceptor full";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E009: // no cash box
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "no cash box";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E010: // coin escrow
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "coin escrow";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::W010: // coin escrow
|
||||
eventClass = EVENT_CLASS::WARNING;
|
||||
parameter = "coin escrow";
|
||||
break;
|
||||
case DeviceController::State::E011: // mem error int.ee.
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "mem error int.ee.";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E018: // no paper
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "no paper";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E020: // printer error
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "printer error";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E025: // coin blocker
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "coin blocker";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E026: // error coin validator
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "error coin validator";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E034: // mdb error
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "mdb error";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
|
||||
case DeviceController::State::E071: // cash box change is ongoing
|
||||
case DeviceController::State::M0071: // cash box change is ongoing
|
||||
eventClass = EVENT_CLASS::STATE;
|
||||
parameter = "cash box change is ongoing";
|
||||
break;
|
||||
case DeviceController::State::E072: // card test running
|
||||
case DeviceController::State::M0072: // card test running
|
||||
eventClass = EVENT_CLASS::STATE;
|
||||
parameter = "card test running";
|
||||
break;
|
||||
case DeviceController::State::E073: // startup-test is running
|
||||
case DeviceController::State::M0073: // startup-test is running
|
||||
eventClass = EVENT_CLASS::STATE;
|
||||
parameter = "startup-test is running";
|
||||
break;
|
||||
|
||||
case DeviceController::State::E252: // cash box door open
|
||||
case DeviceController::State::M0252: // cash box door open
|
||||
eventClass = EVENT_CLASS::STATE;
|
||||
parameter = "cash box door open";
|
||||
break;
|
||||
case DeviceController::State::E253: // service or battery door open
|
||||
case DeviceController::State::M0253: // service or battery door open
|
||||
eventClass = EVENT_CLASS::STATE;
|
||||
parameter = "service or battery door open";
|
||||
break;
|
||||
case DeviceController::State::E254: // no valid data from DeviceController
|
||||
case DeviceController::State::M0254: // no valid data from DeviceController
|
||||
eventClass = EVENT_CLASS::STATE;
|
||||
parameter = "no valid data from DeviceController";
|
||||
break;
|
||||
case DeviceController::State::E255: // no valid data from DeviceController
|
||||
eventClass = EVENT_CLASS::STATE;
|
||||
parameter = "";
|
||||
qCritical() << " ... ignore " << QMetaEnum::fromType<DeviceController::State>().valueToKey(result);
|
||||
return;
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "no valid data from DeviceController";
|
||||
break;
|
||||
case DeviceController::State::O000: // everything is fine
|
||||
this->machineEventSet.clear();
|
||||
this->_isErrorState = false;
|
||||
eventClass = EVENT_CLASS::OPERATE;
|
||||
parameter = "";
|
||||
qCritical() << " ... everything fine";
|
||||
if (this->lastState == DeviceController::State::O000) {
|
||||
qCritical() << " ... everything fine, no state change -> skip sending";
|
||||
return;
|
||||
}
|
||||
else {
|
||||
qCritical() << " ... everything fine";
|
||||
}
|
||||
break;
|
||||
|
||||
case DeviceController::State::W001: // paper low
|
||||
@@ -496,23 +585,46 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
|
||||
eventClass = EVENT_CLASS::WARNING;
|
||||
parameter = "temperatur warning";
|
||||
break;
|
||||
case DeviceController::State::W255: // restart carun
|
||||
eventClass = EVENT_CLASS::WARNING;
|
||||
parameter = "restart carun";
|
||||
break;
|
||||
}
|
||||
|
||||
this->lastState = result;
|
||||
|
||||
/**
|
||||
* Variant: send 'parameter' as JSON:
|
||||
*
|
||||
JSON::setPrettySerialize(false);
|
||||
JSON::JsonObject json = JSON::objectBuilder()
|
||||
->set("description", parameter)
|
||||
->create();
|
||||
QString parameterJsonString = JSON::serialize(json);
|
||||
*/
|
||||
|
||||
ATBMachineEvent *machineEvent = new ATBMachineEvent(
|
||||
eventId,
|
||||
"DC",
|
||||
eventClass,
|
||||
eventName,
|
||||
1,
|
||||
1, // eventState
|
||||
parameter,
|
||||
"" // second level info
|
||||
);
|
||||
|
||||
//emit diagResponse(machineEvent);
|
||||
|
||||
QCoreApplication::postEvent(eventReceiver, machineEvent);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* reset / restart / reinit deviceController
|
||||
*/
|
||||
void DeviceControllerDiag::restartCArun()
|
||||
{
|
||||
this->E255counter = 0;
|
||||
this->private_sendDiagEvent(DeviceController::State::W255);
|
||||
QProcess::startDetached("/bin/systemctl", {"restart", "carun"});
|
||||
}
|
||||
|
@@ -29,6 +29,7 @@ namespace DeviceController {
|
||||
E008,
|
||||
E009,
|
||||
E010,
|
||||
W010, // Coin Escrow
|
||||
E011,
|
||||
|
||||
E018,
|
||||
@@ -40,19 +41,24 @@ namespace DeviceController {
|
||||
|
||||
E034,
|
||||
|
||||
E071,
|
||||
E072,
|
||||
E073,
|
||||
M0071, // cashbox change is ongoing
|
||||
M0072, // cardtest is running
|
||||
M0073, // startup-test is running
|
||||
|
||||
M0252, // cashbox door open
|
||||
M0253, // service or battery door is open
|
||||
M0254, // no valid data from DC
|
||||
|
||||
E252,
|
||||
E253,
|
||||
E254,
|
||||
E255,
|
||||
|
||||
W001,
|
||||
W002,
|
||||
W003,
|
||||
W004
|
||||
W004,
|
||||
|
||||
W255,
|
||||
|
||||
INITIAL_STATE
|
||||
};
|
||||
Q_ENUM_NS(State)
|
||||
}
|
||||
@@ -70,9 +76,32 @@ public:
|
||||
nsDeviceControllerInterface::COIN_PROCESSOR coinProcessorType;
|
||||
nsDeviceControllerInterface::BILL_ACCEPTOR billAcceptor;
|
||||
|
||||
/**
|
||||
* return true, if machineEventSet contains an error
|
||||
*/
|
||||
bool isErrorState();
|
||||
bool isOperatingState();
|
||||
QSet<DeviceController::State> getCurrentMachineState();
|
||||
|
||||
void setTimeout(int timeout);
|
||||
|
||||
public slots:
|
||||
/**
|
||||
* start diag request
|
||||
*/
|
||||
void diagRequest();
|
||||
|
||||
/**
|
||||
* reset / re-init diag request.
|
||||
* Called e.g. when doors are closed.
|
||||
*/
|
||||
void diagReInit();
|
||||
|
||||
/**
|
||||
* reset / restart / reinit deviceController
|
||||
*/
|
||||
void restartCArun();
|
||||
|
||||
signals:
|
||||
void diagResponse(ATBMachineEvent* machineEvent);
|
||||
|
||||
@@ -91,10 +120,14 @@ private:
|
||||
|
||||
int lastVoltage;
|
||||
|
||||
DeviceController::State lastState;
|
||||
QSet<DeviceController::State> machineEventSet;
|
||||
bool _isErrorState;
|
||||
|
||||
PersistentData* pData;
|
||||
|
||||
int E255counter;
|
||||
|
||||
private slots:
|
||||
void onDiagRequestTimeoutTimerTimeout();
|
||||
|
||||
@@ -103,7 +136,6 @@ private slots:
|
||||
|
||||
void sys_superviseSystem();
|
||||
|
||||
|
||||
};
|
||||
|
||||
#endif // DEVICECONTROLLERDIAG_H
|
||||
|
@@ -5,6 +5,8 @@
|
||||
|
||||
#include <QSettings>
|
||||
#include <QString>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QHash>
|
||||
|
||||
#include "ATBAPPplugin.h"
|
||||
|
||||
@@ -39,6 +41,12 @@ public:
|
||||
virtual nsDeviceControllerInterface::PLUGIN_STATE initDCPlugin(QObject *eventReceiver,
|
||||
const QSettings & settings) = 0;
|
||||
|
||||
/**
|
||||
* e.g. send location
|
||||
*/
|
||||
virtual void sendDeviceParameter(const QJsonObject & jsonObject) = 0;
|
||||
|
||||
|
||||
// TASKS: Cash handling -------------------------------------------------------
|
||||
/**
|
||||
* enables coin input
|
||||
@@ -53,9 +61,10 @@ public:
|
||||
virtual void requestStopCashInput() = 0;
|
||||
|
||||
/**
|
||||
* called e.g. on Button "NEXT" in pay-up (direct coin input)
|
||||
* called e.g. after printing
|
||||
*/
|
||||
virtual void cashCollect() = 0;
|
||||
virtual void cashCollect(const QString & amount) = 0;
|
||||
virtual void cashAbort() = 0;
|
||||
|
||||
// TASKS: Account -------------------------------------------------------------
|
||||
@@ -131,6 +140,14 @@ signals:
|
||||
const QString & errorCode,
|
||||
const QString & errorDescription);
|
||||
|
||||
/**
|
||||
* emitted if cashPayment has been finished, e.g. in result to task cashCollect():
|
||||
* if coins in changer must be given back to user.
|
||||
*/
|
||||
void cashPaymentChanging(nsDeviceControllerInterface::RESULT_STATE resultState,
|
||||
const QString & changeValue, // amount changed by changer/escrow
|
||||
const QString & errorCode,
|
||||
const QString & errorDescription);
|
||||
/**
|
||||
* emitted if cashPayment has been finished, e.g. in result to task cashCollect():
|
||||
* -> ticket should be printed sucessfully
|
||||
@@ -138,7 +155,7 @@ signals:
|
||||
* Provides data for logging, especially changed value
|
||||
*/
|
||||
void cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
|
||||
const QString & newCashValue, // total inserted amount amount
|
||||
const QString & newCashValue, // total inserted amount
|
||||
const QString & coinValue, // inserted amount, paid with coins
|
||||
const QString & noteValue, // inserted amount, paid with notes
|
||||
const QString & changeValue, // amount changed by changer/escrow
|
||||
@@ -196,10 +213,11 @@ signals:
|
||||
|
||||
|
||||
Q_DECLARE_INTERFACE(DeviceControllerInterface,
|
||||
"eu.atb.ptu.plugin.DeviceControllerInterface/1.1.2")
|
||||
"eu.atb.ptu.plugin.DeviceControllerInterface/1.2.1")
|
||||
|
||||
|
||||
namespace nsDeviceControllerInterface {
|
||||
Q_NAMESPACE
|
||||
|
||||
enum class PLUGIN_STATE : quint8 {
|
||||
NOT_INITIALIZED = 0,
|
||||
@@ -224,16 +242,48 @@ namespace nsDeviceControllerInterface {
|
||||
|
||||
|
||||
enum class TICKET_VARIANT : quint8 {
|
||||
INVALID,
|
||||
NO_TICKET,
|
||||
PARKING_TICKET,
|
||||
PARKING_TICKET_CAR,
|
||||
PARKING_TICKET_VAN,
|
||||
PARKING_TICKET_CAMPER,
|
||||
DAY_TICKET,
|
||||
DAY_TICKET_ADULT,
|
||||
DAY_TICKET_TEEN,
|
||||
DAY_TICKET_CHILD,
|
||||
DAY_TICKET_CAR,
|
||||
DAY_TICKET_VAN,
|
||||
DAY_TICKET_CAMPER,
|
||||
RECEIPT,
|
||||
ERROR_RECEIPT,
|
||||
START_RECEIPT, // e.g. Szeged Start
|
||||
STOP_RECEIPT, // e.g. Szeged Stop
|
||||
FINE_PAYMENT, // e.g. Klaipeda
|
||||
FOOD_STAMP,
|
||||
FIXED_PRICE_1,
|
||||
FIXED_PRICE_2,
|
||||
FIXED_PRICE_3,
|
||||
FIXED_PRICE_4,
|
||||
FIXED_PRICE_5,
|
||||
FIXED_PRICE_6,
|
||||
FIXED_PRICE_7,
|
||||
FIXED_PRICE_8,
|
||||
FIXED_PRICE_9,
|
||||
FIXED_PRICE_10,
|
||||
FREE_TICKET
|
||||
};
|
||||
Q_ENUM_NS(TICKET_VARIANT)
|
||||
|
||||
inline uint qHash(const nsDeviceControllerInterface::TICKET_VARIANT &key, uint seed = 0)
|
||||
{
|
||||
return ::qHash(static_cast<quint8>(key), seed);
|
||||
}
|
||||
|
||||
enum class COIN_PROCESSOR : quint8 {
|
||||
CHANGER,
|
||||
ESCROW
|
||||
ESCROW,
|
||||
NONE
|
||||
};
|
||||
|
||||
enum class BILL_ACCEPTOR : quint8 {
|
||||
@@ -250,4 +300,6 @@ namespace nsDeviceControllerInterface {
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
#endif // DEVICECONTROLLERINTERFACE_H
|
||||
|
@@ -30,7 +30,10 @@ PersistentData::PersistentData(const QString &datafileName, QObject *parent)
|
||||
|
||||
void PersistentData::serializeToFile()
|
||||
{
|
||||
this->save();
|
||||
if (this->isChangedFlag) {
|
||||
qCritical() << "PersistentData::isChanged -> save";
|
||||
this->save();
|
||||
}
|
||||
}
|
||||
|
||||
void PersistentData::save()
|
||||
@@ -44,6 +47,8 @@ void PersistentData::save()
|
||||
out << this->hash;
|
||||
fileOut.flush();
|
||||
fileOut.close();
|
||||
|
||||
this->isChangedFlag = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
231
src/ATBAPP/support/Ticket.cpp
Normal file
231
src/ATBAPP/support/Ticket.cpp
Normal file
@@ -0,0 +1,231 @@
|
||||
#include "Ticket.h"
|
||||
|
||||
#include <QDebug>
|
||||
|
||||
Ticket::Ticket(TICKET_VARIANT ticketVariant, QObject *parent )
|
||||
: QObject(parent)
|
||||
, ticketVariant(ticketVariant)
|
||||
, _hasTemplateDynData(false)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
TICKET_VARIANT Ticket::variant()
|
||||
{
|
||||
return this->ticketVariant;
|
||||
}
|
||||
|
||||
QList<quint8> * Ticket::templateList()
|
||||
{
|
||||
return &(this->_templateList);
|
||||
}
|
||||
|
||||
bool Ticket::hasTemplateDynData()
|
||||
{
|
||||
return this->_hasTemplateDynData;
|
||||
}
|
||||
|
||||
quint8 Ticket::getCurrentProcessedTemplateNumber()
|
||||
{
|
||||
return this->currentProcessedTemplateNumber;
|
||||
}
|
||||
|
||||
void Ticket::setCurrentTemplateProcessed()
|
||||
{
|
||||
this->currentProcessedTemplateNumber++;
|
||||
}
|
||||
|
||||
|
||||
bool Ticket::initNew(TICKET_VARIANT ticketVariant, const QList<quint8> & templateList, const QHash<QString, QVariant> & printingData)
|
||||
{
|
||||
this->clear();
|
||||
|
||||
this->ticketVariant = ticketVariant;
|
||||
this->printingData = printingData;
|
||||
this->_templateList = templateList;
|
||||
this->currentProcessedTemplateNumber = 0;
|
||||
|
||||
// DEBUG
|
||||
qCritical() << "Ticket::initNew():";
|
||||
qCritical() << " -> " << ticketVariant;
|
||||
|
||||
int multiplicatorInt = 1; // default
|
||||
quint8 headerTemplate;
|
||||
quint8 multiTemplate;
|
||||
quint8 footerTemplate;
|
||||
|
||||
switch (this->ticketVariant) {
|
||||
case TICKET_VARIANT::START_RECEIPT:
|
||||
if (templateList.isEmpty()) {
|
||||
this->_templateList << 21 << 22 << 23;
|
||||
}
|
||||
else {
|
||||
this->_templateList = templateList;
|
||||
}
|
||||
break;
|
||||
case TICKET_VARIANT::STOP_RECEIPT:
|
||||
if (templateList.isEmpty()) {
|
||||
this->_templateList << 24 << 25 << 26;
|
||||
}
|
||||
else {
|
||||
this->_templateList = templateList;
|
||||
}
|
||||
break;
|
||||
case TICKET_VARIANT::FINE_PAYMENT:
|
||||
if (templateList.isEmpty()) {
|
||||
this->_templateList << 24 << 25 << 26;
|
||||
}
|
||||
else {
|
||||
this->_templateList = templateList;
|
||||
}
|
||||
break;
|
||||
case TICKET_VARIANT::FREE_TICKET:
|
||||
if (templateList.isEmpty()) {
|
||||
this->_templateList << 24 << 25 << 26;
|
||||
}
|
||||
else {
|
||||
this->_templateList = templateList;
|
||||
}
|
||||
break;
|
||||
case TICKET_VARIANT::FOOD_STAMP:
|
||||
if (printingData.contains("dyn1_list")) {
|
||||
this->_hasTemplateDynData = true;
|
||||
|
||||
this->dyn1List = printingData["dyn1_list"].toStringList();
|
||||
this->dyn2List = printingData["dyn2_list"].toStringList();
|
||||
}
|
||||
|
||||
if (templateList.isEmpty()) {
|
||||
headerTemplate = 0;
|
||||
multiTemplate = 1;
|
||||
footerTemplate = 2;
|
||||
}
|
||||
else
|
||||
if (templateList.size() == 2) {
|
||||
headerTemplate = 0;
|
||||
multiTemplate = templateList.at(0);
|
||||
footerTemplate = templateList.at(1);
|
||||
}
|
||||
else
|
||||
if (templateList.size() == 3) {
|
||||
headerTemplate = templateList.at(0);
|
||||
multiTemplate = templateList.at(1);
|
||||
footerTemplate = templateList.at(2);
|
||||
}
|
||||
else {
|
||||
headerTemplate = 0;
|
||||
multiTemplate = 1;
|
||||
footerTemplate = 2;
|
||||
}
|
||||
|
||||
// header is optional:
|
||||
if (headerTemplate != 0) {
|
||||
this->_templateList << headerTemplate;
|
||||
}
|
||||
|
||||
if (printingData.contains("multiplicator")) {
|
||||
multiplicatorInt = printingData["multiplicator"].toInt();
|
||||
for (int i = 1; i < multiplicatorInt; i++) {
|
||||
this->_templateList << multiTemplate;
|
||||
}
|
||||
// last template:
|
||||
this->_templateList << footerTemplate;
|
||||
}
|
||||
else {
|
||||
this->_templateList = templateList;
|
||||
}
|
||||
|
||||
// DEBUG FOOD_STAMP:
|
||||
qCritical() << " --> printingData[\"multiplicator\"]" << multiplicatorInt;
|
||||
|
||||
break;
|
||||
default:
|
||||
this->_templateList = templateList;
|
||||
}
|
||||
|
||||
|
||||
// DEBUG
|
||||
QString templateListString;
|
||||
for (int i =0; i < this->_templateList.size(); ++i) {
|
||||
templateListString.append(QString(" %1").arg(this->_templateList.at(i)));
|
||||
}
|
||||
qCritical() << " -> templates: " << templateListString;
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void Ticket::clear()
|
||||
{
|
||||
this->ticketVariant = TICKET_VARIANT::PARKING_TICKET;
|
||||
this->printingData.clear();
|
||||
this->_templateList.clear();
|
||||
this->errorCode.clear();
|
||||
this->errorDescription.clear();
|
||||
|
||||
this->_hasTemplateDynData = false;
|
||||
this->dyn1List.clear();
|
||||
this->dyn1List.clear();
|
||||
}
|
||||
|
||||
QString Ticket::getErrorCode() { return this->errorCode; }
|
||||
QString Ticket::getErrorDescription() { return this->errorDescription; }
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
*/
|
||||
QStringList Ticket::getDyn1List()
|
||||
{
|
||||
return this->dyn1List;
|
||||
}
|
||||
|
||||
QStringList Ticket::getDyn2List()
|
||||
{
|
||||
return this->dyn2List;
|
||||
}
|
||||
|
||||
QHash<QString, QVariant> & Ticket::getPrintingData()
|
||||
{
|
||||
return this->printingData;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/************************************************************************************************
|
||||
* operator
|
||||
*
|
||||
*/
|
||||
QDebug operator<<(QDebug debug, TICKET_VARIANT ticketVariant)
|
||||
{
|
||||
switch (ticketVariant) {
|
||||
case TICKET_VARIANT::PARKING_TICKET:
|
||||
debug << "TICKET_VARIANT::PARKING_TICKET";
|
||||
break;
|
||||
case TICKET_VARIANT::RECEIPT:
|
||||
debug << "TICKET_VARIANT::RECEIPT";
|
||||
break;
|
||||
case TICKET_VARIANT::ERROR_RECEIPT:
|
||||
debug << "TICKET_VARIANT::ERROR_RECEIPT";
|
||||
break;
|
||||
case TICKET_VARIANT::START_RECEIPT:
|
||||
debug << "TICKET_VARIANT::START_RECEIPT";
|
||||
break;
|
||||
case TICKET_VARIANT::STOP_RECEIPT:
|
||||
debug << "TICKET_VARIANT::STOP_RECEIPT";
|
||||
break;
|
||||
case TICKET_VARIANT::FINE_PAYMENT:
|
||||
debug << "TICKET_VARIANT::FINE_PAYMENT";
|
||||
break;
|
||||
case TICKET_VARIANT::FOOD_STAMP:
|
||||
debug << "TICKET_VARIANT::FOOD_STAMP";
|
||||
break;
|
||||
case TICKET_VARIANT::FREE_TICKET:
|
||||
debug << "TICKET_VARIANT::FREE_TICKET";
|
||||
break;
|
||||
}
|
||||
|
||||
return debug;
|
||||
}
|
88
src/ATBAPP/support/Ticket.h
Normal file
88
src/ATBAPP/support/Ticket.h
Normal file
@@ -0,0 +1,88 @@
|
||||
#ifndef TICKET_H
|
||||
#define TICKET_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
|
||||
#include "../DeviceControllerInterface.h"
|
||||
|
||||
using namespace nsDeviceControllerInterface;
|
||||
|
||||
QDebug operator<<(QDebug debug, TICKET_VARIANT ticketVariant);
|
||||
|
||||
|
||||
|
||||
class Ticket : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
Ticket(TICKET_VARIANT ticketVariant, QObject *parent = nullptr);
|
||||
|
||||
bool initNew(TICKET_VARIANT ticketVariant, const QList<quint8> & templateList, const QHash<QString, QVariant> & printingData);
|
||||
void clear();
|
||||
|
||||
TICKET_VARIANT variant();
|
||||
|
||||
QList<quint8> * templateList();
|
||||
|
||||
/**
|
||||
* @brief getPrintingData - generic getter for printingData
|
||||
* Used mainly for simple tickets (single tickets e.g. ParkingTicket)
|
||||
* @return
|
||||
*/
|
||||
QHash<QString, QVariant> & getPrintingData();
|
||||
|
||||
/**
|
||||
* @brief hasTemplateDynData
|
||||
* @return true, if ticket has dynamic data for each template.
|
||||
*
|
||||
* This depends on TICKET_VARIANT and printingData
|
||||
*/
|
||||
bool hasTemplateDynData();
|
||||
|
||||
/**
|
||||
* @brief getDyn1List
|
||||
* contains dynamic template data
|
||||
* The size of the lists must be exactly the same as the number of templates.
|
||||
*/
|
||||
QStringList getDyn1List();
|
||||
QStringList getDyn2List();
|
||||
|
||||
quint8 getCurrentProcessedTemplateNumber();
|
||||
|
||||
/**
|
||||
* Mark current template as processed
|
||||
*/
|
||||
void setCurrentTemplateProcessed();
|
||||
|
||||
|
||||
// error handling
|
||||
QString getErrorCode();
|
||||
QString getErrorDescription();
|
||||
|
||||
|
||||
|
||||
|
||||
private:
|
||||
TICKET_VARIANT ticketVariant;
|
||||
|
||||
// printingData from application
|
||||
QHash<QString, QVariant> printingData;
|
||||
|
||||
// templateList, from .ini or created by ticketVariant...
|
||||
QList<quint8> _templateList;
|
||||
|
||||
bool _hasTemplateDynData;
|
||||
|
||||
quint8 currentProcessedTemplateNumber;
|
||||
|
||||
QStringList dyn1List;
|
||||
QStringList dyn2List;
|
||||
|
||||
// error handling
|
||||
QString errorCode;
|
||||
QString errorDescription;
|
||||
};
|
||||
|
||||
#endif // TICKET_H
|
26
src/ATBAPP/support/TicketUtils.cpp
Normal file
26
src/ATBAPP/support/TicketUtils.cpp
Normal file
@@ -0,0 +1,26 @@
|
||||
#include "TicketUtils.h"
|
||||
|
||||
#include <QLocale>
|
||||
#include <QDate>
|
||||
|
||||
TicketUtils::TicketUtils(QObject *parent) : QObject(parent)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
QString TicketUtils::getLocaleDateString(const QLocale & qLocale, const QDate & qDate)
|
||||
{
|
||||
QString dateString;
|
||||
|
||||
if (qLocale.language() == QLocale::Lithuanian) {
|
||||
// QLocale::ShortFormat produces date string: "yyyy-mm-dd" ...
|
||||
// this is to long for the printer.
|
||||
dateString = qDate.toString("yy-MM-dd");
|
||||
}
|
||||
else {
|
||||
dateString = qLocale.toString(qDate, QLocale::ShortFormat);
|
||||
}
|
||||
|
||||
return dateString;
|
||||
}
|
34
src/ATBAPP/support/TicketUtils.h
Normal file
34
src/ATBAPP/support/TicketUtils.h
Normal file
@@ -0,0 +1,34 @@
|
||||
#ifndef TICKETUTILS_H
|
||||
#define TICKETUTILS_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
class TicketUtils : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit TicketUtils(QObject *parent = nullptr);
|
||||
|
||||
/**
|
||||
* @brief getLocaleDateString
|
||||
* @param qLocale
|
||||
* @param qDate
|
||||
* @return a localized date string short format
|
||||
*
|
||||
* Note QLocale::ShortFormat does not result to the
|
||||
* string we need for ticket printing therefore this
|
||||
* helper method was created.
|
||||
*
|
||||
* e.g. using Lithuanian (lt_LT) we get a date in short format:
|
||||
* "2024-08-08" unfortunately this is to long, we need
|
||||
* the year with only two digits.
|
||||
* e.g. in German (de_DE) it is enought: "08.08.24"
|
||||
*
|
||||
*/
|
||||
static QString getLocaleDateString(const QLocale &qLocale, const QDate &qDate);
|
||||
|
||||
signals:
|
||||
|
||||
};
|
||||
|
||||
#endif // TICKETUTILS_H
|
Reference in New Issue
Block a user