diff --git a/src/Model/Friction/Friction.py b/src/Model/Friction/Friction.py index 3d32f806..30fe5d59 100644 --- a/src/Model/Friction/Friction.py +++ b/src/Model/Friction/Friction.py @@ -207,6 +207,15 @@ class Friction(SQLSubModel): return new + def must_be_saved(self): + ssi = self._status.scenario_id + + return ( + self._begin_strickler._owner_scenario == ssi + or self._end_strickler._owner_scenario == ssi + or super(Friction, self).must_be_saved() + ) + def _db_save(self, execute, data=None): if not self.must_be_saved(): return True @@ -228,7 +237,7 @@ class Friction(SQLSubModel): "VALUES (" + f"{self.id}, {self._db_format(self.is_deleted())}, " + f"{ind}, {self._begin_rk}, {self._end_rk}, " + - f"{self._reach.id}, {b_s_id}, {e_s_id}" + + f"{self._reach.id}, {b_s_id}, {e_s_id}, " + f"{self._status.scenario_id}" + ")" ) diff --git a/src/Model/Friction/FrictionList.py b/src/Model/Friction/FrictionList.py index 94a392a6..d18004fc 100644 --- a/src/Model/Friction/FrictionList.py +++ b/src/Model/Friction/FrictionList.py @@ -62,7 +62,7 @@ class FrictionList(PamhyrModelList): reach = data["reach"] execute( f"DELETE FROM friction WHERE reach = {reach.id} " + - f"WHERE scenario = {self._status.scenario_id}" + f"AND scenario = {self._status.scenario_id}" ) ok = True diff --git a/src/View/Frictions/translate.py b/src/View/Frictions/translate.py index 5c62ba6c..8893c515 100644 --- a/src/View/Frictions/translate.py +++ b/src/View/Frictions/translate.py @@ -45,5 +45,5 @@ class FrictionsTranslate(MainTranslate): "begin_rk": _translate("Frictions", "Start (m)"), "end_rk": _translate("Frictions", "End (m)"), "begin_strickler": _translate("Frictions", "Start coefficient"), - "end_strickler": _translate("Frictions", "End coefficient"), + # "end_strickler": _translate("Frictions", "End coefficient"), }