From 1ec16e64fb6ee5b954d02de67d2eb584ae1dc0c4 Mon Sep 17 00:00:00 2001 From: Matt Gerega Date: Mon, 15 Apr 2024 10:44:03 -0400 Subject: [PATCH] Updated calculation of default values during migration and added additional help --- client/public/locales/en/common.json | 4 ++-- .../2024_03_26_1349-304a32906234_spool_weight_population.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/client/public/locales/en/common.json b/client/public/locales/en/common.json index 39b1ed0..8425dfd 100644 --- a/client/public/locales/en/common.json +++ b/client/public/locales/en/common.json @@ -160,8 +160,8 @@ "used_weight": "How much filament has been used from the spool. A new spool should have 0g used.", "remaining_weight": "How much filament is left on the spool. For a new spool this should match the spool weight.", "measured_weight": "How much the filament and spool weigh.", - "initial_weight": "The initial Weight of the filament (net weight)", - "spool_weight": "The weight of the spool when it is empty.", + "initial_weight": "The initial Weight of the filament (net weight). This value may come from the filament, but is tracked at the spool level to allow for individual variations the weight of filament on the spool.", + "spool_weight": "The weight of the spool when it is empty. This value may come from either the filament or the vendor, but is tracked at the spool level to allow for individual variations of the weight of an empty spool.", "location": "Where the spool is located if you have multiple locations where you store your spools.", "lot_nr": "Manufacturer's lot number. Can be used to ensure a print has consistent color if multiple spools are used." }, diff --git a/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py b/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py index 1b061fd..79763d4 100644 --- a/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py +++ b/migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py @@ -44,7 +44,7 @@ def upgrade() -> None: ) initial_weight = ( - sa.select((filament.c.weight + filament.c.spool_weight).label("initial_weight")) + sa.select((filament.c.weight).label("initial_weight")) .where(filament.c.id == spool.c.filament_id) .scalar_subquery() ) @@ -55,7 +55,6 @@ def upgrade() -> None: set_spool_weight = sa.update(spool).values(spool_weight=spool_weight) op.execute(set_spool_weight) - pass def downgrade() -> None: