diff --git a/.gitignore b/.gitignore index 443e01e..0739b09 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ #ReIgnore **/__pycache__ -**/test/ \ No newline at end of file +**/test/ +**/PythonSQL.py \ No newline at end of file diff --git a/CenRa_AUTOMAP/canvas_editor.py b/CenRa_AUTOMAP/canvas_editor.py index 0fb0317..b7ef2f0 100644 --- a/CenRa_AUTOMAP/canvas_editor.py +++ b/CenRa_AUTOMAP/canvas_editor.py @@ -67,7 +67,6 @@ import glob from .tools.resources import ( load_ui, resources_path, - login_base, send_issues, ) from .issues import CenRa_Issues diff --git a/CenRa_AUTOMAP/style_invoke.py b/CenRa_AUTOMAP/style_invoke.py index cc340c2..db32122 100644 --- a/CenRa_AUTOMAP/style_invoke.py +++ b/CenRa_AUTOMAP/style_invoke.py @@ -70,7 +70,6 @@ from .tools.PythonSQL import * from .tools.resources import ( load_ui, resources_path, - login_base, send_issues, ) from .issues import CenRa_Issues diff --git a/CenRa_AUTOMAP/tools/lecture_sql.py b/CenRa_AUTOMAP/tools/lecture_sql.py deleted file mode 100644 index 06d7405..0000000 Binary files a/CenRa_AUTOMAP/tools/lecture_sql.py and /dev/null differ diff --git a/CenRa_AUTOMAP/tools/resources.py b/CenRa_AUTOMAP/tools/resources.py index ee534a5..df100fa 100644 --- a/CenRa_AUTOMAP/tools/resources.py +++ b/CenRa_AUTOMAP/tools/resources.py @@ -107,6 +107,7 @@ 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) @@ -126,6 +127,7 @@ def login_base(take=None): return cur,con else: return cur +''' def send_issues(url,titre,body,labels): import requests import json diff --git a/CenRa_COPIE/copie_editor.py b/CenRa_COPIE/copie_editor.py index 0a65921..482ed32 100644 --- a/CenRa_COPIE/copie_editor.py +++ b/CenRa_COPIE/copie_editor.py @@ -16,10 +16,10 @@ from qgis.core import * from qgis.core import QgsDataSourceUri from .tools.PythonSQL import * +from .tools.SQLRequet import * from .tools.resources import ( load_ui, resources_path, - login_base, send_issues, ) from .issues import CenRa_Issues diff --git a/CenRa_COPIE/tools/PythonSQL.py b/CenRa_COPIE/tools/PythonSQL.py index fcf0b80..3e91995 100644 --- a/CenRa_COPIE/tools/PythonSQL.py +++ b/CenRa_COPIE/tools/PythonSQL.py @@ -30,145 +30,4 @@ else: 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) -) -""" \ No newline at end of file + os_user = 'stage' \ No newline at end of file diff --git a/CenRa_FLUX/CenRa_Flux.py b/CenRa_FLUX/CenRa_Flux.py index 14492e4..cc21d09 100644 --- a/CenRa_FLUX/CenRa_Flux.py +++ b/CenRa_FLUX/CenRa_Flux.py @@ -12,13 +12,15 @@ import qgis #include - +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,18 @@ 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) + IPAddr=socket.gethostbyname(socket.gethostname()) + if IPAddr[0:11] == "100.100.100": + self.flux_editor.setEnabled(True) + elif IPAddr[0:9] == "192.168.0": + self.flux_editor.setEnabled(True) + elif IPAddr[0:9] == "192.168.1": + self.flux_editor.setEnabled(True) def open_about_dialog(self): """ diff --git a/CenRa_FLUX/flux_editor.py b/CenRa_FLUX/flux_editor.py index 3dea146..3e11281 100644 --- a/CenRa_FLUX/flux_editor.py +++ b/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 @@ -46,16 +51,130 @@ import psycopg2.extras import base64 try: - 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] - first_conn.close() + 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 = ''' + + + + + + + +
+ + + +''' +targetCrs = QgsCoordinateReferenceSystem('EPSG:4326') +layerCrs = QgsCoordinateReferenceSystem('EPSG:2154') +TranformCRS = QgsCoordinateTransform(layerCrs, targetCrs,QgsProject.instance()) class Flux_Editor(QDialog, EDITOR_CLASS): @@ -84,10 +203,14 @@ 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.lineEdit.mousePressEvent = self._mousePressEvent #metadonnees_plugin = open(self.plugin_path + '/metadata.txt') @@ -97,6 +220,128 @@ class Flux_Editor(QDialog, EDITOR_CLASS): """Run method that performs all the real work""" self.bd_source() + 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() bd_origine=self.comboBox_2.currentText() @@ -223,6 +468,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() @@ -268,6 +514,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): @@ -285,6 +540,7 @@ class Flux_Editor(QDialog, EDITOR_CLASS): return switcher.get(type, "nothing") + def displayOnWindows(type, uri, name): p = [] @@ -427,6 +683,14 @@ class Flux_Editor(QDialog, EDITOR_CLASS): 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 diff --git a/CenRa_FLUX/tools/PythonSQL.py b/CenRa_FLUX/tools/PythonSQL.py index 4d22d3c..f803009 100644 --- a/CenRa_FLUX/tools/PythonSQL.py +++ b/CenRa_FLUX/tools/PythonSQL.py @@ -1,6 +1,10 @@ import sys import socket import os +import base64 +import psycopg2 +import psycopg2.extras + IPAddr=socket.gethostbyname(socket.gethostname()) print(IPAddr) if IPAddr[0:11] == "100.100.100": #4269 @@ -33,153 +37,23 @@ if 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' - order by schemaname;""" -schemaname_list_ref="""SELECT schemaname,tablename 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' - order by schemaname,tablename;""" -schemaname_list="""(SELECT schemaname,tablename from pg_catalog.pg_tables - where schemaname like 'trav%' or schemaname like '\_ag%' or schemaname like '\_00%' or schemaname like '\_01%' or schemaname like '\_07%' or schemaname like '\_26%' or schemaname like '\_form%' or schemaname like '\_42%' or schemaname like '\_69%' order by schemaname,tablename) - UNION - (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews order by schemaname,tablename) order by schemaname,tablename;""" -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))""" +def login_base(take=None): + 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] -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))""" + con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp) -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)) -""" + cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor) + first_conn.close() -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) -) -""" \ No newline at end of file + if take == 'account': + return user,mdp,host,port,dbname,sigdb,refdb + if take: + return cur,con + else: + return cur diff --git a/CenRa_FLUX/tools/SQLRequet.py b/CenRa_FLUX/tools/SQLRequet.py new file mode 100644 index 0000000..721a3fa --- /dev/null +++ b/CenRa_FLUX/tools/SQLRequet.py @@ -0,0 +1,151 @@ + +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' + order by schemaname;""" +schemaname_list_ref="""SELECT schemaname,tablename 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' + order by schemaname,tablename;""" +schemaname_list="""(SELECT schemaname,tablename from pg_catalog.pg_tables + where schemaname like 'trav%' or schemaname like '\_ag%' or schemaname like '\_00%' or schemaname like '\_01%' or schemaname like '\_07%' or schemaname like '\_26%' or schemaname like '\_form%' or schemaname like '\_42%' or schemaname like '\_69%' order by schemaname,tablename) + UNION + (SELECT schemaname,matviewname AS tablename FROM pg_catalog.pg_matviews order by schemaname,tablename) order by schemaname,tablename;""" +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) +) +""" \ No newline at end of file diff --git a/CenRa_FLUX/tools/resources.py b/CenRa_FLUX/tools/resources.py index 246471a..5776a6e 100644 --- a/CenRa_FLUX/tools/resources.py +++ b/CenRa_FLUX/tools/resources.py @@ -2,10 +2,8 @@ import configparser import shutil +import socket 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,19 @@ def plugin_test_data_path(*args, copy=False): else: return path +def pyperclip(): + IPAddr=socket.gethostbyname(socket.gethostname()) + dst = abspath(abspath(join(plugin_path(), "CenRa_FLUX\\tools\\"))) + if IPAddr[0:11] == "100.100.100": #4269 + src = '\\\\100.100.100.100\\nuage\\SI_Systeme d information\\Z_QGIS\\PLUGIN\\PythonSQL.py' + if IPAddr[0:9] == "192.168.0": #01 + src = '\\\\100.100.100.100\\nuage\\SI_Systeme d information\\Z_QGIS\\PLUGIN\\PythonSQL.py' + if IPAddr[0:9] == "192.168.1": #0726 + src = '\\\\100.100.100.100\\nuage\\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 +117,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 diff --git a/CenRa_FLUX/tools/ui/CenRa_Flux_base.ui b/CenRa_FLUX/tools/ui/CenRa_Flux_base.ui index 52bb6d7..a3468b5 100644 --- a/CenRa_FLUX/tools/ui/CenRa_Flux_base.ui +++ b/CenRa_FLUX/tools/ui/CenRa_Flux_base.ui @@ -326,11 +326,49 @@ + + + + 90 + 10 + 730 + 730 + + + + background-color: rgba(255, 255, 255,0.50); + + + + about:blank + + + + + + + 830 + 20 + 70 + 17 + + + + + + + + + QWebView + QWidget +
QtWebKitWidgets/QWebView
+ + diff --git a/CenRa_METABASE/dock.py b/CenRa_METABASE/dock.py index 281d8e4..74e1678 100644 --- a/CenRa_METABASE/dock.py +++ b/CenRa_METABASE/dock.py @@ -47,11 +47,10 @@ from pg_metadata.connection_manager import ( settings_connections_names, ) ''' - +from CenRa_METABASE.tools.PythonSQL import login_base from .tools.resources import ( load_ui, resources_path, - login_base, ) DOCK_CLASS = load_ui('CenRa_Metabase_dockwidget_base.ui') diff --git a/CenRa_METABASE/editor.py b/CenRa_METABASE/editor.py index 2f81554..a9c9997 100644 --- a/CenRa_METABASE/editor.py +++ b/CenRa_METABASE/editor.py @@ -38,10 +38,10 @@ from qgis.PyQt.QtWidgets import ( ) from qgis.utils import iface +from CenRa_METABASE.tools.PythonSQL import login_base from .tools.resources import ( load_ui, resources_path, - login_base, send_issues, ) from .issues import CenRa_Issues diff --git a/CenRa_METABASE/tools/PythonSQL.py b/CenRa_METABASE/tools/PythonSQL.py index 8a79b69..6358246 100644 --- a/CenRa_METABASE/tools/PythonSQL.py +++ b/CenRa_METABASE/tools/PythonSQL.py @@ -1,6 +1,10 @@ import sys import socket import os +import base64 +import psycopg2 +import psycopg2.extras + IPAddr=socket.gethostbyname(socket.gethostname()) #print(IPAddr) if IPAddr[0:11] == "100.100.100": #4269 @@ -31,4 +35,23 @@ else: if os_user == 'STAGE': os_user='stage' if os_user == 'Administrateur': - os_user='stage' \ No newline at end of file + os_user='stage' + +def login_base(take=None): + 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 \ No newline at end of file diff --git a/CenRa_METABASE/tools/lecture_sql.py b/CenRa_METABASE/tools/lecture_sql.py deleted file mode 100644 index 06d7405..0000000 Binary files a/CenRa_METABASE/tools/lecture_sql.py and /dev/null differ diff --git a/CenRa_METABASE/tools/resources.py b/CenRa_METABASE/tools/resources.py index 005667e..581673d 100644 --- a/CenRa_METABASE/tools/resources.py +++ b/CenRa_METABASE/tools/resources.py @@ -3,9 +3,6 @@ import configparser import shutil import tempfile -import base64 -import psycopg2 -import psycopg2.extras from os.path import abspath, join, pardir, dirname from qgis.PyQt.QtWidgets import QApplication from qgis.PyQt import uic @@ -107,25 +104,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 diff --git a/CenRa_PAGERENDER/canvas_editor.py b/CenRa_PAGERENDER/canvas_editor.py index b55796c..ae24355 100644 --- a/CenRa_PAGERENDER/canvas_editor.py +++ b/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 diff --git a/CenRa_PAGERENDER/tools/PythonSQL.py b/CenRa_PAGERENDER/tools/PythonSQL.py deleted file mode 100644 index f6c2886..0000000 --- a/CenRa_PAGERENDER/tools/PythonSQL.py +++ /dev/null @@ -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' \ No newline at end of file diff --git a/CenRa_PAGERENDER/tools/lecture_sql.py b/CenRa_PAGERENDER/tools/lecture_sql.py deleted file mode 100644 index 06d7405..0000000 Binary files a/CenRa_PAGERENDER/tools/lecture_sql.py and /dev/null differ diff --git a/CenRa_PAGERENDER/tools/resources.py b/CenRa_PAGERENDER/tools/resources.py index 9e91089..d29dce9 100644 --- a/CenRa_PAGERENDER/tools/resources.py +++ b/CenRa_PAGERENDER/tools/resources.py @@ -106,7 +106,7 @@ def load_ui(*args): ui_class, _ = uic.loadUiType(resources_path("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) @@ -126,6 +126,7 @@ def login_base(take=None): return cur,con else: return cur +''' def send_issues(url,titre,body,labels): import requests import json diff --git a/CenRa_POSTGIS/postgis_creator.py b/CenRa_POSTGIS/postgis_creator.py index a192856..5001b23 100644 --- a/CenRa_POSTGIS/postgis_creator.py +++ b/CenRa_POSTGIS/postgis_creator.py @@ -16,10 +16,11 @@ from qgis.core import * from qgis.core import QgsDataSourceUri from .tools.PythonSQL import * +from .tools.SQLRequet import * + from .tools.resources import ( load_ui, resources_path, - login_base, send_issues, create_vierge, create_contour, diff --git a/CenRa_POSTGIS/postgis_editor.py b/CenRa_POSTGIS/postgis_editor.py index 0d591f3..ca74b04 100644 --- a/CenRa_POSTGIS/postgis_editor.py +++ b/CenRa_POSTGIS/postgis_editor.py @@ -16,10 +16,11 @@ from qgis.core import * from qgis.core import QgsDataSourceUri from .tools.PythonSQL import * +from .tools.SQLRequet import * + from .tools.resources import ( load_ui, resources_path, - login_base, send_issues, create_vierge, create_contour, diff --git a/CenRa_POSTGIS/postgis_rename.py b/CenRa_POSTGIS/postgis_rename.py index fdb643f..80bc74f 100644 --- a/CenRa_POSTGIS/postgis_rename.py +++ b/CenRa_POSTGIS/postgis_rename.py @@ -16,10 +16,11 @@ from qgis.core import * from qgis.core import QgsDataSourceUri from .tools.PythonSQL import * +from .tools.SQLRequet import * + from .tools.resources import ( load_ui, resources_path, - login_base, send_issues, create_vierge, create_contour, diff --git a/CenRa_POSTGIS/tools/HubToTea.py b/CenRa_POSTGIS/tools/HubToTea.py deleted file mode 100644 index 7428d53..0000000 --- a/CenRa_POSTGIS/tools/HubToTea.py +++ /dev/null @@ -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) \ No newline at end of file diff --git a/CenRa_POSTGIS/tools/PythonSQL.py b/CenRa_POSTGIS/tools/PythonSQL.py index 1bfaf2d..e809b12 100644 --- a/CenRa_POSTGIS/tools/PythonSQL.py +++ b/CenRa_POSTGIS/tools/PythonSQL.py @@ -30,145 +30,4 @@ else: 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", - x_wgs84 double precision, - y_wgs84 double precision, - 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", - longueur_m double precision, - longueur_km double precision, - 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) -) -""" \ No newline at end of file + os_user='stage' \ No newline at end of file diff --git a/CenRa_POSTGIS/tools/resources.py b/CenRa_POSTGIS/tools/resources.py index c74fa46..57d5e6e 100644 --- a/CenRa_POSTGIS/tools/resources.py +++ b/CenRa_POSTGIS/tools/resources.py @@ -108,7 +108,7 @@ def load_ui(*args): ui_class, _ = uic.loadUiType(resources_path("ui", *args)) return ui_class - +''' def login_base(take=None): from .PythonSQL import host,port,dbname,password,os_user first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password) @@ -127,6 +127,7 @@ def login_base(take=None): return cur,con else: return cur +''' def send_issues(url,titre,body,labels): import requests import json diff --git a/CenRa_SICEN/tools/HubToTea.py b/CenRa_SICEN/tools/HubToTea.py deleted file mode 100644 index 7428d53..0000000 --- a/CenRa_SICEN/tools/HubToTea.py +++ /dev/null @@ -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) \ No newline at end of file diff --git a/CenRa_SICEN/tools/PythonSQL.py b/CenRa_SICEN/tools/PythonSQL.py index dbb7afc..1c64b04 100644 --- a/CenRa_SICEN/tools/PythonSQL.py +++ b/CenRa_SICEN/tools/PythonSQL.py @@ -28,145 +28,4 @@ if sys.platform == 'linux': 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))""" -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) -) -""" \ No newline at end of file + os_user='stage' \ No newline at end of file diff --git a/CenRa_SICEN/tools/resources.py b/CenRa_SICEN/tools/resources.py index 5ea2a62..49226df 100644 --- a/CenRa_SICEN/tools/resources.py +++ b/CenRa_SICEN/tools/resources.py @@ -106,7 +106,7 @@ 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) @@ -125,6 +125,7 @@ def login_base(take=None): return cur,con else: return cur +''' def send_issues(url,titre,body,labels): import requests import json