fix: formatting of csv

app/vkk/workhours/accounting/projects/project/export/receipts/views.py

@@ -75,7 +75,7 @@ class ReceiptTemplateSelectionView(FormView, AccountantRequiredMixin):
         )
 
         # init writer for creating csv
-        writer = csv.writer(response)
+        writer = csv.writer(response, delimiter=';')
 
         # retrieving data for creating the receipt in csv format
         template_data = receipt_template.data
@@ -112,19 +112,18 @@ def _data_cell_calculation(template, receipt, data):
         args = value.split(" ")
         out = []
         for arg in args:
+            lookup = None
             parts = arg.split(".")
             if parts[0] == "data":
                 lookup = data
+            elif hasattr(receipt, parts[0]):
+                lookup = getattr(receipt, parts[0])
+            if lookup is not None:
                 for part in parts[1:]:
-                    lookup = lookup.get(part)
-                    if lookup is None:
-                        break
-                if lookup is not None:
-                    out.append(str(_format(lookup)))
-            elif parts[0] in vars(receipt):
-                lookup = vars(receipt)
-                for part in parts:
-                    lookup = lookup.get(part)
+                    if isinstance(lookup, dict):
+                        lookup = lookup.get(part)
+                    elif hasattr(lookup, part):
+                        lookup = getattr(lookup, part)
                     if lookup is None:
                         break
                 if lookup is not None:

app/vkk/workhours/models.py

@@ -609,7 +609,7 @@ class ReceiptTemplate(models.Model):
     data = models.JSONField()
 
     def __str__(self):
-        return f"{self._meta.verbose_name}: {self.pk}"
+        return f"{self._meta.verbose_name}: {self.start}"
 
     class Meta:
         default_permissions = ()

receipt_template.json

@@ -23,6 +23,14 @@
         { "method" : "GENERATED", "value" : "end" },
         { "method" : "GENERATED", "value" : "end" }
     ]},
+    { "Jahr" : [
+        { "method" : "GENERATED", "value" : "end.year" },
+        { "method" : "GENERATED", "value" : "end.year" },
+        { "method" : "GENERATED", "value" : "end.year" },
+        { "method" : "GENERATED", "value" : "end.year" },
+        { "method" : "GENERATED", "value" : "end.year" },
+        { "method" : "GENERATED", "value" : "end.year" }
+    ]},
     { "BUPER" : [
         { "method" : "GENERATED", "value" : "buper" },
         { "method" : "GENERATED", "value" : "buper" },