Browse Source

refactor valueChosenOrEntered to value

aguryev 3 years ago
parent
commit
5d4fe1993c
1 changed files with 7 additions and 7 deletions
  1. 7 7
      antrag.py

+ 7 - 7
antrag.py

@@ -91,10 +91,10 @@ class SampleAntrag(Antrag):
         }
 
         if self.instance['product_line'].get('name') == 'Automobile':
-            vehicle_type = self.get_field_by_name('VehicleType').get('valueChosenOrEntered')
+            vehicle_type = self.get_field_by_name('VehicleType').get('value')
             brand_field = self.get_field_by_name('Brand')
             brand_field['inputRange'] = ['async', mapVechicleToList[vehicle_type]]
-            #brand_field['valueChosenOrEntered'] = None
+            #brand_field['value'] = None
 
 
     def update_attachments(self):
@@ -128,7 +128,7 @@ class SampleAntrag(Antrag):
         
         # get files from db
         antrag_files = File.query.filter_by(parent_id=self.id).all()
-        attachments['valueChosenOrEntered'] = [
+        attachments['value'] = [
             {
                 "id": file.id,
                 "name": file.filename,
@@ -174,7 +174,7 @@ class SampleAntrag(Antrag):
         
         # get files from db
         antrag_docs = File.query.filter_by(type="document").group_by(File.filename).all()
-        documents['valueChosenOrEntered'] = [
+        documents['value'] = [
             {
                 "id": file.id,
                 "name": file.filename,
@@ -201,10 +201,10 @@ class SampleAntrag(Antrag):
         for key, value in data['values'].items():
             field = self.get_field_by_name(key)
             if field and (field['fieldType'] == 1):
-                field['valueChosenOrEntered'] = booleans.get(value) or value
+                field['value'] = booleans.get(value) or value
                 if field.get("fieldDataType") == "FlagWithOptions" and field.get("relatedFields"):
                     for sub_field in field['relatedFields']:
-                        sub_field['valueChosenOrEntered'] = data['values'].get(sub_field['name'])
+                        sub_field['value'] = data['values'].get(sub_field['name'])
 
         self.update_auto_brands()
         self.update_attachments()
@@ -225,7 +225,7 @@ class SampleAntrag(Antrag):
         # execute activity
         if data['activity'] == 'Berechnen':
             premium = self.get_field_by_name('premium')
-            premium['valueChosenOrEntered'] = 1347
+            premium['value'] = 1347
             self.instance['status'] = 'Calculated'
             return self.get()