apmtools 0.2.22__tar.gz → 0.2.23__tar.gz

{apmtools-0.2.22 → apmtools-0.2.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: apmtools
-Version: 0.2.022
+Version: 0.2.023
 Summary: A collection of tools for processing air pollution monitoring data
 Project-URL: Homepage, https://github.com/federlorenz/apmtools
 Author-email: Federico Lorenzetti <lorenzetti.federico@gmail.com>

{apmtools-0.2.22 → apmtools-0.2.23}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "apmtools"
-version = "0.2.022"
+version = "0.2.023"
 authors = [
   { name="Federico Lorenzetti", email="lorenzetti.federico@gmail.com" },
 ]

{apmtools-0.2.22 → apmtools-0.2.23}/src/apmtools/shiny/summary.py

@@ -449,6 +449,70 @@ def create_summary_app(
     subset_columns = columns
 
     app_ui = ui.page_sidebar(
+        ui.sidebar(
+            ui.h4("Plot controls"),
+            ui.input_select("plot_type", "Plot type",
+                            choices=PLOT_TYPES, selected=plot_type),
+            ui.output_ui("x_control"),
+            ui.output_ui("y_control"),
+            ui.input_selectize(
+                "group_by", "Group by",
+                choices={c: c for c in group_columns},
+                selected=initial_groups,
+                multiple=True,
+                options={"placeholder": "Select one or more grouping columns"},
+            ),
+            ui.hr(),
+            ui.h5("Aggregation"),
+            ui.input_select(
+                "frequency", "Frequency", choices=FREQUENCIES,
+                selected="None (raw data)",
+            ),
+            ui.input_select(
+                "aggregate", "Statistic", choices=AGGREGATES,
+                selected="Mean",
+            ),
+            ui.hr(),
+            ui.h5("Subset"),
+            ui.input_selectize(
+                "subset_columns", "Columns", choices={c: c for c in subset_columns},
+                selected=[], multiple=True,
+                options={"placeholder": "Select one or more columns"},
+            ),
+            ui.output_ui("subset_filters"),
+            ui.hr(),
+            ui.h5("Datetime filter"),
+            ui.input_text(
+                "datetime_start", "Start datetime",
+                value="", placeholder="YYYY-MM-DD or YYYY-MM-DD HH:MM:SS",
+            ),
+            ui.input_text(
+                "datetime_end", "End datetime",
+                value="", placeholder="YYYY-MM-DD or YYYY-MM-DD HH:MM:SS",
+            ),
+            ui.panel_conditional(
+                "input.plot_type === 'histogram'",
+                ui.input_numeric("bins", "Histogram bins",
+                                 value=30, min=1, max=200, step=1),
+                ui.input_select("hist_density", "Density", choices={
+                                "False": "False", "True": "True"}, selected="False"),
+                ui.input_select("hist_stacked", "Stacked", choices={
+                                "False": "False", "True": "True"}, selected="False"),
+                ui.input_select("hist_type", "Histogram type", choices={
+                    "bar": "bar", "barstacked": "barstacked",
+                    "step": "step", "stepfilled": "stepfilled",
+                }, selected="bar"),
+                ui.input_select("hist_cumulative", "Cumulative", choices={
+                    "0": "False", "1": "True (ascending)", "-1": "-1 (descending)",
+                }, selected="0"),
+            ),
+            ui.input_text("title", "Plot title", value=title),
+            ui.help_text(
+                "Subset and datetime filters are applied before aggregation. "
+                "When a frequency is selected, aggregation is performed with "
+                "Summary.group_stat()."
+            ),
+        ),
         ui.div(
             ui.tags.style("""
             /* Allow the main pane to consume all width remaining after the sidebar. */
@@ -514,70 +578,6 @@ def create_summary_app(
                 class_="summary-plot-container",
             ),
         ),
-        sidebar=ui.sidebar(
-            ui.h4("Plot controls"),
-            ui.input_select("plot_type", "Plot type",
-                            choices=PLOT_TYPES, selected=plot_type),
-            ui.output_ui("x_control"),
-            ui.output_ui("y_control"),
-            ui.input_selectize(
-                "group_by", "Group by",
-                choices={c: c for c in group_columns},
-                selected=initial_groups,
-                multiple=True,
-                options={"placeholder": "Select one or more grouping columns"},
-            ),
-            ui.hr(),
-            ui.h5("Aggregation"),
-            ui.input_select(
-                "frequency", "Frequency", choices=FREQUENCIES,
-                selected="None (raw data)",
-            ),
-            ui.input_select(
-                "aggregate", "Statistic", choices=AGGREGATES,
-                selected="Mean",
-            ),
-            ui.hr(),
-            ui.h5("Subset"),
-            ui.input_selectize(
-                "subset_columns", "Columns", choices={c: c for c in subset_columns},
-                selected=[], multiple=True,
-                options={"placeholder": "Select one or more columns"},
-            ),
-            ui.output_ui("subset_filters"),
-            ui.hr(),
-            ui.h5("Datetime filter"),
-            ui.input_text(
-                "datetime_start", "Start datetime",
-                value="", placeholder="YYYY-MM-DD or YYYY-MM-DD HH:MM:SS",
-            ),
-            ui.input_text(
-                "datetime_end", "End datetime",
-                value="", placeholder="YYYY-MM-DD or YYYY-MM-DD HH:MM:SS",
-            ),
-            ui.panel_conditional(
-                "input.plot_type === 'histogram'",
-                ui.input_numeric("bins", "Histogram bins",
-                                 value=30, min=1, max=200, step=1),
-                ui.input_select("hist_density", "Density", choices={
-                                "False": "False", "True": "True"}, selected="False"),
-                ui.input_select("hist_stacked", "Stacked", choices={
-                                "False": "False", "True": "True"}, selected="False"),
-                ui.input_select("hist_type", "Histogram type", choices={
-                    "bar": "bar", "barstacked": "barstacked",
-                    "step": "step", "stepfilled": "stepfilled",
-                }, selected="bar"),
-                ui.input_select("hist_cumulative", "Cumulative", choices={
-                    "0": "False", "1": "True (ascending)", "-1": "-1 (descending)",
-                }, selected="0"),
-            ),
-            ui.input_text("title", "Plot title", value=title),
-            ui.help_text(
-                "Subset and datetime filters are applied before aggregation. "
-                "When a frequency is selected, aggregation is performed with "
-                "Summary.group_stat()."
-            ),
-        ),
     )
 
     def server(input, output, session):