Update app.py

app.py

@@ -115,7 +115,7 @@ def fetch_personalized_data(externalID):
                            e5390g37899_decisions.tripledAmount1,
                            e5390g37899_decisions.keptForSelf1,
                            e5390g37899_decisions.returned1,
-                           e5390g37899_decisions.totalRound2, 
+                           e5390g37899_decisions.totalRound1, 
                            e5390g37899_decisions.transfer2,
                            e5390g37899_decisions.tripledAmount2,
                            e5390g37899_decisions.keptForSelf2,
@@ -158,7 +158,7 @@ def fetch_personalized_data(externalID):
                            e5390g37899_decisions.tripledAmount1,
                            e5390g37899_decisions.keptForSelf1,
                            e5390g37899_decisions.returned1,
-                           e5390g37899_decisions.totalRound2, 
+                           e5390g37899_decisions.totalRound1, 
                            e5390g37899_decisions.transfer2,
                            e5390g37899_decisions.tripledAmount2,
                            e5390g37899_decisions.keptForSelf2,
@@ -210,7 +210,7 @@ def fetch_personalized_data(externalID):
                     'tripledAmount1': row[9],
                     'keptForSelf1': row[10],
                     'returned1': row[11],
-                    'totalRound2': row[12],
+                    'totalRound1': row[12],
                     'transfer2': row[13],
                     'tripledAmount2': row[14],
                     'keptForSelf2': row[15],
@@ -245,9 +245,9 @@ def extract_variables(all_personalized_data, part):
     extracted_data = {}
 
     if part == "1":
-        rounds = range(1, 4)  # Rounds 1-3
+        rounds = range(1, 4)  # Rounds 1-3 for part 1
     elif part == "2":
-        rounds = range(1, 4)  # Rounds 1-3 for part 2 as well
+        rounds = range(4, 7)  # Rounds 4-6 for part 2 
     else:
         print("No data for the particular part found")
         return None
@@ -256,10 +256,14 @@ def extract_variables(all_personalized_data, part):
         role = map_role(str(data.get('role', 'unknown')))  # Get the role description
         player_data = {}  # Store data for the current player
         for round_num in rounds:
-            round_key = f'round{round_num}'
+            round_key = f'round{round_num - 3 if part == "2" else round_num}'  # Adjusting round numbers if part is 2
             player_data[round_key] = {}
             for var in ['transfer', 'tripledAmount', 'keptForSelf', 'returned', 'totalRound']:
                 var_name = f'{var}{round_num}'
+                if role == 'The Dealer' and var == 'tripledAmount':
+                    continue  # Skip adding 'tripledAmount' for the Dealer
+                if role == 'The Investor' and var == 'keptForSelf':
+                    continue  # Skip adding 'keptForSelf' for the Investor
                 if data.get(var_name) is not None:
                     player_data[round_key][var] = data[var_name]
 
@@ -396,7 +400,7 @@ def generate(
                 groupNrStart = entry.get('groupNrStart', "no_groupNrStart")  # Retrieve groupNrStart value
                 onPage = entry.get('onPage', "no_onPage")  # Retrieve onPage value
                 role = entry.get('role', "no_role")  # Retrieve role value
-                part = role = entry.get('part', "no_part")  # Retrieve part value
+                part = entry.get('part', "no_part")  # Retrieve part value
                 break  # Break the loop since we found the desired entry
     
     # Print the values of onPage, playerNr, and groupNrStart and oart
@@ -412,7 +416,7 @@ def generate(
     print("onPage_prompt:", onPage_prompt)
 
     # Print the role value 
-    role_prompt = map_role(role) 
+    role_prompt = map_role(str(role))
     print("role_prompt:", role_prompt)
     
     extracted_data = extract_variables(all_personalized_data, part)