Merge branch 'feat/format-code' of https://github.com/richardkoehler/App_ClinicalDBSAnnot into feat/format-code

Author: richardkoehler

src/clinical_dbs_annotator/utils/longitudinal_exporter.py

@@ -685,8 +685,16 @@ def _add_longitudinal_data_table(
         ]
         display_cols = [c for c in lateral_df.columns if c not in columns_to_exclude]
 
-        lateral_cols = ["date", "laterality", "frequency", "anode", "cathode", "amplitude", "pulse_width"]
-        common_cols = ["program_ID", "scale_name", "scale_value", "notes"]
+        lateral_cols = [
+            "date",
+            "laterality",
+            "frequency",
+            "anode",
+            "cathode",
+            "amplitude",
+            "pulse_width",
+        ]
+        common_cols = ["group_ID", "scale_name", "scale_value", "notes"]
 
         lateral_cols = [c for c in lateral_cols if c in display_cols]
         common_cols = [c for c in common_cols if c in display_cols]
@@ -706,10 +714,16 @@ def _add_longitudinal_data_table(
             section.page_width - section.left_margin - section.right_margin
         ) / 914400
         base_w = {
-            "date": 0.65, "laterality": 0.25, "program_ID": 0.35,
-            "frequency": 0.45, "anode": 0.45, "cathode": 0.60,
-            "amplitude": 0.60, "pulse_width": 0.50,
-            "scale_name": 1.00, "scale_value": 0.55,
+            "date": 0.65,
+            "laterality": 0.25,
+            "group_ID": 0.35,
+            "frequency": 0.45,
+            "anode": 0.45,
+            "cathode": 0.60,
+            "amplitude": 0.60,
+            "pulse_width": 0.50,
+            "scale_name": 1.00,
+            "scale_value": 0.55,
         }
         widths = [base_w.get(c, 0.5) for c in ordered]
         if "notes" in ordered:
@@ -1368,7 +1382,8 @@ def _column_header(col: str) -> str:
             "cathode": "-",
             "amplitude": PLACEHOLDERS.get("amplitude", "Amp"),
             "pulse_width": PLACEHOLDERS.get("pulse_width", "PW"),
-            "program_ID": "Prog", "laterality": "",
+            "group_ID": "Grp",
+            "laterality": "",
         }
         return m.get(col, col.replace("_", " ").title())
 

src/clinical_dbs_annotator/utils/session_exporter.py

@@ -501,15 +501,15 @@ def _create_lateral_table_data(self, df):
             right_row["block_id"] = block_id
 
             # Common columns (non-lateral) - use combined scales with internal lines
-            left_row['program_ID'] = first_row.get('program_ID', '')
-            left_row['scale_name'] = combined_scale_name
-            left_row['scale_value'] = combined_scale_value
-            left_row['notes'] = first_row.get('notes', '')
+            left_row["group_ID"] = first_row.get("group_ID", "")
+            left_row["scale_name"] = combined_scale_name
+            left_row["scale_value"] = combined_scale_value
+            left_row["notes"] = first_row.get("notes", "")
 
-            right_row['program_ID'] = first_row.get('program_ID', '')
-            right_row['scale_name'] = combined_scale_name
-            right_row['scale_value'] = combined_scale_value
-            right_row['notes'] = first_row.get('notes', '')
+            right_row["group_ID"] = first_row.get("group_ID", "")
+            right_row["scale_name"] = combined_scale_name
+            right_row["scale_value"] = combined_scale_value
+            right_row["notes"] = first_row.get("notes", "")
 
             # Lateral columns - map to generic names
             lateral_mappings = {
@@ -570,8 +570,15 @@ def _add_session_data_table(self, doc: Document, df_table: pd.DataFrame) -> None
             col for col in lateral_df.columns if col not in columns_to_exclude
         ]
 
-        lateral_cols = ['laterality', 'frequency', 'anode', 'cathode', 'amplitude', 'pulse_width']
-        common_cols = ['program_ID', 'scale_name', 'scale_value', 'notes']
+        lateral_cols = [
+            "laterality",
+            "frequency",
+            "anode",
+            "cathode",
+            "amplitude",
+            "pulse_width",
+        ]
+        common_cols = ["group_ID", "scale_name", "scale_value", "notes"]
 
         lateral_cols = [col for col in lateral_cols if col in display_columns]
         common_cols = [col for col in common_cols if col in display_columns]
@@ -588,15 +595,15 @@ def _add_session_data_table(self, doc: Document, df_table: pd.DataFrame) -> None
         ) / 914400
 
         base_in = {
-            'laterality': 0.30,
-            'program_ID': 0.40,
-            'frequency': 0.50,
-            'anode': 0.45,
-            'cathode': 0.60,
-            'amplitude': 0.60,
-            'pulse_width': 0.50,
-            'scale_name': 1.10,
-            'scale_value': 0.60,
+            "laterality": 0.30,
+            "group_ID": 0.40,
+            "frequency": 0.50,
+            "anode": 0.45,
+            "cathode": 0.60,
+            "amplitude": 0.60,
+            "pulse_width": 0.50,
+            "scale_name": 1.10,
+            "scale_value": 0.60,
         }
         widths_in = [base_in.get(c, 0.5) for c in ordered_columns]
         if "notes" in ordered_columns: