add overall procedure

1 files changed, 33 insertions, 23 deletions

diff --git a/modeling/model_env.py b/modeling/model_env.py
index fd262c6..c548e99 100644
--- a/modeling/model_env.py
+++ b/modeling/model_env.py
@@ -6,7 +6,7 @@ def generate_environments():
 
     screen = {}
     generate_variables(screen)
-    # generate_procedures(screen)
+    generate_procedures(screen)
 
     envs.append(screen)
 
@@ -14,29 +14,39 @@ def generate_environments():
 
 
 def generate_procedures(screen):
-    screen["Procedure1"] = {"text": "proc1", "position": (400, 100)}
-    screen["Procedure2"] = {"text": "proc2", "position": (400, 200)}
-    screen["Procedure3"] = {"text": "proc3", "position": (400, 300)}
-    screen["Procedure4"] = {"text": "proc4", "position": (400, 400)}
-    screen["Procedure5"] = {"text": "proc5", "position": (400, 500)}
-    screen["ProcedureOverall"] = {"text": "proc_overall", "position": (400, 500)}
+    procs = ["procs1", "procs2", "procs3", "procs4", "procs5", "procs6"]
+    screen["Procedure1"] = {"text": procs[0], "position": (0, 100)}
+    screen["Procedure2"] = {"text": procs[1], "position": (0, 200)}
+    screen["Procedure3"] = {"text": procs[2], "position": (0, 300)}
+    screen["Procedure4"] = {"text": procs[3], "position": (0, 400)}
+    screen["Procedure5"] = {"text": procs[4], "position": (0, 500)}
 
+    screen["ProcedureOverall"] = {"text": "proc_overall", "position": (0, 600)}
+
+    screen["Answers"] = {"text": "Answers", "position": (100, 0)}
+    screen["Answer1"] = {"text": 1, "position": (100, 100)}
+    screen["Answer2"] = {"text": 2, "position": (100, 200)}
+    screen["Answer3"] = {"text": 3, "position": (100, 300)}
+    screen["Answer4"] = {"text": 4, "position": (100, 400)}
+    screen["Answer5"] = {"text": 5, "position": (100, 500)}
+
+    screen["AnswerOverall"] = {"text": "proc_overall", "position": (100, 600)}
 
 def generate_variables(screen):
     # Variables
-    screen["Algen"] = {"text": "Algen", "position": (100, 100)}
-    screen["AlgenVar"] = {"text": "3", "position": (100, 200)}
-    screen["Mineralien"] = {"text": "Mineralien", "position": (200, 100)}
-    screen["MineralienVar"] = {"text": "9", "position": (200, 200)}
-
-    screen["Gifte"] = {"text": "Gifte", "position": (300, 100)}
-    screen["GifteVar1"] = {"text": "3", "position": (300, 200)}
-    screen["GifteVar2"] = {"text": "1", "position": (300, 300)}
-    screen["GifteVar3"] = {"text": "8", "position": (300, 400)}
-    screen["GifteVar4"] = {"text": "6", "position": (300, 500)}
-
-    screen["Sandstein"] = {"text": "Sandstein", "position": (400, 100)}
-    screen["SandsteinVar1"] = {"text": "3", "position": (400, 200)}
-    screen["SandsteinVar2"] = {"text": "4", "position": (400, 300)}
-    screen["SandsteinVar3"] = {"text": "5", "position": (400, 400)}
-    screen["SandsteinVar4"] = {"text": "6", "position": (400, 500)}
+    screen["Algen"] = {"text": "Algen", "position": (400, 100)}
+    screen["AlgenVar"] = {"text": "3", "position": (400, 200)}
+    screen["Mineralien"] = {"text": "Mineralien", "position": (500, 100)}
+    screen["MineralienVar"] = {"text": "9", "position": (500, 200)}
+
+    screen["Gifte"] = {"text": "Gifte", "position": (600, 100)}
+    screen["GifteVar1"] = {"text": "3", "position": (600, 200)}
+    screen["GifteVar2"] = {"text": "1", "position": (600, 300)}
+    screen["GifteVar3"] = {"text": "8", "position": (600, 400)}
+    screen["GifteVar4"] = {"text": "6", "position": (600, 500)}
+
+    screen["Sandstein"] = {"text": "Sandstein", "position": (700, 100)}
+    screen["SandsteinVar1"] = {"text": "3", "position": (700, 200)}
+    screen["SandsteinVar2"] = {"text": "4", "position": (700, 300)}
+    screen["SandsteinVar3"] = {"text": "5", "position": (700, 400)}
+    screen["SandsteinVar4"] = {"text": "6", "position": (700, 500)}