From b5ae352af5d55c569cc665c8be05eeff75f43ccc Mon Sep 17 00:00:00 2001 From: JeaDylan <101608960+JeaDylan@users.noreply.github.com> Date: Thu, 9 Jul 2026 13:47:23 +0200 Subject: [PATCH] WeatherParameters: deleted variable not useful in default params --- src/Model/WeatherParameters/WeatherParameters.py | 12 +++--------- src/Model/WeatherParameters/WeatherParametersList.py | 7 +------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/Model/WeatherParameters/WeatherParameters.py b/src/Model/WeatherParameters/WeatherParameters.py index 72dd30e5..786deb5c 100644 --- a/src/Model/WeatherParameters/WeatherParameters.py +++ b/src/Model/WeatherParameters/WeatherParameters.py @@ -176,7 +176,7 @@ class WeatherParametersDefault(SQLSubModel): return new table = execute( - "SELECT pamhyr_id, deleted, type, value, scenario " + + "SELECT pamhyr_id, type, value, scenario " + "FROM weather_parameters_default " + f"WHERE scenario = {scenario.id} " + f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) " @@ -186,7 +186,6 @@ class WeatherParametersDefault(SQLSubModel): it = iter(row) pid = next(it) - deleted = next(it) type = next(it) value = next(it) owner_scenario = next(it) @@ -198,8 +197,6 @@ class WeatherParametersDefault(SQLSubModel): status=status, owner_scenario=owner_scenario ) - if deleted: - wp_default.set_as_deleted() loaded.add(pid) new.append(wp_default) @@ -217,10 +214,9 @@ class WeatherParametersDefault(SQLSubModel): execute( "INSERT INTO " + "weather_parameters_default(" + - "pamhyr_id, deleted, type, value, scenario) " + + "pamhyr_id, type, value, scenario) " + "VALUES (" + - f"{self.id}, {self._db_format(self.is_deleted())}, " + - f"'{self._db_format(self._type)}', {self._value}, " + + f"{self.id}, '{self._db_format(self._type)}', {self._value}, " + f"{self._status.scenario_id}" + ")" ) @@ -286,7 +282,6 @@ class WeatherParameters(SQLSubModel): execute(f""" CREATE TABLE weather_parameters_default{ext}( {cls.create_db_add_pamhyr_id()}, - deleted BOOLEAN NOT NULL DEFAULT FALSE, type TEXT NOT NULL, value FLOAT NOT NULL, {Scenario.create_db_add_scenario()}, @@ -348,7 +343,6 @@ class WeatherParameters(SQLSubModel): execute(f""" CREATE TABLE weather_parameters_default( {cls.create_db_add_pamhyr_id()}, - deleted BOOLEAN NOT NULL DEFAULT FALSE, type TEXT NOT NULL, value FLOAT NOT NULL, {Scenario.create_db_add_scenario()}, diff --git a/src/Model/WeatherParameters/WeatherParametersList.py b/src/Model/WeatherParameters/WeatherParametersList.py index 4e5c932d..c47657db 100644 --- a/src/Model/WeatherParameters/WeatherParametersList.py +++ b/src/Model/WeatherParameters/WeatherParametersList.py @@ -152,12 +152,7 @@ class WeatherParametersList(PamhyrModelList): @property def default(self): - return list( - filter( - lambda el: not el.is_deleted(), - self._default - ) - ) + return self._default.copy() def default_for_type(self, type): for wp_default in self.default: