refactor valueChosenOrEntered to value

AntragDrucken.py

@@ -11,7 +11,7 @@ class Field:
     fieldType: int
     isGroupField: bool
     group: str
-    valueChosenOrEnteredOutput: object
+    valueOutput: object
     kurzbeschreibung: str
 
 
@@ -27,13 +27,13 @@ class AntragDrucken:
         for fieldGroup in self.antrag.instance["field_groups"]:
             self.activityFields.append(Field(name=fieldGroup["name"],
                                              fieldType=fieldGroup["fieldType"],
-                                             isGroupField=True, group="", valueChosenOrEnteredOutput=None,
+                                             isGroupField=True, group="", valueOutput=None,
                                              kurzbeschreibung=fieldGroup["brief"]))
             for field in self.antrag.instance[fieldGroup["name"]]:
                 self.activityFields.append(Field(name=field["name"],
                                                  fieldType=field["fieldType"],
                                                  isGroupField=False, group=fieldGroup["name"],
-                                                 valueChosenOrEnteredOutput=field["valueChosenOrEntered"],
+                                                 valueOutput=field["value"],
                                                  kurzbeschreibung=field["brief"]))
         self._printPDF()
         return True
@@ -85,32 +85,32 @@ Based on the given parameters we are happy to provide a premium indication as fo
             html += template
 
             for field in [x for x in self.activityFields if not x.isGroupField and x.group == groupField.name]:
-                if isinstance(field.valueChosenOrEnteredOutput, datetime):
-                    field.valueChosenOrEnteredOutput = field.valueChosenOrEnteredOutput.strftime("%Y-%M-%D")
+                if isinstance(field.valueOutput, datetime):
+                    field.valueOutput = field.valueOutput.strftime("%Y-%M-%D")
                 if field.fieldType == 3:  # Don' print hidden fields!
                     continue
                 template = f"""<tr><font face="arial" size="8"><b>
                     <td align="right">{str(field.kurzbeschreibung)}</td></b></font>
-                    <td><font face="arial" size="9">{str(field.valueChosenOrEnteredOutput)}</font></td>
+                    <td><font face="arial" size="9">{str(field.valueOutput)}</font></td>
                     </tr>"""
                 html += template
 
         # Output of fields without group
         for field in [x for x in self.activityFields if not x.isGroupField and not x.group]:
-            if isinstance(field.valueChosenOrEnteredOutput, datetime):
-                field.valueChosenOrEnteredOutput = field.valueChosenOrEnteredOutput.strftime("%Y-%M-%D")
+            if isinstance(field.valueOutput, datetime):
+                field.valueOutput = field.valueOutput.strftime("%Y-%M-%D")
             if field.fieldType == 3:  # Don' print hidden fields!
                 continue
             if field.name == "premium":
                 template = f"""<tr><font face="arial" size="9"><b>
                     <td align="right"><br>{str(field.kurzbeschreibung)} in Euro</td></b></font>
-                    <td align="left"><b>{str(field.valueChosenOrEnteredOutput)}</b></td>
+                    <td align="left"><b>{str(field.valueOutput)}</b></td>
                     </tr>"""
                 html += template
             else:
                 template = f"""<tr><font face="arial" size="9"><b>
                     <td align="right">{str(field.kurzbeschreibung)} </td></b></font>
-                    <td>{str(field.valueChosenOrEnteredOutput)}</td>
+                    <td>{str(field.valueOutput)}</td>
                     </tr>"""
                 html += template
 

pms/data/antrags.json

@@ -10,9 +10,9 @@
         "fieldDataType": "Zahl",
         "inputRange": [],
         "onlyFromRange": true,
-        "valueChosenOrEntered": "None",
-        "valueChosenOrEnteredTech": "None",
-        "valueChosenOrEnteredOutput": "Euro None",
+        "value": "None",
+        "valueTech": "None",
+        "valueOutput": "Euro None",
         "inputTriggers": false,
         "isMandatory": false,
         "errorMessage": "",
@@ -29,7 +29,7 @@
         "fieldDataType": "Flag",
         "inputRange": [],
         "onlyFromRange": false,
-        "valueChosenOrEntered": "True",
+        "value": "True",
         "inputTriggers": false,
         "isMandatory": false,
         "errorMessage": "",
