Support non-working work days

E.g. when having a 4-day work week Part of TIM-15 Conflicts: config.dist.php
netresearch · Apr 6, 2017 · 5e64a31 · 5e64a31
1 parent 97213a8
commit 5e64a31
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/data/templates/month.tpl.php b/data/templates/month.tpl.php
@@ -85,7 +85,7 @@
         $class = 'alert-danger';
     }
     $mainclass = '';
-    if ($day['dow'] >= 6 || $day['holiday']) {
+    if ($day['required'] == 0 || $day['holiday']) {
         $mainclass = 'muted';
     }
     if ($day['dow'] == 7) {
@@ -97,7 +97,7 @@
 
     echo "<tr class='$mainclass'>"
         . '<td><nobr>' . $day['date'] . '</nobr></td>';
-    if ($day['holiday'] && $day['worked'] == 0.0) {
+    if (($day['holiday'] || $day['required'] == 0) && $day['worked'] == 0.0) {
         echo '<td colspan="4">' . $day['name'] . '</td>';
     } else {
         echo '<td class="r">' . $day['required'] . '</td>'

diff --git a/src/data.php b/src/data.php
@@ -170,14 +170,14 @@
         'holiday'  => isset($holidays[$date]),
         'future'   => $date > $today,
     );
-    if ($days[$date]['dow'] >= 6 || $days[$date]['holiday']) {
+    if ($days[$date]['holiday']) {
         $days[$date]['required'] = 0;
+    }
+    if ($days[$date]['required'] == 0) {
         if ($days[$date]['holiday']) {
             $days[$date]['name'] = $holidays[$date];
-        } else if ($days[$date]['dow'] == 6) {
-            $days[$date]['name'] = 'Sonnabend';
-        } else if ($days[$date]['dow'] == 7) {
-            $days[$date]['name'] = 'Sonntag';
+        } else {
+            $days[$date]['name'] = strftime('%A', $ts);
         }
         $days[$date]['holiday'] = true;
     }