diff --git a/src/Model/Scenario.py b/src/Model/Scenario.py index 95c571fd..1f06f333 100644 --- a/src/Model/Scenario.py +++ b/src/Model/Scenario.py @@ -20,6 +20,7 @@ from tools import logger_exception from Model.Tools.PamhyrDB import SQLSubModel + class Scenario(SQLSubModel): _id_cnt = 0 _sub_classes = [] @@ -28,7 +29,7 @@ class Scenario(SQLSubModel): id: int = -1, name: str = "", description: str = "", - revision:int = 0, + revision: int = 0, parent=None, status=None): super(Scenario, self).__init__() @@ -148,7 +149,7 @@ class Scenario(SQLSubModel): "INSERT OR REPLACE INTO " + "scenario(id, name, description, revision, parent_id) " + "VALUES (" + - f"{self._id}, "+ + f"{self._id}, " + f"'{self._db_format(self.name)}', " + f"'{self._db_format(self.description)}', " + f"{self._revision}, " + diff --git a/src/Model/Scenarios.py b/src/Model/Scenarios.py index a390f114..6b39c59e 100644 --- a/src/Model/Scenarios.py +++ b/src/Model/Scenarios.py @@ -21,6 +21,7 @@ from tools import logger_exception from Model.Tools.PamhyrDict import PamhyrModelDict from Model.Scenario import Scenario + class Scenarios(PamhyrModelDict): _sub_classes = [ Scenario, diff --git a/src/Model/Study.py b/src/Model/Study.py index 14168af0..963d2043 100644 --- a/src/Model/Study.py +++ b/src/Model/Study.py @@ -316,11 +316,11 @@ class Study(SQLModel): ) data = {"status": new.status} - sql_exec = lambda sql: new.execute( - sql, - fetch_one=False, - commit=True - ) + + def sql_exec(sql): + return new.execute( + sql, fetch_one=False, commit=True + ) new.scenarios = Scenarios._db_load( sql_exec, diff --git a/src/Model/Tools/PamhyrID.py b/src/Model/Tools/PamhyrID.py index 4cffab93..0527329a 100644 --- a/src/Model/Tools/PamhyrID.py +++ b/src/Model/Tools/PamhyrID.py @@ -18,6 +18,7 @@ from tools import trace, timer + class PamhyrID(object): _pamhyr_id_cnt = 0