Update app.py

Cleaning up responsiveness for mobile

app.py

@@ -34,7 +34,7 @@ def get_formatter(format_str):
     return format_str
 
 
-class CannabinoidEstimator(param.Parameterized):
+class CannabinoidCalculations(param.Parameterized):
     # --- Input Parameters ---
     kg_processed_per_hour = param.Number(
         default=150.0,
@@ -135,10 +135,9 @@ class CannabinoidEstimator(param.Parameterized):
     shifts_per_week = param.Number(
         default=21.0, bounds=(1, 28), step=1.0, label="Shifts per week"
     )
-    batch_frequency = param.String(
-        default = "Day", label="New batch frequency"
-    )
+    batch_frequency = param.String(default="Day", label="New batch frequency")
 
+    # --- Calculated Attributes ---
     kg_processed_per_shift = 0.0
     labour_cost_per_shift = 0.0
     variable_cost_per_shift = 0.0
@@ -168,42 +167,248 @@ class CannabinoidEstimator(param.Parameterized):
     net_rev_per_kg_output = 0.0
     operating_profit_pct = 0.0
     resin_spread_pct = 0.0
+    batch_test_cost_per_shift = 0.0
+
+    def __init__(self, **params):
+        super().__init__(**params)
+
+    @param.depends(
+        "kg_processed_per_hour",
+        "finished_product_yield_pct",
+        "kwh_rate",
+        "water_cost_per_1000l",
+        "consumables_per_kg_bio_rate",
+        "kwh_per_kg_bio",
+        "water_liters_consumed_per_kg_bio",
+        "consumables_per_kg_output",
+        "bio_cbx_pct",
+        "bio_cost",
+        "wholesale_cbx_price",
+        "wholesale_cbx_pct",
+        "batch_test_cost",
+        "batch_frequency",
+        "fixed_overhead_per_week",
+        "workers_per_shift",
+        "worker_hourly_rate",
+        "managers_per_shift",
+        "manager_hourly_rate",
+        "labour_hours_per_shift",
+        "processing_hours_per_shift",
+        "shifts_per_day",
+        "shifts_per_week",
+        watch=True,
+    )
+    def _update_calculations(self, *events):
+        self.kg_processed_per_shift = (
+            self.processing_hours_per_shift * self.kg_processed_per_hour
+        )
+        if self.shifts_per_week == 0:
+            self.shifts_per_week = 1
+
+        self._calc_saleable_kg()
+        self._calc_biomass_cost()
+        self._calc_cogs()
+        self._calc_gross_revenue()
+        self._calc_net_revenue()
+
+        self.operating_profit_pct = (
+            (self.net_rev_per_kg_bio / self.gross_rev_per_kg_bio)
+            if self.gross_rev_per_kg_bio
+            else 0.0
+        )
+        self.resin_spread_pct = (
+            ((self.gross_rev_per_kg_bio - self.bio_cost) / self.bio_cost)
+            if self.bio_cost
+            else 0.0
+        )
+
+        self._post_calculation_update()
+
+    def _post_calculation_update(self):
+        pass
+
+    def _calc_cogs(self):
+        worker_cost = self.workers_per_shift * self.worker_hourly_rate
+        manager_cost = self.managers_per_shift * self.manager_hourly_rate
+        self.labour_cost_per_shift = (
+            worker_cost + manager_cost
+        ) * self.labour_hours_per_shift
+
+        power_cost_per_kg = self.kwh_rate * self.kwh_per_kg_bio
+        water_cost_per_kg = (
+            self.water_cost_per_1000l / 1000.0
+        ) * self.water_liters_consumed_per_kg_bio
+        total_variable_consumable_cost_per_kg = (
+            self.consumables_per_kg_bio_rate + power_cost_per_kg + water_cost_per_kg
+        )
+        self.variable_cost_per_shift = (
+            total_variable_consumable_cost_per_kg * self.kg_processed_per_shift
+        )
+
+        self.overhead_cost_per_shift = (
+            self.fixed_overhead_per_week / self.shifts_per_week
+            if self.shifts_per_week > 0
+            else 0.0
+        )
+
+        self.batch_test_cost_per_shift = 0.0
+        if self.batch_frequency == "Shift":
+            self.batch_test_cost_per_shift = self.batch_test_cost
+        elif self.batch_frequency == "Day":
+            if self.shifts_per_day > 0:
+                self.batch_test_cost_per_shift = (
+                    self.batch_test_cost / self.shifts_per_day
+                )
+            else:
+                self.batch_test_cost_per_shift = 0.0
+        elif self.batch_frequency == "Week":
+            if self.shifts_per_week > 0:
+                self.batch_test_cost_per_shift = (
+                    self.batch_test_cost / self.shifts_per_week
+                )
+            else:
+                self.batch_test_cost_per_shift = 0.0
+
+        shift_cogs_before_output_specific = (
+            self.labour_cost_per_shift
+            + self.variable_cost_per_shift
+            + self.overhead_cost_per_shift
+            + self.batch_test_cost_per_shift
+        )
+        shift_output_specific_cogs = (
+            self.consumables_per_kg_output * self.saleable_kg_per_shift
+        )
+
+        self.internal_cogs_per_shift = (
+            shift_cogs_before_output_specific + shift_output_specific_cogs
+        )
+        self.internal_cogs_per_kg_bio = (
+            self.internal_cogs_per_shift / self.kg_processed_per_shift
+            if self.kg_processed_per_shift > 0
+            else 0.0
+        )
+        self.internal_cogs_per_day = self.internal_cogs_per_shift * self.shifts_per_day
+        self.internal_cogs_per_week = (
+            self.internal_cogs_per_shift * self.shifts_per_week
+        )
+        self.internal_cogs_per_kg_output = (
+            (self.internal_cogs_per_kg_bio * self.biomass_kg_per_saleable_kg)
+            if self.biomass_kg_per_saleable_kg != 0
+            else 0.0
+        )
+
+    def _calc_gross_revenue(self):
+        self.gross_rev_per_kg_bio = (
+            self.saleable_kg_per_kg_bio * self.wholesale_cbx_price
+        )
+        self.gross_rev_per_shift = (
+            self.gross_rev_per_kg_bio * self.kg_processed_per_shift
+        )
+        self.gross_rev_per_day = self.gross_rev_per_shift * self.shifts_per_day
+        self.gross_rev_per_week = self.gross_rev_per_shift * self.shifts_per_week
+
+    def _calc_net_revenue(self):
+        self.net_rev_per_kg_bio = (
+            self.gross_rev_per_kg_bio - self.internal_cogs_per_kg_bio - self.bio_cost
+        )
+        self.net_rev_per_shift = self.net_rev_per_kg_bio * self.kg_processed_per_shift
+        self.net_rev_per_day = self.net_rev_per_shift * self.shifts_per_day
+        self.net_rev_per_week = self.net_rev_per_shift * self.shifts_per_week
+        self.net_rev_per_kg_output = (
+            (self.biomass_kg_per_saleable_kg * self.net_rev_per_kg_bio)
+            if self.biomass_kg_per_saleable_kg != 0
+            else 0.0
+        )
 
-    money_data_df = param.DataFrame(pd.DataFrame())
+    def _calc_biomass_cost(self):
+        self.biomass_cost_per_shift = self.kg_processed_per_shift * self.bio_cost
+        self.biomass_cost_per_day = self.biomass_cost_per_shift * self.shifts_per_day
+        self.biomass_cost_per_week = self.biomass_cost_per_shift * self.shifts_per_week
+
+    def _calc_saleable_kg(self):
+        if self.wholesale_cbx_pct == 0:
+            self.saleable_kg_per_kg_bio = 0.0
+        else:
+            self.saleable_kg_per_kg_bio = (
+                (self.bio_cbx_pct / 100.0)
+                * (self.finished_product_yield_pct / 100.0)
+                / (self.wholesale_cbx_pct / 100.0)
+            )
+        self.saleable_kg_per_shift = (
+            self.saleable_kg_per_kg_bio * self.kg_processed_per_shift
+        )
+        self.saleable_kg_per_day = self.saleable_kg_per_shift * self.shifts_per_day
+        self.saleable_kg_per_week = self.saleable_kg_per_shift * self.shifts_per_week
+        self.biomass_kg_per_saleable_kg = (
+            1 / self.saleable_kg_per_kg_bio if self.saleable_kg_per_kg_bio > 0 else 0.0
+        )
+        self.biomass_cost_per_kg_output = (
+            self.biomass_kg_per_saleable_kg * self.bio_cost
+        )
+
+
+class CannabinoidEstimatorGUI(CannabinoidCalculations):
+    money_data_unit_df = param.DataFrame(
+        pd.DataFrame()
+    )  # For $/kg Biomass and $/kg Output
+    money_data_time_df = param.DataFrame(
+        pd.DataFrame()
+    )  # For Per Shift, Per Day, Per Week
     profit_data_df = param.DataFrame(pd.DataFrame())
     processing_data_df = param.DataFrame(pd.DataFrame())
 
     def __init__(self, **params):
         super().__init__(**params)
         self._create_sliders()
-        self.money_table = pn.widgets.Tabulator(
-            self.money_data_df,
-            formatters=self._get_money_formatters(),
+
+        # Table for $/kg Biomass and $/kg Output
+        self.money_unit_table = pn.widgets.Tabulator(
+            self.money_data_unit_df,
+            formatters={
+                "$/kg Biomass": get_formatter("$%.02f"),
+                "$/kg Output": get_formatter("$%.02f"),
+            },
             disabled=True,
             layout="fit_data",
             sizing_mode="fixed",
             align="center",
-            show_index=False,  # Hide index column
+            show_index=False,
             text_align={
                 " ": "right",
                 "$/kg Biomass": "center",
                 "$/kg Output": "center",
+            },
+        )
+
+        # Table for Per Shift, Per Day, Per Week
+        self.money_time_table = pn.widgets.Tabulator(
+            self.money_data_time_df,
+            formatters={
+                "Per Shift": get_formatter("$%.02f"),
+                "Per Day": get_formatter("$%.02f"),
+                "Per Week": get_formatter("$%.02f"),
+            },
+            disabled=True,
+            layout="fit_data",
+            sizing_mode="fixed",
+            align="center",
+            show_index=False,
+            text_align={
+                " ": "right",
                 "Per Shift": "center",
                 "Per Day": "center",
                 "Per Week": "center",
             },
         )
+
         self.profit_table = pn.widgets.Tabulator(
             self.profit_data_df,
             disabled=True,
             layout="fit_data_table",
             sizing_mode="fixed",
             align="center",
-            show_index=False,  # Hide index column
-            text_align={
-                "Metric": "right",
-                "Value": "center",
-            },
+            show_index=False,
+            text_align={"Metric": "right", "Value": "center"},
         )
         self.processing_table = pn.widgets.Tabulator(
             self.processing_data_df,
@@ -212,46 +417,39 @@ class CannabinoidEstimator(param.Parameterized):
             layout="fit_data_table",
             sizing_mode="fixed",
             align="center",
-            show_index=False,  # Hide index column
-            text_align={
-                "Metric (Per Shift)": "right",
-                "Value": "center",
-            },
+            show_index=False,
+            text_align={"Metric (Per Shift)": "right", "Value": "center"},
         )
         self.profit_weekly = pn.indicators.Number(
             name="Weekly Profit",
-            value=self.net_rev_per_week,
-            format=f"${self.net_rev_per_week / 1000:.0f} k",
+            value=0,
+            format="$0 k",
             default_color="green",
             align="center",
         )
         self.profit_pct = pn.indicators.Number(
             name="Operating Profit",
-            value=self.operating_profit_pct,
-            format=f"{self.operating_profit_pct * 100.0:.2f}%",
+            value=0,
+            format="0.00%",
             default_color="green",
             align="center",
         )
+
         self._update_calculations()
 
     def _create_sliders(self):
         self.kg_processed_per_hour_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.kg_processed_per_hour,
             name=self.param.kg_processed_per_hour.label,
-            fixed_start=self.param.kg_processed_per_hour.bounds[0],
-            fixed_end=self.param.kg_processed_per_hour.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
-            # format="0",
             format=PrintfTickFormatter(format="%i kg"),
         )
         self.finished_product_yield_pct_slider = (
             pn.widgets.EditableFloatSlider.from_param(
                 self.param.finished_product_yield_pct,
                 name=self.param.finished_product_yield_pct.label,
-                fixed_start=self.param.finished_product_yield_pct.bounds[0],
-                fixed_end=self.param.finished_product_yield_pct.bounds[1],
                 design=slider_design,
                 styles=slider_style,
                 stylesheets=slider_stylesheet,
@@ -261,19 +459,14 @@ class CannabinoidEstimator(param.Parameterized):
         self.kwh_rate_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.kwh_rate,
             name=self.param.kwh_rate.label,
-            fixed_start=self.param.kwh_rate.bounds[0],
-            fixed_end=self.param.kwh_rate.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
             format="0.00",
-            # format=PrintfTickFormatter(format='%.2f per kWh'),
         )
         self.water_cost_per_1000l_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.water_cost_per_1000l,
             name=self.param.water_cost_per_1000l.label,
-            fixed_start=self.param.water_cost_per_1000l.bounds[0],
-            fixed_end=self.param.water_cost_per_1000l.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
@@ -283,8 +476,6 @@ class CannabinoidEstimator(param.Parameterized):
             pn.widgets.EditableFloatSlider.from_param(
                 self.param.consumables_per_kg_bio_rate,
                 name=self.param.consumables_per_kg_bio_rate.label,
-                fixed_start=self.param.consumables_per_kg_bio_rate.bounds[0],
-                fixed_end=self.param.consumables_per_kg_bio_rate.bounds[1],
                 design=slider_design,
                 styles=slider_style,
                 stylesheets=slider_stylesheet,
@@ -294,8 +485,6 @@ class CannabinoidEstimator(param.Parameterized):
         self.kwh_per_kg_bio_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.kwh_per_kg_bio,
             name=self.param.kwh_per_kg_bio.label,
-            fixed_start=self.param.kwh_per_kg_bio.bounds[0],
-            fixed_end=self.param.kwh_per_kg_bio.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
@@ -305,8 +494,6 @@ class CannabinoidEstimator(param.Parameterized):
             pn.widgets.EditableFloatSlider.from_param(
                 self.param.water_liters_consumed_per_kg_bio,
                 name=self.param.water_liters_consumed_per_kg_bio.label,
-                fixed_start=self.param.water_liters_consumed_per_kg_bio.bounds[0],
-                fixed_end=self.param.water_liters_consumed_per_kg_bio.bounds[1],
                 design=slider_design,
                 styles=slider_style,
                 stylesheets=slider_stylesheet,
@@ -317,8 +504,6 @@ class CannabinoidEstimator(param.Parameterized):
             pn.widgets.EditableFloatSlider.from_param(
                 self.param.consumables_per_kg_output,
                 name=self.param.consumables_per_kg_output.label,
-                fixed_start=self.param.consumables_per_kg_output.bounds[0],
-                fixed_end=self.param.consumables_per_kg_output.bounds[1],
                 design=slider_design,
                 styles=slider_style,
                 stylesheets=slider_stylesheet,
@@ -328,8 +513,6 @@ class CannabinoidEstimator(param.Parameterized):
         self.bio_cbx_pct_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.bio_cbx_pct,
             name=self.param.bio_cbx_pct.label,
-            fixed_start=self.param.bio_cbx_pct.bounds[0],
-            fixed_end=self.param.bio_cbx_pct.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
@@ -338,8 +521,6 @@ class CannabinoidEstimator(param.Parameterized):
         self.bio_cost_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.bio_cost,
             name=self.param.bio_cost.label,
-            fixed_start=self.param.bio_cost.bounds[0],
-            fixed_end=self.param.bio_cost.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
@@ -348,8 +529,6 @@ class CannabinoidEstimator(param.Parameterized):
         self.wholesale_cbx_price_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.wholesale_cbx_price,
             name=self.param.wholesale_cbx_price.label,
-            fixed_start=self.param.wholesale_cbx_price.bounds[0],
-            fixed_end=self.param.wholesale_cbx_price.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
@@ -358,8 +537,6 @@ class CannabinoidEstimator(param.Parameterized):
         self.wholesale_cbx_pct_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.wholesale_cbx_pct,
             name=self.param.wholesale_cbx_pct.label,
-            fixed_start=self.param.wholesale_cbx_pct.bounds[0],
-            fixed_end=self.param.wholesale_cbx_pct.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
@@ -368,8 +545,6 @@ class CannabinoidEstimator(param.Parameterized):
         self.batch_test_cost_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.batch_test_cost,
             name=self.param.batch_test_cost.label,
-            fixed_start=self.param.batch_test_cost.bounds[0],
-            fixed_end=self.param.batch_test_cost.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
@@ -378,8 +553,6 @@ class CannabinoidEstimator(param.Parameterized):
         self.fixed_overhead_per_week_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.fixed_overhead_per_week,
             name=self.param.fixed_overhead_per_week.label,
-            fixed_start=self.param.fixed_overhead_per_week.bounds[0],
-            fixed_end=self.param.fixed_overhead_per_week.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
@@ -388,8 +561,6 @@ class CannabinoidEstimator(param.Parameterized):
         self.workers_per_shift_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.workers_per_shift,
             name=self.param.workers_per_shift.label,
-            fixed_start=self.param.workers_per_shift.bounds[0],
-            fixed_end=self.param.workers_per_shift.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
@@ -398,8 +569,6 @@ class CannabinoidEstimator(param.Parameterized):
         self.worker_hourly_rate_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.worker_hourly_rate,
             name=self.param.worker_hourly_rate.label,
-            fixed_start=self.param.worker_hourly_rate.bounds[0],
-            fixed_end=self.param.worker_hourly_rate.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
@@ -408,8 +577,6 @@ class CannabinoidEstimator(param.Parameterized):
         self.managers_per_shift_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.managers_per_shift,
             name=self.param.managers_per_shift.label,
-            fixed_start=self.param.managers_per_shift.bounds[0],
-            fixed_end=self.param.managers_per_shift.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
@@ -418,45 +585,32 @@ class CannabinoidEstimator(param.Parameterized):
         self.manager_hourly_rate_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.manager_hourly_rate,
             name=self.param.manager_hourly_rate.label,
-            fixed_start=self.param.worker_hourly_rate.default,  # Keeping original logic as per file
-            fixed_end=self.param.manager_hourly_rate.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
             format="0.00",
         )
-
         self.labour_hours_per_shift_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.labour_hours_per_shift,
             name=self.param.labour_hours_per_shift.label,
-            fixed_start=self.param.labour_hours_per_shift.bounds[
-                0
-            ],  # Changed in previous request
-            fixed_end=self.param.labour_hours_per_shift.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
             format="0.00",
         )
-
         self.processing_hours_per_shift_slider = (
             pn.widgets.EditableFloatSlider.from_param(
                 self.param.processing_hours_per_shift,
                 name=self.param.processing_hours_per_shift.label,
-                fixed_start=self.param.processing_hours_per_shift.bounds[0],
-                fixed_end=self.labour_hours_per_shift,  # Changed in previous request
                 design=slider_design,
                 styles=slider_style,
                 stylesheets=slider_stylesheet,
                 format="0.00",
             )
         )
-
         self.shifts_per_day_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.shifts_per_day,
             name=self.param.shifts_per_day.label,
-            fixed_start=self.param.shifts_per_day.bounds[0],
-            fixed_end=self.param.shifts_per_day.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
@@ -465,14 +619,11 @@ class CannabinoidEstimator(param.Parameterized):
         self.shifts_per_week_slider = pn.widgets.EditableFloatSlider.from_param(
             self.param.shifts_per_week,
             name=self.param.shifts_per_week.label,
-            fixed_start=self.param.shifts_per_week.bounds[0],
-            fixed_end=self.param.shifts_per_week.bounds[1],
             design=slider_design,
             styles=slider_style,
             stylesheets=slider_stylesheet,
             format="0",
         )
-
         self.batch_frequency_radio = pn.widgets.RadioButtonGroup.from_param(
             self.param.batch_frequency,
             name=self.param.batch_frequency.label,
@@ -480,209 +631,33 @@ class CannabinoidEstimator(param.Parameterized):
             button_type="primary",
         )
 
-    @param.depends(
-        "kg_processed_per_hour",
-        "finished_product_yield_pct",
-        "kwh_rate",
-        "water_cost_per_1000l",
-        "consumables_per_kg_bio_rate",
-        "kwh_per_kg_bio",
-        "water_liters_consumed_per_kg_bio",
-        "consumables_per_kg_output",
-        "bio_cbx_pct",
-        "bio_cost",
-        "wholesale_cbx_price",
-        "wholesale_cbx_pct",
-        "batch_test_cost",
-        "batch_frequency",
-        "fixed_overhead_per_week",
-        "workers_per_shift",
-        "worker_hourly_rate",
-        "managers_per_shift",
-        "manager_hourly_rate",
-        "labour_hours_per_shift",
-        "processing_hours_per_shift",
-        "shifts_per_day",
-        "shifts_per_week",
-        watch=True,
-    )
-    def _update_calculations(self, *events):
-        self.kg_processed_per_shift = (
-            self.processing_hours_per_shift * self.kg_processed_per_hour
-        )
-        if self.shifts_per_week == 0:
-            self.shifts_per_week = 1
-
-        self._calc_saleable_kg()
-        self._calc_biomass_cost()
-        self._calc_cogs()
-        self._calc_gross_revenue()
-        self._calc_net_revenue()
-
-        self.operating_profit_pct = (
-            (self.net_rev_per_kg_bio / self.gross_rev_per_kg_bio)
-            if self.gross_rev_per_kg_bio
-            else 0.0
-        )
-        self.resin_spread_pct = (
-            ((self.gross_rev_per_kg_bio - self.bio_cost) / self.bio_cost)
-            if self.bio_cost
-            else 0.0
-        )
-
-        self._update_tables_data()
-
     @param.depends("labour_hours_per_shift", watch=True)
     def _update_processing_hours_slider_constraints(self):
         new_max_processing_hours = self.labour_hours_per_shift
-
-        # Get the current lower bound of the processing_hours_per_shift parameter
         current_min_processing_hours = self.param.processing_hours_per_shift.bounds[0]
-
-        # Update the bounds of the underlying param.Number object for processing_hours_per_shift
-        # This allows the parameter to accept values up to the new maximum
         self.param.processing_hours_per_shift.bounds = (
             current_min_processing_hours,
             new_max_processing_hours,
         )
-
-        # Ensure the slider widget has been created before trying to access it
         if hasattr(self, "processing_hours_per_shift_slider"):
-            # Update the 'end' property of the slider widget
             self.processing_hours_per_shift_slider.end = new_max_processing_hours
-
-            # If the current value of processing_hours_per_shift is now greater than
-            # the new maximum, adjust it to be the new maximum.
             if self.processing_hours_per_shift > new_max_processing_hours:
                 self.processing_hours_per_shift = new_max_processing_hours
 
-    def _calc_cogs(self):
-        worker_cost = self.workers_per_shift * self.worker_hourly_rate
-        manager_cost = self.managers_per_shift * self.manager_hourly_rate
-        self.labour_cost_per_shift = (
-            worker_cost + manager_cost
-        ) * self.labour_hours_per_shift
-
-        power_cost_per_kg = self.kwh_rate * self.kwh_per_kg_bio
-        water_cost_per_kg = (
-            self.water_cost_per_1000l / 1000.0
-        ) * self.water_liters_consumed_per_kg_bio
-        total_variable_consumable_cost_per_kg = (
-            self.consumables_per_kg_bio_rate + power_cost_per_kg + water_cost_per_kg
-        )
-        self.variable_cost_per_shift = (
-            total_variable_consumable_cost_per_kg * self.kg_processed_per_shift
-        )
-
-        self.overhead_cost_per_shift = (
-            self.fixed_overhead_per_week / self.shifts_per_week
-            if self.shifts_per_week > 0
-            else 0.0
-        )
-
-        # Calculate batch_test_cost_per_shift based on batch_frequency
-        self.batch_test_cost_per_shift = 0.0
-        if self.batch_frequency == "Shift":
-            self.batch_test_cost_per_shift = self.batch_test_cost
-        elif self.batch_frequency == "Day":
-            # Ensure self.shifts_per_day is defined and positive
-            if hasattr(self, 'shifts_per_day') and self.shifts_per_day > 0:
-                self.batch_test_cost_per_shift = self.batch_test_cost / self.shifts_per_day
-            else:
-                # If no shifts per day, or attribute not defined, cost per shift is 0
-                # Or, this could be an error condition if shifts_per_day is expected
-                self.batch_test_cost_per_shift = 0.0
-        elif self.batch_frequency == "Week":
-            # self.shifts_per_week is used above, so it should be available
-            if self.shifts_per_week > 0:
-                self.batch_test_cost_per_shift = self.batch_test_cost / self.shifts_per_week
-            else:
-                # If no shifts per week, cost per shift is 0
-                self.batch_test_cost_per_shift = 0.0
-        # else: # Optional: handle invalid self.batch_frequency value
-            # For example, raise ValueError or log a warning
-            # print(f"Warning: Unknown batch_frequency: {self.batch_frequency}")
-
-        shift_cogs_before_output_specific = (
-            self.labour_cost_per_shift
-            + self.variable_cost_per_shift
-            + self.overhead_cost_per_shift
-            + self.batch_test_cost_per_shift  # Added batch test cost
-        )
-        shift_output_specific_cogs = (
-            self.consumables_per_kg_output * self.saleable_kg_per_shift
-        )
-
-        self.internal_cogs_per_shift = (
-            shift_cogs_before_output_specific + shift_output_specific_cogs
-        )
-        self.internal_cogs_per_kg_bio = (
-            self.internal_cogs_per_shift / self.kg_processed_per_shift
-            if self.kg_processed_per_shift > 0
-            else 0.0
-        )
-        self.internal_cogs_per_day = self.internal_cogs_per_shift * self.shifts_per_day
-        self.internal_cogs_per_week = (
-            self.internal_cogs_per_shift * self.shifts_per_week
-        )
-        self.internal_cogs_per_kg_output = (
-            (self.internal_cogs_per_kg_bio * self.biomass_kg_per_saleable_kg)
-            if self.biomass_kg_per_saleable_kg != 0
-            else 0.0
-        )
-
-    def _calc_gross_revenue(self):
-        self.gross_rev_per_kg_bio = (
-            self.saleable_kg_per_kg_bio * self.wholesale_cbx_price
-        )
-        self.gross_rev_per_shift = (
-            self.gross_rev_per_kg_bio * self.kg_processed_per_shift
-        )
-        self.gross_rev_per_day = self.gross_rev_per_shift * self.shifts_per_day
-        self.gross_rev_per_week = self.gross_rev_per_shift * self.shifts_per_week
-
-    def _calc_net_revenue(self):
-        self.net_rev_per_kg_bio = (
-            self.gross_rev_per_kg_bio - self.internal_cogs_per_kg_bio - self.bio_cost
-        )
-        self.net_rev_per_shift = self.net_rev_per_kg_bio * self.kg_processed_per_shift
-        self.net_rev_per_day = self.net_rev_per_shift * self.shifts_per_day
-        self.net_rev_per_week = self.net_rev_per_shift * self.shifts_per_week
-        self.net_rev_per_kg_output = (
-            (self.biomass_kg_per_saleable_kg * self.net_rev_per_kg_bio)
-            if self.biomass_kg_per_saleable_kg != 0
-            else 0.0
-        )
-
-    def _calc_biomass_cost(self):
-        self.biomass_cost_per_shift = self.kg_processed_per_shift * self.bio_cost
-        self.biomass_cost_per_day = self.biomass_cost_per_shift * self.shifts_per_day
-        self.biomass_cost_per_week = self.biomass_cost_per_shift * self.shifts_per_week
-
-    def _calc_saleable_kg(self):
-        if self.wholesale_cbx_pct == 0:
-            self.saleable_kg_per_kg_bio = 0.0
-        else:
-            self.saleable_kg_per_kg_bio = (
-                (self.bio_cbx_pct / 100.0)
-                * (self.finished_product_yield_pct / 100.0)
-                / (self.wholesale_cbx_pct / 100.0)
-            )
-        self.saleable_kg_per_shift = (
-            self.saleable_kg_per_kg_bio * self.kg_processed_per_shift
-        )
-        self.saleable_kg_per_day = self.saleable_kg_per_shift * self.shifts_per_day
-        self.saleable_kg_per_week = self.saleable_kg_per_shift * self.shifts_per_week
-        self.biomass_kg_per_saleable_kg = (
-            1 / self.saleable_kg_per_kg_bio if self.saleable_kg_per_kg_bio > 0 else 0.0
-        )
-        self.biomass_cost_per_kg_output = (
-            self.biomass_kg_per_saleable_kg * self.bio_cost
-        )
+    def _post_calculation_update(self):
+        self._update_tables_data()
 
     def _update_tables_data(self):
-        money_data_dict = {
-            " ": ["Biomass cost", "Processing cost", "Gross Revenue", "Net Revenue"],
+        metric_names = [
+            "Biomass cost",
+            "Processing cost",
+            "Gross Revenue",
+            "Net Revenue",
+        ]
+
+        # Data for Unit-based table
+        money_data_unit_dict = {
+            " ": metric_names,
             "$/kg Biomass": [
                 self.bio_cost,
                 self.internal_cogs_per_kg_bio,
@@ -695,6 +670,14 @@ class CannabinoidEstimator(param.Parameterized):
                 self.wholesale_cbx_price,
                 self.net_rev_per_kg_output,
             ],
+        }
+        self.money_data_unit_df = pd.DataFrame(money_data_unit_dict)
+        if hasattr(self, "money_unit_table"):
+            self.money_unit_table.value = self.money_data_unit_df
+
+        # Data for Time-based table
+        money_data_time_dict = {
+            " ": metric_names,
             "Per Shift": [
                 self.biomass_cost_per_shift,
                 self.internal_cogs_per_shift,
@@ -714,9 +697,9 @@ class CannabinoidEstimator(param.Parameterized):
                 self.net_rev_per_week,
             ],
         }
-        self.money_data_df = pd.DataFrame(money_data_dict)
-        if hasattr(self, "money_table"):
-            self.money_table.value = self.money_data_df
+        self.money_data_time_df = pd.DataFrame(money_data_time_dict)
+        if hasattr(self, "money_time_table"):
+            self.money_time_table.value = self.money_data_time_df
 
         profit_data_dict = {
             "Metric": ["Operating Profit", "Resin Spread"],
@@ -747,41 +730,32 @@ class CannabinoidEstimator(param.Parameterized):
         self.processing_data_df = pd.DataFrame(processing_data_dict)
         if hasattr(self, "processing_table"):
             self.processing_table.value = self.processing_data_df
-        
+
         if hasattr(self, "profit_weekly"):
             self.profit_weekly.value = self.net_rev_per_week
             self.profit_weekly.format = f"${self.net_rev_per_week / 1000:.0f} k"
-        
+
         if hasattr(self, "profit_pct"):
             self.profit_pct.value = self.operating_profit_pct
-            self.profit_pct.format=f"{self.operating_profit_pct * 100.0:.2f}%"
-
-    def _get_money_formatters(self):
-        return {
-            "$/kg Biomass": get_formatter("$%.02f"),
-            "$/kg Output": get_formatter("$%.02f"),
-            "Per Shift": get_formatter("$%.02f"),
-            "Per Day": get_formatter("$%.02f"),
-            "Per Week": get_formatter("$%.02f"),
-        }
+            self.profit_pct.format = f"{self.operating_profit_pct * 100.0:.2f}%"
 
     def view(self):
         input_col_max_width = 400
-        col1 = pn.Column(
+        extractionCol = pn.Column(
             "### Extraction",
             self.kg_processed_per_hour_slider,
             self.finished_product_yield_pct_slider,
             sizing_mode="stretch_width",
             max_width=input_col_max_width,
         )
-        col2 = pn.Column(
+        biomassCol = pn.Column(
             pn.pane.Markdown("### Biomass parameters", margin=0),
             self.bio_cbx_pct_slider,
             self.bio_cost_slider,
             sizing_mode="stretch_width",
             max_width=input_col_max_width,
         )
-        col3 = pn.Column(
+        consumableCol = pn.Column(
             pn.pane.Markdown("### Consumable rates", margin=0),
             self.kwh_rate_slider,
             self.water_cost_per_1000l_slider,
@@ -789,22 +763,22 @@ class CannabinoidEstimator(param.Parameterized):
             sizing_mode="stretch_width",
             max_width=input_col_max_width,
         )
-        col4 = pn.Column(
+        wholesaleCol = pn.Column(
             pn.pane.Markdown("### Wholesale details", margin=0),
             self.wholesale_cbx_price_slider,
             self.wholesale_cbx_pct_slider,
             sizing_mode="stretch_width",
             max_width=input_col_max_width,
         )
-        col5 = pn.Column(
-            pn.pane.Markdown("### Variable costs", margin=0),
+        variableCol = pn.Column(
+            pn.pane.Markdown("### Variable processing costs", margin=0),
             self.kwh_per_kg_bio_slider,
             self.water_liters_consumed_per_kg_bio_slider,
             self.consumables_per_kg_output_slider,
             sizing_mode="stretch_width",
             max_width=input_col_max_width,
         )
-        col6 = pn.Column(
+        complianceBatchCol = pn.Column(
             pn.pane.Markdown("### Compliance", margin=0),
             self.batch_test_cost_slider,
             pn.pane.Markdown("New Batch Every:", margin=0),
@@ -814,7 +788,7 @@ class CannabinoidEstimator(param.Parameterized):
             sizing_mode="stretch_width",
             max_width=input_col_max_width,
         )
-        col8 = pn.Column(
+        workerCol = pn.Column(
             pn.pane.Markdown("### Worker Details", margin=0),
             self.workers_per_shift_slider,
             self.worker_hourly_rate_slider,
@@ -823,7 +797,7 @@ class CannabinoidEstimator(param.Parameterized):
             sizing_mode="stretch_width",
             max_width=input_col_max_width,
         )
-        col9 = pn.Column(
+        shiftCol = pn.Column(
             pn.pane.Markdown("### Shift details", margin=0),
             self.labour_hours_per_shift_slider,
             self.processing_hours_per_shift_slider,
@@ -833,20 +807,34 @@ class CannabinoidEstimator(param.Parameterized):
             max_width=input_col_max_width,
         )
 
-        # input_grid = pn.GridSpec(sizing_mode="stretch_width", max_width=1800, margin=10)
-        # input_grid[0, 0] = col1
-        # input_grid[0, 1] = col2
-        # input_grid[0, 2] = col3
-        # input_grid[0, 3] = col4
         input_grid = pn.FlexBox(
-            col1, col2, col3, col4, col5, col8, col9, col6, align_content="normal"
+            extractionCol,
+            biomassCol,
+            consumableCol,
+            wholesaleCol,
+            variableCol,
+            workerCol,
+            shiftCol,
+            complianceBatchCol,
+            align_content="normal",
+        )
+
+        money_unit_table_display = pn.Column(
+            pn.pane.Markdown(
+                "### Financial Summary (Per Unit)", styles={"text-align": "center"}
+            ),
+            self.money_unit_table,
+            sizing_mode="stretch_width",
+            max_width=input_col_max_width + 50,  # Slightly wider for two data columns
         )
 
-        money_table_display = pn.Column(
-            pn.pane.Markdown("### Financial Summary", styles={"text-align": "center"}),
-            self.money_table,
+        money_time_table_display = pn.Column(
+            pn.pane.Markdown(
+                "### Financial Summary (Aggregated)", styles={"text-align": "center"}
+            ),
+            self.money_time_table,
             sizing_mode="stretch_width",
-            max_width=700,
+            max_width=500,  # Accommodate three data columns
         )
 
         profit_table_display = pn.Column(
@@ -855,7 +843,6 @@ class CannabinoidEstimator(param.Parameterized):
             sizing_mode="stretch_width",
             max_width=input_col_max_width,
         )
-
         processing_table_display = pn.Column(
             pn.pane.Markdown("### Processing Summary", styles={"text-align": "center"}),
             self.processing_table,
@@ -863,34 +850,15 @@ class CannabinoidEstimator(param.Parameterized):
             max_width=input_col_max_width,
         )
 
-        # profit_weekly = pn.indicators.Number(
-        #     name="Weekly Profit",
-        #     value=self.net_rev_per_week,
-        #     format=f"${self.net_rev_per_week / 1000:.0f} k",
-        #     default_color="green",
-        #     align="center",
-        # )
-
-        # profit_pct = pn.indicators.Number(
-        #     name="Operating Profit",
-        #     value=self.operating_profit_pct,
-        #     format=f"{self.operating_profit_pct * 100.0:.2f}%",
-        #     default_color="green",
-        #     align="center",
-        # )
-
-        # indicator_layout = pn.Column(profit_pct, profit_weekly, align="center")
-
-        # table_grid = pn.GridSpec(sizing_mode="stretch_width", max_width=1800, margin=10)
-        # table_grid[:, 0:2] = tables_layout
-        # table_grid[:, 2] = indicator_layout
         table_grid = pn.FlexBox(
             self.profit_weekly,
             self.profit_pct,
             processing_table_display,
             profit_table_display,
-            money_table_display,
+            money_unit_table_display,
+            money_time_table_display,  # Added new tables here
             align_content="normal",
+            flex_wrap="wrap",  # Ensure wrapping for smaller screens
         )
 
         main_layout = pn.Column(
@@ -899,25 +867,12 @@ class CannabinoidEstimator(param.Parameterized):
             table_grid,
             styles={"margin": "0px 10px"},
         )
-
         return main_layout
 
 
-estimator_app = CannabinoidEstimator()
-# To run in a Panel server:
-# pn.config.raw_css = custom_themes.get_base_css(custom_themes.DARK_THEME_VARS)
+estimator_app = CannabinoidEstimatorGUI()
 estimator_app.view().servable(title="CBx Revenue Estimator")
 
-# Instantiate the template with widgets displayed in the sidebar
-# template = pn.template.FastListTemplate(
-#     title="CBx Revenue Estimator (FastList Panel)",
-#     #theme = custom_themes.DarkTheme,
-#     #sidebar=[freq, phase],
-# )
-
-# template.main.append(estimator_app.view())
-# template.servable()
-
 if __name__ == "__main__":
     pn.serve(
         estimator_app.view(),