From 2f97c1e2cac065443734e94ae1346da2f1d648d1 Mon Sep 17 00:00:00 2001 From: SanJacobs Date: Wed, 13 Jul 2022 00:57:58 +0200 Subject: Squashed a couple bugs Fixed: - Splitpoints in workday constructor was generating backwards timeblocks, - Planned wrap could cut up main chunk of workday. --- src/time.cpp | 9 +++++++++ src/time.h | 1 + 2 files changed, 10 insertions(+) (limited to 'src') diff --git a/src/time.cpp b/src/time.cpp index 9ecdc69..45d5c48 100755 --- a/src/time.cpp +++ b/src/time.cpp @@ -147,6 +147,15 @@ workday::workday(const moment& previous_wrap, (moment){0, 23, call.day, call.month, call.year}+(delta){0, 7, 0}, // 6, next morning }; + // Eliminate planned wrap, if it occurs within normal 8-hour period. + // This is to make sure the first period of time becomes a pure 8 hours, + // which makes detecting the main section of the workday easier. + if(splitpoints[5] < splitpoints[3]){ + splitpoints[5] = splitpoints[3]; + } + + std::sort(splitpoints, splitpoints + 10); + int j = 0; for(int i = 0; i<=10; i++) { const moment* each_moment = &splitpoints[i]; diff --git a/src/time.h b/src/time.h index fc5dcbc..17a6854 100755 --- a/src/time.h +++ b/src/time.h @@ -5,6 +5,7 @@ #include #include #include +#include enum weekday{ monday, -- cgit v1.2.1