⏪ Restore subscales

Author: shnizzedy

src/mindlogger_data_export/outputs.py

@@ -527,14 +527,34 @@ def _prepare_activity_columns(
             col.replace("_index", "") for col in df.columns if col.endswith("_index")
         }
 
-        return df.select(
-            [
-                col
-                for col in df.columns
-                if col not in (response_bases | score_bases | index_bases)
-                and not col.startswith(f"{activity_prefix}_response_response_")
-                and not col.startswith(f"{activity_prefix}_response_value_")
-            ]
+        return (
+            df.rename(
+                {
+                    col: col.replace(
+                        f"{activity_prefix}_response_response_", f"{activity_prefix}_"
+                    ).replace("_response_response_", "_")
+                    + "_response"
+                    for col in df.columns
+                    if f"{activity_prefix}_response_response_" in col
+                }
+            )
+            .rename(
+                {
+                    col: col.replace(
+                        f"{activity_prefix}_response_value_", f"{activity_prefix}_"
+                    ).replace("_response_value_", "_")
+                    + "_score"
+                    for col in df.columns
+                    if f"{activity_prefix}_response_value_" in col
+                }
+            )
+            .select(
+                [
+                    col
+                    for col in df.columns
+                    if col not in (response_bases | score_bases | index_bases)
+                ]
+            )
         )
 
     def _format_activity(self, df: pl.DataFrame, activity_name: str) -> pl.DataFrame: