From b05a047a870034d6f45bb13410e3f7d84ae56114 Mon Sep 17 00:00:00 2001 From: Tom LAVEILLE Date: Tue, 21 Jan 2025 14:40:23 +0100 Subject: [PATCH] =?UTF-8?q?add=20variable=20pour=20recup=C3=A9r=C3=A9=20le?= =?UTF-8?q?=20gid=5Fseq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CenRa_AUTOMAP/CenRa_AutoMap.py | 4 +- CenRa_AUTOMAP/about_form.py | 4 +- .../tools/ui/CenRa_AutoMap_about_form.ui | 96 ---------------- CenRa_COPIE/CenRa_Copie.py | 6 +- CenRa_COPIE/about_form.py | 2 +- CenRa_COPIE/tools/ui/CenRa_about_form.ui | 2 +- CenRa_FLUX/CenRa_Flux.py | 2 +- CenRa_FLUX/tools/ui/CenRa_about_form.ui | 2 +- CenRa_PAGERENDER/CenRa_PageRender.py | 4 +- CenRa_PAGERENDER/about_form.py | 4 +- .../tools/ui/CenRa_PageRender_about_form.ui | 96 ---------------- CenRa_POSTGIS/CenRa_Postgis.py | 4 +- CenRa_POSTGIS/about_form.py | 4 +- CenRa_POSTGIS/metadata.txt | 4 +- CenRa_POSTGIS/postgis_editor.py | 107 +++++++++--------- CenRa_POSTGIS/tools/ui/CenRa_about_form.ui | 2 +- CenRa_SICEN/forms/about_form.py | 4 +- CenRa_SICEN/forms/sicen_about_form.ui | 96 ---------------- CenRa_SICEN/sicen.py | 4 +- plugins.xml | 6 +- 20 files changed, 85 insertions(+), 368 deletions(-) delete mode 100644 CenRa_AUTOMAP/tools/ui/CenRa_AutoMap_about_form.ui delete mode 100644 CenRa_PAGERENDER/tools/ui/CenRa_PageRender_about_form.ui delete mode 100644 CenRa_SICEN/forms/sicen_about_form.ui diff --git a/CenRa_AUTOMAP/CenRa_AutoMap.py b/CenRa_AUTOMAP/CenRa_AutoMap.py index c64978f..1c02888 100644 --- a/CenRa_AUTOMAP/CenRa_AutoMap.py +++ b/CenRa_AUTOMAP/CenRa_AutoMap.py @@ -30,7 +30,7 @@ from .tools.resources import ( maj_verif, ) from .canvas_editor import AutoMap_Editor -from .about_form import AutoMapAboutDialog +from .about_form import AboutDialog from PyQt5.QtCore import * @@ -114,7 +114,7 @@ class PgAutoMap: """ About dialog """ - dialog = AutoMapAboutDialog(iface) + dialog = AboutDialog(iface) dialog.exec_() def open_help(): """ Open the online help. """ diff --git a/CenRa_AUTOMAP/about_form.py b/CenRa_AUTOMAP/about_form.py index 3d9836b..05e2840 100644 --- a/CenRa_AUTOMAP/about_form.py +++ b/CenRa_AUTOMAP/about_form.py @@ -12,12 +12,12 @@ ABOUT_FORM_CLASS, _ = uic.loadUiType( os.path.join( str(Path(__file__).resolve().parent), 'tools/ui', - 'CenRa_AutoMap_about_form.ui' + 'CenRa_about_form.ui' ) ) -class AutoMapAboutDialog(QDialog, ABOUT_FORM_CLASS): +class AboutDialog(QDialog, ABOUT_FORM_CLASS): """ About - Let the user display the about dialog. """ diff --git a/CenRa_AUTOMAP/tools/ui/CenRa_AutoMap_about_form.ui b/CenRa_AUTOMAP/tools/ui/CenRa_AutoMap_about_form.ui deleted file mode 100644 index ace0430..0000000 --- a/CenRa_AUTOMAP/tools/ui/CenRa_AutoMap_about_form.ui +++ /dev/null @@ -1,96 +0,0 @@ - - - CenRa_Metabase_editorwidget_base - - - - 0 - 0 - 471 - 594 - - - - Metabase - - - - ../../CenRa_Metabase/tools/ui/icon.svg../../CenRa_Metabase/tools/ui/icon.svg - - - - - - true - - - Qt::NoFocus - - - QFrame::NoFrame - - - QFrame::Plain - - - true - - - - - 0 - 0 - 453 - 547 - - - - - - 0 - 0 - 451 - 541 - - - - DevLog - - - - - 10 - 20 - 431 - 511 - - - - - about:blank - - - - - - - - - - - QDialogButtonBox::Ok - - - - - - - - QWebView - QWidget -
QtWebKitWidgets/QWebView
- - - - - diff --git a/CenRa_COPIE/CenRa_Copie.py b/CenRa_COPIE/CenRa_Copie.py index 0da1f96..b260d2b 100644 --- a/CenRa_COPIE/CenRa_Copie.py +++ b/CenRa_COPIE/CenRa_Copie.py @@ -20,7 +20,7 @@ from .tools.resources import ( maj_verif, ) from .copie_editor import Copie_Editor -from .about_form import CopieAboutDialog +from .about_form import AboutDialog from PyQt5.QtCore import * @@ -40,7 +40,7 @@ class PgCopie: maj_verif(NAME) # Display About window on first use - version = qgis.utils.pluginMetadata('CenRa_Copie','version') + version = qgis.utils.pluginMetadata('CenRa_COPIE','version') s = QSettings() versionUse = s.value("copie/version", 1, type=str) if str(versionUse) != str(version) : @@ -71,7 +71,7 @@ class PgCopie: """ About dialog """ - dialog = CopieAboutDialog(iface) + dialog = AboutDialog(iface) dialog.exec_() def open_help(): """ Open the online help. """ diff --git a/CenRa_COPIE/about_form.py b/CenRa_COPIE/about_form.py index cb0794b..991375b 100644 --- a/CenRa_COPIE/about_form.py +++ b/CenRa_COPIE/about_form.py @@ -17,7 +17,7 @@ ABOUT_FORM_CLASS, _ = uic.loadUiType( ) -class CopieAboutDialog(QDialog, ABOUT_FORM_CLASS): +class AboutDialog(QDialog, ABOUT_FORM_CLASS): """ About - Let the user display the about dialog. """ diff --git a/CenRa_COPIE/tools/ui/CenRa_about_form.ui b/CenRa_COPIE/tools/ui/CenRa_about_form.ui index 3e3608f..4afd0e4 100644 --- a/CenRa_COPIE/tools/ui/CenRa_about_form.ui +++ b/CenRa_COPIE/tools/ui/CenRa_about_form.ui @@ -11,7 +11,7 @@ - Metabase + Journal des modifications diff --git a/CenRa_FLUX/CenRa_Flux.py b/CenRa_FLUX/CenRa_Flux.py index 1d2a818..14492e4 100644 --- a/CenRa_FLUX/CenRa_Flux.py +++ b/CenRa_FLUX/CenRa_Flux.py @@ -40,7 +40,7 @@ class PgFlux: maj_verif(NAME) # Display About window on first use - version = qgis.utils.pluginMetadata('CenRa_Flux','version') + version = qgis.utils.pluginMetadata('CenRa_FLUX','version') s = QSettings() versionUse = s.value("flux/version", 1, type=str) if str(versionUse) != str(version) : diff --git a/CenRa_FLUX/tools/ui/CenRa_about_form.ui b/CenRa_FLUX/tools/ui/CenRa_about_form.ui index 3e3608f..4afd0e4 100644 --- a/CenRa_FLUX/tools/ui/CenRa_about_form.ui +++ b/CenRa_FLUX/tools/ui/CenRa_about_form.ui @@ -11,7 +11,7 @@ - Metabase + Journal des modifications diff --git a/CenRa_PAGERENDER/CenRa_PageRender.py b/CenRa_PAGERENDER/CenRa_PageRender.py index 6b49c3f..0b83595 100644 --- a/CenRa_PAGERENDER/CenRa_PageRender.py +++ b/CenRa_PAGERENDER/CenRa_PageRender.py @@ -30,7 +30,7 @@ from .tools.resources import ( maj_verif, ) from .canvas_editor import PageRender_Editor -from .about_form import PageRenderAboutDialog +from .about_form import AboutDialog from PyQt5.QtCore import * @@ -114,7 +114,7 @@ class PgPageRender: """ About dialog """ - dialog = PageRenderAboutDialog(iface) + dialog = AboutDialog(iface) dialog.exec_() def open_help(): """ Open the online help. """ diff --git a/CenRa_PAGERENDER/about_form.py b/CenRa_PAGERENDER/about_form.py index 57827e5..f1960e6 100644 --- a/CenRa_PAGERENDER/about_form.py +++ b/CenRa_PAGERENDER/about_form.py @@ -12,12 +12,12 @@ ABOUT_FORM_CLASS, _ = uic.loadUiType( os.path.join( str(Path(__file__).resolve().parent), 'tools/ui', - 'CenRa_PageRender_about_form.ui' + 'CenRa_about_form.ui' ) ) -class PageRenderAboutDialog(QDialog, ABOUT_FORM_CLASS): +class AboutDialog(QDialog, ABOUT_FORM_CLASS): """ About - Let the user display the about dialog. """ diff --git a/CenRa_PAGERENDER/tools/ui/CenRa_PageRender_about_form.ui b/CenRa_PAGERENDER/tools/ui/CenRa_PageRender_about_form.ui deleted file mode 100644 index 3e3608f..0000000 --- a/CenRa_PAGERENDER/tools/ui/CenRa_PageRender_about_form.ui +++ /dev/null @@ -1,96 +0,0 @@ - - - CenRa_Metabase_editorwidget_base - - - - 0 - 0 - 471 - 594 - - - - Metabase - - - - ../../CenRa_Metabase/tools/ui/icon.svg../../CenRa_Metabase/tools/ui/icon.svg - - - - - - true - - - Qt::NoFocus - - - QFrame::NoFrame - - - QFrame::Plain - - - true - - - - - 0 - 0 - 453 - 547 - - - - - - 0 - 0 - 451 - 541 - - - - DevLog - - - - - 10 - 20 - 431 - 511 - - - - - about:blank - - - - - - - - - - - QDialogButtonBox::Ok - - - - - - - - QWebView - QWidget -
QtWebKitWidgets/QWebView
- - - - - diff --git a/CenRa_POSTGIS/CenRa_Postgis.py b/CenRa_POSTGIS/CenRa_Postgis.py index a959c2c..d87cf1a 100644 --- a/CenRa_POSTGIS/CenRa_Postgis.py +++ b/CenRa_POSTGIS/CenRa_Postgis.py @@ -21,7 +21,7 @@ from .tools.resources import ( ) from .postgis_editor import Postgis_Editor from .postgis_creator import Postgis_Creator -from .about_form import PostgisAboutDialog +from .about_form import AboutDialog from PyQt5.QtCore import * @@ -80,7 +80,7 @@ class PgPostgis: """ About dialog """ - dialog = PostgisAboutDialog(iface) + dialog = AboutDialog(iface) dialog.exec_() def open_help(): """ Open the online help. """ diff --git a/CenRa_POSTGIS/about_form.py b/CenRa_POSTGIS/about_form.py index 59bb77d..27bf660 100644 --- a/CenRa_POSTGIS/about_form.py +++ b/CenRa_POSTGIS/about_form.py @@ -17,7 +17,7 @@ ABOUT_FORM_CLASS, _ = uic.loadUiType( ) -class PostgisAboutDialog(QDialog, ABOUT_FORM_CLASS): +class AboutDialog(QDialog, ABOUT_FORM_CLASS): """ About - Let the user display the about dialog. """ @@ -26,7 +26,7 @@ class PostgisAboutDialog(QDialog, ABOUT_FORM_CLASS): self.iface = iface self.setupUi(self) - self.viewer.setHtml(devlog('CenRa_POSTGRES')) + self.viewer.setHtml(devlog('CenRa_POSTGIS')) self.rejected.connect(self.onReject) self.buttonBox.rejected.connect(self.onReject) diff --git a/CenRa_POSTGIS/metadata.txt b/CenRa_POSTGIS/metadata.txt index b32f75e..596b544 100644 --- a/CenRa_POSTGIS/metadata.txt +++ b/CenRa_POSTGIS/metadata.txt @@ -12,7 +12,7 @@ name=CenRa_POSTGIS qgisMinimumVersion=3.0 description=Permet de crée un dossier dans la base PostGis -version=2.1 +version=2.2 author=Conservatoire d'Espaces Naturels de Rhône-Alpes email=si_besoin@cen-rhonealpes.fr @@ -21,7 +21,7 @@ email=si_besoin@cen-rhonealpes.fr # Optional items: # Uncomment the following line and add your changelog entries: -changelog=

CenRa_POSTGIS:


07/01/2025 - Version 2.1:

- ByPass du certif ssl ci erreur.

22/10/2024 - Version 2.0:

- Refont du code.

+changelog=

CenRa_POSTGIS:


21/01/2025 - Version 2.2:

- Correctif sur la longeur des nom.

07/01/2025 - Version 2.1:

- ByPass du certif ssl ci erreur.

22/10/2024 - Version 2.0:

- Refont du code.

# tags are comma separated with spaces allowed tags=cenra, postgis, database diff --git a/CenRa_POSTGIS/postgis_editor.py b/CenRa_POSTGIS/postgis_editor.py index b345589..8661a5f 100644 --- a/CenRa_POSTGIS/postgis_editor.py +++ b/CenRa_POSTGIS/postgis_editor.py @@ -110,7 +110,13 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): tablename = schema + "_contour_" + self.annee_1.text() tablename_qgis = tablename[1:] # Permet d'enlever le "_", ajouter a la premiere etape, dans qgis + RETURNE = "SELECT pg_get_serial_sequence('"+schema + "."+ tablename+"','gid')" SQL_contour = "CREATE TABLE " + schema + "."+ tablename + champ_contour + + cur.execute(SQL_contour) + cur.execute(RETURNE) + sequence_name = cur.fetchone()[0] + SQL_pkey = "ALTER TABLE " + schema + "." + tablename + " ADD CONSTRAINT " + tablename + "_pkey" + " PRIMARY KEY (gid)" SQL_trigger_area_m2 = "CREATE TRIGGER area_m2" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.area_m2();" SQL_trigger_area_ha = "CREATE TRIGGER area_ha" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.area_ha();" @@ -121,9 +127,8 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): SELECT f_table_catalog, '""" + schema + "', '" + tablename + """', f_geometry_column, stylename, styleqml, stylesld, useasdefault, "owner", ui, now() FROM layer_styles WHERE description = 'contour_modele_v3'""" - SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_sig;GRANT ALL ON SEQUENCE "+schema+"."+tablename+"_gid_seq TO grp_qgis;" + SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_sig;GRANT ALL ON SEQUENCE "+sequence_name+" TO grp_qgis;" - cur.execute(SQL_contour) cur.execute(SQL_pkey) cur.execute(SQL_trigger_area_m2) cur.execute(SQL_trigger_area_ha) @@ -152,17 +157,22 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): tablename = schema + "_habitat_" + self.annee_2.text() tablename_1=tablename+"_points" + RETURNE = "SELECT pg_get_serial_sequence('"+schema + "."+ tablename_1+"','gid')" tablename_qgis = tablename_1[1:] # Permet d'enlever le "_", ajouter a la premiere etape, dans qgis SQL_VEGETHAB = "CREATE TABLE "+ schema + "."+ tablename_1 + champ_vegethab_point + + cur.execute(SQL_VEGETHAB) + cur.execute(RETURNE) + sequence_name = cur.fetchone()[0] + SQL_pkey = "ALTER TABLE " + schema + "." + tablename_1 + " ADD CONSTRAINT " + tablename_1 + "_pkey" + " PRIMARY KEY (gid)" SQL_trigger_coordonnees = "CREATE TRIGGER coordonnees" + tablename_1 + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename_1 + " FOR EACH ROW EXECUTE PROCEDURE ref.coordonnees();" SQL_style = """INSERT INTO layer_styles (f_table_catalog, f_table_schema, f_table_name, f_geometry_column, stylename, styleqml, stylesld, useasdefault, "owner", ui, update_time) SELECT f_table_catalog, '""" + schema + "', '" + tablename_1 + """', f_geometry_column, stylename, styleqml, stylesld, useasdefault, "owner", ui, now() FROM layer_styles WHERE description = 'vegethab_points_modele_v3'""" - SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename_1+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename_1+" TO grp_sig;GRANT ALL ON SEQUENCE "+schema+"."+tablename_1+"_gid_seq TO grp_qgis;" + SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename_1+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename_1+" TO grp_sig;GRANT ALL ON SEQUENCE "+sequence_name+" TO grp_qgis;" - cur.execute(SQL_VEGETHAB) cur.execute(SQL_pkey) cur.execute(SQL_trigger_coordonnees) cur.execute(SQL_style) @@ -179,8 +189,14 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): layer = self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres") tablename_2=tablename+"_lignes" + RETURNE = "SELECT pg_get_serial_sequence('"+schema + "."+ tablename_2+"','gid')" tablename_qgis = tablename_2[1:] SQL_VEGETHAB = "CREATE TABLE "+ schema + "."+ tablename_2 + champ_vegethab_multilinestring + + cur.execute(SQL_VEGETHAB) + cur.execute(RETURNE) + sequence_name = cur.fetchone()[0] + SQL_pkey = "ALTER TABLE " + schema + "." + tablename_2 + " ADD CONSTRAINT " + tablename_2 + "_pkey" + " PRIMARY KEY (gid)" SQL_trigger_length_m = "CREATE TRIGGER length_m" + tablename_2 + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename_2 + " FOR EACH ROW EXECUTE PROCEDURE ref.length_m();" SQL_trigger_length_km = "CREATE TRIGGER length_km" + tablename_2 + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename_2 + " FOR EACH ROW EXECUTE PROCEDURE ref.length_km();" @@ -188,9 +204,8 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): SELECT f_table_catalog, '""" + schema + "', '" + tablename_2 + """', f_geometry_column, stylename, styleqml, stylesld, useasdefault, "owner", ui, now() FROM layer_styles WHERE description = 'vegethab_lignes_modele_v3'""" - SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename_2+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename_2+" TO grp_sig;GRANT ALL ON SEQUENCE "+schema+"."+tablename_2+"_gid_seq TO grp_qgis;" + SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename_2+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename_2+" TO grp_sig;GRANT ALL ON SEQUENCE "+sequence_name+" TO grp_qgis;" - cur.execute(SQL_VEGETHAB) cur.execute(SQL_pkey) cur.execute(SQL_trigger_length_m) cur.execute(SQL_trigger_length_km) @@ -208,8 +223,14 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): layer = self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres") tablename_3=tablename+"_polygones" + RETURNE = "SELECT pg_get_serial_sequence('"+schema + "."+ tablename_3+"','gid')" tablename_qgis = tablename_3[1:] SQL_VEGETHAB = "CREATE TABLE "+ schema + "."+ tablename_3 + champ_vegethab_multipolygon + + cur.execute(SQL_VEGETHAB) + cur.execute(RETURNE) + sequence_name = cur.fetchone()[0] + SQL_pkey = "ALTER TABLE " + schema + "." + tablename_3 + " ADD CONSTRAINT " + tablename_3 + "_pkey" + " PRIMARY KEY (gid)" SQL_trigger_area_m2 = "CREATE TRIGGER area_m2" + tablename_3 + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename_3 + " FOR EACH ROW EXECUTE PROCEDURE ref.area_m2();" SQL_trigger_area_ha = "CREATE TRIGGER area_ha" + tablename_3 + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename_3 + " FOR EACH ROW EXECUTE PROCEDURE ref.area_ha();" @@ -217,9 +238,8 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): SELECT f_table_catalog, '""" + schema + "', '" + tablename_3 + """', f_geometry_column, stylename, styleqml, stylesld, useasdefault, "owner", ui, now() FROM layer_styles WHERE description = 'vegethab_polygones_modele_v3'""" - SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename_3+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename_3+" TO grp_sig;GRANT ALL ON SEQUENCE "+schema+"."+tablename_3+"_gid_seq TO grp_qgis;" + SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename_3+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename_3+" TO grp_sig;GRANT ALL ON SEQUENCE "+sequence_name+" TO grp_qgis;" - cur.execute(SQL_VEGETHAB) cur.execute(SQL_pkey) cur.execute(SQL_trigger_area_m2) cur.execute(SQL_trigger_area_ha) @@ -235,42 +255,7 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): uri.setDataSource(schema, tablename_3, geom) layer = self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres") - ''' - SQL_habitat = "CREATE TABLE " + schema + "."+ tablename + champ_habitat - SQL_pkey = "ALTER TABLE " + schema + "." + tablename + " ADD CONSTRAINT " + tablename + "_pkey" + " PRIMARY KEY (gid)" - SQL_trigger_area_m2 = "CREATE TRIGGER area_m2" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.area_m2();" - SQL_trigger_area_ha = "CREATE TRIGGER area_ha" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.area_ha();" - SQL_trigger_concat_cd_cb = "CREATE TRIGGER concat_cd_cb" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.concat_cd_cb();" - SQL_trigger_date_creation = "CREATE TRIGGER date_creation" + tablename + " BEFORE INSERT ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.date_creation();" - SQL_trigger_date_maj = "CREATE TRIGGER date_maj" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.date_maj();" - SQL_style = """INSERT INTO layer_styles (f_table_catalog, f_table_schema, f_table_name, f_geometry_column, stylename, styleqml, stylesld, useasdefault, "owner", ui, update_time) - SELECT f_table_catalog, '""" + schema + "', '" + tablename + """', f_geometry_column, stylename, styleqml, stylesld, useasdefault, "owner", ui, now() - FROM layer_styles - WHERE description = 'habitat_modele_v3'""" - SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_sig;GRANT ALL ON SEQUENCE "+schema+"."+tablename+"_gid_seq TO grp_qgis;" - - cur.execute(SQL_habitat) - cur.execute(SQL_pkey) - cur.execute(SQL_trigger_area_m2) - cur.execute(SQL_trigger_area_ha) - cur.execute(SQL_trigger_concat_cd_cb) - cur.execute(SQL_trigger_date_creation) - cur.execute(SQL_trigger_date_maj) - cur.execute(SQL_style) ## Enregistrement du style (comme style par defaut) dans la table layer_styles - cur.execute(SQL_GRANT_TABLE) - - con.commit() - - ## Affichage de la table - uri = QgsDataSourceUri() - # set host name, port, database name, username and password - uri.setConnection(host ,port ,dbname ,user ,mdp) - # set database schema, table name, geometry column and optionaly subset (WHERE clause) - uri.setDataSource(schema, tablename, geom) - - layer = self.iface.addVectorLayer(uri.uri(), tablename_qgis, "postgres") - ''' ### Creation de la table travaux prevus if self.couche_travaux_prevus.isChecked(): #**********Poly @@ -280,7 +265,13 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): tablename = schema + "_travaux_prevus_poly_" + self.annee_5.text() tablename_qgis = tablename[1:] # Permet d'enlever le "_", ajouter a la premiere etape, dans qgis + RETURNE = "SELECT pg_get_serial_sequence('"+schema + "."+ tablename+"','gid')" SQL_travaux_prevus = "CREATE TABLE " + schema + "."+ tablename + champ_travaux_prevus_multipolygon + + cur.execute(SQL_travaux_prevus) + cur.execute(RETURNE) + sequence_name = cur.fetchone()[0] + SQL_pkey = "ALTER TABLE " + schema + "." + tablename + " ADD CONSTRAINT " + tablename + "_pkey" + " PRIMARY KEY (gid)" SQL_trigger_date_creation = "CREATE TRIGGER date_creation" + tablename + " BEFORE INSERT ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.date_creation();" SQL_trigger_date_maj = "CREATE TRIGGER date_maj" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.date_maj();" @@ -291,9 +282,8 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): SELECT f_table_catalog, '""" + schema + "', '" + tablename + """', f_geometry_column, stylename, styleqml, stylesld, useasdefault, "owner", ui, now() FROM layer_styles WHERE description = 'travaux_prevus_poly_modele_v3'""" - SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_sig;GRANT ALL ON SEQUENCE "+schema+"."+tablename+"_gid_seq TO grp_qgis;" + SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_sig;GRANT ALL ON SEQUENCE "+sequence_name+" TO grp_qgis;" - cur.execute(SQL_travaux_prevus) cur.execute(SQL_pkey) cur.execute(SQL_trigger_date_creation) cur.execute(SQL_trigger_date_maj) @@ -320,7 +310,13 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): tablename = schema + "_travaux_prevus_ligne_" + self.annee_5.text() tablename_qgis = tablename[1:] # Permet d'enlever le "_", ajouter a la premiere etape, dans qgis + RETURNE = "SELECT pg_get_serial_sequence('"+schema + "."+ tablename+"','gid')" SQL_travaux_prevus = "CREATE TABLE " + schema + "."+ tablename + champ_travaux_prevus_multilinestring + + cur.execute(SQL_travaux_prevus) + cur.execute(RETURNE) + sequence_name = cur.fetchone()[0] + SQL_pkey = "ALTER TABLE " + schema + "." + tablename + " ADD CONSTRAINT " + tablename + "_pkey" + " PRIMARY KEY (gid)" SQL_trigger_date_creation = "CREATE TRIGGER date_creation" + tablename + " BEFORE INSERT ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.date_creation();" SQL_trigger_date_maj = "CREATE TRIGGER date_maj" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.date_maj();" @@ -331,9 +327,8 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): SELECT f_table_catalog, '""" + schema + "', '" + tablename + """', f_geometry_column, stylename, styleqml, stylesld, useasdefault, "owner", ui, now() FROM layer_styles WHERE description = 'travaux_prevus_ligne_modele_v3'""" - SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_sig;GRANT ALL ON SEQUENCE "+schema+"."+tablename+"_gid_seq TO grp_qgis;" + SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_sig;GRANT ALL ON SEQUENCE "+sequence_name+" TO grp_qgis;" - cur.execute(SQL_travaux_prevus) cur.execute(SQL_pkey) cur.execute(SQL_trigger_date_creation) cur.execute(SQL_trigger_date_maj) @@ -360,7 +355,13 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): tablename = schema + "_travaux_prevus_point_" + self.annee_5.text() tablename_qgis = tablename[1:] # Permet d'enlever le "_", ajouter a la premiere etape, dans qgis + RETURNE = "SELECT pg_get_serial_sequence('"+schema + "."+ tablename+"','gid')" SQL_travaux_prevus = "CREATE TABLE " + schema + "."+ tablename + champ_travaux_prevus_point + + cur.execute(SQL_travaux_prevus) + cur.execute(RETURNE) + sequence_name = cur.fetchone()[0] + SQL_pkey = "ALTER TABLE " + schema + "." + tablename + " ADD CONSTRAINT " + tablename + "_pkey" + " PRIMARY KEY (gid)" SQL_trigger_date_creation = "CREATE TRIGGER date_creation" + tablename + " BEFORE INSERT ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.date_creation();" SQL_trigger_date_maj = "CREATE TRIGGER date_maj" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.date_maj();" @@ -370,9 +371,8 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): SELECT f_table_catalog, '""" + schema + "', '" + tablename + """', f_geometry_column, stylename, styleqml, stylesld, useasdefault, "owner", ui, now() FROM layer_styles WHERE description = 'travaux_prevus_point_modele_v3'""" - SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_sig;GRANT ALL ON SEQUENCE "+schema+"."+tablename+"_gid_seq TO grp_qgis;" + SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_sig;GRANT ALL ON SEQUENCE "+sequence_name+" TO grp_qgis;" - cur.execute(SQL_travaux_prevus) cur.execute(SQL_pkey) cur.execute(SQL_trigger_date_creation) cur.execute(SQL_trigger_date_maj) @@ -408,7 +408,13 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): if self.couche_vierge_polygone.isChecked() == 1 : champ_vierge = champ_viergePolygone + RETURNE = "SELECT pg_get_serial_sequence('"+schema + "."+ tablename+"','gid')" SQL_vierge = "CREATE TABLE " + schema + "."+ tablename + champ_vierge + + cur.execute(SQL_vierge) + cur.execute(RETURNE) + sequence_name = cur.fetchone()[0] + SQL_pkey = "ALTER TABLE " + schema + "." + tablename + " ADD CONSTRAINT " + tablename + "_pkey" + " PRIMARY KEY (gid)" SQL_trigger_area_m2 = "CREATE TRIGGER area_m2" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.area_m2();" @@ -416,9 +422,8 @@ class Postgis_Editor(QDialog, EDITOR_CLASS): SQL_trigger_length_m = "CREATE TRIGGER length_m" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.length_m();" SQL_trigger_length_km = "CREATE TRIGGER length_km" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.length_km();" SQL_trigger_coordonnees = "CREATE TRIGGER coordonnees" + tablename + " BEFORE INSERT OR UPDATE ON " + schema + "." + tablename + " FOR EACH ROW EXECUTE PROCEDURE ref.coordonnees();" - SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_sig;GRANT ALL ON SEQUENCE "+schema+"."+tablename+"_gid_seq TO grp_qgis;" + SQL_GRANT_TABLE="GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_qgis;GRANT DELETE, INSERT, REFERENCES, SELECT, TRIGGER, TRUNCATE, UPDATE ON "+schema+"."+tablename+" TO grp_sig;GRANT ALL ON SEQUENCE "+sequence_name+" TO grp_qgis;" - cur.execute(SQL_vierge) cur.execute(SQL_pkey) cur.execute(SQL_GRANT_TABLE) diff --git a/CenRa_POSTGIS/tools/ui/CenRa_about_form.ui b/CenRa_POSTGIS/tools/ui/CenRa_about_form.ui index 3e3608f..4afd0e4 100644 --- a/CenRa_POSTGIS/tools/ui/CenRa_about_form.ui +++ b/CenRa_POSTGIS/tools/ui/CenRa_about_form.ui @@ -11,7 +11,7 @@ - Metabase + Journal des modifications diff --git a/CenRa_SICEN/forms/about_form.py b/CenRa_SICEN/forms/about_form.py index 89329d3..1e72d9f 100644 --- a/CenRa_SICEN/forms/about_form.py +++ b/CenRa_SICEN/forms/about_form.py @@ -12,12 +12,12 @@ ABOUT_FORM_CLASS, _ = uic.loadUiType( os.path.join( str(Path(__file__).resolve().parent.parent), 'forms', - 'sicen_about_form.ui' + 'CenRa_about_form.ui' ) ) -class SicenAboutDialog(QDialog, ABOUT_FORM_CLASS): +class AboutDialog(QDialog, ABOUT_FORM_CLASS): """ About - Let the user display the about dialog. """ diff --git a/CenRa_SICEN/forms/sicen_about_form.ui b/CenRa_SICEN/forms/sicen_about_form.ui deleted file mode 100644 index a99c3ea..0000000 --- a/CenRa_SICEN/forms/sicen_about_form.ui +++ /dev/null @@ -1,96 +0,0 @@ - - - CenRa_Metabase_editorwidget_base - - - - 0 - 0 - 471 - 594 - - - - SICEN - - - - ../../CenRa_Metabase/tools/ui/icon.svg../../CenRa_Metabase/tools/ui/icon.svg - - - - - - true - - - Qt::NoFocus - - - QFrame::NoFrame - - - QFrame::Plain - - - true - - - - - 0 - 0 - 453 - 547 - - - - - - 0 - 0 - 451 - 541 - - - - DevLog - - - - - 10 - 20 - 431 - 511 - - - - - about:blank - - - - - - - - - - - QDialogButtonBox::Ok - - - - - - - - QWebView - QWidget -
QtWebKitWidgets/QWebView
- - - - - diff --git a/CenRa_SICEN/sicen.py b/CenRa_SICEN/sicen.py index 7d3ee4a..1c1a149 100644 --- a/CenRa_SICEN/sicen.py +++ b/CenRa_SICEN/sicen.py @@ -52,7 +52,7 @@ import qgis import datetime import csv -from .forms.about_form import SicenAboutDialog +from .forms.about_form import AboutDialog import psycopg2 import psycopg2.extras @@ -135,7 +135,7 @@ class SICEN(object): self.sicen_export.triggered.connect(self.export) def open_about_dialog(self): - dialog = SicenAboutDialog(self.iface) + dialog = AboutDialog(self.iface) dialog.exec_() def unload(self): diff --git a/plugins.xml b/plugins.xml index f1b5782..39da68a 100644 --- a/plugins.xml +++ b/plugins.xml @@ -1,8 +1,8 @@ - + - 2.1 + 2.2 3.16 https://plateformesig.cenra-outils.org/ CenRa_POSTGIS.zip @@ -11,7 +11,7 @@ https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_POSTGIS.zip CEN-Rhone-Alpes 2024-02-06 - 2025-01-07 + 2025-01-21 False False cenra,postgis