Suite maj TT

?

.gitignore

@@ -17,3 +17,5 @@
 #ReIgnore
 **/__pycache__
 **/test/
+PythonSQL.py
+StyleLayer.py

CenRa_AUTOMAP/CenRa_AutoMap.py

@@ -27,9 +27,13 @@ import os
 from .tools.resources import (
     plugin_path,
     resources_path,
+    pyperclip,
     maj_verif,
 )
+pyperclip()
+
 from .canvas_editor import AutoMap_Editor
+from .style_invoke import AutoMap_Style
 from .about_form import AboutDialog
 
 from PyQt5.QtCore import *
@@ -38,6 +42,7 @@ class PgAutoMap:
     def __init__(self):
         """ Constructor. """
         self.canvas_editor = None
+        self.style_dock = None
 #        self.issues = None
         self.provider = None
         self.locator_filter = None
@@ -73,10 +78,16 @@ class PgAutoMap:
         if not self.canvas_editor:
             self.canvas_editor = AutoMap_Editor()
 
-
             self.automap_action = QAction(icon, 'CenRa_AutoMap',None)
             self.toolBar.addAction(self.automap_action)
             self.automap_action.triggered.connect(self.open_editor)
+
+        if not self.style_dock:
+            self.style_dock = AutoMap_Style()
+
+        if os.environ['USERNAME'] == 'tlaveille' or os.environ['USERNAME'] == 'lpoulin' or os.environ['USERNAME'] == 'rclement':
+            iface.addDockWidget(Qt.LeftDockWidgetArea, self.style_dock)
+
     '''
         if not self.locator_filter:
             self.locator_filter = LocatorFilter(iface)

CenRa_AUTOMAP/canvas_editor.py

@@ -48,6 +48,8 @@ from qgis.PyQt.QtWebKitWidgets import QWebPage
 from qgis.PyQt.QtWidgets import (
     QDialog,
     QAction,
+    QMessageBox,
+    QPushButton,
     QDockWidget,
     QFileDialog,
     QInputDialog,
@@ -58,13 +60,13 @@ from qgis.PyQt.QtWidgets import (
     QVBoxLayout,
 )
 from PyQt5 import QtGui
+from PyQt5 import QtWidgets
 from qgis.PyQt.QtXml import QDomDocument
 from qgis.utils import iface
 import glob
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
     send_issues,
 )
 from .issues import CenRa_Issues
@@ -121,6 +123,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
             path = path+'/'+i
         self.tabWidget.setStyleSheet('background-image: url('+path+'/tools/bg/Capture.png);')
 
+        self.verticalScrollBar.hide()
         self.commandLinkButton.clicked.connect(self.chargement_qpt)
         self.radioButton_9.clicked.connect(self.statu_atlas)
         self.radioButton_10.clicked.connect(self.statu_source)
@@ -131,6 +134,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
         self.commandLinkButton_2.clicked.connect(self.load_ortho)
         self.commandLinkButton_3.clicked.connect(self.load_osm)
         self.CustomeLogo.clicked.connect(self.deflogoteck)
+        self.verticalScrollBar.valueChanged.connect(self.moveFrame)
 
         ## On ajoute le nom des templates à la liste déroulante de l'onglet "mises en page" :
         mises_en_page = []
@@ -190,6 +194,14 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
         self.hide_source()
         self.hide_atlas()
 
+    def wheelEvent(self,event):
+        if (event.angleDelta().y() >= 1):
+            vsb = self.verticalScrollBar.value()+20
+        else:
+            vsb = self.verticalScrollBar.value()-20
+        self.verticalScrollBar.setValue(vsb)
+    def moveFrame(self):
+        self.frame.move(self.frame.x(),self.verticalScrollBar.value())
     def update_logo_library(self):
         self.mComboBox_4.clear()
         logo_library = []
@@ -321,6 +333,8 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
         self.comboBox_6.clear()
         self.comboBox_7.clear()
 
+        if (self.s.value("automap/prenom_nom", "1", type=str) != "1"):
+            self.lineEdit_5.setText(self.s.value("automap/prenom_nom", 1, type=str))
         couches = []
         couche_vecteur = ['']
         mapThemes = ['']
@@ -434,7 +448,18 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 doc = QDomDocument()
                 doc.setContent(template_content)
                 self.layout.loadFromTemplate(doc, QgsReadWriteContext(), True)
+
+                try:
+                    cutLayout = layout_name.index("¶")
+                except:
+                    cutLayout = 0
+ 
+                if cutLayout >= 1:
                     self.layout.setName(layout_name)
+                    titre_layout_name=layout_name[:cutLayout]
+                else:
+                    self.layout.setName(layout_name)
+                    titre_layout_name = layout_name
 
                 if self.radioButton_6.isChecked() and self.radioButton_7.isChecked():
                     logo_div = A4_size['Portrait']['RIGHT']
@@ -499,7 +524,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     ## Ajout d'un titre à la mise en page
                     title = QgsLayoutItemLabel(self.layout)
                     self.layout.addLayoutItem(title)
-                    titre = layout_name
+                    titre = titre_layout_name
                     title.setText(titre)
                     title.setFont(QFont("Calibri", 15, QFont.Bold))
                     title.setItemRotation(self.template_parameters['Titre_rotate'])
@@ -521,7 +546,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     if self.radioButton_9.isChecked() == 1:
                         titre = titre + ' [%' + self.comboBox_4.currentText() + '%]'
                     subtitle.setText(titre)
-                    subtitle.setFont(QFont("MS Shell Dlg 2", 10))
+                    subtitle.setFont(QFont("Calibri", 10))
                     subtitle.setItemRotation(self.template_parameters['Sous_titre_rotate'])
                     subtitle.attemptResize(self.template_parameters['Sous_titre_size'])
                     subtitle.attemptMove(self.template_parameters['Sous_titre_locals'])
@@ -628,6 +653,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 self.scalebarnumeric_qpt.setNumberOfSegments(2)
                 self.scalebarnumeric_qpt.setNumberOfSegmentsLeft(0)
 
+                self.scalebarnumeric_qpt.setFont(QFont("Calibri", 12))
                 self.scalebarnumeric_qpt.attemptMove(self.template_parameters['Echelle_locals'])
                 self.scalebarnumeric_qpt.attemptResize(self.template_parameters['Echelle_size'])
                 self.scalebarnumeric_qpt.setItemRotation(self.template_parameters['Echelle_rotate'])
@@ -647,6 +673,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 self.scalebar_qpt.setNumberOfSegments(2)
                 self.scalebar_qpt.setNumberOfSegmentsLeft(0)
 
+                self.scalebar_qpt.setFont(QFont("Calibri", 12))
                 self.scalebar_qpt.attemptMove(self.template_parameters['Echelle_2_locals'])
                 self.scalebar_qpt.attemptResize(self.template_parameters['Echelle_2_size'])
                 self.scalebar_qpt.setItemRotation(self.template_parameters['Echelle_2_rotate'])
@@ -664,6 +691,8 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 north.attemptMove(self.template_parameters['Arrow_locals'])
                 north.attemptResize(self.template_parameters['Arrow_size'])
                 north.setItemRotation(self.template_parameters['Arrow_rotate'])
+                north.setBackgroundEnabled(True)
+                north.setBackgroundColor(QColor(255, 255, 255, 130))
 
                 if self.radioButton_10.isChecked() == 1:
                     text_source = ' '
@@ -674,13 +703,19 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 else:
                     info_text = ["Source : " + self.lineEdit_4.text()][0]
                 # ajout note info:
-                info = ["Réalisation : " + "CEN Rhône-Alpes (" + date.today().strftime(
+                if self.radioButton_14.isChecked() == 1:
-                    "%d/%m/%Y") + ")"]
+                    self.s.setValue("automap/prenom_nom",self.lineEdit_5.text())
+                    prenom_nom = self.s.value("automap/prenom_nom", 1, type=str)
+                    info = ["Réalisation : " + "CEN Rhône-Alpes (" + date.today().strftime("%d/%m/%Y") + ") par "+prenom_nom]
+                else:
+                    info = ["Réalisation : " + "CEN Rhône-Alpes (" + date.today().strftime("%d/%m/%Y") + ")"]
                 credit_text = QgsLayoutItemLabel(self.layout)
                 credit_text.setText(info[0])
                 credit_text.setFont(QFont("Calibri", 9))
                 credit_text.setHAlign(Qt.AlignRight)
                 credit_text.setVAlign(Qt.AlignVCenter)
+                credit_text.setBackgroundEnabled(True)
+                credit_text.setBackgroundColor(QColor(255, 255, 255, 130))
                 credit_text2 = QgsLayoutItemLabel(self.layout)
                 credit_text2.setText(info_text)
                 credit_text2.setFont(QFont("Calibri", 9))
@@ -692,6 +727,8 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 credit_text2.setItemRotation(self.template_parameters['Source_rotate'])
                 credit_text2.attemptResize(self.template_parameters['Source_size'])
                 credit_text2.attemptMove(self.template_parameters['Source_locals'])
+                credit_text2.setBackgroundEnabled(True)
+                credit_text2.setBackgroundColor(QColor(255, 255, 255, 130))
                 self.layout.addLayoutItem(credit_text)
                 self.layout.addLayoutItem(credit_text2)
 
@@ -721,10 +758,34 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
 
                 existing_layout = project.layoutManager().layoutByName(self.layout.name())
             if existing_layout:
-                #if self.radioButton_12.isChecked() != 1:
+                self.QMBquestion = QMessageBox()
-                project.layoutManager().removeLayout(existing_layout)
+                self.QMBquestion.setWindowTitle(u"Attention !")
+                self.QMBquestion.setIcon(QMessageBox.Warning)
+                self.QMBquestion.setText("Mise en page existente, la mise en page vas être écraser !")
+                self.QMBquestion.setStandardButtons(QMessageBox.Yes|QMessageBox.No)
+                self.QMBquestion.addButton(QPushButton('Autre mise en page'),QMessageBox.AcceptRole)
+                self.QMBquestion = self.QMBquestion.exec()
 
+                #if self.radioButton_12.isChecked() != 1:
+                if self.QMBquestion == QMessageBox.Yes:
+                    project.layoutManager().removeLayout(existing_layout)
                     result = project.layoutManager().addLayout(self.layout)
+                if self.QMBquestion == QMessageBox.AcceptRole:
+                    LayoutCOUNT=0
+                    arrayManager = []
+                    for AddArrayManager in project.layoutManager().layouts():
+                        arrayManager.append(AddArrayManager.name())
+                    arrayManager.sort()
+                    for LayoutNAME in arrayManager:
+                        if LayoutNAME == layout_name:
+                            LayoutCOUNT = LayoutCOUNT+1
+                        if LayoutNAME == layout_name+"¶"+str(LayoutCOUNT):
+                            LayoutCOUNT=LayoutCOUNT+1
+                    layout_name = (layout_name+"¶"+str(LayoutCOUNT))
+                    self.layout.setName(layout_name)
+
+            else:
+                existing_layout = True
 
 
 
@@ -737,8 +798,22 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
 
         fichier_mise_en_page = layout_name
         layout_modifie = QgsProject.instance().layoutManager().layoutByName(fichier_mise_en_page)
+        try:
+            if (self.QMBquestion == QMessageBox.AcceptRole):
+                TryMessage = (self.QMBquestion == QMessageBox.AcceptRole)
+            elif (self.QMBquestion == QMessageBox.Yes):
+                TryMessage = (self.QMBquestion == QMessageBox.Yes)
+            else:
+                TryMessage = False
+            del self.QMBquestion
+        except:
+            TryMessage = True
+
+        if TryMessage == True:
             iface.openLayoutDesigner(layout_modifie)
             self.close()
+        else:
+            self.activateWindow()
 
     def actualisation_mise_en_page(self):
         values_page = self.comboBox.currentText()
@@ -770,7 +845,6 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 bar_echelle.setUnits(QgsUnitTypes.DistanceKilometers)
                 bar_echelle.setUnitLabel("km")
                 bar_echelle.setUnitsPerSegment(round((echelle.scale()*0.04)/1000))
-
             else:
                 bar_echelle.setUnits(QgsUnitTypes.DistanceMeters)
                 bar_echelle.setUnitLabel("m")

CenRa_AUTOMAP/metadata.txt

@@ -6,7 +6,7 @@
 name=CenRa_AutoMap
 qgisMinimumVersion=3.0
 description=CenRa_AutoMap
-version=0.1.10
+version=1.5
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -21,7 +21,7 @@ tracker=https://gitea.cenra-outils.org/api/v1/repos/CEN-RA/Plugin_QGIS/issues
 
 hasProcessingProvider=no
 # Uncomment the following line and add your changelog:
-changelog=<h2>CenRa_AutoMap:</h2></br><p><h3>13/01/2025 - Version 0.1.10: </h3> - Correctif.</br></p></br><p><h3>07/01/2025 - Version 0.1.9: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>19/12/2024 - Version 0.1.8: </h3> - Nouvelle mise en page.</br> - Incrémentation automatique de nouveau modele de mise en page. </br> - Correctif de bug.</p></br><p><h3>21/10/2024 - Version 0.1.7: </h3> - Epurations du code.</p></br><p><h3>07/10/2024 - Version 0.1.6: </h3> - Option de bibliotheque de logo custome.</p></br><p><h3>03/10/2024 - Version 0.1.5: </h3> - Remonte la fênetre dans la pille.</br> - Gestion du nombre de colonne dans la légend.</br></p></br><p><h3>02/10/2024 - Version 0.1.4: </h3> - Mise en page plein écrant.</br></p></br><p><h3>01/10/2024 - Version 0.1.3: </h3> - Récupération du titre et sous-titre pour mise en page existente.</br> - Integration de bibliotheque de logo.</br> - Integration de gestionaire pour les source de donnée.</br> - Mise en place d'une bar d'echelle adaptative. </br></p></br><p><h3>30/09/2024 - Version 0.1.2: </h3> - Activation du thème. </br> - Ajouter une carte de suivie. </br><p></br><h3>27/09/2024 - Version 0.1.1: </h3> - Ajout d'une liste déroulante pour les sources de données. </br>- Bouton pour ajouter des fonts de carte customisés. </br>- Fonctionnalité de génération d'atlas. </p></br><p><h3>26/09/2024 - Version 0.1.0: </h3> - Lancement du plugin CenRa_AutoMap avec une seul mise en page. </p></br>
+changelog=<h2>CenRa_AUTOMAP:</h2></br><p><h3>09/04/2025 - Version 1.5: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 1.4: </h3> - Mise a jour de securite.</p></br><p><h3>20/03/2025 - Version 1.3: </h3> - Fenêtre redimensionnable avec déplaçable avec la mollette sourit.</p></br><p><h3>25/02/2025 - Version 1.2: </h3> - DockWidget pour ouverture de couche avec theme.</p></br><p><h3>28/01/2025 - Version 1.1: </h3> - Multi-Composeur pris en charge.</p></br><p><h3>27/01/2025 - Version 1.0: </h3> - Version releases.</br> - Ajoute un message d'avertissement au moment d'écraser la mise en page.</br> - Ajoute prénom et nom dans la réalisation.</br> - Utilisation de Calibri.</p></br><p><h3>13/01/2025 - Version 0.1.10: </h3> - Correctif.</p></br><p><h3>07/01/2025 - Version 0.1.9: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>19/12/2024 - Version 0.1.8: </h3> - Nouvelle mise en page.</br> - Incrémentation automatique de nouveau modele de mise en page. </br> - Correctif de bug.</p></br><p><h3>21/10/2024 - Version 0.1.7: </h3> - Epurations du code.</p></br><p><h3>07/10/2024 - Version 0.1.6: </h3> - Option de bibliotheque de logo custome.</p></br><p><h3>03/10/2024 - Version 0.1.5: </h3> - Remonte la fênetre dans la pille.</br> - Gestion du nombre de colonne dans la légend.</br></p></br><p><h3>02/10/2024 - Version 0.1.4: </h3> - Mise en page plein écrant.</br></p></br><p><h3>01/10/2024 - Version 0.1.3: </h3> - Récupération du titre et sous-titre pour mise en page existente.</br> - Integration de bibliotheque de logo.</br> - Integration de gestionaire pour les source de donnée.</br> - Mise en place d'une bar d'echelle adaptative. </br></p></br><p><h3>30/09/2024 - Version 0.1.2: </h3> - Activation du thème. </br> - Ajouter une carte de suivie. </br><p></br><h3>27/09/2024 - Version 0.1.1: </h3> - Ajout d'une liste déroulante pour les sources de données. </br>- Bouton pour ajouter des fonts de carte customisés. </br>- Fonctionnalité de génération d'atlas. </p></br><p><h3>26/09/2024 - Version 0.1.0: </h3> - Lancement du plugin CenRa_AutoMap avec une seul mise en page. </p></br>
 
 # Tags are comma separated with spaces allowed
 tags=python

CenRa_AUTOMAP/style_invoke.py

@@ -0,0 +1,201 @@
+import logging
+import os
+from PyQt5.QtCore import QSettings
+from collections import namedtuple
+from enum import Enum
+from functools import partial
+from pathlib import Path
+from xml.dom.minidom import parseString
+from qgis.gui import *
+import qgis
+from importlib import import_module
+from qgis.core import (
+    NULL,
+    QgsApplication,
+    QgsScaleBarSettings,	
+    QgsDataSourceUri,
+    QgsProject,
+    QgsProviderConnectionException,
+    QgsProviderRegistry,
+    QgsRasterLayer,
+    QgsSettings,
+    QgsVectorLayer,
+    QgsGeometry,
+    QgsPrintLayout,
+    QgsReadWriteContext,
+    QgsLayoutItemMap,
+    QgsLayoutItemPage,
+    QgsLayoutSize,
+    QgsUnitTypes,
+    QgsLayoutPoint,
+    QgsLayoutItemLabel,
+    QgsLayoutItemPicture,
+    QgsLayoutItemLegend,
+    QgsLegendStyle,
+    QgsLayoutItemScaleBar,
+    QgsLayerTreeGroup,
+    QgsCoordinateReferenceSystem,
+    QgsCoordinateTransform,
+    QgsLayerTree,
+    QgsLayoutTableColumn,
+    QgsRectangle,
+    QgsLayoutItemMapOverviewStack,
+    QgsMapThemeCollection,
+)
+from qgis.PyQt.QtCore import QLocale, QUrl, QDateTime, Qt
+from qgis.PyQt.QtGui import QDesktopServices, QIcon, QColor, QFont, QMovie
+from qgis.PyQt.QtPrintSupport import QPrinter
+from qgis.PyQt.QtWebKitWidgets import QWebPage
+from qgis.PyQt.QtWidgets import (
+    QDockWidget,
+    QAction,
+    QMessageBox,
+    QPushButton,
+    QDockWidget,
+    QFileDialog,
+    QInputDialog,
+    QMenu,
+    QToolButton,
+    QTableWidget, 
+    QTableWidgetItem,
+    QVBoxLayout,
+)
+import psycopg2
+from PyQt5 import QtGui
+from PyQt5 import QtWidgets
+from qgis.PyQt.QtXml import QDomDocument
+from qgis.utils import iface
+import glob
+try:
+
+    Enabled = True
+    from .tools.StyleLayer import *
+except:
+    Enabled = False
+from .tools.resources import (
+    load_ui,
+    resources_path,
+    send_issues,
+)
+from .issues import CenRa_Issues
+
+from datetime import date
+
+EDITOR_CLASS = load_ui('CenRa_AutoMapStyle_base.ui')
+LOGGER = logging.getLogger('CenRa_AutoMapStyle')
+
+class AutoMap_Style(QDockWidget, EDITOR_CLASS):
+
+    def __init__(self, parent=None):
+        _ = parent
+        super().__init__()
+        self.setupUi(self)
+        self.settings = QgsSettings()
+        self.s = QSettings()
+
+        self.toolButton.setIcon(QtGui.QIcon(resources_path('icons','loader.png')))
+
+        self.loadComboBox()
+        self.toolButton.clicked.connect(self.loadStyle)
+
+    def loadComboBox(self):
+        style = self.comboBox
+        style.clear()
+        style.addItem('')
+        style.addItem('Foncier')
+        style.addItem('Administratif')
+
+    def loadStyle(self):
+        style = self.comboBox.currentText()
+        if style == 'Foncier':
+            self.loadFoncier()
+        if style == 'Administratif':
+            self.loadAdministratif()
+
+    def loginfo(self):
+        InputDialog = QInputDialog()
+        mdp = InputDialog.getText(None,'Foncier','Mot de pass base foncier:')
+        return mdp
+
+    def loadAdministratif(self):
+        mtc = QgsProject.instance().mapThemeCollection()
+        theme_name = 'Administratif'
+        theme_state = mtc.mapThemeState(theme_name)
+
+        mdp = self.loginfo()[0]
+        if mdp != '':
+            # couche = [['_form_power_rename','_form_power_rename_contour_2025'],['_42_bois_du_roy','_42_bois_du_roy_habitat_2021']]
+            couche = [['administratif','departements2024','gid'],['administratif','v_communes','id']]
+            for schema_table in couche:
+                schema = schema_table[0]
+                table = schema_table[1]
+                key = schema_table[2]
+                uri = QgsDataSourceUri()
+                uri.setConnection(host ,port ,dbname ,os_user ,mdp)
+                # nom du schéma à remplacer: "hydrographie" à supprimer et mettre "couches_collaboratives" lorsqu'on aura regroupé les couches à modifier dans un même schéma
+                uri.setDataSource(schema, table, "geom")
+                uri.setKeyColumn(key)
+                layer = QgsVectorLayer(uri.uri(), table, "postgres")
+                if layer.isValid() == True:
+                    layerName = layer.name()
+                    listStyle = layer.listStylesInDatabase()
+                    try:
+                        StyleExist = True
+                        indexStyle = (listStyle[2].index(layerName))
+                    except:
+                        StyleExist = False
+                    if StyleExist:
+                        StyleId = (listStyle[1][indexStyle])
+                        styleTuple = layer.getStyleFromDatabase(StyleId)
+                        styleqml = styleTuple[0]
+                        styledoc = QDomDocument()
+                        styledoc.setContent(styleqml)
+                        layer.importNamedStyle(styledoc)
+
+                    # Ajout de la couche au canevas QGIS
+                    QgsProject.instance().addMapLayer(layer)
+
+                    layer_record = QgsMapThemeCollection.MapThemeLayerRecord(layer)
+                    theme_state.addLayerRecord(layer_record)
+                    mtc.insert(theme_name, theme_state)
+
+    def loadFoncier(self):
+        mtc = QgsProject.instance().mapThemeCollection()
+        theme_name = 'Foncier'
+        theme_state = mtc.mapThemeState(theme_name)
+
+        mdp = self.loginfo()[0]
+        if mdp != '':
+            # couche = [['_form_power_rename','_form_power_rename_contour_2025'],['_42_bois_du_roy','_42_bois_du_roy_habitat_2021']]
+            couche = [['sites','v_sites_parcelles'],['sites','v_sites'],['inventaires','suivi_zh'],['inventaires','suivi_ps']]
+            for schema_table in couche:
+                schema = schema_table[0]
+                table = schema_table[1]
+                uri = QgsDataSourceUri()
+                uri.setConnection(host ,port ,dbname ,os_user ,mdp)
+                # nom du schéma à remplacer: "hydrographie" à supprimer et mettre "couches_collaboratives" lorsqu'on aura regroupé les couches à modifier dans un même schéma
+                uri.setDataSource(schema, table, "geom")
+                uri.setKeyColumn('gid')
+                layer = QgsVectorLayer(uri.uri(), table, "postgres")
+                if layer.isValid() == True:
+                    layerName = layer.name()
+                    listStyle = layer.listStylesInDatabase()
+                    try:
+                        StyleExist = True
+                        indexStyle = (listStyle[2].index(layerName))
+                    except:
+                        StyleExist = False
+                    if StyleExist:
+                        StyleId = (listStyle[1][indexStyle])
+                        styleTuple = layer.getStyleFromDatabase(StyleId)
+                        styleqml = styleTuple[0]
+                        styledoc = QDomDocument()
+                        styledoc.setContent(styleqml)
+                        layer.importNamedStyle(styledoc)
+
+                    # Ajout de la couche au canevas QGIS
+                    QgsProject.instance().addMapLayer(layer)
+
+                    layer_record = QgsMapThemeCollection.MapThemeLayerRecord(layer)
+                    theme_state.addLayerRecord(layer_record)
+                    mtc.insert(theme_name, theme_state)

CenRa_AUTOMAP/tools/PythonSQL.py

@@ -1,34 +0,0 @@
-import sys
-import socket
-import os
-IPAddr=socket.gethostbyname(socket.gethostname())
-#print(IPAddr)
-if IPAddr[0:11] == "100.100.100": #4269
-    host = "100.100.100.81"
-    port = "5432"
-    dbname = "sig4269"
-    sigdb="sig4269"
-    refdb="ref_geo4269"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.0": #01
-    host = "192.168.0.201"
-    port = "5432"
-    dbname = "sig01"
-    sigdb="sig01"
-    refdb="ref_geo01"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.1": #0726
-    host = "192.168.1.201"
-    port = "5432"
-    dbname = "sig0726"
-    sigdb="sig0726"
-    refdb="ref_geo0726"
-    password = "McVities"
-if sys.platform == 'linux':
-    os_user = os.environ['USER']
-else:
-    os_user = os.environ['USERNAME']
-if os_user == 'STAGE':
-    os_user='stage'
-if os_user == 'Administrateur':
-    os_user='stage'

CenRa_AUTOMAP/tools/resources.py

@@ -4,6 +4,7 @@ import configparser
 import shutil
 import tempfile
 import base64
+import os
 import psycopg2
 import psycopg2.extras
 from os.path import abspath, join, pardir, dirname
@@ -107,25 +108,15 @@ def load_ui(*args):
 
     return ui_class
 
-def login_base(take=None):
+def pyperclip():
-    from CenRa_METABASE.tools.PythonSQL import host,port,dbname,password,os_user
+    dst = dirname(dirname(__file__))+"\\tools\\"
-    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+    if os.access('N:/',os.R_OK):
-    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+        src = 'N:/SI_Systeme d information/Z_QGIS/PLUGIN/StyleLayer.py'
-    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+    try:
-    res_ident = first_cur.fetchone()
+        shutil.copy(src, dst)
+    except:
+        print('404')
 
-    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
-    user = res_ident[1]
-
-    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
-    
-    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_conn.close()
-
-    if take:
-        return cur,con
-    else:
-        return cur
 def send_issues(url,titre,body,labels):
     import requests
     import json
@@ -158,7 +149,7 @@ def maj_verif(NAME):
 
     url = qgis.utils.pluginMetadata(NAME,'repository')
     #URL = url+'/raw/branch/main/plugins.xml'
-    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
 #    print(URL)
     version = qgis.utils.pluginMetadata(NAME,'version')
     len_version = len(version)

CenRa_AUTOMAP/tools/ui/CenRa_AutoMapStyle_base.ui

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CenRa_AutoMapStyle</class>
+ <widget class="QDockWidget" name="CenRa_AutoMapStyle">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>48</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="floating">
+   <bool>false</bool>
+  </property>
+  <property name="features">
+   <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable</set>
+  </property>
+  <property name="windowTitle">
+   <string>CenRa_AutoMap</string>
+  </property>
+  <widget class="QWidget" name="dockWidgetContents">
+   <property name="autoFillBackground">
+    <bool>true</bool>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <property name="leftMargin">
+     <number>5</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>5</number>
+    </property>
+    <property name="bottomMargin">
+     <number>0</number>
+    </property>
+    <property name="horizontalSpacing">
+     <number>5</number>
+    </property>
+    <item row="0" column="1">
+     <widget class="QComboBox" name="comboBox">
+      <property name="autoFillBackground">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="0">
+     <widget class="QLabel" name="label">
+      <property name="maximumSize">
+       <size>
+        <width>40</width>
+        <height>16777215</height>
+       </size>
+      </property>
+      <property name="font">
+       <font>
+        <pointsize>12</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Style:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="2">
+     <widget class="QToolButton" name="toolButton">
+      <property name="autoFillBackground">
+       <bool>true</bool>
+      </property>
+      <property name="text">
+       <string/>
+      </property>
+      <property name="iconSize">
+       <size>
+        <width>20</width>
+        <height>20</height>
+       </size>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

CenRa_AUTOMAP/tools/ui/CenRa_AutoMap_base.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1150</width>
+    <width>1144</width>
-    <height>778</height>
+    <height>765</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -51,26 +51,76 @@
     <attribute name="title">
      <string>Liste de templates existants</string>
     </attribute>
-    <widget class="QGroupBox" name="groupBox_6">
+    <widget class="QLabel" name="label_5">
      <property name="geometry">
       <rect>
-       <x>680</x>
+       <x>920</x>
-       <y>350</y>
+       <y>10</y>
-       <width>141</width>
+       <width>211</width>
-       <height>41</height>
+       <height>71</height>
       </rect>
      </property>
-     <property name="styleSheet">
+     <property name="text">
-      <string notr="true">QGroupBox#groupBox_6{background-color: rgb(255, 255, 255, 170);}</string>
-     </property>
-     <property name="title">
       <string/>
      </property>
-     <widget class="QCommandLinkButton" name="commandLinkButton">
+     <property name="scaledContents">
+      <bool>true</bool>
+     </property>
+    </widget>
+    <widget class="QScrollBar" name="verticalScrollBar">
+     <property name="geometry">
+      <rect>
+       <x>1120</x>
+       <y>9</y>
+       <width>20</width>
+       <height>741</height>
+      </rect>
+     </property>
+     <property name="minimum">
+      <number>-500</number>
+     </property>
+     <property name="maximum">
+      <number>0</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="invertedAppearance">
+      <bool>true</bool>
+     </property>
+    </widget>
+    <widget class="QGroupBox" name="frame">
      <property name="geometry">
       <rect>
        <x>0</x>
        <y>0</y>
+       <width>1141</width>
+       <height>761</height>
+      </rect>
+     </property>
+     <property name="title">
+      <string/>
+     </property>
+     <widget class="QGroupBox" name="groupBox_2">
+      <property name="geometry">
+       <rect>
+        <x>950</x>
+        <y>10</y>
+        <width>161</width>
+        <height>111</height>
+       </rect>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">QGroupBox#groupBox_2{background-color: rgb(255, 255, 255, 170);}</string>
+      </property>
+      <property name="title">
+       <string/>
+      </property>
+      <widget class="QCommandLinkButton" name="commandLinkButton_3">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>60</y>
          <width>141</width>
          <height>41</height>
         </rect>
@@ -85,7 +135,32 @@
         <string notr="true">background-color: qconicalgradient(cx:0, cy:0, angle:135, stop:0 rgba(255, 255, 0, 69), stop:0.375 rgba(255, 255, 0, 69), stop:0.423533 rgba(251, 255, 0, 145), stop:0.45 rgba(247, 255, 0, 208), stop:0.477581 rgba(255, 244, 71, 130), stop:0.518717 rgba(255, 218, 71, 130), stop:0.55 rgba(255, 255, 0, 255), stop:0.57754 rgba(255, 203, 0, 130), stop:0.625 rgba(255, 255, 0, 69), stop:1 rgba(255, 255, 0, 69));</string>
        </property>
        <property name="text">
-       <string> Mise en page</string>
+        <string>OpenStreetMap</string>
+       </property>
+      </widget>
+      <widget class="QCommandLinkButton" name="commandLinkButton_2">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>10</y>
+         <width>141</width>
+         <height>41</height>
+        </rect>
+       </property>
+       <property name="font">
+        <font>
+         <family>Segoe UI</family>
+         <pointsize>10</pointsize>
+        </font>
+       </property>
+       <property name="autoFillBackground">
+        <bool>false</bool>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">background-color: qconicalgradient(cx:0, cy:0, angle:135, stop:0 rgba(255, 255, 0, 69), stop:0.375 rgba(255, 255, 0, 69), stop:0.423533 rgba(251, 255, 0, 145), stop:0.45 rgba(247, 255, 0, 208), stop:0.477581 rgba(255, 244, 71, 130), stop:0.518717 rgba(255, 218, 71, 130), stop:0.55 rgba(255, 255, 0, 255), stop:0.57754 rgba(255, 203, 0, 130), stop:0.625 rgba(255, 255, 0, 69), stop:1 rgba(255, 255, 0, 69));</string>
+       </property>
+       <property name="text">
+        <string> Ortho</string>
        </property>
       </widget>
      </widget>
@@ -93,9 +168,9 @@
       <property name="geometry">
        <rect>
         <x>20</x>
-       <y>70</y>
+        <y>50</y>
         <width>391</width>
-       <height>611</height>
+        <height>631</height>
        </rect>
       </property>
       <property name="font">
@@ -305,7 +380,7 @@
        <property name="geometry">
         <rect>
          <x>40</x>
-        <y>470</y>
+         <y>490</y>
          <width>290</width>
          <height>20</height>
         </rect>
@@ -342,7 +417,7 @@
        <property name="geometry">
         <rect>
          <x>30</x>
-        <y>450</y>
+         <y>470</y>
          <width>161</width>
          <height>21</height>
         </rect>
@@ -485,7 +560,7 @@
        <property name="geometry">
         <rect>
          <x>270</x>
-        <y>570</y>
+         <y>590</y>
          <width>82</width>
          <height>15</height>
         </rect>
@@ -621,7 +696,7 @@
        <property name="geometry">
         <rect>
          <x>40</x>
-        <y>530</y>
+         <y>550</y>
          <width>310</width>
          <height>20</height>
         </rect>
@@ -658,7 +733,7 @@
        <property name="geometry">
         <rect>
          <x>30</x>
-        <y>510</y>
+         <y>530</y>
          <width>111</width>
          <height>21</height>
         </rect>
@@ -681,7 +756,7 @@
        <property name="geometry">
         <rect>
          <x>340</x>
-        <y>470</y>
+         <y>490</y>
          <width>42</width>
          <height>21</height>
         </rect>
@@ -697,7 +772,7 @@
        <property name="geometry">
         <rect>
          <x>30</x>
-        <y>560</y>
+         <y>580</y>
          <width>111</width>
          <height>23</height>
         </rect>
@@ -706,6 +781,52 @@
         <string>Custom Bibliotheque</string>
        </property>
       </widget>
+      <widget class="QRadioButton" name="radioButton_14">
+       <property name="geometry">
+        <rect>
+         <x>50</x>
+         <y>440</y>
+         <width>121</width>
+         <height>21</height>
+        </rect>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>7</pointsize>
+        </font>
+       </property>
+       <property name="text">
+        <string>Prénom Nom</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+      </widget>
+      <widget class="QLineEdit" name="lineEdit_5">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="geometry">
+        <rect>
+         <x>140</x>
+         <y>440</y>
+         <width>201</width>
+         <height>21</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+       <property name="readOnly">
+        <bool>false</bool>
+       </property>
+       <property name="clearButtonEnabled">
+        <bool>true</bool>
+       </property>
+      </widget>
       <zorder>label_14</zorder>
       <zorder>label_8</zorder>
       <zorder>label_7</zorder>
@@ -728,22 +849,8 @@
       <zorder>lineEdit_3</zorder>
       <zorder>lineEdit_4</zorder>
       <zorder>lineEdit_2</zorder>
-    </widget>
+      <zorder>radioButton_14</zorder>
-    <widget class="QLabel" name="label_5">
+      <zorder>lineEdit_5</zorder>
-     <property name="geometry">
-      <rect>
-       <x>920</x>
-       <y>10</y>
-       <width>211</width>
-       <height>71</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="scaledContents">
-      <bool>true</bool>
-     </property>
      </widget>
      <widget class="QGroupBox" name="groupBox">
       <property name="geometry">
@@ -902,69 +1009,6 @@
        </property>
       </widget>
      </widget>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="geometry">
-      <rect>
-       <x>970</x>
-       <y>10</y>
-       <width>161</width>
-       <height>111</height>
-      </rect>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">QGroupBox#groupBox_2{background-color: rgb(255, 255, 255, 170);}</string>
-     </property>
-     <property name="title">
-      <string/>
-     </property>
-     <widget class="QCommandLinkButton" name="commandLinkButton_3">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>60</y>
-        <width>141</width>
-        <height>41</height>
-       </rect>
-      </property>
-      <property name="font">
-       <font>
-        <family>Segoe UI</family>
-        <pointsize>10</pointsize>
-       </font>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">background-color: qconicalgradient(cx:0, cy:0, angle:135, stop:0 rgba(255, 255, 0, 69), stop:0.375 rgba(255, 255, 0, 69), stop:0.423533 rgba(251, 255, 0, 145), stop:0.45 rgba(247, 255, 0, 208), stop:0.477581 rgba(255, 244, 71, 130), stop:0.518717 rgba(255, 218, 71, 130), stop:0.55 rgba(255, 255, 0, 255), stop:0.57754 rgba(255, 203, 0, 130), stop:0.625 rgba(255, 255, 0, 69), stop:1 rgba(255, 255, 0, 69));</string>
-      </property>
-      <property name="text">
-       <string>OpenStreetMap</string>
-      </property>
-     </widget>
-     <widget class="QCommandLinkButton" name="commandLinkButton_2">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>10</y>
-        <width>141</width>
-        <height>41</height>
-       </rect>
-      </property>
-      <property name="font">
-       <font>
-        <family>Segoe UI</family>
-        <pointsize>10</pointsize>
-       </font>
-      </property>
-      <property name="autoFillBackground">
-       <bool>false</bool>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">background-color: qconicalgradient(cx:0, cy:0, angle:135, stop:0 rgba(255, 255, 0, 69), stop:0.375 rgba(255, 255, 0, 69), stop:0.423533 rgba(251, 255, 0, 145), stop:0.45 rgba(247, 255, 0, 208), stop:0.477581 rgba(255, 244, 71, 130), stop:0.518717 rgba(255, 218, 71, 130), stop:0.55 rgba(255, 255, 0, 255), stop:0.57754 rgba(255, 203, 0, 130), stop:0.625 rgba(255, 255, 0, 69), stop:1 rgba(255, 255, 0, 69));</string>
-      </property>
-      <property name="text">
-       <string> Ortho</string>
-      </property>
-     </widget>
-    </widget>
      <widget class="QGroupBox" name="groupBox_3">
       <property name="geometry">
        <rect>
@@ -1093,12 +1137,48 @@
        </item>
       </widget>
      </widget>
-    <zorder>groupBox</zorder>
+     <widget class="QGroupBox" name="groupBox_6">
-    <zorder>groupBox_6</zorder>
+      <property name="geometry">
-    <zorder>groupBox_7</zorder>
+       <rect>
+        <x>680</x>
+        <y>350</y>
+        <width>141</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">QGroupBox#groupBox_6{background-color: rgb(255, 255, 255, 170);}</string>
+      </property>
+      <property name="title">
+       <string/>
+      </property>
+      <widget class="QCommandLinkButton" name="commandLinkButton">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>141</width>
+         <height>41</height>
+        </rect>
+       </property>
+       <property name="font">
+        <font>
+         <family>Segoe UI</family>
+         <pointsize>10</pointsize>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">background-color: qconicalgradient(cx:0, cy:0, angle:135, stop:0 rgba(255, 255, 0, 69), stop:0.375 rgba(255, 255, 0, 69), stop:0.423533 rgba(251, 255, 0, 145), stop:0.45 rgba(247, 255, 0, 208), stop:0.477581 rgba(255, 244, 71, 130), stop:0.518717 rgba(255, 218, 71, 130), stop:0.55 rgba(255, 255, 0, 255), stop:0.57754 rgba(255, 203, 0, 130), stop:0.625 rgba(255, 255, 0, 69), stop:1 rgba(255, 255, 0, 69));</string>
+       </property>
+       <property name="text">
+        <string> Mise en page</string>
+       </property>
+      </widget>
+     </widget>
+    </widget>
+    <zorder>frame</zorder>
     <zorder>label_5</zorder>
-    <zorder>groupBox_2</zorder>
+    <zorder>verticalScrollBar</zorder>
-    <zorder>groupBox_3</zorder>
    </widget>
   </widget>
  </widget>

CenRa_COPIE/CenRa_Copie.py

@@ -12,13 +12,15 @@ import qgis
 
 
 #include <QSettings>
-
+import socket
 import os
 from .tools.resources import (
     plugin_path,
+    pyperclip,
     resources_path,
     maj_verif,
 )
+#pyperclip()
 from .copie_editor import Copie_Editor
 from .about_form import AboutDialog
 
@@ -66,6 +68,10 @@ class PgCopie:
             self.copie_editor = QAction(icon, 'Copie',None)
             self.toolBar.addAction(self.copie_editor)
             self.copie_editor.triggered.connect(self.open_editor)
+            self.copie_editor.setEnabled(False)
+            IPAddr=socket.gethostbyname(socket.gethostname())
+            if os.access('N:/',os.R_OK):
+                self.copie_editor.setEnabled(True)
 
     def open_about_dialog(self):
         """

CenRa_COPIE/copie_editor.py

@@ -14,12 +14,16 @@ from PyQt5.QtGui import *
 from PyQt5 import QtGui
 from qgis.core import *
 from qgis.core import QgsDataSourceUri
+import os
 
-from .tools.PythonSQL import *
+try:
+    from .tools.PythonSQL import login_base
+except:
+    print('Pas de fichier PythonSQL')
+from .tools.SQLRequet import *
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
     send_issues,
 )
 from .issues import CenRa_Issues
@@ -62,21 +66,22 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
                 # tablename
             source_tablename = [s for s in list_sources if "table" in s][0].split('"')[3]
 
+
+            account = login_base("account")
+            sigdb = account[5]
+
+
             if source_db != sigdb:
                 #self.iface.messageBar().pushMessage(u"Un référentiel ne peut être copié, utilisez les filtres !", level=QgsMessageBar.CRITICAL, duration=10)
                 self.iface.messageBar().pushMessage("Ooops", u"Vous ne pouvez copier des couches que dans sigXX", level=Qgis.Critical, duration=5)
-
             else:
-
+                user = account[0]
-                first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+                mdp = account[1]
-                first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                host = account[2]
-                first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+                port = account[3]
-                res_ident = first_cur.fetchone()
+                dbname = account[4]
-                mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+                cur = account[7]
-                user = res_ident[1]
+                con = account[8]
-                con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
-                cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-                first_conn.close()
 
                             # Creation de la liste des schemas de la base de donnees
                 SQL = """WITH list_schema AS (
@@ -115,15 +120,15 @@ class Copie_Editor(QDialog, EDITOR_CLASS):
         #******************************debut script*********************************
 
 
-                    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+                    account = login_base("account")
-                    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                    user = account[0]
-                    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+                    mdp = account[1]
-                    res_ident = first_cur.fetchone()
+                    host = account[2]
-                    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+                    port = account[3]
-                    user = res_ident[1]
+                    dbname = account[4]
-                    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+                    cur = account[7]
-                    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                    con = account[8]
-                    first_conn.close()
+
                     # Récupération de la couche active
                     layer = self.iface.activeLayer()
 

CenRa_COPIE/metadata.txt

@@ -10,7 +10,7 @@
 name=CenRA_COPIE
 qgisMinimumVersion=3.0
 description=Permet la copie d'une table dans une base PostGis
-version=2.1
+version=2.3
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -19,7 +19,7 @@ email=si_besoin@cen-rhonealpes.fr
 # Recommended items:
 
 # Uncomment the following line and add your changelog:
-changelog=<h2>CenRa_COPIE:</h2></br><p><h3>07/01/2025 - Version 2.1: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>22/10/2024 - Version 2:</h3>- Refonte du code.</p></br><p><h3>13/09/2024 - Version 1.5:</h3>- Ajoute d'un changelog et vérification de mise à jour.</p>
+changelog=<h2>CenRa_COPIE:</h2></br><p><h3>09/04/2025 - Version 2.3: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 2.2: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 2.1: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>22/10/2024 - Version 2:</h3>- Refonte du code.</p></br><p><h3>13/09/2024 - Version 1.5:</h3>- Ajoute d'un changelog et vérification de mise à jour.</p>
 
 # Tags are comma separated with spaces allowed
 tags=cenra, database, table

CenRa_COPIE/tools/PythonSQL.py

@@ -1,174 +0,0 @@
-import sys
-import socket
-import os
-IPAddr=socket.gethostbyname(socket.gethostname())
-if IPAddr[0:11] == "100.100.100": #4269
-    host = "100.100.100.11"
-    port = "5432"
-    dbname = "sig4269"
-    sigdb="sig4269"
-    refdb="ref_geo4269"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.0": #01
-    host = "192.168.0.201"
-    port = "5432"
-    dbname = "sig01"
-    sigdb="sig01"
-    refdb="ref_geo01"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.1": #0726
-    host = "192.168.1.201"
-    port = "5432"
-    dbname = "sig0726"
-    sigdb="sig0726"
-    refdb="ref_geo0726"
-    password = "McVities"
-if sys.platform == 'linux':
-    os_user = os.environ['USER']
-else:
-    os_user = os.environ['USERNAME']
-if os_user == 'STAGE':
-    os_user='stage'
-if os_user == 'Administrateur':
-    os_user = 'stage'
-
-geom = "geom"
-champ_travaux_prevus_multipolygon="""(gid serial NOT NULL, groupe_gestion text, gestion_lib text, id_gestion text, datedebut date, datefin date, commentaire text, surface_m2 double precision, surface_ha double precision,  date_creation date, date_maj date, geom geometry(MultiPolygon,2154))"""
-champ_travaux_prevus_multilinestring="""(gid serial NOT NULL, groupe_gestion text, gestion_lib text, id_gestion text, datedebut date, datefin date, commentaire text, longueur_m double precision, longueur_km double precision,  date_creation date, date_maj date, geom geometry(MultiLineString,2154))"""
-champ_travaux_prevus_point = """(gid serial NOT NULL, groupe_gestion text, gestion_lib text, id_gestion text, datedebut date, datefin date, commentaire text, x_wgs84 double precision, y_wgs84 double precision,  date_creation date, date_maj date, geom geometry(Point,2154))"""
-
-champ_viergePolygone = """(gid serial NOT NULL, commentaire text, surface_m2 double precision, surface_ha double precision, geom geometry(MultiPolygon,2154))"""
-champ_viergeLigne = """(gid serial NOT NULL, commentaire text, longueur_m double precision, longueur_km double precision, geom geometry(MultiLineString,2154))"""
-champ_viergePoint = """(gid serial NOT NULL, commentaire text, x_wgs84 double precision, y_wgs84 double precision, geom geometry(Point,2154))"""
-
-champ_habitat = """(gid serial NOT NULL, cd_cb_01 text, lb_cb97_fr_01 text, occupation_01 integer, cd_cb_02 text, lb_cb97_fr_02 text, occupation_02 integer, cd_cb_03 text, lb_cb97_fr_03 text, occupation_03 integer, milieu_code text, milieu_libelle text, surface_m2 double precision, surface_ha double precision, commentaire text, date_creation date, date_maj date, geom geometry(MultiPolygon,2154))"""
-
-champ_contour="""(gid serial NOT NULL, date_creation date, date_maj date, utilisateur character varying, dept character(2), nom character varying, surface_m2 double precision, surface_ha double precision, type_site character varying, type_milieu character varying, date_premier_pg integer, date_debut_pg integer, date_fin_pg integer, referent character varying, gestion_deleguee character varying, terrain_militaire character(3), ens character(3), zh character(3), adapt_pmr character(3), inform character(3), guide character(3), ouverture_public character(3), obs character(3), anim character(3), n2000_anim character(3), contrat_n2000_conseil character(3), n2000_op character(3), contrat_n2000_benef character(3), contrat_agri character(3), bc_habitat integer, bc_amphibien integer, bc_coleoptere integer, bc_crustace integer, bc_mammifere integer, bc_chiroptere integer, bc_mollusque integer, bc_odonate integer, bc_oiseau integer, bc_orthoptere integer, bc_poisson integer, bc_reptile integer, bc_rhopalocere integer, bc_heterocere integer, bc_autre_invertebre integer, bc_flore integer, bc_bryophyte integer, bc_champignon integer, suiv_analyse_sol character(3), suiv_piezo character(3), suiv_climat character(3), suiv_topo character(3), suiv_habitat character(3), suiv_amphibien character(3), suiv_coleoptere character(3), suiv_crustace character(3), suiv_mammifere character(3), suiv_chiroptere character(3), suiv_mollusque character(3), suiv_odonate character(3), suiv_oiseau character(3), suiv_orthoptere character(3), suiv_poisson character(3), suiv_reptile character(3), suiv_rhopalocere character(3), suiv_heterocere character(3), suiv_autre_invertebre character(3), suiv_flore character(3), suiv_bryophyte character(3), suiv_champignon character(3), suiv_analyse_eau character(3), suiv_phenologie character(3), suiv_frequentation character(3), suiv_paysager character(3), suiv_autre character(3), commentaire text, geom geometry(MultiPolygon,2154))
-"""
-
-champ_vegethab_point = """(
-    gid serial NOT NULL ,
-    cd_eu_01 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_01 character varying(254) COLLATE pg_catalog."default",
-    occupati_1 bigint,
-    cd_eu_02 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_02 character varying(254) COLLATE pg_catalog."default",
-    occupati_2 bigint,
-    cd_eu_03 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_03 character varying(254) COLLATE pg_catalog."default",
-    occupati_3 bigint,
-    milieu_cod character varying(254) COLLATE pg_catalog."default",
-    milieu_lib character varying(254) COLLATE pg_catalog."default",
-    surface_m2 numeric,
-    surface_ha numeric,
-    commentair character varying(254) COLLATE pg_catalog."default",
-    date_creat date,
-    date_maj date,
-    num_phyto character varying(254) COLLATE pg_catalog."default",
-    type_unite character varying(254) COLLATE pg_catalog."default",
-    dynamique character varying(254) COLLATE pg_catalog."default",
-    gestio_obs character varying(254) COLLATE pg_catalog."default",
-    degrad_obs character varying(254) COLLATE pg_catalog."default",
-    eta_conser character varying(254) COLLATE pg_catalog."default",
-    clas_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_phyto character varying(254) COLLATE pg_catalog."default",
-    syntaxon character varying(254) COLLATE pg_catalog."default",
-    n2000 character varying(254) COLLATE pg_catalog."default",
-    lrr_aura character varying(254) COLLATE pg_catalog."default",
-    lrr_cbna character varying(254) COLLATE pg_catalog."default",
-    lrr_cbnmc character varying(254) COLLATE pg_catalog."default",
-    vege_enjeu character varying(254) COLLATE pg_catalog."default",
-    num_photo character varying(254) COLLATE pg_catalog."default",
-    nature_obs character varying(254) COLLATE pg_catalog."default",
-    date_sais date,
-    s_al_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_name character varying(254) COLLATE pg_catalog."default",
-    salli_name character varying(254) COLLATE pg_catalog."default",
-    class_name character varying(254) COLLATE pg_catalog."default",
-    geom geometry(Point,2154)
-)
-"""
-champ_vegethab_multilinestring = """(
-    gid serial NOT NULL ,
-    cd_eu_01 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_01 character varying(254) COLLATE pg_catalog."default",
-    occupati_1 bigint,
-    cd_eu_02 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_02 character varying(254) COLLATE pg_catalog."default",
-    occupati_2 bigint,
-    cd_eu_03 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_03 character varying(254) COLLATE pg_catalog."default",
-    occupati_3 bigint,
-    milieu_cod character varying(254) COLLATE pg_catalog."default",
-    milieu_lib character varying(254) COLLATE pg_catalog."default",
-    surface_m2 numeric,
-    surface_ha numeric,
-    commentair character varying(254) COLLATE pg_catalog."default",
-    date_creat date,
-    date_maj date,
-    num_phyto character varying(254) COLLATE pg_catalog."default",
-    type_unite character varying(254) COLLATE pg_catalog."default",
-    dynamique character varying(254) COLLATE pg_catalog."default",
-    gestio_obs character varying(254) COLLATE pg_catalog."default",
-    degrad_obs character varying(254) COLLATE pg_catalog."default",
-    eta_conser character varying(254) COLLATE pg_catalog."default",
-    clas_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_phyto character varying(254) COLLATE pg_catalog."default",
-    syntaxon character varying(254) COLLATE pg_catalog."default",
-    n2000 character varying(254) COLLATE pg_catalog."default",
-    lrr_aura character varying(254) COLLATE pg_catalog."default",
-    lrr_cbna character varying(254) COLLATE pg_catalog."default",
-    lrr_cbnmc character varying(254) COLLATE pg_catalog."default",
-    vege_enjeu character varying(254) COLLATE pg_catalog."default",
-    num_photo character varying(254) COLLATE pg_catalog."default",
-    nature_obs character varying(254) COLLATE pg_catalog."default",
-    date_sais date,
-    s_al_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_name character varying(254) COLLATE pg_catalog."default",
-    salli_name character varying(254) COLLATE pg_catalog."default",
-    class_name character varying(254) COLLATE pg_catalog."default",
-    geom geometry(MultiLineString,2154)
-)
-"""
-champ_vegethab_multipolygon = """(
-    gid serial NOT NULL ,
-    cd_eu_01 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_01 character varying(254) COLLATE pg_catalog."default",
-    occupati_1 bigint,
-    cd_eu_02 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_02 character varying(254) COLLATE pg_catalog."default",
-    occupati_2 bigint,
-    cd_eu_03 character varying(254) COLLATE pg_catalog."default",
-    lb_eu_03 character varying(254) COLLATE pg_catalog."default",
-    occupati_3 bigint,
-    milieu_cod character varying(254) COLLATE pg_catalog."default",
-    milieu_lib character varying(254) COLLATE pg_catalog."default",
-    surface_m2 numeric,
-    surface_ha numeric,
-    commentair character varying(254) COLLATE pg_catalog."default",
-    date_creat date,
-    date_maj date,
-    num_phyto character varying(254) COLLATE pg_catalog."default",
-    type_unite character varying(254) COLLATE pg_catalog."default",
-    dynamique character varying(254) COLLATE pg_catalog."default",
-    gestio_obs character varying(254) COLLATE pg_catalog."default",
-    degrad_obs character varying(254) COLLATE pg_catalog."default",
-    eta_conser character varying(254) COLLATE pg_catalog."default",
-    clas_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_phyto character varying(254) COLLATE pg_catalog."default",
-    syntaxon character varying(254) COLLATE pg_catalog."default",
-    n2000 character varying(254) COLLATE pg_catalog."default",
-    lrr_aura character varying(254) COLLATE pg_catalog."default",
-    lrr_cbna character varying(254) COLLATE pg_catalog."default",
-    lrr_cbnmc character varying(254) COLLATE pg_catalog."default",
-    vege_enjeu character varying(254) COLLATE pg_catalog."default",
-    num_photo character varying(254) COLLATE pg_catalog."default",
-    nature_obs character varying(254) COLLATE pg_catalog."default",
-    date_sais date,
-    s_al_phyto character varying(254) COLLATE pg_catalog."default",
-    alli_name character varying(254) COLLATE pg_catalog."default",
-    salli_name character varying(254) COLLATE pg_catalog."default",
-    class_name character varying(254) COLLATE pg_catalog."default",
-    geom geometry(MultiPolygon,2154)
-)
-"""

CenRa_COPIE/tools/SQLRequet.py

@@ -1,34 +1,3 @@
-import sys
-import socket
-import os
-IPAddr=socket.gethostbyname(socket.gethostname())
-if IPAddr[0:11] == "100.100.100": #4269
-    host = "100.100.100.11"
-    port = "5432"
-    dbname = "sig4269"
-    sigdb="sig4269"
-    refdb="ref_geo4269"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.0": #01
-    host = "192.168.0.201"
-    port = "5432"
-    dbname = "sig01"
-    sigdb="sig01"
-    refdb="ref_geo01"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.1": #0726
-    host = "192.168.1.201"
-    port = "5432"
-    dbname = "sig0726"
-    sigdb="sig0726"
-    refdb="ref_geo0726"
-    password = "McVities"
-if sys.platform == 'linux':
-    os_user = os.environ['USER']
-else:
-    os_user = os.environ['USERNAME']
-if os_user == 'STAGE':
-    os_user='stage'
 
 geom = "geom"
 champ_travaux_prevus_multipolygon="""(gid serial NOT NULL, groupe_gestion text, gestion_lib text, id_gestion text, datedebut date, datefin date, commentaire text, surface_m2 double precision, surface_ha double precision,  date_creation date, date_maj date, geom geometry(MultiPolygon,2154))"""

CenRa_COPIE/tools/resources.py

@@ -6,6 +6,7 @@ import tempfile
 import base64
 import psycopg2
 import psycopg2.extras
+import os
 from os.path import abspath, join, pardir, dirname
 
 from qgis.PyQt import uic
@@ -89,7 +90,7 @@ def resources_path(*args):
     :return: Absolute path to the resources folder.
     :rtype: str
     """
-    path = abspath(abspath(join(plugin_path(), "CenRa_Copie\\tools")))
+    path = abspath(abspath(join(plugin_path(), "CenRa_COPIE\\tools")))
     for item in args:
         path = abspath(join(path, item))
     return path
@@ -107,24 +108,15 @@ def load_ui(*args):
 
     return ui_class
 
-def login_base(take=None):
+def pyperclip():
-    from CenRa_Metabase.resources.PythonSQL import host,port,dbname,password,os_user
+    dst = dirname(dirname(__file__))+"\\tools\\"
-    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+    if os.access('N:/',os.R_OK):
-    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+        src = 'N:/SI_Systeme d information/Z_QGIS/PLUGIN/PythonSQL.py'
-    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+    try:
-    res_ident = first_cur.fetchone()
+        shutil.copy(src, dst)
-    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+    except:
-    user = res_ident[1]
+        print('404')
 
-    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
-
-    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_conn.close()
-
-    if take:
-        return cur,con
-    else:
-        return cur
 def send_issues(url,titre,body,labels):
     import requests
     import json
@@ -157,7 +149,7 @@ def maj_verif(NAME):
 
     url = qgis.utils.pluginMetadata(NAME,'repository')
     #URL = url+'/raw/branch/main/plugins.xml'
-    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
 #    print(URL)
     version = qgis.utils.pluginMetadata(NAME,'version')
     len_version = len(version)

CenRa_FLUX/CenRa_Flux.py

@@ -12,13 +12,15 @@ import qgis
 
 
 #include <QSettings>
-
+import socket
 import os
 from .tools.resources import (
     plugin_path,
+    pyperclip,
     resources_path,
     maj_verif,
 )
+pyperclip()
 from .flux_editor import Flux_Editor
 from .about_form import AboutDialog
 
@@ -63,9 +65,13 @@ class PgFlux:
         if not self.action_editor:
             self.action_editor = Flux_Editor()
 
+
             self.flux_editor = QAction(icon, 'SigCEN',None)
             self.toolBar.addAction(self.flux_editor)
             self.flux_editor.triggered.connect(self.open_editor)
+            self.flux_editor.setEnabled(False)
+            if os.access('N:/',os.R_OK):
+                self.flux_editor.setEnabled(True)
 
     def open_about_dialog(self):
         """

CenRa_FLUX/flux_editor.py

@@ -29,15 +29,20 @@ from qgis.PyQt.QtWidgets import (
     QMessageBox,
     QVBoxLayout,
 )
-from .tools.PythonSQL import *
+from .tools.SQLRequet import *
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
     send_issues,
 )
+try:
+    from .tools.PythonSQL import login_base
+except:
+    print('Pas de fichier PythonSQL')
+
 from .issues import CenRa_Issues
 
+from ast import literal_eval
 from qgis.utils import iface
 import os.path
 import webbrowser, os
@@ -45,15 +50,136 @@ import psycopg2
 import psycopg2.extras
 import base64
 
-first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+global DeBUG
-first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+DeBUG = 0
-first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
-res_ident = first_cur.fetchone()
-mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
-user = res_ident[1]
-first_conn.close()
 
+try:
+    account = login_base('account')
+    user = account[0]
+    mdp = account[1]
+    host = account[2]
+    port = account[3]
+    dbname = account[4]
+    sigdb = account[5]
+    refdb = account[6]
+
+
+
+except:
+    print('')
 EDITOR_CLASS = load_ui('CenRa_Flux_base.ui')
+html = '''<!DOCTYPE html>
+<html>
+<head>
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"
+     integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
+     crossorigin=""/>
+    <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
+     integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
+     crossorigin=""></script>
+    <style>
+        body { padding: 0; margin: 0; }
+        html, body, #map { height: 100%; }
+        .leaflet-control-layers-toggle {
+          background-image: url(https://intranet.cenra-outils.org/Intranet/css/images/layers.png);
+        }
+        .legend_parc {
+          border-radius: 15px;
+          box-shadow: 2px 2px 3px 0 #6a6a6a;
+          background-color: #fefafab3;
+          opacity:0;
+        }
+        .legend_parc:hover{
+          opacity:1;
+        }
+        .popup-with-no-events {
+          pointer-events: none;
+        }
+    </style>
+</head>
+<body>
+    <div id="map"></div>
+    <script src="map.js"></script>
+</body>
+</html>
+<script>'''
+font = '''var OrthoIGN = L.tileLayer('https://wmts.geopf.fr/wmts?'+
+'&LAYER={ignLayer}&STYLE={style}&TILEMATRIXSET=PM'+
+'&SERVICE={service}&REQUEST=GetTile&VERSION=1.0.0'+
+'&FORMAT={format}&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}',
+{
+	ignLayer: 'ORTHOIMAGERY.ORTHOPHOTOS',
+	style: 'normal',
+	service: 'WMTS',
+	format: 'image/jpeg',
+	minZoom: 0,
+	maxZoom: 19,
+	attribution: '&copy; IGN'
+}).addTo(map);
+// Plan IGN avec une transparence de 50%
+var PlanIGN = L.tileLayer('https://wmts.geopf.fr/wmts?'+
+'&LAYER={ignLayer}&STYLE={style}&TILEMATRIXSET=PM'+
+'&SERVICE={service}&REQUEST=GetTile&VERSION=1.0.0'+
+'&FORMAT={format}&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}',
+{
+	ignLayer: 'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2',
+	style: 'normal',
+	service: 'WMTS',
+	format: 'image/png',
+	minZoom: 0,
+	maxZoom: 19,
+	attribution: '&copy; IGN'
+});
+var baseMaps = {
+	// "BDORTHO2" : bdortho,
+// "Openstreetmap": openStreetMap,
+// "Opentopomap": openTopoMap,				
+"BDORTHO" : OrthoIGN,
+"PlanIGN": PlanIGN
+};
+var overlayMaps = {
+"Sites": Sites,
+//"Parcelle":JSON
+};
+L.control.layers(baseMaps,overlayMaps).addTo(map);
+var scale = L.control.scale({position: 'bottomleft', metric:true, imperial:false});
+scale.addTo(map);
+var legend = L.control({position: 'bottomleft'});
+
+legend.onAdd = function (map) {
+    var div = L.DomUtil.create('div', 'info legend_parc'),
+    labels = [];
+    labels.push('<i style="background:#73004c;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Acquisition')
+
+    labels.push('<i style="background:#ff00c5;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Acquis en partie BND')
+
+    labels.push('<i style="background:#f0ade1ab;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Acquisition pour partie')
+
+    labels.push('<i style="background:#73462e;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Acquisition / Convention')
+
+    labels.push('<i style="background:#e69800;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Convention')
+
+    labels.push('<i style="background:#ffd37f;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Convention en partie BND')
+
+    labels.push('<i style="background:#ffebaf;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Convention pour partie')
+
+    labels.push('<i style="background:#c8c8c8;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Autre')
+
+    labels.push('<i style="background:#f9ff08;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Projet en cours')
+
+    labels.push('<i style="background:#fe0000;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Problème de mise à jour')
+
+    labels.push('<i style="background:#000;width:18px;height:18px;float:left;margin-right:8px;opacity: 0.7;"></i> Pas de maitrise')
+
+    div.innerHTML = labels.join('<br>');
+    return div;
+};
+
+legend.addTo(map);
+</script>'''
+targetCrs = QgsCoordinateReferenceSystem('EPSG:4326')
+layerCrs = QgsCoordinateReferenceSystem('EPSG:2154')
+TranformCRS  = QgsCoordinateTransform(layerCrs, targetCrs,QgsProject.instance())
 
 class Flux_Editor(QDialog, EDITOR_CLASS):
 
@@ -72,6 +198,7 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
 
         self.tableWidget.setSelectionBehavior(QTableWidget.SelectRows)
         self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        self.toolButton.setIcon(QtGui.QIcon(resources_path('ui','find.png')))
         self.comboBox_2.addItem("SIG")
         self.comboBox_2.addItem('REF')
         self.comboBox.currentIndexChanged.connect(self.initialisation_flux)
@@ -81,9 +208,20 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
         self.commandLinkButton_2.clicked.connect(self.suppression_flux)
         self.tableWidget_2.itemDoubleClicked.connect(self.suppression_flux)
         self.comboBox_2.currentIndexChanged.connect(self.bd_source)
+        self.checkBox.hide()
+        self.checkBox.stateChanged.connect(self.modeCarte)
+        self.toolButton.clicked.connect(self.getCanevas)
         layout = QVBoxLayout()
         self.lineEdit.textChanged.connect(self.filtre_dynamique)
+        self.viewer.titleChanged.connect(self.NewTitle)
         layout.addWidget(self.lineEdit)
+        self.viewer.hide()
+        self.DeBUG.addItem('')
+        self.DeBUG.addItem('01')
+        self.DeBUG.addItem('0726')
+        self.DeBUG.addItem('4269')
+
+        self.DeBUG.hide()
         #self.lineEdit.mousePressEvent = self._mousePressEvent
 
         #metadonnees_plugin = open(self.plugin_path + '/metadata.txt')
@@ -92,6 +230,141 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
     def raise_(self):
         """Run method that performs all the real work"""
         self.bd_source()
+    def ModeDeBUG(self):
+        self.DeBUG.show()
+
+    def mousePressEvent(self, event):
+        global DeBUG
+        if 330 <= event.pos().x() <= 560 and 5 <= event.pos().y() <= 75:
+            DeBUG = DeBUG+1
+            if DeBUG == 3:
+                DeBUG = 0
+                self.ModeDeBUG()
+        else:
+            DeBUG = 0
+            self.DeBUG.hide()
+
+    def NewTitle(self):
+        if self.viewer.title() != '':
+            Tsplit = ((self.viewer.title()).split('.'))
+            print(Tsplit[0],Tsplit[1])
+            self.openPostGIS(Tsplit[0],Tsplit[1])
+
+    def modeCarte(self):
+        if self.checkBox.isChecked():
+            self.viewer.show()
+
+            cur.execute("SELECT ST_AsGeoJSON(st_centroid(ST_Transform(geom,4326))) FROM _agregation_ra._agreg_contour")
+            varcenter = literal_eval(cur.fetchall()[0][0])
+            varcenter = [varcenter['coordinates'][1],varcenter['coordinates'][0]]
+
+            cur.execute("SELECT ST_AsGeoJSON(ST_Transform(st_collect(geom),4326)),tschema,tname FROM _agregation_ra._agreg_contour WHERE geom IS NOT NULL GROUP BY tschema,tname;" )
+            varSite = cur.fetchall()
+            cur.execute("SELECT ST_AsGeoJSON(ST_Transform(st_collect(geom),4326)),tschema,tname FROM _agregation_ra._agreg_travaux_prevus_poly WHERE geom IS NOT NULL GROUP BY tschema,tname;")
+            varTravaux = cur.fetchall()
+            cur.execute("SELECT ST_AsGeoJSON(ST_Transform(geom,4326)),milieu_libelle ,lb_eu_01,tschema,tname FROM _agregation_ra._agreg_eu_habitat WHERE geom IS NOT NULL;")
+            varHabitat = cur.fetchall()
+
+            vargeomS = literal_eval(varSite[0][0])
+            vargeomT = literal_eval(varTravaux[0][0])
+            vargeomH = literal_eval(varHabitat[0][0])
+            #new_objectS = self.SwitchGeom(vargeomS)
+            #new_objectT = self.SwitchGeom(vargeomT)
+            #new_objectH = self.SwitchGeom(vargeomH)
+
+            script = 'var map = L.map("map").setView('+str(varcenter)+', 13);'
+
+            id = 0
+            varSiteJSON = '''var ParcelleJSON = {
+    "type": "FeatureCollection",
+    "features":['''
+            for varP in varSite:
+                id = id+1
+                varSiteJSON = varSiteJSON+'{"properties": {"code": "'+str(varP[1])+'.'+str(varP[2])+'" },'+str(varP[0][1:])+','
+            varSiteJSON = varSiteJSON[:-1]+''']};
+var Sites = L.geoJSON(ParcelleJSON,{
+    style: function(feature) {
+        switch (feature.geometry.properties.code) {
+            case 'Ensemble de sites': return {fillColor: "#9a7863",color:"white",weight: 1,fillOpacity: 0.7};
+            case 'Sous-site conservatoire': return {fillColor: "#e69800",color:"white",weight: 1,fillOpacity: 0.7};
+            case 'Site non géré': return {fillColor: "#73004c",color:"white",weight: 1,fillOpacity: 0.7};
+            case 'Animation territoriale': return {fillColor: "#ffebaf",color:"white",weight: 1,fillOpacity: 0.7};
+            case 'Site conservatoire': return {fillColor: "#f9ff08",color:"white",weight: 1,fillOpacity: 0.7};
+            default: return {fillColor: "#c8c8c8",color:"white",weight: 1,fillOpacity: 0.7};
+        }
+    },
+    onEachFeature: function (feature,layer) { 
+        layer.on('click', function(e) {
+            map.fitBounds(layer.getBounds());
+            document.title = feature.properties.code.toString();
+        });
+        layer.on('mouseover', function(e) {
+            layer.setStyle({
+                weight: 5,
+                color: '#fe0000',
+                dashArray: '',
+            });
+        });
+        //layer.on('mousemove', function(e) {
+            //layer.openPopup(e.latlng);
+        //});
+        layer.on('mouseout', function(e) {
+            layer.setStyle({
+                color:"white",
+                weight: 1,
+            });
+        });
+        layer.bindTooltip(feature.properties.code.toString(), {
+            sticky: true,
+            permanent: false,
+            direction: 'right',
+            className: 'label_parc'
+        });
+    }
+}).addTo(map);'''
+            id = 0
+            varTravauxJSON = '''var TravauxJSON = {
+    "type": "FeatureCollection",
+    "features":['''
+            for varT in varTravaux:
+                id = id+1
+                varTravauxJSON = varTravauxJSON+'{"properties": {"code": "'+str(varT[1])+'.'+str(varT[2])+'" },'+str(varT[0][1:])+','
+            varTravauxJSON = varTravauxJSON[:-1]+''']};
+var Travaux = L.geoJSON(TravauxJSON,{
+    onEachFeature: function (feature,layer) { 
+        layer.on('click', function(e) {
+            map.fitBounds(layer.getBounds());
+            document.title = feature.properties.code.toString();
+        });
+        layer.on('mouseover', function(e) {
+            layer.setStyle({
+                weight: 5,
+                color: '#fe0000',
+                dashArray: '',
+            });
+        });
+        //layer.on('mousemove', function(e) {
+            //layer.openPopup(e.latlng);
+        //});
+        layer.on('mouseout', function(e) {
+            layer.setStyle({
+                color:"white",
+                weight: 1,
+            });
+        });
+        layer.bindTooltip(feature.properties.code.toString(), {
+            sticky: true,
+            permanent: false,
+            direction: 'right',
+            className: 'label_parc'
+        });
+    }
+}).addTo(map);'''
+            script = script+varSiteJSON+varTravauxJSON
+            self.viewer.setHtml(html+script+font)
+
+        else:
+            self.viewer.hide()
 
     def bd_source(self):
         self.activateWindow()
@@ -158,6 +431,7 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
 
     def initialisation_flux(self):
         if dbtype == sigdb:
+            # self.toolButton.setEnabled(1)
             if self.comboBox.currentText() == 'toutes les catégories':
                 custom_list=schemaname_list
             elif self.comboBox.currentText() == 'travaux':
@@ -182,6 +456,10 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             if dbtype == sigdb:
                 type_val = str(value[0])[1:3]
                 schema_name=str(value[0])[4:]
+                table_name=str(value[1][len(value[0])+1:])
+                if value[0] == value[1][:len(value[0])]:
+                    table_name=str(value[1][len(value[0])+1:])
+                else:
                     table_name=str(value[1])
             else:
                 type_val = ''
@@ -190,6 +468,9 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             if type_val == 'fo':
                 type_val=str(value[0])[1:5]
                 schema_name=str(value[0])[6:]
+                if value[0] == value[1][:len(value[0])]:
+                    table_name=str(value[1][len(value[0])+1:])
+                else:
                     table_name=str(value[1])
             elif type_val == 'ra':
                 type_val='travaux'
@@ -211,6 +492,7 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
         self.tableWidget.setColumnWidth(1, 300)
         self.tableWidget.setColumnWidth(2, 300)
         self.tableWidget.setHorizontalHeaderLabels(["Code","Schema","Table"])
+
     def selection_flux(self):
         selected_row = 0
         selected_items = self.tableWidget.selectedItems()
@@ -256,6 +538,15 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
 
         if self.tableWidget_2.rowCount() <= 5:
             self.chargement_flux()
+    def openPostGIS(self,schema,table):
+        uri = QgsDataSourceUri()
+        uri.setConnection(host ,port ,sigdb ,user ,mdp)
+        uri.setDataSource(schema, table, "geom")
+        uri.setKeyColumn('gid')
+        uri.setSrid('2154')
+        layer = QgsVectorLayer(uri.uri(), table, "postgres")
+        # Ajout de la couche au canevas QGIS
+        QgsProject.instance().addMapLayer(layer)
 
     def chargement_flux(self):
 
@@ -273,17 +564,23 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             return switcher.get(type, "nothing")
 
 
+
         def displayOnWindows(type, uri, name):
             p = []
 
         for row in range(0, self.tableWidget_2.rowCount()):
+            color_rgba = 855030089
+            if self.tableWidget_2.item(row, 0).background().color().rgba() != 855030089:
                 ## supression de la partie de l'url après le point d'interrogation
                 if dbtype == sigdb:
                     code = self.tableWidget_2.item(row,0).text()
                     schema = '_'+code+'_'+self.tableWidget_2.item(row,1).text()
                     if code == 'travaux' or code == 'agregation':
                         schema = self.tableWidget_2.item(row,1).text()
-                    table = self.tableWidget_2.item(row,2).text()#.split("?", 1)[0]
+                        table = self.tableWidget_2.item(row,2).text()
+                    else:
+                        table = self.tableWidget_2.item(row,2).text()
+                        table = schema+'_'+table
                 if dbtype == refdb:
 #                    code = self.tableWidget_2.item(row,0).text()
                     schema = self.tableWidget_2.item(row,1).text()
@@ -300,7 +597,6 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
                 geom_type ='SELECT right(st_geometrytype(geom),-3) as a FROM '+schema+'.'+table+' GROUP BY a'
                 cur.execute(geom_type)
                 list_typegeom = cur.fetchall()
-                print(len(list_typegeom))
                 if len(list_typegeom) > 1:
                     for typegeom in list_typegeom:
                         if typegeom[0] == 'MultiPolygon':
@@ -324,9 +620,11 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
                     layer = QgsVectorLayer(uri.uri(), table, "postgres")
                     # Ajout de la couche au canevas QGIS
                     QgsProject.instance().addMapLayer(layer)
-
+            else:
+                self.QMBquestion = QMessageBox.question(iface.mainWindow(), u"Attention !","La couche «" + str(self.tableWidget_2.item(row,1).text()) +' '+ str(self.tableWidget_2.item(row,2).text()) + "» ne ce trouve pas dans cette BD !",QMessageBox.Yes)
     def combobox_custom(self):
         if dbtype == sigdb:
+            self.toolButton.setEnabled(1)
             self.comboBox.clear()
             self.comboBox.addItem("toutes les catégories")
             self.comboBox.addItem('00')
@@ -339,6 +637,7 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             self.comboBox.addItem('travaux')
             self.comboBox.addItem('form')
         if dbtype == refdb:
+            self.toolButton.setEnabled(0)
             custom_list=schemaname_distinct
             cur.execute(custom_list)
             list_schema = cur.fetchall()
@@ -346,8 +645,10 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
             self.comboBox.addItem("toutes les catégories")
             for baxval in list_schema:
                 self.comboBox.addItem(baxval[0])
-    def filtre_dynamique(self, filter_text):
 
+    def filtre_dynamique(self, filter_text):
+        if filter_text.find(' ') >= 0:
+            filter_text=filter_text.replace(" ","_")
         for i in range(self.tableWidget.rowCount()):
             for j in range(self.tableWidget.columnCount()):
                 item = self.tableWidget.item(i, j)
@@ -356,6 +657,64 @@ class Flux_Editor(QDialog, EDITOR_CLASS):
                 if not match:
                     break
 
+    def getCanevas(self):
+        poly = iface.mapCanvas().extent()
+        geom = (str(poly.xMinimum())+','+str(poly.yMinimum())+','+str(poly.xMaximum())+','+str(poly.yMaximum()))
+
+        SQL_GEOM_CONTOUR = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_contour" WHERE st_intersects(geom,ST_MakeEnvelope("""+geom+",2154)) ORDER BY tname"
+        SQL_GEOM_HABITAT = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_habitat" WHERE st_intersects(geom,ST_MakeEnvelope("""+geom+",2154)) ORDER BY tname"
+        SQL_GEOM_EU_HABITAT = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_eu_habitat" WHERE st_intersects(geom,ST_MakeEnvelope("""+geom+",2154)) ORDER BY tname"
+        SQL_GEOM_TRAVAUX_PREVUS_LIGNE = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_travaux_prevus_ligne" WHERE st_intersects(geom,ST_MakeEnvelope("""+geom+",2154)) ORDER BY tname"
+        SQL_GEOM_TRAVAUX_PREVUS_POINT = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_travaux_prevus_point" WHERE st_intersects(geom,ST_MakeEnvelope("""+geom+",2154)) ORDER BY tname"
+        SQL_GEOM_TRAVAUX_PREVUS_POLY = """SELECT DISTINCT tschema,tname FROM "_agregation_ra"."_agreg_travaux_prevus_poly" WHERE st_intersects(geom,ST_MakeEnvelope("""+geom+",2154)) ORDER BY tname"
+
+        cur.execute(SQL_GEOM_CONTOUR)
+        TableContour = cur.fetchall()
+        cur.execute(SQL_GEOM_HABITAT)
+        TableHabitat = cur.fetchall()
+        cur.execute(SQL_GEOM_EU_HABITAT)
+        TableEuHabitat = cur.fetchall()
+        cur.execute(SQL_GEOM_TRAVAUX_PREVUS_LIGNE)
+        TableTravauxLigne = cur.fetchall()
+        cur.execute(SQL_GEOM_TRAVAUX_PREVUS_POINT)
+        TableTravauxPoint = cur.fetchall()
+        cur.execute(SQL_GEOM_TRAVAUX_PREVUS_POLY)
+        TableTravauxPoly = cur.fetchall()
+
+        TableHaveGeom = sorted(TableContour+TableHabitat+TableEuHabitat+TableTravauxLigne+TableTravauxPoint+TableTravauxPoly)
+        row_count = 0
+        self.tableWidget.setRowCount(0)
+        for e in TableHaveGeom:
+            cur.execute("""SELECT DISTINCT count(*) FROM pg_catalog.pg_tables WHERE schemaname LIKE '"""+e[0]+"""' AND tablename LIKE '"""+e[1]+"""';""")
+            TableSomme = cur.fetchall()[0][0]
+
+            if e[0][1:3] != 'fo':
+                DepName = QTableWidgetItem(e[0][1:3])
+                SchemaName = QTableWidgetItem(e[0][4:])
+            else:
+                DepName = QTableWidgetItem('form')
+                SchemaName = QTableWidgetItem(e[0][6:])
+            TableName = QTableWidgetItem(e[1][len(e[0])+1:])
+            self.tableWidget.insertRow(row_count)
+            self.tableWidget.setItem(row_count,0,DepName)
+            self.tableWidget.setItem(row_count,1,SchemaName)
+            self.tableWidget.setItem(row_count,2,TableName)
+            if TableSomme == 0:
+                for j in range(self.tableWidget.columnCount()):
+                    self.tableWidget.item(row_count, j).setBackground(QtGui.QColor(246, 185, 73,50))
+                    self.tableWidget.item(row_count,j).setToolTip('Couche dans une autre BD !')
+            row_count = row_count+1
+        if self.lineEdit.text() != 'Recherche par mots-clés':
+            self.filtre_dynamique(self.lineEdit.text())
+
+    def SwitchGeom(self,vargeom):
+        new_object = '['
+        obj = vargeom['coordinates'][0][0]
+        for obj_X in obj:
+            new_object = new_object+'['+str(obj_X[1])+','+str(obj_X[0])+'],'
+        new_object = new_object[:-1]+']'
+        return(new_object)
+
     def popup(self):
 
         self.dialog = Popup()  # +++ - self

CenRa_FLUX/metadata.txt

@@ -6,7 +6,7 @@
 name=CenRa_FLUX
 qgisMinimumVersion=3.0
 description=Permet d'ouvrire une table dans la base PostGis
-version=2.2
+version=2.8
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -32,7 +32,7 @@ icon=icon.png
 # experimental flag
 experimental=False
 
-changelog=<h1>CenRA_FLUX:</h1></br><p><h3>07/01/2025 - Version 2.2: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>22/10/2024 - Version 2.1:</h3> - Correctif de bug.</br> - Evolution de la limit de 3 à 5. </br></p></br><p><h3>22/10/2024 - Version 2.0:</h3> - Reformatage du code.</br></p></br><p><h3>03/10/2024 - Version 1.14:</h3> - Remonte la fênetre dans la pille.</br></p><p><h3>13/09/2024 - Version 1.13:</h3>- MAJ sur le lien du changelog</br>- Bug-fix: Ouvre MultiPolygone et Polygon séparément.</p></br><p><h3>10/09/2024 - Version 1.11:</h3>- Ouverture de table contenant plusieurs géométries.</p></br><p><h3>26/08/2024 - Version 1.10:</h3>- Ajoute d'un changelog et vérification de mise à jour.</p>
+changelog=<h2>CenRa_FLUX:</h2></br><p><h3>09/04/2025 - Version 2.8: </h3> - Optimisation pour le TT.</p></br><p><h3>07/04/2025 - Version 2.7: </h3> - mode debug.</p></br><p><h3>03/04/2025 - Version 2.6: </h3> - Mise a jour de securite.</p></br><p><h3>20/03/2025 - Version 2.5: </h3> - Visualisation distincte des couches ne se trouvant pas dans l'antenne.</p></br><p><h3>13/02/2025 - Version 2.4: </h3> - Ajoute redimensionnement et déplacement mollette.</p></br><p><h3>05/02/2025 - Version 2.3: </h3> - Bouton de visualisation des couches se trouvent uniquement dans le canva de la carte.</p></br><p><h3>07/01/2025 - Version 2.2: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>22/10/2024 - Version 2.1:</h3> - Correctif de bug.</br> - Evolution de la limit de 3 à 5. </br></p></br><p><h3>22/10/2024 - Version 2.0:</h3> - Reformatage du code.</br></p></br><p><h3>03/10/2024 - Version 1.14:</h3> - Remonte la fênetre dans la pille.</br></p><p><h3>13/09/2024 - Version 1.13:</h3>- MAJ sur le lien du changelog</br>- Bug-fix: Ouvre MultiPolygone et Polygon séparément.</p></br><p><h3>10/09/2024 - Version 1.11:</h3>- Ouverture de table contenant plusieurs géométries.</p></br><p><h3>26/08/2024 - Version 1.10:</h3>- Ajoute d'un changelog et vérification de mise à jour.</p>
 
 # deprecated flag (applies to the whole plugin, not just a single version)
 deprecated=False

CenRa_FLUX/tools/SQLRequet.py

@@ -1,37 +1,3 @@
-import sys
-import socket
-import os
-IPAddr=socket.gethostbyname(socket.gethostname())
-print(IPAddr)
-if IPAddr[0:11] == "100.100.100": #4269
-    host = "100.100.100.11"
-    port = "5432"
-    dbname = "sig4269"
-    sigdb="sig4269"
-    refdb="ref_geo4269"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.0": #01
-    host = "192.168.0.201"
-    port = "5432"
-    dbname = "sig01"
-    sigdb="sig01"
-    refdb="ref_geo01"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.1": #0726
-    host = "192.168.1.201"
-    port = "5432"
-    dbname = "sig0726"
-    sigdb="sig0726"
-    refdb="ref_geo0726"
-    password = "McVities"
-if sys.platform == 'linux':
-    os_user = os.environ['USER']
-else:
-    os_user = os.environ['USERNAME']
-if os_user == 'STAGE':
-    os_user='stage'
-if os_user == 'Administrateur':
-    os_user = 'stage'
 
 schemaname_distinct="""SELECT DISTINCT schemaname from pg_catalog.pg_tables
                             WHERE schemaname NOT LIKE '_archives' AND schemaname NOT LIKE 'topology' AND schemaname NOT LIKE 'information_schema' AND schemaname NOT LIKE 'pg_catalog' and schemaname NOT LIKE 'public' AND schemaname NOT LIKE '_trier'

CenRa_FLUX/tools/resources.py

@@ -2,10 +2,8 @@
 
 import configparser
 import shutil
+import os
 import tempfile
-import base64
-import psycopg2
-import psycopg2.extras
 from os.path import abspath, join, pardir, dirname
 
 from qgis.PyQt import uic
@@ -79,6 +77,14 @@ def plugin_test_data_path(*args, copy=False):
     else:
         return path
 
+def pyperclip():
+    dst = dirname(dirname(__file__))+"\\tools\\"
+    if os.access('N:/',os.R_OK):
+        src = 'N:/SI_Systeme d information/Z_QGIS/PLUGIN/PythonSQL.py'
+    try:
+        shutil.copy(src, dst)
+    except:
+        print('404')
 
 def resources_path(*args):
     """Get the path to our resources folder.
@@ -106,25 +112,6 @@ def load_ui(*args):
     ui_class, _ = uic.loadUiType(resources_path("ui", *args))
 
     return ui_class
-
-def login_base(take=None):
-    from .tools.PythonSQL import host,port,dbname,password,os_user
-    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
-    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
-    res_ident = first_cur.fetchone()
-    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
-    user = res_ident[1]
-
-    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
-
-    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_conn.close()
-
-    if take:
-        return cur,con
-    else:
-        return cur
 def send_issues(url,titre,body,labels):
     import requests
     import json
@@ -157,7 +144,7 @@ def maj_verif(NAME):
 
     url = qgis.utils.pluginMetadata(NAME,'repository')
     #URL = url+'/raw/branch/main/plugins.xml'
-    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
 #    print(URL)
     version = qgis.utils.pluginMetadata(NAME,'version')
     len_version = len(version)

CenRa_FLUX/tools/ui/CenRa_Flux_base - Copie.ui

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Dialog</class>
- <resources>
- </resources>
  <widget class="QDialog" name="Dialog">
   <property name="enabled">
    <bool>true</bool>
@@ -65,8 +63,8 @@
   <widget class="QLabel" name="label_3">
    <property name="geometry">
     <rect>
-     <x>350</x>
+     <x>345</x>
-     <y>20</y>
+     <y>10</y>
      <width>221</width>
      <height>71</height>
     </rect>
@@ -75,7 +73,7 @@
     <string/>
    </property>
    <property name="pixmap">
-    <pixmap resource="resources.qrc">:/plugins/CenRa_FLUX/logo.jpg</pixmap>
+    <pixmap>:/plugins/CenRa_FLUX/logo.jpg</pixmap>
    </property>
    <property name="scaledContents">
     <bool>true</bool>
@@ -139,7 +137,7 @@
     <string/>
    </property>
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset>
      <normaloff>:/plugins/CenRa_FLUX/arrow-bottom.png</normaloff>:/plugins/CenRa_FLUX/arrow-bottom.png</iconset>
    </property>
    <property name="iconSize">
@@ -162,7 +160,7 @@
     <string/>
    </property>
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset>
      <normaloff>:/plugins/CenRa_FLUX/arrow-up.png</normaloff>:/plugins/CenRa_FLUX/arrow-up.png</iconset>
    </property>
    <property name="iconSize">
@@ -237,6 +235,18 @@
     <string>Flux sélectionné(s) à charger :</string>
    </property>
   </widget>
+  <zorder>label_3</zorder>
+  <zorder>comboBox</zorder>
+  <zorder>comboBox_2</zorder>
+  <zorder>pushButton_2</zorder>
+  <zorder>tableWidget</zorder>
+  <zorder>tableWidget_2</zorder>
+  <zorder>commandLinkButton</zorder>
+  <zorder>commandLinkButton_2</zorder>
+  <zorder>lineEdit</zorder>
+  <zorder>label</zorder>
+  <zorder>label_2</zorder>
  </widget>
+ <resources/>
  <connections/>
 </ui>

CenRa_FLUX/tools/ui/CenRa_Flux_base.ui

@@ -9,148 +9,95 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>910</width>
+    <width>890</width>
-    <height>800</height>
+    <height>810</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>910</width>
+    <width>600</width>
-    <height>800</height>
+    <height>400</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>910</width>
+    <width>890</width>
-    <height>800</height>
+    <height>810</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>SIG CEN-RA</string>
   </property>
-  <widget class="QComboBox" name="comboBox">
+  <property name="sizeGripEnabled">
-   <property name="geometry">
-    <rect>
-     <x>260</x>
-     <y>130</y>
-     <width>171</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <property name="editable">
    <bool>false</bool>
   </property>
-   <property name="currentText">
+  <layout class="QGridLayout" name="gridLayout">
-    <string notr="true"/>
+   <property name="sizeConstraint">
+    <enum>QLayout::SetMaximumSize</enum>
    </property>
-  </widget>
+   <property name="leftMargin">
-  <widget class="QComboBox" name="comboBox_2">
+    <number>0</number>
-   <property name="geometry">
-    <rect>
-     <x>370</x>
-     <y>80</y>
-     <width>171</width>
-     <height>22</height>
-    </rect>
    </property>
-   <property name="editable">
+   <property name="topMargin">
-    <bool>false</bool>
+    <number>0</number>
    </property>
-   <property name="currentText">
+   <property name="rightMargin">
-    <string notr="true"/>
+    <number>0</number>
    </property>
-  </widget>
+   <property name="bottomMargin">
-  <widget class="QLabel" name="label_3">
+    <number>0</number>
-   <property name="geometry">
-    <rect>
-     <x>345</x>
-     <y>10</y>
-     <width>221</width>
-     <height>71</height>
-    </rect>
    </property>
-   <property name="text">
+   <property name="spacing">
-    <string/>
+    <number>0</number>
    </property>
-   <property name="pixmap">
+   <item row="0" column="0">
-    <pixmap>:/plugins/CenRa_FLUX/logo.jpg</pixmap>
+    <widget class="QScrollArea" name="scrollArea">
-   </property>
+     <property name="maximumSize">
-   <property name="scaledContents">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="pushButton_2">
-   <property name="geometry">
-    <rect>
-     <x>370</x>
-     <y>750</y>
-     <width>171</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Charger les couches</string>
-   </property>
-  </widget>
-  <widget class="QTableWidget" name="tableWidget">
-   <property name="enabled">
-    <bool>true</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>170</y>
-     <width>850</width>
-     <height>281</height>
-    </rect>
-   </property>
-   <property name="selectionMode">
-    <enum>QAbstractItemView::SingleSelection</enum>
-   </property>
-   <property name="sortingEnabled">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QTableWidget" name="tableWidget_2">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>550</y>
-     <width>850</width>
-     <height>181</height>
-    </rect>
-   </property>
-   <property name="selectionMode">
-    <enum>QAbstractItemView::SingleSelection</enum>
-   </property>
-  </widget>
-  <widget class="QCommandLinkButton" name="commandLinkButton">
-   <property name="geometry">
-    <rect>
-     <x>400</x>
-     <y>470</y>
-     <width>61</width>
-     <height>61</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset>
-     <normaloff>:/plugins/CenRa_FLUX/arrow-bottom.png</normaloff>:/plugins/CenRa_FLUX/arrow-bottom.png</iconset>
-   </property>
-   <property name="iconSize">
       <size>
-     <width>50</width>
+       <width>890</width>
-     <height>40</height>
+       <height>810</height>
+      </size>
+     </property>
+     <property name="inputMethodHints">
+      <set>Qt::ImhNoEditMenu</set>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Sunken</enum>
+     </property>
+     <property name="lineWidth">
+      <number>0</number>
+     </property>
+     <property name="midLineWidth">
+      <number>0</number>
+     </property>
+     <property name="verticalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOff</enum>
+     </property>
+     <property name="horizontalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOff</enum>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents_2">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>890</width>
+        <height>810</height>
+       </rect>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>890</width>
+        <height>810</height>
        </size>
       </property>
-  </widget>
       <widget class="QCommandLinkButton" name="commandLinkButton_2">
        <property name="geometry">
         <rect>
-     <x>460</x>
+         <x>450</x>
          <y>470</y>
          <width>61</width>
          <height>61</height>
@@ -170,13 +117,75 @@
         </size>
        </property>
       </widget>
+      <widget class="QPushButton" name="pushButton_2">
+       <property name="geometry">
+        <rect>
+         <x>360</x>
+         <y>750</y>
+         <width>171</width>
+         <height>23</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Charger les couches</string>
+       </property>
+      </widget>
+      <widget class="QLabel" name="label">
+       <property name="geometry">
+        <rect>
+         <x>30</x>
+         <y>150</y>
+         <width>161</width>
+         <height>16</height>
+        </rect>
+       </property>
+       <property name="font">
+        <font>
+         <family>Calibri</family>
+         <pointsize>10</pointsize>
+         <italic>false</italic>
+        </font>
+       </property>
+       <property name="text">
+        <string>Liste des flux disponibles :</string>
+       </property>
+      </widget>
+      <widget class="QTableWidget" name="tableWidget_2">
+       <property name="geometry">
+        <rect>
+         <x>20</x>
+         <y>550</y>
+         <width>851</width>
+         <height>181</height>
+        </rect>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::SingleSelection</enum>
+       </property>
+      </widget>
+      <widget class="QComboBox" name="comboBox">
+       <property name="geometry">
+        <rect>
+         <x>250</x>
+         <y>130</y>
+         <width>171</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="editable">
+        <bool>false</bool>
+       </property>
+       <property name="currentText">
+        <string notr="true"/>
+       </property>
+      </widget>
       <widget class="QLineEdit" name="lineEdit">
        <property name="enabled">
         <bool>true</bool>
        </property>
        <property name="geometry">
         <rect>
-     <x>480</x>
+         <x>470</x>
          <y>130</y>
          <width>171</width>
          <height>21</height>
@@ -195,30 +204,48 @@
         <bool>true</bool>
        </property>
       </widget>
-  <widget class="QLabel" name="label">
+      <widget class="QToolButton" name="toolButton">
        <property name="geometry">
         <rect>
-     <x>40</x>
+         <x>660</x>
-     <y>150</y>
+         <y>130</y>
-     <width>161</width>
+         <width>21</width>
-     <height>16</height>
+         <height>21</height>
         </rect>
        </property>
-   <property name="font">
-    <font>
-     <family>Calibri</family>
-     <pointsize>10</pointsize>
-     <italic>false</italic>
-    </font>
-   </property>
        <property name="text">
-    <string>Liste des flux disponibles :</string>
+        <string/>
+       </property>
+      </widget>
+      <widget class="QTableWidget" name="tableWidget">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="geometry">
+        <rect>
+         <x>20</x>
+         <y>170</y>
+         <width>850</width>
+         <height>281</height>
+        </rect>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::SingleSelection</enum>
+       </property>
+       <property name="sortingEnabled">
+        <bool>true</bool>
        </property>
       </widget>
       <widget class="QLabel" name="label_2">
        <property name="geometry">
         <rect>
-     <x>30</x>
+         <x>20</x>
          <y>530</y>
          <width>171</width>
          <height>16</height>
@@ -235,18 +262,150 @@
         <string>Flux sélectionné(s) à charger :</string>
        </property>
       </widget>
-  <zorder>label_3</zorder>
+      <widget class="QLabel" name="label_3">
-  <zorder>comboBox</zorder>
+       <property name="geometry">
-  <zorder>comboBox_2</zorder>
+        <rect>
-  <zorder>pushButton_2</zorder>
+         <x>335</x>
-  <zorder>tableWidget</zorder>
+         <y>10</y>
-  <zorder>tableWidget_2</zorder>
+         <width>221</width>
-  <zorder>commandLinkButton</zorder>
+         <height>71</height>
-  <zorder>commandLinkButton_2</zorder>
+        </rect>
-  <zorder>lineEdit</zorder>
+       </property>
-  <zorder>label</zorder>
+       <property name="text">
-  <zorder>label_2</zorder>
+        <string/>
+       </property>
+       <property name="pixmap">
+        <pixmap>:/plugins/CenRa_FLUX/logo.jpg</pixmap>
+       </property>
+       <property name="scaledContents">
+        <bool>true</bool>
+       </property>
       </widget>
+      <widget class="QComboBox" name="comboBox_2">
+       <property name="geometry">
+        <rect>
+         <x>360</x>
+         <y>80</y>
+         <width>171</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="editable">
+        <bool>false</bool>
+       </property>
+       <property name="currentText">
+        <string notr="true"/>
+       </property>
+      </widget>
+      <widget class="QCommandLinkButton" name="commandLinkButton">
+       <property name="geometry">
+        <rect>
+         <x>390</x>
+         <y>470</y>
+         <width>61</width>
+         <height>61</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normaloff>:/plugins/CenRa_FLUX/arrow-bottom.png</normaloff>:/plugins/CenRa_FLUX/arrow-bottom.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>50</width>
+         <height>40</height>
+        </size>
+       </property>
+      </widget>
+      <widget class="QWebView" name="viewer" native="true">
+       <property name="geometry">
+        <rect>
+         <x>90</x>
+         <y>10</y>
+         <width>730</width>
+         <height>730</height>
+        </rect>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">background-color: rgba(255, 255, 255,0.50);</string>
+       </property>
+       <property name="url" stdset="0">
+        <url>
+         <string>about:blank</string>
+        </url>
+       </property>
+      </widget>
+      <widget class="QCheckBox" name="checkBox">
+       <property name="geometry">
+        <rect>
+         <x>830</x>
+         <y>20</y>
+         <width>70</width>
+         <height>17</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+      <widget class="QComboBox" name="DeBUG">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>20</y>
+         <width>71</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="editable">
+        <bool>false</bool>
+       </property>
+       <property name="currentText">
+        <string notr="true"/>
+       </property>
+      </widget>
+      <zorder>viewer</zorder>
+      <zorder>commandLinkButton_2</zorder>
+      <zorder>pushButton_2</zorder>
+      <zorder>label</zorder>
+      <zorder>tableWidget_2</zorder>
+      <zorder>comboBox</zorder>
+      <zorder>lineEdit</zorder>
+      <zorder>toolButton</zorder>
+      <zorder>tableWidget</zorder>
+      <zorder>label_2</zorder>
+      <zorder>label_3</zorder>
+      <zorder>comboBox_2</zorder>
+      <zorder>commandLinkButton</zorder>
+      <zorder>checkBox</zorder>
+      <zorder>DeBUG</zorder>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QWebView</class>
+   <extends>QWidget</extends>
+   <header location="global">QtWebKitWidgets/QWebView</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>

CenRa_METABASE/CenRa_Metabase.py

@@ -26,9 +26,11 @@ from pg_metadata.qgis_plugin_tools.tools.custom_logging import setup_logger
 import os
 from .tools.resources import (
     plugin_path,
+    pyperclip,
     resources_path,
     maj_verif,
 )
+pyperclip()
 from .dock import CenRa_Metabase
 from .editor import Metabase_Editor
 from .about_form import MetabaseAboutDialog

CenRa_METABASE/dock.py

@@ -47,11 +47,14 @@ from pg_metadata.connection_manager import (
     settings_connections_names,
 )
 '''
+try:
+    from .tools.PythonSQL import login_base
+except:
+    print('Pas de fichier PythonSQL')
 
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
 )
 
 DOCK_CLASS = load_ui('CenRa_Metabase_dockwidget_base.ui')

