Removing display related information in models

api/rpk-api/firm/contract/models.py

@@ -17,6 +17,7 @@ class ContractStatus(str, Enum):
     signed = 'signed'
     printed = 'printed'
     executed = 'executed'
+    canceled = 'canceled'
 
 
 class ContractDraftStatus(str, Enum):
@@ -94,15 +95,8 @@ class ContractDraft(CrudDocument):
     name: str = Field(title="Nom")
     title: str = Field(title="Titre")
     parties: List[DraftParty] = Field(title="Parties")
-    provisions: List[DraftProvision] = Field(
+    provisions: List[DraftProvision] = Field(title='Clauses')
-        props={"items-per-row": "1", "numbered": True},
+    variables: List[DictionaryEntry] = Field(default=[], title='Variables')
-        title='Clauses'
-    )
-    variables: List[DictionaryEntry] = Field(
-        default=[],
-        format="dictionary",
-        title='Variables'
-    )
     status: ContractDraftStatus = Field(default=ContractDraftStatus.in_progress, title="Statut")
     todo: List[str] = Field(default=[], title="Reste à faire")
 

api/rpk-api/firm/template/models.py

@@ -85,16 +85,8 @@ class ContractTemplate(CrudDocument):
     name: str = Field(title="Nom")
     title: str = Field(title="Titre")
     parties: List[PartyTemplate] = Field(default=[], title="Parties")
-    provisions: List[ProvisionTemplateReference] = Field(
+    provisions: List[ProvisionTemplateReference] = Field(default=[], title="Clauses")
-        default=[],
+    variables: List[DictionaryEntry] = Field(default=[], title="Variables")
-        props={"items-per-row": "1", "numbered": True},
-        title="Clauses"
-    )
-    variables: List[DictionaryEntry] = Field(
-        default=[],
-        format="dictionary",
-        title="Variables"
-    )
 
     def compute_label(self) -> str:
         return f"{self.name} - \"{unescape(remove_html_tags(self.title))}\""