GerhardHoffmann/MOBILISIS-Calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator

Browse Source
This commit is contained in:
Siegfried Siegert 2023-05-09 11:47:05 +02:00
commit 3cc447ca87
Signed by: SiegfriedSiegert
GPG Key ID: 68371E015E8F0B03
3 changed files with 170 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
library/include/mobilisis/calculate_price.h
View File

@ -4,6 +4,8 @@
#include <time.h> #include <time.h>
#include <inttypes.h> #include <inttypes.h>
#include <QString>
#ifdef WIN32 #ifdef WIN32
#ifdef CALCULATE_LIBRARY_EXPORTS #ifdef CALCULATE_LIBRARY_EXPORTS
#define CALCULATE_LIBRARY_API __declspec(dllexport) #define CALCULATE_LIBRARY_API __declspec(dllexport)
@ -30,14 +32,90 @@ struct CALCULATE_LIBRARY_API price_t {
double vat; double vat;
}; };
bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file); struct CALCULATE_LIBRARY_API CalcState {
enum class State : uint8_t {
SUCCESS,
ERROR_PARSING_ZONE_NR,
ERROR_LOADING_TARIFF,
ERROR_PARSING_TARIFF,
NEGATIVE_PARING_TIME,
INVALID_START_DATE,
WRONG_PARAM_VALUES,
ABOVE_MAX_PARKING_TIME,
BELOW_MIN_PARKING_TIME,
BELOW_MIN_PARKING_PRICE,
OVERPAID
};
State m_status;
QString m_desc;
explicit CalcState() : m_status(State::SUCCESS), m_desc("") {}
explicit operator bool() const noexcept {
return (m_status == State::SUCCESS);
}
explicit operator QString () const noexcept {
QString s;
switch (m_status) {
case State::SUCCESS:
s = "SUCCESS";
break;
case State::ERROR_PARSING_ZONE_NR:
s = "ERROR_PARSING_ZONE_NR";
break;
case State::ERROR_LOADING_TARIFF:
s = "ERROR_LOADING_TARIFF";
break;
case State::ERROR_PARSING_TARIFF:
s = "ERROR_PARSING_TARIFF";
break;
case State::NEGATIVE_PARING_TIME:
s = "NEGATIVE_PARKING_TIME";
break;
case State::ABOVE_MAX_PARKING_TIME:
s = "ABOVE_MAX_PARKING_TIME";
break;
case State::WRONG_PARAM_VALUES:
s = "WRONG_PARAM_VALUES";
break;
case State::BELOW_MIN_PARKING_TIME:
s = "BELOW_MIN_PARKING_TIME";
break;
case State::BELOW_MIN_PARKING_PRICE:
s = "BELOW_MIN_PARKING_PRICE";
break;
case State::OVERPAID:
s = "OVERPAID";
break;
case State::INVALID_START_DATE:
s = "INVALID_START_DATE";
break;
}
return s + ":" + m_desc;
}
CalcState &set(State s) { m_status = s; return *this; }
CalcState &setDesc(QString s) { m_desc = s; return *this; }
};
CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,
char const *config_file);
void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff); void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff);
int CALCULATE_LIBRARY_API get_zone_nr(); int CALCULATE_LIBRARY_API get_zone_nr();
bool CALCULATE_LIBRARY_API compute_price_for_parking_ticket(parking_tariff_t *tariff, CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
time_t start_parking_time, parking_tariff_t *tariff,
time_t end_parking_time, time_t start_parking_time,
struct price_t *price); time_t end_parking_time,
struct price_t *price);
CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
parking_tariff_t *tariff,
time_t start_parking_time,
double cost,
QString &duration);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif

125
library/src/calculate_price.cpp
View File

@ -16,19 +16,18 @@ int CALCULATE_LIBRARY_API get_zone_nr() {
QFileInfo finfo(zone); QFileInfo finfo(zone);
if (finfo.size() <= 4) { // decimal 000\n if (finfo.size() <= 4) { // decimal 000\n
if (zone.open(QIODevice::ReadOnly | QIODevice::Text)) { if (zone.open(QIODevice::ReadOnly | QIODevice::Text)) {
QTextStream in(&zone); QTextStream in(&zone);
return in.readLine(100).toInt(); return in.readLine(100).toInt();
} }
} }
} }
return -1; return -1;
} }
bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file) { CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file) {
*tariff = new Configuration(); *tariff = new Configuration();
CalcState calcState;
int const zone = get_zone_nr(); int const zone = get_zone_nr();
// DEBUG // DEBUG
@ -36,7 +35,7 @@ bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *co
qCritical() << " ... zone = " << zone; qCritical() << " ... zone = " << zone;
if (zone <= 0) { if (zone <= 0) {
return false; return calcState.set(CalcState::State::ERROR_PARSING_ZONE_NR);
} }
QString confFile(config_file); QString confFile(config_file);
@ -53,57 +52,103 @@ bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *co
qCritical() << " ... confFile = " << confFile; qCritical() << " ... confFile = " << confFile;
QFile fname(confFile); QFile fname(confFile);
if (fname.exists()) { if (fname.exists() &&
fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
// DEBUG // DEBUG
qCritical() << " ... confFile exists"; qCritical() << " ... confFile is open";
if (fname.open(QIODevice::ReadOnly | QIODevice::Text)) { QString json = fname.readAll();
if (! (*tariff)->ParseJson(*tariff, json.toStdString().c_str())) {
// DEBUG calcState.m_status = CalcState::State::ERROR_PARSING_TARIFF;
qCritical() << " ... confFile is open";
QString json = fname.readAll();
return (*tariff)->ParseJson(*tariff, json.toStdString().c_str());
} }
} else {
calcState.m_status = CalcState::State::ERROR_LOADING_TARIFF;
} }
qCritical() << "init_tariff: Parsing tariff config (" << confFile << ") failed!"; qCritical() << "init_tariff: Parsing tariff config (" << confFile << ") failed!";
return false; return calcState;
} }
void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) { void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
delete tariff; delete tariff;
} }
bool CALCULATE_LIBRARY_API compute_price_for_parking_ticket( CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
parking_tariff_t *tariff, parking_tariff_t *tariff,
time_t start_parking_time, // in minutes time_t start_parking_time, // in minutes
time_t end_parking_time, // in minutes time_t end_parking_time, // in minutes
struct price_t *price) { struct price_t *price) {
CalcState calcState;
double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
if (minMin < 0 || maxMin < 0 || maxMin < minMin) {
calcState.setDesc(QString("minMin=%1, maxMin=%2").arg(minMin, maxMin));
return calcState.set(CalcState::State::WRONG_PARAM_VALUES);
}
int const duration = end_parking_time - start_parking_time; int const duration = end_parking_time - start_parking_time;
if (duration > 0) { if (duration < 0) {
QDate const d(1970, 1, 1); calcState.setDesc(QString("end=%1, start=%2")
QTime const t(0, 0, 0); .arg(end_parking_time, start_parking_time));
QDateTime start(d, t, Qt::UTC); return calcState.set(CalcState::State::NEGATIVE_PARING_TIME);
start = start.toLocalTime().addSecs(start_parking_time * 60); }
if (start.isValid()) { if (duration > maxMin) {
QString cs = start.toString(Qt::ISODate); calcState.setDesc(QString("duration=%1, maxMin=%2").arg(duration, maxMin));
double cost = calculator.GetCostFromDuration( return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
tariff, PaymentOption::Option1, }
cs.toLocal8Bit().constData(), if (duration < minMin) {
duration, false, true); calcState.setDesc(QString("duration=%1, minMin=%2").arg(duration, minMin));
price->units = cost; return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
price->netto = cost; }
return true;
}
} else
if (duration == 0) { if (duration == 0) {
memset(price, 0x00, sizeof(*price)); memset(price, 0x00, sizeof(*price));
return true; return calcState.set(CalcState::State::SUCCESS);
} }
qCritical() << "ERROR start_parking_time (" << start_parking_time << ") <"
<< "end_parking_time (" << end_parking_time << ")"; QDate const d(1970, 1, 1);
return false; QTime const t(0, 0, 0);
QDateTime start(d, t, Qt::UTC);
start = start.toLocalTime().addSecs(start_parking_time * 60);
if (start.isValid()) {
QString cs = start.toString(Qt::ISODate);
double cost = calculator.GetCostFromDuration(
tariff, PaymentOption::Option1,
cs.toLocal8Bit().constData(),
duration, false, true);
double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
if (cost < minCost) {
calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));
return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
}
price->units = cost;
price->netto = cost;
} else {
return calcState.set(CalcState::State::INVALID_START_DATE);
}
return calcState.set(CalcState::State::SUCCESS);
}
CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
parking_tariff_t *tariff,
time_t start_parking_time,
double price,
QString &duration) {
CalcState calcState;
QDate const d(1970, 1, 1);
QTime const t(0, 0, 0);
QDateTime start(d, t, Qt::UTC);
start = start.toLocalTime().addSecs(start_parking_time * 60);
if (start.isValid()) {
QString cs = start.toString(Qt::ISODate);
duration = calculator.GetDurationFromCost(tariff, PaymentOption::Option1,
cs.toLocal8Bit().constData(),
price, false, true).c_str();
} else {
return calcState.set(CalcState::State::INVALID_START_DATE);
}
return calcState.set(CalcState::State::SUCCESS);
} }

3
library/src/calculator_functions.cpp
View File

@ -509,5 +509,6 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio
double ret_val = total_cost; double ret_val = total_cost;
total_cost = 0.0f; total_cost = 0.0f;
return floor(ret_val); // return ceil(ret_val);
return floor(ret_val);
} }