@@ -44,7 +44,7 @@
         "fieldDataType": "Flag",
         "inputRange": [],
         "onlyFromRange": false,
-        "valueChosenOrEntered": "True",
+        "value": "True",
         "inputTriggers": false,
         "isMandatory": false,
         "errorMessage": "",
@@ -59,7 +59,7 @@
         "fieldDataType": "Flag",
         "inputRange": [],
         "onlyFromRange": false,
-        "valueChosenOrEntered": "True",
+        "value": "True",
         "inputTriggers": false,
         "isMandatory": false,
         "errorMessage": "",
@@ -74,7 +74,7 @@
         "fieldDataType": "Flag",
         "inputRange": [],
         "onlyFromRange": false,
-        "valueChosenOrEntered": "True",
+        "value": "True",
         "inputTriggers": false,
         "isMandatory": false,
         "errorMessage": "",
@@ -91,7 +91,7 @@
         "fieldDataType": "Datum",
         "inputRange": [],
         "onlyFromRange": false,
-        "valueChosenOrEntered": "2021-01-01",
+        "value": "2021-01-01",
         "inputTriggers": false,
         "isMandatory": true,
         "errorMessage": "",
@@ -104,7 +104,7 @@
         "tooltip": "Please give the detailes on the previously canceled policies if any",
         "icon": "",
         "fieldDataType": "FlagWithOptions",
-        "valueChosenOrEntered": "False",
+        "value": "False",
         "isMandatory": true,
         "relatedFields": [
           {
@@ -121,7 +121,7 @@
             "brief": "Insurance Company",
             "tooltip": "Please type the name of the insurance company where the last polisy was cancel",
             "fieldDataType": "Text",
-            "valueChosenOrEntered": "",
+            "value": "",
             "isMandatory": true
           },
           {
@@ -130,7 +130,7 @@
             "brief": "Cancelation Reason",
             "tooltip": "Please type the reason for the policy cancelation",
             "fieldDataType": "TextBox",
-            "valueChosenOrEntered": "",
+            "value": "",
             "isMandatory": true
           }
         ]
@@ -151,7 +151,7 @@
           "Bus"
         ],
         "onlyFromRange": false,
-        "valueChosenOrEntered": "Car",
+        "value": "Car",
         "inputTriggers": true,
         "isMandatory": true,
         "errorMessage": "",
@@ -166,7 +166,7 @@
         "fieldDataType": "Text",
         "inputRange": ["async", "carBrand"],
         "onlyFromRange": false,
-        "valueChosenOrEntered": "Renault",
+        "value": "Renault",
         "isMandatory": true,
         "errorMessage": "",
         "endpoint": ""
@@ -184,7 +184,7 @@
           "80"
         ],
         "onlyFromRange": true,
-        "valueChosenOrEntered": "30",
+        "value": "30",
         "inputTriggers": false,
         "isMandatory": true,
         "errorMessage": "",
@@ -199,7 +199,7 @@
         "fieldDataType": "Flag",
         "inputRange": [],
         "onlyFromRange": false,
-        "valueChosenOrEntered": "True",
+        "value": "True",
         "inputTriggers": false,
         "isMandatory": false,
         "errorMessage": "",
@@ -218,7 +218,7 @@
           "99999"
         ],
         "onlyFromRange": true,
-        "valueChosenOrEntered": "1010",
+        "value": "1010",
         "inputTriggers": false,
         "isMandatory": true,
         "errorMessage": "",
@@ -237,7 +237,7 @@
           "17"
         ],
         "onlyFromRange": true,
-        "valueChosenOrEntered": "0",
+        "value": "0",
         "inputTriggers": true,
         "isMandatory": true,
         "errorMessage": "",
@@ -257,7 +257,7 @@
           "for use in the taxi trade"
         ],
         "onlyFromRange": false,
-        "valueChosenOrEntered": "no special use",
+        "value": "no special use",
         "inputTriggers": false,
         "isMandatory": true,
         "errorMessage": "",
@@ -276,7 +276,7 @@
           "20"
         ],
         "onlyFromRange": true,
-        "valueChosenOrEntered": "0",
+        "value": "0",
         "inputTriggers": false,
         "isMandatory": false,
         "errorMessage": "",
@@ -295,7 +295,7 @@
           "annually"
         ],
         "onlyFromRange": true,