CenRa_METABASE/editor.py

@@ -38,10 +38,14 @@ from qgis.PyQt.QtWidgets import (
 )
 from qgis.utils import iface
 
+try:
+    from .tools.PythonSQL import login_base
+except:
+    print('Pas de fichier PythonSQL')
+
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
     send_issues,
 )
 from .issues import CenRa_Issues

CenRa_METABASE/metadata.txt

@@ -6,7 +6,7 @@
 name=CenRa_Metabase
 qgisMinimumVersion=3.0
 description=CenRa_METABASE
-version=0.1.6
+version=0.2.2
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -21,7 +21,7 @@ tracker=https://gitea.cenra-outils.org/api/v1/repos/CEN-RA/Plugin_QGIS/issues
 
 hasProcessingProvider=no
 # Uncomment the following line and add your changelog:
-changelog=<h2>CenRa_Metabase:</h2></br><p><h3>07/01/2025 - Version 0.1.6: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>19/12/2024 - Version 0.1.5: </h3> - Fix les problem de lenteur qu'en la base est down.</p></br><p><h3>12/12/2024 - Version 0.1.4: </h3> - Crash Fix .</p></br><p><h3>08/10/2024 - Version 0.1.3: </h3> - Lecture de métadonnée des flux WMS/WFS.</p></br><p><h3>07/10/2024 - Version 0.1.2: </h3> - Correctif de bug.</p></br><p><h3>03/10/2024 - Version 0.1.1: </h3> - Remonte la fênetre dans la pille.</p></br><p><h3>26/08/2024 - Version 0.1.0: </h3> - Lancement du plugin CenRa_Metabase </p></br>
+changelog=<h2>CenRa_METABASE:</h2></br><p><h3>09/04/2025 - Version 0.2.2: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 0.2.1: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 0.2.0: </h3> - Deployment sur serveur SIG.</p></br><p><h3>07/01/2025 - Version 0.1.6: </h3> - ByPass du certif ssl ci erreur</p></br><p><h3>19/12/2024 - Version 0.1.5: </h3> - Fix les problem de lenteur qu'en la base est down.</p></br><p><h3>12/12/2024 - Version 0.1.4: </h3> - Crash Fix .</p></br><p><h3>08/10/2024 - Version 0.1.3: </h3> - Lecture de métadonnée des flux WMS/WFS.</p></br><p><h3>07/10/2024 - Version 0.1.2: </h3> - Correctif de bug.</p></br><p><h3>03/10/2024 - Version 0.1.1: </h3> - Remonte la fênetre dans la pille.</p></br><p><h3>26/08/2024 - Version 0.1.0: </h3> - Lancement du plugin CenRa_Metabase </p>
 
 # Tags are comma separated with spaces allowed
 tags=python

CenRa_METABASE/tools/PythonSQL.py

@@ -1,34 +0,0 @@
-import sys
-import socket
-import os
-IPAddr=socket.gethostbyname(socket.gethostname())
-#print(IPAddr)
-if IPAddr[0:11] == "100.100.100": #4269
-    host = "100.100.100.81"
-    port = "5432"
-    dbname = "sig4269"
-    sigdb="sig4269"
-    refdb="ref_geo4269"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.0": #01
-    host = "192.168.0.201"
-    port = "5432"
-    dbname = "sig01"
-    sigdb="sig01"
-    refdb="ref_geo01"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.1": #0726
-    host = "192.168.1.201"
-    port = "5432"
-    dbname = "sig0726"
-    sigdb="sig0726"
-    refdb="ref_geo0726"
-    password = "McVities"
-if sys.platform == 'linux':
-    os_user = os.environ['USER']
-else:
-    os_user = os.environ['USERNAME']
-if os_user == 'STAGE':
-    os_user='stage'
-if os_user == 'Administrateur':
-    os_user='stage'

CenRa_METABASE/tools/resources.py

@@ -3,9 +3,7 @@
 import configparser
 import shutil
 import tempfile
-import base64
+import os
-import psycopg2
-import psycopg2.extras
 from os.path import abspath, join, pardir, dirname
 from qgis.PyQt.QtWidgets import QApplication
 from qgis.PyQt import uic
@@ -94,6 +92,14 @@ def resources_path(*args):
         path = abspath(join(path, item))
     return path
 
+def pyperclip():
+    dst = dirname(dirname(__file__))+"\\tools\\"
+    if os.access('N:/',os.R_OK):
+        src = 'N:/SI_Systeme d information/Z_QGIS/PLUGIN/PythonSQL.py'
+    try:
+        shutil.copy(src, dst)
+    except:
+        print('404')
 
 def load_ui(*args):
     """Get compile UI file.
@@ -107,25 +113,6 @@ def load_ui(*args):
 
     return ui_class
 
-def login_base(take=None):
-    from CenRa_METABASE.tools.PythonSQL import host,port,dbname,password,os_user
-    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
-    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
-    res_ident = first_cur.fetchone()
-
-    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
-    user = res_ident[1]
-
-    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
-    
-    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_conn.close()
-
-    if take:
-        return cur,con
-    else:
-        return cur
 def send_issues(url,titre,body,labels):
     import requests
     import json
@@ -158,7 +145,7 @@ def maj_verif(NAME):
 
     url = qgis.utils.pluginMetadata(NAME,'repository')
     #URL = url+'/raw/branch/main/plugins.xml'
-    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
 #    print(URL)
     version = qgis.utils.pluginMetadata(NAME,'version')
     len_version = len(version)

CenRa_PAGERENDER/canvas_editor.py

@@ -65,7 +65,6 @@ import glob
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
     send_issues,
 )
 from .issues import CenRa_Issues

CenRa_PAGERENDER/metadata.txt

@@ -6,7 +6,7 @@
 name=CenRa_PageRender
 qgisMinimumVersion=3.0
 description=CenRa_PageRender
-version=0.1.5
+version=0.1.6
 author=Conservatoire d'Espaces Naturels de Rhône-Alpes
 email=si_besoin@cen-rhonealpes.fr
 
@@ -21,7 +21,7 @@ tracker=https://gitea.cenra-outils.org/api/v1/repos/CEN-RA/Plugin_QGIS/issues
 
 hasProcessingProvider=no
 # Uncomment the following line and add your changelog:
-changelog=<h2>CenRa_PageRender:</h2></br><p><h3>07/01/2025 - Version 0.1.5: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>14/11/2024 - Version 0.1.4: </h3> - Implementation de la mollet. </br> - Implementation du dragging pour déplacer et modification de la taille </br></p></br><p><h3>08/11/2024 - Version 0.1.3: </h3> - Correctif de bug. </br><p><h3>21/10/2024 - Version 0.1.1: </h3> - Les match en if. </br> - Bouton de scroll et adaptation portrait.</p></br><p><h3>09/10/2024 - Version 0.1.0: </h3> - Création.</p>
+changelog=<h2>CenRa_PAGERENDER:</h2></br><p><h3>03/04/2025 - Version 0.1.6: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 0.1.5: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>14/11/2024 - Version 0.1.4: </h3> - Implementation de la mollet. </br> - Implementation du dragging pour déplacer et modification de la taille </br></p></br><p><h3>08/11/2024 - Version 0.1.3: </h3> - Correctif de bug. </br><p><h3>21/10/2024 - Version 0.1.1: </h3> - Les match en if. </br> - Bouton de scroll et adaptation portrait.</p></br><p><h3>09/10/2024 - Version 0.1.0: </h3> - Création.</p>
 
 # Tags are comma separated with spaces allowed
 tags=python

CenRa_PAGERENDER/tools/PythonSQL.py

@@ -1,34 +0,0 @@
-import sys
-import socket
-import os
-IPAddr=socket.gethostbyname(socket.gethostname())
-#print(IPAddr)
-if IPAddr[0:11] == "100.100.100": #4269
-    host = "100.100.100.81"
-    port = "5432"
-    dbname = "sig4269"
-    sigdb="sig4269"
-    refdb="ref_geo4269"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.0": #01
-    host = "192.168.0.201"
-    port = "5432"
-    dbname = "sig01"
-    sigdb="sig01"
-    refdb="ref_geo01"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.1": #0726
-    host = "192.168.1.201"
-    port = "5432"
-    dbname = "sig0726"
-    sigdb="sig0726"
-    refdb="ref_geo0726"
-    password = "McVities"
-if sys.platform == 'linux':
-    os_user = os.environ['USER']
-else:
-    os_user = os.environ['USERNAME']
-if os_user == 'STAGE':
-    os_user='stage'
-if os_user == 'Administrateur':
-    os_user='stage'

CenRa_PAGERENDER/tools/resources.py

@@ -107,25 +107,6 @@ def load_ui(*args):
 
     return ui_class
 
-def login_base(take=None):
-    from CenRa_METABASE.tools.PythonSQL import host,port,dbname,password,os_user
-    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
-    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
-    res_ident = first_cur.fetchone()
-
-    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
-    user = res_ident[1]
-
-    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
-    
-    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_conn.close()
-
-    if take:
-        return cur,con
-    else:
-        return cur
 def send_issues(url,titre,body,labels):
     import requests
     import json
@@ -158,7 +139,7 @@ def maj_verif(NAME):
 
     url = qgis.utils.pluginMetadata(NAME,'repository')
     #URL = url+'/raw/branch/main/plugins.xml'
-    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
 #    print(URL)
     version = qgis.utils.pluginMetadata(NAME,'version')
     len_version = len(version)

CenRa_POSTGIS/CenRa_Postgis.py

@@ -13,23 +13,31 @@ import qgis
 
 #include <QSettings>
 
+import socket
 import os
 from .tools.resources import (
     plugin_path,
+    pyperclip,
     resources_path,
     maj_verif,
 )
+pyperclip()
+
 from .postgis_editor import Postgis_Editor
 from .postgis_creator import Postgis_Creator
+from .postgis_rename import Postgis_Rename
 from .about_form import AboutDialog
 
 from PyQt5.QtCore import *
 
+IPAddr=socket.gethostbyname(socket.gethostname())
+
 class PgPostgis:
     def __init__(self):
         """ Constructor. """
         self.action_editor = None
         self.action_creator = None
+        self.action_rename = None
 #        self.issues = None
         self.provider = None
         self.locator_filter = None
@@ -58,6 +66,7 @@ class PgPostgis:
 
         icon = QIcon(resources_path('icons', 'page_new.png'))
         icon2 = QIcon(resources_path('icons', 'page_ajout.png'))
+        icon3 = QIcon(resources_path('icons', 'page_rename.png'))
 
         # Open the online help
         self.help_action = QAction(icon, "CenRa_Postgis", iface.mainWindow())
@@ -69,6 +78,11 @@ class PgPostgis:
             self.postgis_creator = QAction(icon, 'dossier_creator',None)
             self.toolBar.addAction(self.postgis_creator)
             self.postgis_creator.triggered.connect(self.open_creator)
+
+            self.postgis_creator.setEnabled(False)
+            if os.access('N:/',os.R_OK):
+                self.postgis_creator.setEnabled(True)
+
         if not self.action_editor:
             self.action_editor = Postgis_Editor()
 
@@ -76,6 +90,30 @@ class PgPostgis:
             self.toolBar.addAction(self.postgis_editor)
             self.postgis_editor.triggered.connect(self.open_editor)
 
+            self.postgis_editor.setEnabled(False)
+            if os.access('N:/',os.R_OK):
+                self.postgis_editor.setEnabled(True)
+
+        if not self.action_rename:
+            self.action_rename = Postgis_Rename()
+
+            self.postgis_rename = QAction(icon3, 'dossier_rename',None)
+            self.toolBar.addAction(self.postgis_rename)
+            self.postgis_rename.triggered.connect(self.open_rename)
+
+            if os.environ['USERNAME'] == 'tlaveille' or os.environ['USERNAME'] == 'lpoulin' or os.environ['USERNAME'] == 'rclement':
+                self.action_rename.setEnabled(True)
+                self.postgis_rename.setEnabled(True)
+                self.postgis_rename.setVisible(1)
+            else:
+                self.action_rename.setEnabled(False)
+                self.postgis_rename.setEnabled(False)
+                self.postgis_rename.setVisible(0)
+
+            self.postgis_rename.setEnabled(False)
+            if os.access('N:/',os.R_OK):
+                self.postgis_rename.setEnabled(True)
+
     def open_about_dialog(self):
         """
         About dialog
@@ -94,12 +132,18 @@ class PgPostgis:
         self.action_creator.show()
         self.action_creator.raise_()
 
+    def open_rename(self):
+        self.action_rename.show()
+        self.action_rename.raise_()
+
     def unload(self):
         """ Unload the plugin. """
         if self.action_editor:
             iface.removePluginMenu('CenRa_Postgis',self.postgis_editor)
         if self.action_creator:
             iface.removePluginMenu('CenRa_Postgis',self.postgis_creator)
+        if self.action_rename:
+            iface.removePluginMenu('CenRa_Postgis',self.postgis_rename)
 
         if self.provider:
             QgsApplication.processingRegistry().removeProvider(self.provider)

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.4
+version=2.8
 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=<h2>CenRa_POSTGIS:</h2></br><p><h3>23/01/2025 - Version 2.4: </h3> - Correctif sur les pkey.</p></br><p><h3>22/01/2025 - Version 2.3: </h3> - Correctif sur la creation de projet.</p></br><p><h3>21/01/2025 - Version 2.2: </h3> - Correctif sur la longeur des nom.</p></br><p><h3>07/01/2025 - Version 2.1: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>22/10/2024 - Version 2.0:</h3>- Refont du code.</p>
+changelog=<h2>CenRa_POSTGIS:</h2></br><p><h3>09/04/2025 - Version 2.8: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 2.7: </h3> - Mise a jour de securite.</p></br><p><h3>12/02/2025 - Version 2.6: </h3> - InDev:renomé les schema et table.</p></br><p><h3>04/02/2025 - Version 2.5: </h3> - Correctif bug création de couche.</p></br><p><h3>23/01/2025 - Version 2.4: </h3> - Correctif sur les pkey.</p></br><p><h3>22/01/2025 - Version 2.3: </h3> - Correctif sur la creation de projet.</p></br><p><h3>21/01/2025 - Version 2.2: </h3> - Correctif sur la longeur des nom.</p></br><p><h3>07/01/2025 - Version 2.1: </h3> - ByPass du certif ssl ci erreur.</p></br><p><h3>22/10/2024 - Version 2.0:</h3>- Refont du code.</p>
 
 # tags are comma separated with spaces allowed
 tags=cenra, postgis, database

CenRa_POSTGIS/postgis_creator.py

@@ -15,11 +15,16 @@ from PyQt5 import QtGui
 from qgis.core import *
 from qgis.core import QgsDataSourceUri
 
-from .tools.PythonSQL import *
+try:
+    from .tools.PythonSQL import login_base
+except:
+    print('Pas de fichier PythonSQL')
+
+from .tools.SQLRequet import *
+
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
     send_issues,
     create_vierge,
     create_contour,
@@ -50,6 +55,7 @@ class Postgis_Creator(QDialog, EDITOR_CLASS):
 
     # run method that performs all the real work
     def raise_(self):
+        self.activateWindow()
         # show the dialog
         self.show()
         # Run the dialog event loop
@@ -74,15 +80,14 @@ class Postgis_Creator(QDialog, EDITOR_CLASS):
                 if self.nom.text().find(car) != -1 :
                     QMessageBox.warning(None, "Oups :", u"Le nom de dossier ne doit pas comporter de caractères spéciaux, ni d'espaces !\n\n\t" + self.nom.text().lower() )
                     return
-            first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+            account = login_base("account")
-            first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+            user = account[0]
-            first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+            mdp = account[1]
-            res_ident = first_cur.fetchone()
+            host = account[2]
-            mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+            port = account[3]
-            user = res_ident[1]
+            dbname = account[4]
-            con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+            cur = account[7]
-            cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+            con = account[8]
-            first_conn.close()
 
             SQL_schema = "CREATE SCHEMA " + schema + ";"
             SQL_GRANT_SCHEMA="GRANT CREATE, USAGE ON SCHEMA "+schema+" TO grp_qgis; GRANT CREATE, USAGE ON SCHEMA "+schema+" TO grp_sig;"

