Skip to content
Snippets Groups Projects
Commit e3df9fa5 authored by Lorenz Zahn's avatar Lorenz Zahn
Browse files

zwischenstand mittag

parent d9d9393b
Branches
No related tags found
No related merge requests found
# Generated by Django 4.1.4 on 2022-12-21 19:40
# Generated by Django 4.1.4 on 2022-12-22 08:43
from django.db import migrations, models
......@@ -13,11 +13,18 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='department',
name='invoice_number',
field=models.IntegerField(help_text='Identifier for invoice as number.', null=True, verbose_name='invoice number'),
field=models.IntegerField(null=True, verbose_name='invoice number'),
),
migrations.AddField(
model_name='receipt',
name='buper',
field=models.IntegerField(default=0),
preserve_default=False,
),
migrations.AddField(
model_name='receipt',
name='receipt_number',
field=models.IntegerField(help_text='Identifier for receipt as number.', null=True, verbose_name='receipt number'),
field=models.IntegerField(default=0, verbose_name='receipt number'),
preserve_default=False,
),
]
......@@ -9,7 +9,7 @@ from vkk.generic.forms import CustomDateInput
class ReceiptForm(forms.ModelForm):
class Meta:
model = models.Receipt
fields = ['start', 'end', 'receipt_number']
fields = ['start', 'end', 'receipt_number', 'buper']
widgets={
'start': CustomDateInput,
'end': CustomDateInput,
......
......@@ -74,8 +74,26 @@ class ReceiptTemplateSelectionView(FormView, AccountantRequiredMixin):
headers={'Content-Disposition': 'attachment; filename="dummy.csv"'},
)
# init writer for creating csv
writer = csv.writer(response)
writer.writerow(['First row', 'Foo', 'Bar', 'Baz'])
writer.writerow(['Second row', 'A', 'B', 'C', '"Testing"', "Here's a quote"])
# retrieving data for creating the receipt in csv format
template_data = json.loads(receipt_template.data)
data = json.loads(receipt.data)
# retrieving keys and writing header row
keys = template_data.keys()
writer.writeheader([str(key) for key in keys])
# getting columns and reorganize them to rows
table = zip(*(template_data.get[str(key)] for key in keys))
# here be conversion
# todo
[[print(i) for i in j] for j in table]
# writing data to csv
writer.writerows(table)
return response
\ No newline at end of file
......@@ -640,9 +640,11 @@ class Receipt(models.Model):
on_delete=models.CASCADE,
)
receipt_number = models.IntegerField(
null=True,
verbose_name=_('receipt number'),
)
buper = models.IntegerField(
verbose_name=_('buper'),
)
data = models.JSONField()
......
{
"Betrieb" : [
{ "method" : "FIXED", "value": "1" },
{ "method" : "FIXED", "value": "1" },
{ "method" : "FIXED", "value": "1" },
{ "method" : "FIXED", "value": "1" },
{ "method" : "FIXED", "value": "1" },
{ "method" : "FIXED", "value": "1" }
],
"Belegnr" : [
{ "method" : "GENERATED", "value" : "receipt_number" },
{ "method" : "GENERATED", "value" : "receipt_number" },
{ "method" : "GENERATED", "value" : "receipt_number" },
{ "method" : "GENERATED", "value" : "receipt_number" },
{ "method" : "GENERATED", "value" : "receipt_number" },
{ "method" : "GENERATED", "value" : "receipt_number" }
],
"Datum" : [
{ "method" : "GENERATED", "value" : "end" },
{ "method" : "GENERATED", "value" : "end" },
{ "method" : "GENERATED", "value" : "end" },
{ "method" : "GENERATED", "value" : "end" },
{ "method" : "GENERATED", "value" : "end" },
{ "method" : "GENERATED", "value" : "end" }
],
"BUPER" : [
{ "method" : "GENERATED", "value" : "buper" },
{ "method" : "GENERATED", "value" : "buper" },
{ "method" : "GENERATED", "value" : "buper" },
{ "method" : "GENERATED", "value" : "buper" },
{ "method" : "GENERATED", "value" : "buper" },
{ "method" : "GENERATED", "value" : "buper" }
],
"BA" : [
{ "method" : "FIXED", "value" : "SA" },
{ "method" : "FIXED", "value" : "SA" },
{ "method" : "FIXED", "value" : "SA" },
{ "method" : "FIXED", "value" : "SA" },
{ "method" : "FIXED", "value" : "SA" },
{ "method" : "FIXED", "value" : "SA" }
],
"KontoS" : [
{ "method" : "FIXED", "value" : "755000" },
{ "method" : "FIXED", "value" : "999980" },
{ "method" : "FIXED", "value" : "755000" },
{ "method" : "FIXED", "value" : "999980" },
{ "method" : "FIXED", "value" : "755000" },
{ "method" : "FIXED", "value" : "999980" }
],
"KontoH" : [
{ "method" : "FIXED", "value" : "999980" },
{ "method" : "FIXED", "value" : "562000" },
{ "method" : "FIXED", "value" : "999980" },
{ "method" : "FIXED", "value" : "562010" },
{ "method" : "FIXED", "value" : "999980" },
{ "method" : "FIXED", "value" : "562020" }
],
"Betrag" : [
{ "method" : "GENERATED", "value" : "data.salary_costs_annotated.costs_sum" },
{ "method" : "GENERATED", "value" : "data.salary_costs_annotated.costs_sum" },
{ "method" : "GENERATED", "value" : "data.department_costs.salary_costs" },
{ "method" : "GENERATED", "value" : "data.department_costs.salary_costs" },
{ "method" : "GENERATED", "value" : "data.general_costs.total" },
{ "method" : "GENERATED", "value" : "data.general_costs.total" }
],
"KSTS" : [
{ "method" : "GENERATED", "value" : "data.project.invoice_number" },
{ "method" : "GENERATED", "value" : "data.department.invoice_number" },
{ "method" : "GENERATED", "value" : "data.project.invoice_number" },
{ "method" : "GENERATED", "value" : "data.department.invoice_number" },
{ "method" : "GENERATED", "value" : "data.project.invoice_number" },
{ "method" : "FIXED", "value" : "770310" }
],
"Btext1" : [
{ "method" : "FIXED", "value" : "Zuordn. GK n. SZ u. VKK" },
{ "method" : "FIXED", "value" : "Zuordn. GK n. SZ u. VKK" },
{ "method" : "FIXED", "value" : "Zuordn. GK n. SZ u. VKK" },
{ "method" : "FIXED", "value" : "Zuordn. GK n. SZ u. VKK" },
{ "method" : "FIXED", "value" : "Zuordn. GK n. SZ u. VKK" },
{ "method" : "FIXED", "value" : "Zuordn. GK n. SZ u. VKK" }
],
"Btext2" : [
{ "method" : "GENERATED", "value" : "PGK end data.project.invoice_number" },
{ "method" : "GENERATED", "value" : "PGK end data.project.invoice_number" },
{ "method" : "GENERATED", "value" : "SGK end data.project.invoice_number" },
{ "method" : "GENERATED", "value" : "SGK end data.project.invoice_number" },
{ "method" : "GENERATED", "value" : "VGK end data.project.invoice_number" },
{ "method" : "GENERATED", "value" : "VGK end data.project.invoice_number" }
]
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment