From 6d6dc2d82b29ab466e797efe1a071b4d043e10f5 Mon Sep 17 00:00:00 2001 From: ewandor Date: Fri, 17 Feb 2023 19:43:56 +0100 Subject: [PATCH] Adding contract location/date and party reprensetative --- back/app/contract/models.py | 17 ++++++++++++++++- back/app/contract/schemas.py | 4 +++- back/app/template/models.py | 9 +++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/back/app/contract/models.py b/back/app/contract/models.py index cfc78bc8..9da94b8c 100644 --- a/back/app/contract/models.py +++ b/back/app/contract/models.py @@ -1,3 +1,5 @@ + +import datetime from typing import List, Literal from enum import Enum @@ -28,6 +30,15 @@ class Party(BaseModel): } ) part: str + representative_id: str = Field( + foreignKey={ + "reference": { + "resource": "entity", + "schema": "Entity", + } + }, + default="" + ) class ProvisionGenuine(BaseModel): @@ -58,9 +69,13 @@ class ContractDraft(CrudDocument): name: str title: str parties: List[Party] - provisions: List[DraftProvision] + provisions: List[DraftProvision] = Field( + props={"items-per-row": "1", "numbered": True} + ) variables: List[DictionaryEntry] = Field( default=[], format="dictionary", ) status: ContractDraftStatus = Field(default=ContractDraftStatus.draft) + location: str = "" + date: datetime.date = datetime.date(1, 1, 1) diff --git a/back/app/contract/schemas.py b/back/app/contract/schemas.py index 733764ff..eddc0c10 100644 --- a/back/app/contract/schemas.py +++ b/back/app/contract/schemas.py @@ -1,4 +1,4 @@ - +import datetime from typing import List from pydantic import Field @@ -23,6 +23,8 @@ class ContractDraftCreate(Writer): default=[], format="dictionary", ) + location: str = "" + date: datetime.date = datetime.date(1, 1, 1) async def validate_foreign_key(self): return diff --git a/back/app/template/models.py b/back/app/template/models.py index 00a05e20..8461b613 100644 --- a/back/app/template/models.py +++ b/back/app/template/models.py @@ -17,6 +17,15 @@ class PartyTemplate(BaseModel): default="" ) part: str + representative_id: str = Field( + foreignKey={ + "reference": { + "resource": "entity", + "schema": "Entity", + } + }, + default="" + ) def remove_html_tags(text):