Reorganize sections

Author: anapaulagomes

filter_engine.py

@@ -1,6 +1,6 @@
 import marimo
 
-__generated_with = "0.20.2"
+__generated_with = "0.14.16"
 app = marimo.App(
     width="medium",
     app_title="Open Syndrome Definition - Data Browser",
@@ -100,9 +100,7 @@ def groupped_bar(_df_filtered, definitions, group_by_column="code", top_n=10):
 
 @app.cell
 def _(mo):
-    mo.md(r"""
-    # Open Syndrome Definition 👩🏽‍🔬
-    """)
+    mo.md(r"""# Open Syndrome Definition 👩🏽‍🔬""")
     return
 
 
@@ -225,7 +223,7 @@ def _(df_selected, initial_date_column, initial_yaml, mo):
 
     mo.vstack(
         [
-            mo.md("### **Mapping your data to the format**"),
+            mo.md("### Mapping your data to the format"),
             mo.md(
                 "Edit the YAML below to map your dataset columns to OSD concepts, "
                 "then click **Submit**. "
@@ -296,14 +294,6 @@ def _(get_definition_dir):
     return (definition_options,)
 
 
-@app.cell
-def _(definition_options, json):
-    def load_definition(name: str) -> dict:
-        return json.loads(definition_options[name].read_text())
-
-    return (load_definition,)
-
-
 @app.cell
 def _(definition_options, mo):
     definitions_dropdown = mo.ui.multiselect(
@@ -312,6 +302,30 @@ def _(definition_options, mo):
     return (definitions_dropdown,)
 
 
+@app.cell
+def _(mo):
+    mo.md(r"""### Data sample""")
+    return
+
+
+@app.cell
+def _(df_selected):
+    df_selected.sample(10)
+    return
+
+
+@app.cell
+def _(mo):
+    mo.md(r"""---""")
+    return
+
+
+@app.cell
+def _(mo):
+    mo.md(r"""## Data & Definitions""")
+    return
+
+
 @app.cell
 def _(definitions_dropdown, mo):
     mo.hstack([mo.md("**::lucide:filter:: Filters:**"), definitions_dropdown])
@@ -365,40 +379,16 @@ def _(definitions, df_filtered, df_selected, mo):
         ),
     ]
 
-    _title = "## Data with Open Syndrome Definitions"
-
-    mo.vstack(
-        [
-            mo.md(_title),
-            mo.hstack(_cards, widths="equal", align="center"),
-        ]
-    )
+    mo.hstack(_cards, widths="equal", align="center")
     return
 
 
 @app.cell
-def _(definitions, load_definition, mo):
-    mo.stop(definitions is None)
+def _(definition_options, json):
+    def load_definition(name: str) -> dict:
+        return json.loads(definition_options[name].read_text())
 
-    mo.vstack(
-        [
-            mo.md("### Definitions details"),
-            mo.md(
-                "This section shows the definitions used to filter the data. You can use them to understand how the data was filtered and what criteria were applied. 🔎"
-            ),
-            mo.accordion(
-                {
-                    "JSONs": mo.accordion(
-                        {
-                            definition: mo.json(load_definition(definition))
-                            for definition in definitions
-                        }
-                    ),
-                },
-            ),
-        ]
-    )
-    return
+    return (load_definition,)
 
 
 @app.cell
@@ -424,7 +414,7 @@ def _(
 
     if code_column:
         diagnosis_chart = [
-            mo.md("## Codes comparison per syndromic indicator"),
+            mo.md("### Codes comparison per syndromic indicator"),
             top_n.left(),
             groupped_bar(
                 df_filtered,
@@ -436,20 +426,50 @@ def _(
     else:
         diagnosis_chart = []
 
+    timeseries = [
+        mo.md("### Time series"),
+        plot_cases(
+            df_filtered,
+            definitions,
+            date_column=date_column,
+            date_format=date_format_input.value,
+        ),
+    ]
+
     mo.vstack(
         [
-            mo.md("## Time series"),
-            plot_cases(
-                df_filtered,
-                definitions,
-                date_column=date_column,
-                date_format=date_format_input.value,
-            ),
+            mo.md("## Findings from the data 📊"),
+            *timeseries,
             *diagnosis_chart,
         ]
     )
     return
 
 
+@app.cell
+def _(definitions, load_definition, mo):
+    mo.stop(definitions is None)
+
+    mo.vstack(
+        [
+            mo.md("### Definitions details"),
+            mo.md(
+                "Here the definitions used to filter the data. See here what criteria were applied. 🔎"
+            ),
+            mo.accordion(
+                {
+                    "JSONs": mo.accordion(
+                        {
+                            definition: mo.json(load_definition(definition))
+                            for definition in definitions
+                        }
+                    ),
+                },
+            ),
+        ]
+    )
+    return
+
+
 if __name__ == "__main__":
     app.run()