From 282e070af84c23b5bc664eb4d150c6eda157e50c Mon Sep 17 00:00:00 2001 From: Guillaume Paris Date: Tue, 10 Jun 2025 08:53:48 +0200 Subject: [PATCH 1/3] [pyobas] Update mandatory contract properties --- pyobas/contracts/contract_config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyobas/contracts/contract_config.py b/pyobas/contracts/contract_config.py index 8262829..af228ff 100644 --- a/pyobas/contracts/contract_config.py +++ b/pyobas/contracts/contract_config.py @@ -73,9 +73,9 @@ class ContractElement(ABC): key: str label: str type: str = field(default="", init=False) - mandatoryGroups: List[str] = None - mandatoryConditionField: str = None - mandatoryConditionValue: str = None + mandatoryGroups: List["ContractElement"] = field(default_factory=list) + mandatoryConditionFields: List["ContractElement"] = field(default_factory=list) + mandatoryConditionValues: List[str] = field(default_factory=list) linkedFields: List["ContractElement"] = field(default_factory=list) linkedValues: List[str] = field(default_factory=list) mandatory: bool = False From cfc12006ba5f813f2334d74a22c1e3c06e136a49 Mon Sep 17 00:00:00 2001 From: Guillaume Paris Date: Tue, 17 Jun 2025 14:34:41 +0200 Subject: [PATCH 2/3] [pyobas] Update mandatory contract properties --- pyobas/contracts/contract_config.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pyobas/contracts/contract_config.py b/pyobas/contracts/contract_config.py index af228ff..710e8ea 100644 --- a/pyobas/contracts/contract_config.py +++ b/pyobas/contracts/contract_config.py @@ -2,7 +2,7 @@ from abc import ABC, abstractmethod from dataclasses import dataclass, field from enum import Enum -from typing import List +from typing import List, Dict from pyobas import utils from pyobas.contracts.contract_utils import ContractCardinality, ContractVariable @@ -73,11 +73,12 @@ class ContractElement(ABC): key: str label: str type: str = field(default="", init=False) - mandatoryGroups: List["ContractElement"] = field(default_factory=list) - mandatoryConditionFields: List["ContractElement"] = field(default_factory=list) - mandatoryConditionValues: List[str] = field(default_factory=list) - linkedFields: List["ContractElement"] = field(default_factory=list) - linkedValues: List[str] = field(default_factory=list) + mandatoryGroups: List[str] = field(default_factory=list) + mandatoryConditionFields: List[str] = field(default_factory=list) + mandatoryConditionValues: Dict[str, any] = field(default_factory=list) + visibleConditionFields: List[str] = field(default_factory=list) + visibleConditionValues: Dict[str, any] = field(default_factory=list) + linkedFields: List[str] = field(default_factory=list) mandatory: bool = False readOnly: bool = False From af6c3bcdd7c9764058b890d57c23a61213b49948 Mon Sep 17 00:00:00 2001 From: Guillaume Paris Date: Mon, 8 Sep 2025 20:18:48 +0200 Subject: [PATCH 3/3] formatting --- pyobas/contracts/contract_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyobas/contracts/contract_config.py b/pyobas/contracts/contract_config.py index 710e8ea..62a842f 100644 --- a/pyobas/contracts/contract_config.py +++ b/pyobas/contracts/contract_config.py @@ -2,7 +2,7 @@ from abc import ABC, abstractmethod from dataclasses import dataclass, field from enum import Enum -from typing import List, Dict +from typing import Dict, List from pyobas import utils from pyobas.contracts.contract_utils import ContractCardinality, ContractVariable