premier commit/push

CenRa_COPIE/tools/PythonSQL.py

@@ -57,8 +57,8 @@ champ_vegethab_point = """(
     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,
+    surface_m2 numeric,
+    surface_ha numeric,
     commentair character varying(254) COLLATE pg_catalog."default",
     date_creat date,
     date_maj date,
@@ -99,8 +99,8 @@ champ_vegethab_multilinestring = """(
     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,
+    surface_m2 numeric,
+    surface_ha numeric,
     commentair character varying(254) COLLATE pg_catalog."default",
     date_creat date,
     date_maj date,

CenRa_COPIE/tools/resources.py

@@ -117,6 +117,7 @@ def login_base(take=None):
     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()
 
@@ -138,24 +139,45 @@ def send_issues(url,titre,body,labels):
 
 
     payload = {'title': titre, 'body': body, 'labels': labels}
-
-    r = requests.post(url, data=json.dumps(payload), headers=headers)
-    print(r.text)
+    try:
+        urllib.request.urlopen('https://google.com')
+        binar = True
+    except:
+        binar = False
+        r = ''
+    if binar:
+        r = requests.post(url, data=json.dumps(payload), headers=headers)
     return r
 
 def maj_verif(NAME):
     import qgis
-    import urllib
+    import urllib.request
+    iface = qgis.utils.iface
+    from qgis.core import Qgis
 
     url = qgis.utils.pluginMetadata(NAME,'repository')
-    URL = url+'/raw/branch/main/plugins.xml'
+    #URL = url+'/raw/branch/main/plugins.xml'
+    URL = 'https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/releases/plugins.xml'
 #    print(URL)
     version = qgis.utils.pluginMetadata(NAME,'version')
     len_version = len(version)
-    version_web = str(urllib.request.urlopen(URL).read())
-    plugin_num = version_web.find(NAME)
-    valeur_version_web = version_web.find('<version>',plugin_num)+9
-    version_plugin = version_web[valeur_version_web:valeur_version_web+len_version]
+    try:
+        urllib.request.urlopen('https://google.com')
+        binar = True
+    except:
+        binar = False
+    if binar:
+        version_web = str(urllib.request.urlopen(URL).read())
+        plugin_num = version_web.find(NAME)
+        valeur_version_web = version_web.find('<version>',plugin_num)+9
+        version_plugin = version_web[valeur_version_web:valeur_version_web+len_version]
+        if version_plugin != version:
+            iface.messageBar().pushMessage("MAJ :", "Des mise à jour de plugin sont disponibles.", level=Qgis.Info, duration=30)
+    else:
+        iface.messageBar().pushMessage("WiFi :", "Pas de connection à internet.", level=Qgis.Warning, duration=30)
 
-    if version_plugin == version:
-        iface.messageBar().pushMessage("MAJ :", "Des mise à jour de plugin sont disponibles.", level=Qgis.Info, duration=30)
+def devlog(NAME):
+    import qgis
+    devmaj = '<head><style>* {margin:0; padding:0; }</style></head>'
+    devmaj = devmaj+qgis.utils.pluginMetadata(NAME,'changelog')
+    return devmaj