mirror of https://gitlab.com/pamhyr/pamhyr2
correction bug with saving data for lateral contributions adisTS
parent
9f26a7323c
commit
b6895ae99c
|
|
@ -132,11 +132,13 @@ class Data(SQLSubModel):
|
||||||
if scenario is None:
|
if scenario is None:
|
||||||
return new
|
return new
|
||||||
|
|
||||||
|
lca = data["lca"]
|
||||||
|
|
||||||
table = execute(
|
table = execute(
|
||||||
"SELECT pamhyr_id, deleted, data0, data1 " +
|
"SELECT pamhyr_id, deleted, data0, data1 " +
|
||||||
"FROM lateral_contribution_data_adists " +
|
"FROM lateral_contribution_data_adists " +
|
||||||
f"WHERE scenario = {scenario.id} " +
|
f"WHERE scenario = {scenario.id} " +
|
||||||
f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) "
|
f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) " +
|
||||||
f"AND lca = '{lca.id}'"
|
f"AND lca = '{lca.id}'"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -372,12 +374,12 @@ class LateralContributionAdisTS(SQLSubModel):
|
||||||
|
|
||||||
execute(
|
execute(
|
||||||
"INSERT INTO " +
|
"INSERT INTO " +
|
||||||
"lateral_contribution_adists(pamhyr_id, deleted, " +
|
"lateral_contribution_adists(pamhyr_id, deleted," +
|
||||||
"pollutant, reach, begin_rk, end_rk, scenario) " +
|
"pollutant, reach, begin_rk, end_rk, scenario) " +
|
||||||
"VALUES (" +
|
"VALUES (" +
|
||||||
f"{self.id}, {self._db_format(self.is_deleted())}, " +
|
f"{self.id}, {self._db_format(self.is_deleted())}, " +
|
||||||
f"{self._pollutant}, {self.reach}, " +
|
f"{self._pollutant}, {self.reach}, " +
|
||||||
f"{self._begin_rk}, {self._end_rk}, " +
|
f"{self._begin_rk}, {self._end_rk}" +
|
||||||
f"{self._status.scenario_id}" +
|
f"{self._status.scenario_id}" +
|
||||||
")"
|
")"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue