mirror of https://gitlab.com/pamhyr/pamhyr2
pamhyr: Fix Pep8.
parent
f2bc31c97b
commit
ba4603e850
|
|
@ -20,6 +20,7 @@ from tools import logger_exception
|
||||||
|
|
||||||
from Model.Tools.PamhyrDB import SQLSubModel
|
from Model.Tools.PamhyrDB import SQLSubModel
|
||||||
|
|
||||||
|
|
||||||
class Scenario(SQLSubModel):
|
class Scenario(SQLSubModel):
|
||||||
_id_cnt = 0
|
_id_cnt = 0
|
||||||
_sub_classes = []
|
_sub_classes = []
|
||||||
|
|
@ -28,7 +29,7 @@ class Scenario(SQLSubModel):
|
||||||
id: int = -1,
|
id: int = -1,
|
||||||
name: str = "",
|
name: str = "",
|
||||||
description: str = "",
|
description: str = "",
|
||||||
revision:int = 0,
|
revision: int = 0,
|
||||||
parent=None,
|
parent=None,
|
||||||
status=None):
|
status=None):
|
||||||
super(Scenario, self).__init__()
|
super(Scenario, self).__init__()
|
||||||
|
|
@ -148,7 +149,7 @@ class Scenario(SQLSubModel):
|
||||||
"INSERT OR REPLACE INTO " +
|
"INSERT OR REPLACE INTO " +
|
||||||
"scenario(id, name, description, revision, parent_id) " +
|
"scenario(id, name, description, revision, parent_id) " +
|
||||||
"VALUES (" +
|
"VALUES (" +
|
||||||
f"{self._id}, "+
|
f"{self._id}, " +
|
||||||
f"'{self._db_format(self.name)}', " +
|
f"'{self._db_format(self.name)}', " +
|
||||||
f"'{self._db_format(self.description)}', " +
|
f"'{self._db_format(self.description)}', " +
|
||||||
f"{self._revision}, " +
|
f"{self._revision}, " +
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ from tools import logger_exception
|
||||||
from Model.Tools.PamhyrDict import PamhyrModelDict
|
from Model.Tools.PamhyrDict import PamhyrModelDict
|
||||||
from Model.Scenario import Scenario
|
from Model.Scenario import Scenario
|
||||||
|
|
||||||
|
|
||||||
class Scenarios(PamhyrModelDict):
|
class Scenarios(PamhyrModelDict):
|
||||||
_sub_classes = [
|
_sub_classes = [
|
||||||
Scenario,
|
Scenario,
|
||||||
|
|
|
||||||
|
|
@ -316,11 +316,11 @@ class Study(SQLModel):
|
||||||
)
|
)
|
||||||
|
|
||||||
data = {"status": new.status}
|
data = {"status": new.status}
|
||||||
sql_exec = lambda sql: new.execute(
|
|
||||||
sql,
|
def sql_exec(sql):
|
||||||
fetch_one=False,
|
return new.execute(
|
||||||
commit=True
|
sql, fetch_one=False, commit=True
|
||||||
)
|
)
|
||||||
|
|
||||||
new.scenarios = Scenarios._db_load(
|
new.scenarios = Scenarios._db_load(
|
||||||
sql_exec,
|
sql_exec,
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@
|
||||||
|
|
||||||
from tools import trace, timer
|
from tools import trace, timer
|
||||||
|
|
||||||
|
|
||||||
class PamhyrID(object):
|
class PamhyrID(object):
|
||||||
_pamhyr_id_cnt = 0
|
_pamhyr_id_cnt = 0
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue