From d49965d367d0eb9dfc22d31a974655703bac0646 Mon Sep 17 00:00:00 2001 From: Joel Baldauf Date: Fri, 8 Jan 2021 14:01:23 +0100 Subject: [PATCH] wochentagsberechnung gefixed --- kwrechner/kwrechner.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/kwrechner/kwrechner.cpp b/kwrechner/kwrechner.cpp index ccb9831..083b122 100644 --- a/kwrechner/kwrechner.cpp +++ b/kwrechner/kwrechner.cpp @@ -72,16 +72,18 @@ void datum::ausgeben() { int datum::wochentag() { - string yearst = to_string(jahr); + int year = jahr; + int m = monat; + if (m < 3) + year--; + + string yearst = to_string(year); string cst = yearst.substr(0, 2); string yst = yearst.substr(2, 4); int y = stoi(yst); int c = stoi(cst); int d = tag; - int m = monat; - - if (m < 3) - y--; + if (m == 1 || m == 2) m += 10; @@ -118,8 +120,11 @@ int datum::kwBerechnen() int offset = 0; int kw = 0; - if (wochentagErste < 4) + if (wochentagErste < 4) { offset = wochentagErste - 2; + kw += 1; + } + else offset = (8 - wochentagErste) % 7;