diff --git a/src/Model/HydraulicStructures/HydraulicStructures.py b/src/Model/HydraulicStructures/HydraulicStructures.py index bc29b6688333fbf29cd1e08db42a393a50230935..b71dbda4a3951c5d691df5b927d7e3f34dadfdb5 100644 --- a/src/Model/HydraulicStructures/HydraulicStructures.py +++ b/src/Model/HydraulicStructures/HydraulicStructures.py @@ -64,6 +64,7 @@ class HydraulicStructure(SQLSubModel): @classmethod def _db_create(cls, execute): + execute(""" CREATE TABLE hydraulic_structures( id INTEGER NOT NULL PRIMARY KEY, @@ -138,6 +139,7 @@ class HydraulicStructure(SQLSubModel): return new def _db_save(self, execute, data=None): + print("save hs unit") execute(f"DELETE FROM hydraulic_structures WHERE id = {self.id}") input_reach_id = -1 diff --git a/src/Model/OutputKpAdists/OutputKpAdists.py b/src/Model/OutputKpAdists/OutputKpAdists.py index d8ab6f566b786ac4624ce43308f6861e2387bfd7..986fae1c5a499ce605fa908816eed07f3424f940 100644 --- a/src/Model/OutputKpAdists/OutputKpAdists.py +++ b/src/Model/OutputKpAdists/OutputKpAdists.py @@ -82,15 +82,18 @@ class OutputKpAdists(SQLSubModel): @classmethod def _db_create(cls, execute): - execute(""" - CREATE TABLE OutputKpAdists( - id INTEGER NOT NULL PRIMARY KEY, - reach INTEGER NOT NULL, - kp REAL NOT NULL, - title TEXT NOT NULL, - FOREIGN KEY(edge) REFERENCES river_reach(id) - ) - """) + + sql = ( + "CREATE TABLE OutputKpAdists(" + + "id INTEGER NOT NULL PRIMARY KEY, " + + "reach INTEGER NOT NULL, " + + "kp REAL NOT NULL, " + + "title TEXT NOT NULL, " + + "FOREIGN KEY(reach) REFERENCES river_reach(id)" + + ")" + ) + + execute(sql) return cls._create_submodel(execute) @@ -130,21 +133,14 @@ class OutputKpAdists(SQLSubModel): def _db_save(self, execute, data=None): - print("print output kp unit") - print("id : ", self.id) - print("reach : ", self._reach) - print("kp : ", self._kp) - print("title : ", self._title) - print("title format : ", self._db_format(self._title)) - execute(f"DELETE FROM OutputKpAdists WHERE id = {self.id}") sql = ( "INSERT INTO " + "OutputKpAdists(id, reach, kp, title) " + "VALUES (" + - f"{self.id}, {self._reach}, " + - f"{self._kp}, '{self._db_format(self._title)}'" + + f"{self.id}, {self._reach}, {self._kp}, " + + f"'{self._db_format(self._title)}'" + ")" ) diff --git a/src/Model/OutputKpAdists/OutputKpListAdists.py b/src/Model/OutputKpAdists/OutputKpListAdists.py index 741cb2291a920a1e367fe9b0d260e27c7f99d144..d6560e6847c5357de3bc241f02fb293d57b95afe 100644 --- a/src/Model/OutputKpAdists/OutputKpListAdists.py +++ b/src/Model/OutputKpAdists/OutputKpListAdists.py @@ -35,7 +35,6 @@ class OutputKpAdistsList(PamhyrModelList): return new def _db_save(self, execute, data=None): - print("save outputkpadists") ok = True # Delete previous data diff --git a/src/Model/Pollutants/Pollutants.py b/src/Model/Pollutants/Pollutants.py index 42d5698c1d8ca97a5eb854c52e479d8255b307b7..9ca6bb06eac2b6e6550de64b258d61a73698e0c8 100644 --- a/src/Model/Pollutants/Pollutants.py +++ b/src/Model/Pollutants/Pollutants.py @@ -86,6 +86,7 @@ class Pollutants(SQLSubModel): apd REAL NOT NULL, ac REAL NOT NULL, bc REAL NOT NULL, + pollutant INTEGER NOT NULL, FOREIGN KEY(pollutant) REFERENCES Pollutants(id) ) """) @@ -126,7 +127,7 @@ class Pollutants(SQLSubModel): if table is not None: for t in table: - new_data.append(t) + new_data = t[1:] new_pollutant._data.append(new_data) @@ -136,14 +137,12 @@ class Pollutants(SQLSubModel): def _db_save(self, execute, data=None): - print("save in data base for pollutants") - execute(f"DELETE FROM Pollutants WHERE id = {self.id}") execute(f"DELETE FROM Pollutants_characteristics WHERE pollutant = {self.id}") sql = ( "INSERT INTO " + - "Pollutants(id, name " + + "Pollutants(id, name) " + "VALUES (" + f"{self.id}, " + f"'{self._db_format(self._name)}'" + diff --git a/src/Model/Pollutants/PollutantsList.py b/src/Model/Pollutants/PollutantsList.py index e2fa44043128f47f0b58b008bc8028b5ee66d2e0..2526329a76b0f356f803dee125218eb598aa695f 100644 --- a/src/Model/Pollutants/PollutantsList.py +++ b/src/Model/Pollutants/PollutantsList.py @@ -35,7 +35,6 @@ class PollutantsList(PamhyrModelList): return new def _db_save(self, execute, data=None): - print("save pollutantsList") ok = True # Delete previous data diff --git a/src/View/Pollutants/Edit/Window.py b/src/View/Pollutants/Edit/Window.py index 735d1b20ade9bc42b1d78a7f2f0df5178a919677..1f5351916bb73ef94bbc90b2e74b2cdfb0ec4c2c 100644 --- a/src/View/Pollutants/Edit/Window.py +++ b/src/View/Pollutants/Edit/Window.py @@ -57,7 +57,6 @@ class EditPolluantWindow(PamhyrWindow): trad = EditPollutantTranslate() name = trad[self._pamhyr_name] - print(name) if self._data is not None: name += ( f" - {study.name} " + diff --git a/tests_cases/Ardeche/Ardeche.pamhyr b/tests_cases/Ardeche/Ardeche.pamhyr index 0951c307eaddec127fdc2ffe676ce37bcf6d6f17..1efb0ae8dde7817a8f93c275114fde846c18eaae 100644 Binary files a/tests_cases/Ardeche/Ardeche.pamhyr and b/tests_cases/Ardeche/Ardeche.pamhyr differ diff --git a/tests_cases/Ardeche/Ardeche.pamhyr-journal b/tests_cases/Ardeche/Ardeche.pamhyr-journal new file mode 100644 index 0000000000000000000000000000000000000000..624a5f81faf4cb9659a77c8af45c4107c7acc4a5 Binary files /dev/null and b/tests_cases/Ardeche/Ardeche.pamhyr-journal differ diff --git a/tests_cases/Enlargement/Enlargement.pamhyr b/tests_cases/Enlargement/Enlargement.pamhyr index 275fad25b44b7bc23ef14b467d0a1211b777f704..529aabb07ed8109ecaf6c3172dbdabb10f1878bb 100644 Binary files a/tests_cases/Enlargement/Enlargement.pamhyr and b/tests_cases/Enlargement/Enlargement.pamhyr differ