From a2edb23f4007269e3e501ef27d52ed72330387ea Mon Sep 17 00:00:00 2001 From: Robin Gohmert Date: Fri, 31 Jan 2025 17:11:00 +0100 Subject: [PATCH 1/2] Fixed IncludedNote.content field type --- drafthorse/models/note.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drafthorse/models/note.py b/drafthorse/models/note.py index b8df3b3..3d00c2d 100644 --- a/drafthorse/models/note.py +++ b/drafthorse/models/note.py @@ -1,15 +1,14 @@ -from .container import StringContainer from . import BASIC, COMFORT, EXTENDED, NS_RAM from .elements import Element -from .fields import MultiStringField, StringField +from .fields import StringField class IncludedNote(Element): - content_code = StringField(NS_RAM, "ContentCode", required=False, profile=EXTENDED) - content: StringContainer = MultiStringField( + content_code: StringField = StringField(NS_RAM, "ContentCode", required=False, profile=EXTENDED) + content: StringField = StringField( NS_RAM, "Content", required=False, profile=BASIC ) - subject_code = StringField(NS_RAM, "SubjectCode", required=False, profile=COMFORT) + subject_code: StringField = StringField(NS_RAM, "SubjectCode", required=False, profile=COMFORT) class Meta: namespace = NS_RAM From 7cebee79bb42a7eadd693a91ecf917aefcedce9f Mon Sep 17 00:00:00 2001 From: Robin Gohmert Date: Wed, 12 Feb 2025 13:53:40 +0100 Subject: [PATCH 2/2] Fixed formatting and tests --- drafthorse/models/note.py | 10 ++++++---- tests/conftest.py | 4 +--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drafthorse/models/note.py b/drafthorse/models/note.py index 3d00c2d..4e51a1f 100644 --- a/drafthorse/models/note.py +++ b/drafthorse/models/note.py @@ -4,11 +4,13 @@ class IncludedNote(Element): - content_code: StringField = StringField(NS_RAM, "ContentCode", required=False, profile=EXTENDED) - content: StringField = StringField( - NS_RAM, "Content", required=False, profile=BASIC + content_code: StringField = StringField( + NS_RAM, "ContentCode", required=False, profile=EXTENDED + ) + content: StringField = StringField(NS_RAM, "Content", required=False, profile=BASIC) + subject_code: StringField = StringField( + NS_RAM, "SubjectCode", required=False, profile=COMFORT ) - subject_code: StringField = StringField(NS_RAM, "SubjectCode", required=False, profile=COMFORT) class Meta: namespace = NS_RAM diff --git a/tests/conftest.py b/tests/conftest.py index b3d092d..5238a6f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -22,9 +22,7 @@ def invoice_document(request): doc.header.issue_date_time = date.today() doc.header.languages.add("de") - note = IncludedNote() - note.content.add("Test Node 1") - doc.header.notes.add(note) + doc.header.notes.add(IncludedNote(content="Test Node 1")) doc.trade.agreement.seller.name = "Lieferant GmbH" doc.trade.settlement.payee.name = "Lieferant GmbH"