CenRa_POSTGIS/postgis_editor.py

@@ -15,11 +15,15 @@ from PyQt5 import QtGui
 from qgis.core import *
 from qgis.core import QgsDataSourceUri
 
-from .tools.PythonSQL import *
+try:
+    from .tools.PythonSQL import login_base
+except:
+    print('Pas de fichier PythonSQL')
+from .tools.SQLRequet import *
+
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
     send_issues,
     create_vierge,
     create_contour,
@@ -50,16 +54,15 @@ class Postgis_Editor(QDialog, EDITOR_CLASS):
 
     ### Outil Ajout de nouvelles couche a un dossier
     def raise_(self):
-        first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+        self.activateWindow()
-        first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+        account = login_base("account")
-        first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+        user = account[0]
-        res_ident = first_cur.fetchone()
+        mdp = account[1]
-        mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+        host = account[2]
-        user = res_ident[1]
+        port = account[3]
-
+        dbname = account[4]
-        con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+        cur = account[7]
-        cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+        con = account[8]
-        first_conn.close()
                     # Creation de la liste des schemas de la base de donnees
         SQL = """WITH list_schema AS (
     select schemaname,'sig' as group from pg_catalog.pg_tables
@@ -90,15 +93,14 @@ class Postgis_Editor(QDialog, EDITOR_CLASS):
         # See if OK was pressed
         if result == 1:
 #******************************debut script*********************************
-            first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+            account = login_base("account")
-            first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+            user = account[0]
-            first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+            mdp = account[1]
-            res_ident = first_cur.fetchone()
+            host = account[2]
-            mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+            port = account[3]
-            user = res_ident[1]
+            dbname = account[4]
-            con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+            cur = account[7]
-            cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+            con = account[8]
-            first_conn.close()
 
             if self.schema.currentIndex() == -1 :
                 QMessageBox.warning(None, "Oups :", "Veuillez choisir un nom de dossier.")

CenRa_POSTGIS/postgis_rename.py

@@ -0,0 +1,238 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+# Import the PyQt and QGIS libraries
+from builtins import next
+from builtins import str
+from builtins import object
+import qgis
+from qgis.PyQt.QtCore import QSettings
+from qgis.PyQt.QtWidgets import QAction, QMenu, QDialog, QMessageBox,QDialogButtonBox
+from qgis.PyQt.QtGui import QIcon
+from PyQt5.QtCore import *
+from PyQt5.QtGui import *
+from PyQt5 import QtGui
+from qgis.core import *
+from qgis.core import QgsDataSourceUri
+
+try:
+    from .tools.PythonSQL import login_base
+except:
+    print('Pas de fichier PythonSQL')
+from .tools.SQLRequet import *
+
+from .tools.resources import (
+    load_ui,
+    resources_path,
+    send_issues,
+    create_vierge,
+    create_contour,
+    create_travaux,
+    create_habita
+)
+from .issues import CenRa_Issues
+
+import os.path
+import webbrowser, os
+import psycopg2
+import psycopg2.extras
+import base64
+from qgis.utils import iface
+
+EDITOR_CLASS = load_ui('CenRa_PostgisRename_base.ui')
+ch = [u"à", u"À", u"â", u"Â", u"ä", u"Ä", u"å", u"Å", u"ç", u"Ç", u"é", u"É", u"è", u"È", u"ê", u"Ê", u"ë", u"Ë", u"î", u"Î", u"ï", u"Ï", u"ô", u"Ô", u"ö", u"Ö", u"ù", u"Ù", u"û", u"Û", u"ü", u"Ü", u"ÿ", u"Ÿ", u"'", u"-", u" "]
+try:
+    account = login_base("account")
+    user = account[0]
+    mdp = account[1]
+    host = account[2]
+    port = account[3]
+    dbname = account[4]
+    cur = account[7]
+    con = account[8]
+except:
+    print('')
+class Postgis_Rename(QDialog, EDITOR_CLASS):
+
+    def __init__(self, parent=None):
+        _ = parent
+        super().__init__()
+        self.setupUi(self)
+        self.settings = QgsSettings()
+        self.s = QSettings()
+        self.setWindowIcon(QtGui.QIcon(resources_path('icons','icon.png')))
+        self.iface = iface
+
+        self.schema.currentIndexChanged.connect(self.Test)
+        self.buttonBox.accepted.connect(self.msgBox)
+    ### Outil Ajout de nouvelles couche a un dossier
+    def raise_(self):
+        self.activateWindow()
+        self.groupBox_3.hide()
+        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
+        GET_ALL_SCHEMA = """SELECT DISTINCT table_schema FROM information_schema.tables WHERE table_schema LIKE '_form_%' OR table_schema LIKE '_01_%' OR table_schema LIKE '_07_%' OR table_schema LIKE '_26_%' OR table_schema LIKE '_42_%' OR table_schema LIKE '_69_%' ORDER BY table_schema;"""
+        cur.execute(GET_ALL_SCHEMA)
+        AllSchema = cur.fetchall()
+        last_value_schema = self.schema.currentText()
+        last_value_departement = self.departement.currentText()
+        self.schema.clear()
+        self.departement.clear()
+        self.schema.addItems([''])
+        for Schema in AllSchema:
+            self.schema.addItems(Schema)
+        self.departement.addItems(['','01','07','26','42','69','form'])
+        if last_value_schema != '':
+            self.schema.setCurrentIndex(self.schema.findText(last_value_schema))
+        if last_value_departement != '':
+            self.departement.setCurrentIndex(self.departement.findText(last_value_departement))
+
+    def Test(self):
+        oldSchema = self.schema.currentText()
+        if oldSchema != '':
+            allIsGood = 0
+            
+            GET_COUNT_LEFT = "SELECT count(*) FROM information_schema.tables WHERE table_schema LIKE left(table_name,"+str(len(oldSchema))+") AND table_schema LIKE '"+oldSchema+"';"
+            GET_COUNT_TOT = "SELECT count(*) FROM information_schema.tables WHERE table_schema LIKE '"+oldSchema+"';"
+            
+            cur.execute(GET_COUNT_TOT)
+            CountTot = cur.fetchall()[0]
+            cur.execute(GET_COUNT_LEFT)
+            CountLeft = cur.fetchall()[0]
+
+            if CountLeft[0] == CountTot[0]:
+                allIsGood = allIsGood+1
+                self.couche.setChecked(1)
+            else:
+                self.couche.setChecked(0)
+
+            GET_GRANTEE_PRIVILEGE = "SELECT DISTINCT count(*) FROM information_schema.role_table_grants WHERE table_schema LIKE '"+oldSchema+"' AND grantee LIKE 'grp_qgis' AND privilege_type LIKE 'UPDATE';"
+            cur.execute(GET_GRANTEE_PRIVILEGE)
+            CountPrivilege = cur.fetchall()[0]
+
+            if CountTot[0] == CountPrivilege[0]:
+                allIsGood = allIsGood+1
+                self.compte.setChecked(1)
+            else:
+                self.compte.setChecked(0)
+
+            if allIsGood == 2:
+                self.groupBox_3.show()
+                self.loadValue()
+                self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(True)
+            else:
+                self.groupBox_3.hide()
+                self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
+        else:
+            self.old_name.setText('')
+            self.compte.setChecked(0)
+            self.couche.setChecked(0)
+            self.groupBox_3.hide()
+
+    def loadValue(self):
+        oldSchema = self.schema.currentText()
+        if oldSchema[:6] == '_form_':
+            oldSchema = self.schema.currentText()[6:]
+            prefixSchema = self.schema.currentText()[1:5]
+        else:
+            oldSchema = self.schema.currentText()[4:]
+            prefixSchema = self.schema.currentText()[1:3]
+        if oldSchema[:3] == 'at_':
+            oldSchema = oldSchema[3:]
+            self.animation.setChecked(1)
+        else:
+            self.animation.setChecked(0)
+        self.old_name.setText(oldSchema)
+        self.departement.setCurrentIndex(self.departement.findText(prefixSchema))
+
+    def updateName(self):
+        if self.departement.currentText() != '':
+            oldTableName = self.old_name.text()
+            newTableName = ((self.new_name.text()).lower()).replace(' ','_')
+            newPrefixSchema = '_'+self.departement.currentText()+'_'
+            if self.schema.currentText()[:6] == '_form_':
+                oldPrefixSchema = self.schema.currentText()[:6]
+                if (self.schema.currentText()[6:9]) == "at_":
+                    oldPrefixSchema=oldPrefixSchema+'at_'
+            else:
+                oldPrefixSchema = self.schema.currentText()[:4]
+                if (self.schema.currentText()[4:7]) == 'at_':
+                    oldPrefixSchema=oldPrefixSchema+'at_'
+
+            if self.animation.isChecked():
+                newPrefixSchema=newPrefixSchema+'at_'
+            oldSchemaName = oldPrefixSchema+oldTableName
+            newSchemaName = newPrefixSchema+newTableName
+
+            if oldSchemaName != newSchemaName:
+                global AllSQLrun
+                allSQLrun=''
+
+                SQL_UPDATE = """UPDATE public.layer_styles SET f_table_schema = '"""+newSchemaName+"""',f_table_name = replace(replace(f_table_name,'"""+oldTableName+"""','"""+newTableName+"""'),'"""+oldPrefixSchema+"""','"""+newPrefixSchema+"""') WHERE f_table_schema LIKE '"""+oldSchemaName+"""';"""
+                allSQLrun = allSQLrun+SQL_UPDATE
+                cur.execute(SQL_UPDATE)
+
+                SQL_GET_TABLE_RENAME = """SELECT table_name,replace(replace(table_name,'"""+oldTableName+"""','"""+newTableName+"""'),'"""+oldPrefixSchema+"""','"""+newPrefixSchema+"""') from information_schema.tables WHERE table_schema LIKE '"""+oldSchemaName+"""';"""
+                cur.execute(SQL_GET_TABLE_RENAME)
+                allTableRename = cur.fetchall()
+                allTableList = []
+                for TableRename in allTableRename:
+                    oldTable = TableRename[0]
+                    newTable = TableRename[1]
+                    allTableList.append([oldTable,newSchemaName,newTable])
+                    SQL_RENAME_TABLE = """ALTER TABLE """+oldSchemaName+'.'+oldTable+""" RENAME TO """+newTable+""";"""
+                    allSQLrun = allSQLrun+SQL_RENAME_TABLE
+                    cur.execute(SQL_RENAME_TABLE)
+
+                SQL_RENAME_SCHEMA = 'ALTER SCHEMA '+oldSchemaName+' RENAME TO '+newSchemaName
+                allSQLrun = allSQLrun+SQL_RENAME_SCHEMA
+                cur.execute(SQL_RENAME_SCHEMA)
+                #print(allSQLrun)
+                con.commit()
+                for LayerOpen in allTableList:
+                    self.UnloadLoadLayers(LayerOpen[0],LayerOpen[1],LayerOpen[2])
+
+
+    def UnloadLoadLayers(self,OldName,NewSchema,NewTable):
+        allLayers = (QgsProject.instance().mapLayers().values())
+        listLayers = []
+        listLayersName = []
+        for layer in allLayers:
+            listLayers.append(layer)
+            listLayersName.append(layer.name())
+        if OldName in listLayersName:
+            layer = (listLayers[listLayersName.index(OldName)])
+            provider = layer.dataProvider()
+            dbname = (QgsDataSourceUri(provider.dataSourceUri()).database())
+            user = QgsDataSourceUri(provider.dataSourceUri()).username()
+            mdp = QgsDataSourceUri(provider.dataSourceUri()).password()
+            host = QgsDataSourceUri(provider.dataSourceUri()).host()
+            port = QgsDataSourceUri(provider.dataSourceUri()).port()
+
+            ### 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(NewSchema, NewTable, 'geom')
+            QgsProject.instance().removeMapLayer(layer.id())
+            layer = self.iface.addVectorLayer(uri.uri(), NewTable, "postgres")
+
+    def msgBox(self):
+        self.QMBquestion = QMessageBox()
+        self.QMBquestion.setWindowTitle(u"Attention !")
+        self.QMBquestion.setIcon(QMessageBox.Warning)
+        self.QMBquestion.setText("Attention, le renommage de dossier PostGIS peut engendrer des pertes de liaisons avec des projets QGIS !")
+        self.QMBquestion.setStandardButtons(QMessageBox.Yes|QMessageBox.No)
+        if self.new_name.text() != '':
+            error_caracteres = 0
+            for caracteres in ch :
+                if self.new_name.text().find(caracteres) != -1 :
+                    error_caracteres = 1
+            if error_caracteres == 0:
+                self.QMBquestion = self.QMBquestion.exec()
+            else:
+                QMessageBox.warning(None, "Oups :", u"Le nom de dossier ne doit pas comporter de caractères spéciaux, ni d'espaces !\n\n\t" + self.new_name.text().lower() )
+        else:
+            QMessageBox.warning(None, "Oups :", "Votre projet doit avoire un nom !")
+        if self.QMBquestion == QMessageBox.Yes:
+            self.updateName()

CenRa_POSTGIS/tools/HubToTea.py

@@ -1,21 +0,0 @@
-from qgis.core import QgsApplication
-
-def gitea():
-    file_url = QgsApplication.qgisSettingsDirPath()+'QGIS/QGIS3.ini'
-    recherche_1 = 'plugin_repositories\\github\\url=https://github.com/CEN-Rhone-Alpes/Plugin_QGIS/releases/latest/download/plugins.xml'
-    replace_1 = 'plugin_repositories\\gitea\\url=https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
-
-    recherche_2 = 'github'
-    replace_2 = 'gitea'
-
-    # Read in the file
-    with open(file_url, 'r') as file:
-        filedata = file.read()
-
-    # Replace the target string
-    filedata = filedata.replace(recherche_1, replace_1)
-    filedata = filedata.replace(recherche_2, replace_2)
-
-    # Write the file out again
-    with open(file_url, 'w') as file:
-        file.write(filedata)

CenRa_POSTGIS/tools/SQLRequet.py

@@ -1,36 +1,3 @@
-import sys
-import socket
-import os
-IPAddr=socket.gethostbyname(socket.gethostname())
-if IPAddr[0:11] == "100.100.100": #4269
-    host = "100.100.100.11"
-    port = "5432"
-    dbname = "sig4269"
-    sigdb="sig4269"
-    refdb="ref_geo4269"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.0": #01
-    host = "192.168.0.201"
-    port = "5432"
-    dbname = "sig01"
-    sigdb="sig01"
-    refdb="ref_geo01"
-    password = "McVities"
-if IPAddr[0:9] == "192.168.1": #0726
-    host = "192.168.1.201"
-    port = "5432"
-    dbname = "sig0726"
-    sigdb="sig0726"
-    refdb="ref_geo0726"
-    password = "McVities"
-if sys.platform == 'linux':
-    os_user = os.environ['USER']
-else:
-    os_user = os.environ['USERNAME']
-if os_user == 'STAGE':
-    os_user='stage'
-if os_user == 'Administrateur':
-    os_user='stage'
 
 geom = "geom"
 champ_travaux_prevus_multipolygon="""(gid serial NOT NULL, groupe_gestion text, gestion_lib text, id_gestion text, datedebut date, datefin date, commentaire text, surface_m2 double precision, surface_ha double precision,  date_creation date, date_maj date, geom geometry(MultiPolygon,2154))"""

CenRa_POSTGIS/tools/resources.py

@@ -6,10 +6,10 @@ import tempfile
 import base64
 import psycopg2
 import psycopg2.extras
+import os
 from os.path import abspath, join, pardir, dirname
 from qgis.core import QgsDataSourceUri
-from .PythonSQL import *
+from .SQLRequet import *
-
 from qgis.PyQt import uic
 
 __copyright__ = "Copyright 2019, 3Liz"
@@ -109,24 +109,15 @@ def load_ui(*args):
 
 	return ui_class
 
-def login_base(take=None):
+def pyperclip():
-	from .PythonSQL import host,port,dbname,password,os_user
+    dst = dirname(dirname(__file__))+"\\tools\\"
-	first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+    if os.access('N:/',os.R_OK):
-	first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+        src = 'N:/SI_Systeme d information/Z_QGIS/PLUGIN/PythonSQL.py'
-	first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+    try:
-	res_ident = first_cur.fetchone()
+        shutil.copy(src, dst)
-	mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+    except:
-	user = res_ident[1]
+        print('404')
 
-	con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
-
-	cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-	first_conn.close()
-
-	if take:
-		return cur,con
-	else:
-		return cur
 def send_issues(url,titre,body,labels):
 	import requests
 	import json
@@ -159,7 +150,7 @@ def maj_verif(NAME):
 
 	url = qgis.utils.pluginMetadata(NAME,'repository')
 	#URL = url+'/raw/branch/main/plugins.xml'
-	URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+	URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
 #    print(URL)
 	version = qgis.utils.pluginMetadata(NAME,'version')
 	len_version = len(version)
@@ -379,10 +370,13 @@ def create_habita(self,schema,cur,con,host ,port ,dbname ,user ,mdp):
 			tablename = schema + "_habitat_" + self.annee_2.text()
 
 		tablename_1=tablename+"_points"
-		RETURNE = "SELECT pg_get_serial_sequence('"+schema + "."+ tablename_1[len(schema):]+"','gid')"
+		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
 
+		print(RETURNE)
+		print('')
+		print(SQL_VEGETHAB)
 		cur.execute(SQL_VEGETHAB)
 		cur.execute(RETURNE)
 		sequence_name = cur.fetchone()[0]

CenRa_POSTGIS/tools/ui/CenRa_PostgisRename_base.ui

@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>table_postgis</class>
+ <widget class="QDialog" name="table_postgis">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>533</width>
+    <height>364</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Ajout d'une table</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_4">
+   <item row="1" column="0" colspan="2">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>3</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="schema_label">
+       <property name="maximumSize">
+        <size>
+         <width>90</width>
+         <height>1977</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Code analytique :</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="schema"/>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="title">
+      <string>Tester mon éligibilite :</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="0">
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="0" column="1">
+         <widget class="QCheckBox" name="compte">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Compte</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="1" column="1">
+         <widget class="QCheckBox" name="couche">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Couche</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBox_3">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="title">
+      <string>Les changement :</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_2">
+          <property name="font">
+           <font>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Nouvau nom :</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label">
+          <property name="font">
+           <font>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Partie a renommée :</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="old_name">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="font">
+           <font>
+            <weight>75</weight>
+            <italic>true</italic>
+            <bold>true</bold>
+           </font>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="new_name"/>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QGridLayout" name="gridLayout_3">
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_3">
+          <property name="maximumSize">
+           <size>
+            <width>130</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Département/Animation :</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <widget class="QRadioButton" name="animation">
+          <property name="text">
+           <string>Animation territoriale</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QComboBox" name="departement"/>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLabel" name="Titre">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>14</pointsize>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Renommée de table</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>table_postgis</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>table_postgis</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

CenRa_SICEN/metadata.txt

@@ -12,7 +12,7 @@
 name=CenRa SICEN
 qgisMinimumVersion=3.0
 description=Filtre des données saisies dans SICEN et export d'une liste d'espèces.
-version=1.8
+version=1.10
 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=<h2>CenRa_SICEN:</h2></br><p><h3>07/01/2025 - Version 1.8: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>13/09/2024 - Version 1.7:</h3> - Il est maintenant possible de sélectionné plusieurs entité pour le filtre par Emprise.</br>- Ajoute d'un changelog.</br>- Ajoute une vérification de mise à jour.</p>
+changelog=<h2>CenRa_SICEN:</h2></br><p><h3>09/04/2025 - Version 1.10: </h3> - Optimisation pour le TT.</p></br><p><h3>03/04/2025 - Version 1.9: </h3> - Mise a jour de securite.</p></br><p><h3>07/01/2025 - Version 1.8: </h3> - ByPass du certif ssl ci erreur.</br></p><p><h3>13/09/2024 - Version 1.7:</h3> - Il est maintenant possible de sélectionné plusieurs entité pour le filtre par Emprise.</br>- Ajoute d'un changelog.</br>- Ajoute une vérification de mise à jour.</p>
 
 # tags are comma separated with spaces allowed
 tags=cenra, postgis, sicen

CenRa_SICEN/sicen.py

@@ -45,8 +45,13 @@ from qgis.PyQt.QtWidgets import QMenu, QAction, QDialog, QDialogButtonBox, QLabe
 from . import resources_rc
 # Import the code for the dialog
 from .sicendialog import SICENDialog
-from .tools.PythonSQL import *
+
-from .tools.resources import maj_verif
+from .tools.resources import maj_verif,pyperclip
+pyperclip()
+try:
+    from .tools.PythonSQL import login_base
+except:
+    print('Pas de fichier PythonSQL')
 import os.path
 import qgis
 import datetime
@@ -57,7 +62,7 @@ from .forms.about_form import AboutDialog
 import psycopg2
 import psycopg2.extras
 import base64
-#import socket
+import socket
 import os
 #import sys
 
@@ -100,6 +105,9 @@ class SICEN(object):
         self.action = QAction(
             QIcon(":/plugins/sicen/sicen.png"),
             u"Ouverture des données SICEN", self.iface.mainWindow())
+        self.action.setEnabled(False)
+        if os.access('N:/',os.R_OK):
+            self.action.setEnabled(True)
         # connect the action to the run method
         self.action.triggered.connect(self.ouverture)
 
@@ -111,6 +119,14 @@ class SICEN(object):
         self.action = QAction(
             QIcon(":/plugins/sicen/sicen_export.png"),
             u"Export liste d'espèces", self.iface.mainWindow())
+        self.action.setEnabled(False)
+        IPAddr=socket.gethostbyname(socket.gethostname())
+        if IPAddr[0:11] == "100.100.100":
+            self.action.setEnabled(True)
+        elif IPAddr[0:9] == "192.168.0":
+            self.action.setEnabled(True)
+        elif IPAddr[0:9] == "192.168.1":
+            self.action.setEnabled(True)
         # connect the action to the run method
         self.action.triggered.connect(self.export)
 
@@ -146,16 +162,14 @@ class SICEN(object):
     # run method that performs all the real work
     def ouverture(self):
 
-        first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+        account = login_base("account")
-        first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+        user = account[0]
-        first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+        mdp = account[1]
-        res_ident = first_cur.fetchone()
+        host = account[2]
-        mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+        port = account[3]
-        user = res_ident[1]
+        dbname = account[4]
-
+        cur = account[7]
-        con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+        con = account[8]
-        cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-        first_conn.close()
 
         ## Creation des listes deroulantes
             # Listing de valeur des champs
@@ -255,16 +269,14 @@ class SICEN(object):
         # See if OK was pressed
         if result == 1:
 
-            first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+            account = login_base("account")
-            first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+            user = account[0]
-            first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+            mdp = account[1]
-            res_ident = first_cur.fetchone()
+            host = account[2]
-            mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+            port = account[3]
-            user = res_ident[1]
+            dbname = account[4]
-
+            cur = account[7]
-            con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+            con = account[8]
-            cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-            first_conn.close()
 
             # Requete filtre observateur
             if self.dlg.observateur_1.currentIndex() != -1 :
@@ -620,15 +632,14 @@ class SICEN(object):
 
                         else :
 
-                            first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+                            account = login_base("account")
-                            first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                            user = account[0]
-                            first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+                            mdp = account[1]
-                            res_ident = first_cur.fetchone()
+                            host = account[2]
-                            mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+                            port = account[3]
-                            user = res_ident[1]
+                            dbname = account[4]
-                            con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+                            cur = account[7]
-                            cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                            con = account[8]
-                            first_conn.close()
 
                             # Creation group de couches
                             #i = qgis.utils.iface
@@ -753,15 +764,14 @@ class SICEN(object):
 
                 else :
 
-                    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+                    account = login_base("account")
-                    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                    user = account[0]
-                    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+                    mdp = account[1]
-                    res_ident = first_cur.fetchone()
+                    host = account[2]
-                    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+                    port = account[3]
-                    user = res_ident[1]
+                    dbname = account[4]
-                    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+                    cur = account[7]
-                    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                    con = account[8]
-                    first_conn.close()
 
                     # Creation group de couches
                     i = qgis.utils.iface
@@ -862,16 +872,14 @@ class SICEN(object):
 
                 buffer = '100'
 
-                first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+                account = login_base("account")
-                first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+                user = account[0]
-                first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+                mdp = account[1]
-                res_ident = first_cur.fetchone()
+                host = account[2]
-                mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+                port = account[3]
-                user = res_ident[1]
+                dbname = account[4]
-
+                cur = account[7]
-                con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+                con = account[8]
-                cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-                first_conn.close()
 
                 SQL_list_sp = u"""SELECT DISTINCT classe::text,ordre::text,nom_complet::text,split_part(nom_vern::text,',',1) as nom_vern,cd_ref::text as cd_ref,max(COALESCE(date_obs, date_debut_obs))::text AS derniere_obs FROM _agregation_ra.observations_table WHERE ST_intersects(geometrie,ST_Buffer(ST_geomFromText('""" + poly + "',2154), " + buffer + " ))GROUP BY classe::text, ordre::text, nom_complet::text, nom_vern::text, cd_ref::text ORDER BY nom_complet::text"""
                 cur.execute(SQL_list_sp)

CenRa_SICEN/tools/HubToTea.py

@@ -1,21 +0,0 @@
-from qgis.core import QgsApplication
-
-def gitea():
-    file_url = QgsApplication.qgisSettingsDirPath()+'QGIS/QGIS3.ini'
-    recherche_1 = 'plugin_repositories\\github\\url=https://github.com/CEN-Rhone-Alpes/Plugin_QGIS/releases/latest/download/plugins.xml'
-    replace_1 = 'plugin_repositories\\gitea\\url=https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
-
-    recherche_2 = 'github'
-    replace_2 = 'gitea'
-
-    # Read in the file
-    with open(file_url, 'r') as file:
-        filedata = file.read()
-
-    # Replace the target string
-    filedata = filedata.replace(recherche_1, replace_1)
-    filedata = filedata.replace(recherche_2, replace_2)
-
-    # Write the file out again
-    with open(file_url, 'w') as file:
-        file.write(filedata)

CenRa_SICEN/tools/resources.py

@@ -3,6 +3,7 @@
 import configparser
 import shutil
 import tempfile
+import os
 import base64
 import psycopg2
 import psycopg2.extras
@@ -89,7 +90,7 @@ def resources_path(*args):
     :return: Absolute path to the resources folder.
     :rtype: str
     """
