fixed #61, #62 refactored getTime variants

DocumentCreator/templates/abrechnung.typ

@@ -37,31 +37,35 @@
   [Zeitraum: #meta.TimeRange]
 
   table(
-    columns: (1fr, 1fr, 1fr, 1fr, 1fr, 1fr, .875fr, 1.25fr),
+  columns: (1fr, 1fr, 1fr, 1fr, 1fr, 1fr, .875fr, 1.25fr),
   fill: (x, y) =>
     if y == 0 { oklch(87%, 0, 0deg) },
   table-header(
-    [Datum], [Kommen], [Gehen], [Arbeitsart], [Stunden], [Pause], [Überstunden]
+    [Datum], [Kommen], [Gehen], [Arbeitsart], [Stunden], [Kurzarbeit], [Pause], [Überstunden]
   ),
   .. for day in days {
     (
     [#day.Date],
     if day.DayParts.len() == 0{
         table.cell(colspan: 3)[Keine Buchungen]
-    }else if not day.DayParts.first().IsWorkDay{
+    }else if day.DayParts.len() == 1 and not day.DayParts.first().IsWorkDay{
       table.cell(colspan: 3)[#day.DayParts.first().WorkType]
     }
     else {
-
     table.cell(colspan: 3, inset: 0em)[
-
       #table(
         columns: (1fr, 1fr, 1fr),
         .. for Zeit in day.DayParts {
       (
-      [#Zeit.BookingFrom],
-      [#Zeit.BookingTo],
-      [#Zeit.WorkType],
+        if Zeit.IsWorkDay{
+        (
+          table.cell()[#Zeit.BookingFrom],
+          table.cell()[#Zeit.BookingTo],
+          table.cell()[#Zeit.WorkType],
+        )
+        }else{
+          (table.cell(colspan: 3)[#Zeit.WorkType],)
+        }
       )
     },
       )
@@ -85,9 +89,9 @@
     stroke: none,
     table.hline(start: 0, end: 2, stroke: stroke(dash:"dashed", thickness:.5pt)),
   [Arbeitszeit :], table.cell(align: left)[#meta.WorkTime],
+  [Kurzarbeit :], table.cell(align: left)[#meta.Kurzarbeit],
   [Überstunden :], table.cell(align: left)[#meta.Overtime],
-  [Überstunden :],table.cell(align: left)[#meta.OvertimeTotal],
+  [Überstunden lfd. :],table.cell(align: left)[#meta.OvertimeTotal],
   table.hline(start: 0, end: 2),
-
 )
 }