-        "valueChosenOrEntered": "monthly",
+        "value": "monthly",
         "inputTriggers": false,
         "isMandatory": true,
         "errorMessage": "",
@@ -326,7 +326,7 @@
           ">20"
         ],
         "onlyFromRange": true,
-        "valueChosenOrEntered": "New",
+        "value": "New",
         "inputTriggers": false,
         "isMandatory": true,
         "errorMessage": "",
@@ -351,7 +351,7 @@
           "Combined Diesel and Electric Motor"
         ],
         "onlyFromRange": true,
-        "valueChosenOrEntered": "Petrol",
+        "value": "Petrol",
         "inputTriggers": false,
         "isMandatory": true,
         "errorMessage": "",
@@ -370,7 +370,7 @@
           "500"
         ],
         "onlyFromRange": false,
-        "valueChosenOrEntered": "None",
+        "value": "None",
         "inputTriggers": false,
         "isMandatory": true,
         "errorMessage": "",
@@ -389,7 +389,7 @@
           "999"
         ],
         "onlyFromRange": false,
-        "valueChosenOrEntered": "None",
+        "value": "None",
         "inputTriggers": false,
         "isMandatory": true,
         "errorMessage": "",
@@ -408,7 +408,7 @@
           "15000"
         ],
         "onlyFromRange": true,
-        "valueChosenOrEntered": "None",
+        "value": "None",
         "inputTriggers": false,
         "isMandatory": false,
         "errorMessage": "",
@@ -429,7 +429,7 @@
           "999999"
         ],
         "onlyFromRange": false,
-        "valueChosenOrEntered": "None",
+        "value": "None",
         "inputTriggers": true,
         "isMandatory": true,
         "errorMessage": "",
@@ -444,7 +444,7 @@
         "fieldDataType": "Zahl",
         "inputRange": [],
         "onlyFromRange": false,
-        "valueChosenOrEntered": "0",
+        "value": "0",
         "inputTriggers": false,
         "isMandatory": false,
         "errorMessage": "",
@@ -466,7 +466,7 @@
           "Parking damage general Waiver"
         ],
         "onlyFromRange": true,
-        "valueChosenOrEntered": "Full hull general Waiver",
+        "value": "Full hull general Waiver",
         "inputTriggers": true,
         "isMandatory": false,
         "errorMessage": "",
@@ -485,7 +485,7 @@
           "950"
         ],
         "onlyFromRange": true,
-        "valueChosenOrEntered": "350",
+        "value": "350",
         "inputTriggers": false,
         "isMandatory": false,
         "errorMessage": "",
@@ -505,7 +505,7 @@
           "Driver and Passengers"
         ],
         "onlyFromRange": true,
-        "valueChosenOrEntered": "Driver and Passengers",
+        "value": "Driver and Passengers",
         "inputTriggers": false,
         "isMandatory": false,
         "errorMessage": "",
@@ -529,7 +529,7 @@
         "fieldDataType": "Text",
         "inputRange": [],
         "onlyFromRange": false,
-        "valueChosenOrEntered": "\u20ac 20.000,00",
+        "value": "\u20ac 20.000,00",
         "inputTriggers": false,
         "isMandatory": true,
         "errorMessage": "",
@@ -544,9 +544,9 @@
         "fieldDataType": "Text",
         "inputRange": [],
         "onlyFromRange": false,
-        "valueChosenOrEntered": "\u20ac 40.000,00",
-        "valueChosenOrEnteredTech": "\u20ac 40.000,00",
-        "valueChosenOrEnteredOutput": "\u20ac 40.000,00",
+        "value": "\u20ac 40.000,00",
+        "valueTech": "\u20ac 40.000,00",
+        "valueOutput": "\u20ac 40.000,00",
         "inputTriggers": false,
         "isMandatory": true,
         "errorMessage": "",
@@ -561,7 +561,7 @@
         "fieldDataType": "Image",
         "inputRange": [],
         "onlyFromRange": false,
-        "valueChosenOrEntered": {
+        "value": {
           "width": 300,
           "height": 600,
           "viewBox": "0 0 600 1200",
@@ -617,7 +617,7 @@
         "brief": "Chart Demo",
         "tooltip": "Time series example",
         "fieldDataType": "Chart",
-        "valueChosenOrEntered": {
+        "value": {
           "axis": {
             "x": {
               "label": "Days"