-    path = abspath(abspath(join(plugin_path(), "CenRa_Metabase\\tools")))
+    path = abspath(abspath(join(plugin_path(), "CenRa_SICEN\\tools")))
     for item in args:
         path = abspath(join(path, item))
     return path
@@ -107,24 +108,15 @@ def load_ui(*args):
 
     return ui_class
 
-def login_base(take=None):
+def pyperclip():
-    from .tools.PythonSQL import host,port,dbname,password,os_user
+    dst = dirname(dirname(__file__))+"\\tools\\"
-    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+    if os.access('N:/',os.R_OK):
-    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+        src = 'N:/SI_Systeme d information/Z_QGIS/PLUGIN/PythonSQL.py'
-    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+    try:
-    res_ident = first_cur.fetchone()
+        shutil.copy(src, dst)
-    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+    except:
-    user = res_ident[1]
+        print('404')
 
-    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
-
-    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_conn.close()
-
-    if take:
-        return cur,con
-    else:
-        return cur
 def send_issues(url,titre,body,labels):
     import requests
     import json
@@ -157,7 +149,7 @@ def maj_verif(NAME):
 
     url = qgis.utils.pluginMetadata(NAME,'repository')
     #URL = url+'/raw/branch/main/plugins.xml'
-    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
+    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/plugins.xml'
 #    print(URL)
     version = qgis.utils.pluginMetadata(NAME,'version')
     len_version = len(version)

README.md

@@ -4,12 +4,12 @@ Point de départ de tout les plugin du CEN Rhône Alpes,
 Pour la création et le partage :heart:
 |Nom|Version|Statue|Date de création|
 |---|---|---|---|
-|CenRa_AUTOMAP|0.1.10|Alpha|2024-09-25|
+|CenRa_AUTOMAP|1.2|Releases|2024-09-25|
-|CenRa_COPIE|2.1|Releases|06-02-2024|
+|CenRa_COPIE|2.2|Releases|06-02-2024|
-|CenRa_FLUX|2.2|Releases|06-02-2024|
+|CenRa_FLUX|2.5|Releases|06-02-2024|
 |CenRa_METABASE|0.2.0|Alpha|12-09-2024|
 |CenRa_PAGERENDER|0.1.5|Alpha|09-10-2024|
-|CenRa_POSTGIS|2.4|Releases|2024-02-06|
+|CenRa_POSTGIS|2.6|Releases|2024-02-06|
 |CenRa_SICEN|1.8|Releases|06-02-2024|
 
 > [!NOTE]

plugins.xml

@@ -1,8 +1,7 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
 <plugins>
-    <pyqgis_plugin name="CenRa_POSTGIS" version="2.4">
+    <pyqgis_plugin name="CenRa_POSTGIS" version="2.8">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>2.4</version>
+        <version>2.8</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_POSTGIS.zip</file_name>
@@ -11,15 +10,15 @@
         <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_POSTGIS.zip</download_url>
         <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
         <create_date>2024-02-06</create_date>
-        <update_date>2025-01-23</update_date>
+        <update_date>2025-04-09</update_date>
         <experimental>False</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,postgis</tags>
     </pyqgis_plugin>
 
-    <pyqgis_plugin name="CenRa_COPIE" version="2.1">
+    <pyqgis_plugin name="CenRa_COPIE" version="2.3">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>2.1</version>
+        <version>2.3</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_COPIE.zip</file_name>
@@ -28,15 +27,15 @@
         <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_COPIE.zip</download_url>
         <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
         <create_date>2024-02-06</create_date>
-        <update_date>2025-01-07</update_date>
+        <update_date>2025-04-09</update_date>
         <experimental>False</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,copie</tags>
     </pyqgis_plugin>
 
-    <pyqgis_plugin name="CenRa_SICEN" version="1.8">
+    <pyqgis_plugin name="CenRa_SICEN" version="1.10">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>1.8</version>
+        <version>1.10</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_SICEN.zip</file_name>
@@ -45,15 +44,15 @@
         <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_SICEN.zip</download_url>
         <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
         <create_date>2024-02-06</create_date>
-        <update_date>2025-01-07</update_date>
+        <update_date>2025-04-09</update_date>
         <experimental>False</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,sicen</tags>
     </pyqgis_plugin>
 
-    <pyqgis_plugin name="CenRa_FLUX" version="2.2">
+    <pyqgis_plugin name="CenRa_FLUX" version="2.8">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>2.2</version>
+        <version>2.8</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_FLUX.zip</file_name>
@@ -62,15 +61,15 @@
         <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_FLUX.zip</download_url>
         <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
         <create_date>2024-02-06</create_date>
-        <update_date>2025-01-07</update_date>
+        <update_date>2025-04-09</update_date>
         <experimental>False</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,flux</tags>
     </pyqgis_plugin>
     
-    <pyqgis_plugin name="CenRa_METABASE" version="0.1.6">
+    <pyqgis_plugin name="CenRa_METABASE" version="0.2.2">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>0.1.6</version>
+        <version>0.2.2</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_METABASE.zip</file_name>
@@ -79,15 +78,15 @@
         <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_METABASE.zip</download_url>
         <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
         <create_date>2024-09-12</create_date>
-        <update_date>2025-01-07</update_date>
+        <update_date>2025-04-09</update_date>
         <experimental>True</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,metabase</tags>
     </pyqgis_plugin>
     
-    <pyqgis_plugin name="CenRa_AUTOMAP" version="0.1.10">
+    <pyqgis_plugin name="CenRa_AUTOMAP" version="1.5">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>0.1.10</version>
+        <version>1.5</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_AUTOMAP.zip</file_name>
@@ -96,15 +95,15 @@
         <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_AUTOMAP.zip</download_url>
         <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
         <create_date>2024-09-25</create_date>
-        <update_date>2025-01-13</update_date>
+        <update_date>2025-04-09</update_date>
         <experimental>False</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,mise en page,atlas</tags>
     </pyqgis_plugin>
     
-    <pyqgis_plugin name="CenRa_PAGERENDER" version="0.1.5">
+    <pyqgis_plugin name="CenRa_PAGERENDER" version="0.1.6">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
-        <version>0.1.5</version>
+        <version>0.1.6</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
         <file_name>CenRa_PAGERENDER.zip</file_name>
@@ -113,14 +112,14 @@
         <download_url>https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_PAGERENDER.zip</download_url>
         <uploaded_by>CEN-Rhone-Alpes</uploaded_by>
         <create_date>2024-10-09</create_date>
-        <update_date>2025-01-07</update_date>
+        <update_date>2025-04-03</update_date>
         <experimental>True</experimental>
         <deprecated>False</deprecated>
         <tags>cenra,mise en page,atlas</tags>
     </pyqgis_plugin>
     
     <pyqgis_plugin name="CenRa_gn2qgis" version="0.1.0">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
         <version>0.1.0</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>
@@ -137,7 +136,7 @@
     </pyqgis_plugin>
     
     <pyqgis_plugin name="BiodivAURA" version="0.1.0">
-        <description><![CDATA[Dépôt pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.]]></description>
+        <description>Depot pour les extensiont QGIS du CEN Rhone-Alpes, sur GitHub.</description>
         <version>0.1.0</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
         <homepage>https://plateformesig.cenra-outils.org/</homepage>