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

Check prepaidIf and carryOverIf for null and emptyness.

Browse Source
This commit is contained in:
Gerhard Hoffmann 2025-04-16 11:32:20 +02:00
parent c5900f9f2b
commit d605af5c5a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/src/configuration.cpp
View File

@ -171,8 +171,9 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
if (!d.isNull() && d.isValid()) { if (!d.isNull() && d.isValid()) {
TariffPrepaid.m_date = d; TariffPrepaid.m_date = d;
} }
if (!prepaidIf.isNull() && !prepaidIf.trimmed().isEmpty()) {
TariffPrepaid.setPrepaidIf(prepaidIf); TariffPrepaid.setPrepaidIf(prepaidIf);
}
qCritical() << TariffPrepaid; qCritical() << TariffPrepaid;
cfg.TariffPrepaids.insert(std::pair<int, ATBTariffPrepaid>(weekDay, TariffPrepaid)); cfg.TariffPrepaids.insert(std::pair<int, ATBTariffPrepaid>(weekDay, TariffPrepaid));
@ -258,7 +259,7 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
if (!d.isNull() && d.isValid()) { if (!d.isNull() && d.isValid()) {
TariffCarryOver.m_date = d; TariffCarryOver.m_date = d;
} }
if (!carryOverIf.isEmpty()) { if (!carryOverIf.isNull() && !carryOverIf.trimmed().isEmpty()) {
TariffCarryOver.setCarryOverIf(carryOverIf); TariffCarryOver.setCarryOverIf(carryOverIf);
} }