kw 52 und 53 gfixed

2021-01-08 14:23:43 +01:00
parent d49965d367
commit 1911bcf5e5
1 changed files with 10 additions and 2 deletions
@@ -125,14 +125,22 @@ int datum::kwBerechnen()
 		kw += 1;
 	}
 		
-	else
+	else {
 		offset = (8 - wochentagErste) % 7;
+		offset = 7 - (offset+1);
+	}
 	

 	kw += ((tage + offset) / 7);

 	if (kw == 0)
-		kw = 53;
+	{
+		datum datum2(31, 12, jahr - 1);
+		if (datum2.kwBerechnen() == 52)
+			kw = 52;
+		else
+			kw = 53;
+	}

 	else if (kw == 53)
 	{