From 2dc93271fd1e4f420f2317df541feb913e4197f4 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 5 Jun 2024 16:52:54 +0200 Subject: [PATCH] Added WORKING_DAYS_WITH_RESTRICTED_HOURS (introduced for Neuhauder/Stockerau/748) --- .../include/mobilisis/tariff_business_hours.h | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/library/include/mobilisis/tariff_business_hours.h b/library/include/mobilisis/tariff_business_hours.h index d98697c..3b8a48a 100644 --- a/library/include/mobilisis/tariff_business_hours.h +++ b/library/include/mobilisis/tariff_business_hours.h @@ -8,27 +8,28 @@ #include -#define _NO_RESTRICTION_24_7_ (uint64_t)(0ULL) -#define _MON_ (uint64_t)(1ULL << 8) -#define _TUE_ (uint64_t)(1ULL << 9) -#define _WED_ (uint64_t)(1ULL << 10) -#define _THU_ (uint64_t)(1ULL << 11) -#define _FRI_ (uint64_t)(1ULL << 12) -#define _SAT_ (uint64_t)(1ULL << 13) -#define _SUN_ (uint64_t)(1ULL << 14) -#define _WEEK_DAYS_ ((_MON_|_TUE_|_WED_|_THU_|_FRI_)) -#define _WORKING_DAYS_ ((_MON_|_TUE_|_WED_|_THU_|_FRI_|_SAT_)) -#define _ALL_DAYS_ ((_MON_|_TUE_|_WED_|_THU_|_FRI_|_SAT_|_SUN_)) -#define _OFFICIAL_HOLIDAY_ (uint64_t)(1ULL << 15) -#define _ONLY_WEEKEND_ ((_SAT_|_SUN_)) -#define _ONLY_OPEN_FOR_BUSINESS_DAYS_ (uint64_t)(1ULL << 16) /* verkaufsoffen */ -#define _WITH_RESTRICTED_HOURS_ (uint64_t)(1ULL << 17) -#define _ALL_DAYS_WITH_RESTRICTED_HOURS_ ((_WITH_RESTRICTED_HOURS_|_ALL_DAYS_)) -#define _WEEKEND_WITH_RESTRICTED_HOURS_ ((_WITH_RESTRICTED_HOURS_|_FRI_|_SAT_|_SUN_)) -#define _FRI_WITH_RESTRICTED_HOURS_ ((_WITH_RESTRICTED_HOURS_|_FRI_)) -#define _SAT_WITH_RESTRICTED_HOURS_ ((_WITH_RESTRICTED_HOURS_|_SAT_)) -#define _SUN_WITH_RESTRICTED_HOURS_ ((_WITH_RESTRICTED_HOURS_|_SUN_)) -#define _NOT_DEFINED_ (uint64_t)(~0ULL) +#define _NO_RESTRICTION_24_7_ (uint64_t)(0ULL) +#define _MON_ (uint64_t)(1ULL << 8) +#define _TUE_ (uint64_t)(1ULL << 9) +#define _WED_ (uint64_t)(1ULL << 10) +#define _THU_ (uint64_t)(1ULL << 11) +#define _FRI_ (uint64_t)(1ULL << 12) +#define _SAT_ (uint64_t)(1ULL << 13) +#define _SUN_ (uint64_t)(1ULL << 14) +#define _WEEK_DAYS_ ((_MON_|_TUE_|_WED_|_THU_|_FRI_)) +#define _WORKING_DAYS_ ((_MON_|_TUE_|_WED_|_THU_|_FRI_|_SAT_)) +#define _ALL_DAYS_ ((_MON_|_TUE_|_WED_|_THU_|_FRI_|_SAT_|_SUN_)) +#define _OFFICIAL_HOLIDAY_ (uint64_t)(1ULL << 15) +#define _ONLY_WEEKEND_ ((_SAT_|_SUN_)) +#define _ONLY_OPEN_FOR_BUSINESS_DAYS_ (uint64_t)(1ULL << 16) /* verkaufsoffen */ +#define _WITH_RESTRICTED_HOURS_ (uint64_t)(1ULL << 17) +#define _ALL_DAYS_WITH_RESTRICTED_HOURS_ ((_WITH_RESTRICTED_HOURS_|_ALL_DAYS_)) +#define _WEEKEND_WITH_RESTRICTED_HOURS_ ((_WITH_RESTRICTED_HOURS_|_FRI_|_SAT_|_SUN_)) +#define _WORKING_DAYS_WITH_RESTRICTED_HOURS_ ((_WITH_RESTRICTED_HOURS_|_WORKING_DAYS_)) +#define _FRI_WITH_RESTRICTED_HOURS_ ((_WITH_RESTRICTED_HOURS_|_FRI_)) +#define _SAT_WITH_RESTRICTED_HOURS_ ((_WITH_RESTRICTED_HOURS_|_SAT_)) +#define _SUN_WITH_RESTRICTED_HOURS_ ((_WITH_RESTRICTED_HOURS_|_SUN_)) +#define _NOT_DEFINED_ (uint64_t)(~0ULL) enum BusinessHours : std::uint64_t { @@ -62,6 +63,7 @@ enum BusinessHours : std::uint64_t ONLY_OPEN_FOR_BUSINESS_DAYS = _ONLY_OPEN_FOR_BUSINESS_DAYS_, ALL_DAYS_WITH_RESTRICTED_HOURS = _ALL_DAYS_WITH_RESTRICTED_HOURS_, WEEKEND_WITH_RESTRICTED_HOURS = _WEEKEND_WITH_RESTRICTED_HOURS_, + WORKING_DAYS_WITH_RESTRICTED_HOURS = _WORKING_DAYS_WITH_RESTRICTED_HOURS_, FRI_WITH_RESTRICTED_HOURS = _FRI_WITH_RESTRICTED_HOURS_, SAT_WITH_RESTRICTED_HOURS = _SAT_WITH_RESTRICTED_HOURS_, SUN_WITH_RESTRICTED_HOURS = _SUN_WITH_RESTRICTED_HOURS_,