mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 05:46:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: StatisticsPage: Exclude 2-nd hour from active period.

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2018-09-05 19:03:36 +05:00
parent f4a06fd032
commit 7960bbffa7
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tests/db/test.cpp
View File

@ -143,10 +143,11 @@ void Test::activePeriod()
const qint32 unixHour = DateUtil::getUnixHour(unixTime);
QVERIFY(DateUtil::isHourBetween(unixHour, unixDay, 0, 24));
QVERIFY(DateUtil::isHourBetween(unixHour, unixDay, 15, 15));
QVERIFY(DateUtil::isHourBetween(unixHour, unixDay, 15, 16));
QVERIFY(DateUtil::isHourBetween(unixHour, unixDay, 15, 10));
QVERIFY(DateUtil::isHourBetween(unixHour, unixDay, 16, 15));
QVERIFY(!DateUtil::isHourBetween(unixHour, unixDay, 15, 15));
QVERIFY(!DateUtil::isHourBetween(unixHour, unixDay, 0, 15));
QVERIFY(!DateUtil::isHourBetween(unixHour, unixDay, 16, 15));
QVERIFY(!DateUtil::isHourBetween(unixHour, unixDay, 24, 0));
QVERIFY(!DateUtil::isHourBetween(unixHour, unixDay, 16, 14));
QVERIFY(!DateUtil::isHourBetween(unixHour, unixDay, 16, 24));

4
src/ui/util/dateutil.cpp
View File

@ -87,6 +87,6 @@ bool DateUtil::isHourBetween(qint32 unixHour, qint32 unixDay,
const int hour = unixHour - unixDay;
return fromHour <= toHour
? (hour >= fromHour && hour <= toHour)
: (hour == 0 || hour >= fromHour || hour <= toHour);
? (hour >= fromHour && hour < toHour)
: (hour == 0 || hour >= fromHour || hour < toHour);
}