⏪ Restore subscales

Author: shnizzedy

src/mindlogger_data_export/outputs.py

@@ -514,27 +514,24 @@ def _prepare_activity_columns(
                 # No original response column, use index + 1
                 df = df.with_columns([(pl.col(col) + 1).alias(response_col)])
 
-        # Drop bare item columns that have _response, _score, or _index versions
-        response_bases = {
-            col.replace("_response", "")
-            for col in df.columns
-            if col.endswith("_response")
-        }
-        score_bases = {
-            col.replace("_score", "") for col in df.columns if col.endswith("_score")
-        }
-        index_bases = {
-            col.replace("_index", "") for col in df.columns if col.endswith("_index")
-        }
-
-        return df.select(
-            [
-                col
+        return df.rename(
+            {
+                col: col.replace(
+                    f"{activity_prefix}_response_response_", f"{activity_prefix}_"
+                ).replace("_response_response_", "_")
+                + "_response"
                 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_")
-            ]
+                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
+            }
         )
 
     def _format_activity(self, df: pl.DataFrame, activity_name: str) -> pl.DataFrame: