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

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

Browse Source
This commit is contained in:
Siegfried Siegert
2023-05-12 14:10:57 +02:00
parent 1e2f1589ac 2f8c8cab4c
commit de32022b89
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
library/src/calculator_functions.cpp
View File

@@ -205,7 +205,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
}
if(money_left > 1)
inputDate = inputDate.addSecs(60);
inputDate = inputDate.addSecs(60);
if(price_per_unit > 0) total_duration_min +=1;
money_left -= price_per_unit;
@@ -213,12 +213,12 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
//qDebug() <<"Timestamp:" << inputDate << ", total duration min: " << total_duration_min << ", money left = " << money_left;
}
if ((total_duration_min < minMin) || (price / price_per_unit) < minMin)
{
LOG_DEBUG("Total duration is lower than min_min");
inputDate.time() = worktime_from;
total_duration_min = 0;
}
// if ((total_duration_min < minMin) || (price / price_per_unit) < minMin)
// {
// LOG_DEBUG("Total duration is lower than min_min");
// inputDate.time() = worktime_from;
// total_duration_min = 0;
// }
double ret_val = 0;
double calc_price = (int)total_duration_min - (int)price / price_per_unit;
@@ -227,12 +227,16 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
{
inputDate.addSecs(-(int)ceil(calc_price) * 60);
}
ret_val = total_duration_min;
if(price >= min_price && total_duration_min >= minMin)
qDebug() << "Valid until: " << inputDate.toString(Qt::ISODate);
else qDebug() << "Parking not allowed";
else
{
qDebug() << "Parking not allowed";
total_duration_min = 0;
}
ret_val = total_duration_min;
if(ret_val < 0) ret_val = 0;
qDebug() << "Duration: " << ret_val;
if (ret_val <= 0) return "PARKING NOT ALLOWED";