Corrections diverses

core/db.py

@@ -69,12 +69,15 @@ class CustomDb(pypyodbc.Connection):
     def execute(self, sql, *args):
         cursor = self.cursor()
         args = [sql, tuple(args)] if args else [sql]
-        cursor.execute(*args)
+        try:
+            cursor.execute(*args)
+        except:
+            logger.debug(sql)
+            print(sql)
+            raise
         return cursor
 
 
-
-
 class AccessDb(CustomDb):
     dsn = "DRIVER={Microsoft Access Driver (*.mdb, *.accdb)};FIL={MS Access};"
     default_user = "admin"

core/pde.py

@@ -22,13 +22,13 @@ UID = "olivier"
 PWD = "massot"
 
 # Connexion à la base postgres ControlesSig
-CSIG_SERVER = "TR-POSTGIS-02"
-CSIG_HOST = "TR-POSTGIS-02"
+CSIG_SERVER = "POSTGIS-02"
+CSIG_HOST = "POSTGIS-02"
 CSIG_SCHEMA = "public"
 CSIG_DB = "ControlesSIG"
 CSIG_PORT = "5432"
 CSIG_USER = "ControlesSIG_userrw"
-CSIG_PWD = "Am5VOMkdFHU7WwrfVOs9"
+CSIG_PWD = "4e7V7Z9lZnD9XFGT0hKo"
 
 # Dirs
 WRKDIR = MAIN / "work"

core/select_list_dialog.py

@@ -20,7 +20,7 @@ Ui_window, _ = uic.loadUiType(Path(__file__).parent / 'select_list_dialog.ui')
 
 def exec_(*args, **kwargs):
 
-    app = QApplication(sys.argv)
+    _ = QApplication(sys.argv)
 
     SYS_HOOK = sys.excepthook
     def error_handler(typ, value, trace):

resources/test_analytique2facture.py

@@ -6,21 +6,21 @@ from path import Path
 
 from core.pde import AnalytiqueDb, FacturesDb
 
+if __name__ == "__main__":
+    # reinitialise les données pour les tests de ctrl2analytique.py
+    AnalytiqueDb._path = Path(r"\\h2o\local\4-transversal\BDD\mdb_test\Db_analytique.mdb")
+    FacturesDb._path = Path(r"\\h2o\local\4-transversal\BDD\mdb_test\Facture_data.mdb")
 
-# reinitialise les données pour les tests de ctrl2analytique.py
-AnalytiqueDb._path = Path(r"\\h2o\local\4-transversal\BDD\mdb_test\Db_analytique.mdb")
-FacturesDb._path = Path(r"\\h2o\local\4-transversal\BDD\mdb_test\Facture_data.mdb")
+    analytique_db = AnalytiqueDb(autocommit=False)
+    facture_db = FacturesDb(autocommit=False)
 
-analytique_db = AnalytiqueDb(autocommit=False)
-facture_db = FacturesDb(autocommit=False)
+    for num_aff in ("175256/1", "175195/1"):
 
-for num_aff in ("175256/1", "175195/1"):
+        num_piece = facture_db.first("SELECT * FROM tblPieceEntete WHERE memObsInterne='N° Affaire analytique : {}'".format(num_aff)).lngPieceId
 
-    num_piece = facture_db.first("SELECT * FROM tblPieceEntete WHERE memObsInterne='N° Affaire analytique : {}'".format(num_aff)).lngPieceId
+        facture_db.execute("DELETE * FROM tblPieceEntete WHERE lngPieceId={}".format(num_piece))
+        facture_db.execute("DELETE * FROM tblPieceLigne WHERE lngPieceId={}".format(num_piece))
+        analytique_db.execute("UPDATE tbl_Tarification SET strStatut = 'A facturer', strNumFacture = Null WHERE strNumFacture='{}'".format(num_piece))
 
-    facture_db.execute("DELETE * FROM tblPieceEntete WHERE lngPieceId={}".format(num_piece))
-    facture_db.execute("DELETE * FROM tblPieceLigne WHERE lngPieceId={}".format(num_piece))
-    analytique_db.execute("UPDATE tbl_Tarification SET strStatut = 'A facturer', strNumFacture = Null WHERE strNumFacture='{}'".format(num_piece))
-
-    facture_db.commit()
-    analytique_db.commit()
+        facture_db.commit()
+        analytique_db.commit()

resources/test_ctrl2analytique.py

@@ -6,29 +6,31 @@ from path import Path
 
 from core.pde import ControlesDb, AnalytiqueDb, CommunDb
 
-# reinitialise les données pour les tests de ctrl2analytique.py
-
-ControlesDb._path = Path(r"\\h2o\local\4-transversal\BDD\mdb_test\cg67Parc_data.mdb")
-AnalytiqueDb._path = Path(r"\\h2o\local\4-transversal\BDD\mdb_test\Db_analytique.mdb")
-CommunDb._path = Path(r"\\h2o\local\4-transversal\BDD\mdb_test\Commun_Data.mdb")
-
-analytique_db = AnalytiqueDb(autocommit=False)
-controles_db = ControlesDb(autocommit=False)
-commun_db = CommunDb(autocommit=False)
-
-for num_aff in ("175256", "175195"):
-    controles_db.execute("UPDATE tblCommandes SET sngAffaireIdMos = 0 WHERE [lngChantierId] = {} AND [bytCommandeId] = 1".format(num_aff))
-    controles_db.execute("UPDATE tblEtancheiteIntervs SET sngIntervIdMos = 0 WHERE [lngChantierId] = {} AND [bytCommandeId] = 1".format(num_aff))
-    controles_db.execute("UPDATE tblCompactageIntervs SET sngIntervIdMos = 0 WHERE [lngChantierId] = {} AND [bytCommandeId] = 1".format(num_aff))
-    controles_db.execute("UPDATE tblVideoIntervs SET sngIntervIdMos = 0 WHERE [lngChantierId] = {} AND [bytCommandeId] = 1".format(num_aff))
-    controles_db.commit()
-
-    affaire = analytique_db.first("SELECT DblAffaireId FROM tbl_Affaires WHERE strLiaisonControle='{}/1'".format(num_aff))
-    if affaire:
-        aff_id = affaire.DblAffaireId
-        analytique_db.execute("DELETE * FROM tbl_Intervention WHERE [DblAffaireId]={}".format(aff_id))
-        analytique_db.execute("DELETE * FROM tbl_Tarification WHERE [DblAffaireId]={}".format(aff_id))
-        analytique_db.execute("DELETE * FROM tbl_Affaires WHERE [DblAffaireId]={}".format(aff_id))
-        analytique_db.commit()
+if __name__ == "__main__":
+
+    # reinitialise les données pour les tests de ctrl2analytique.py
+
+    ControlesDb._path = Path(r"\\h2o\local\4-transversal\BDD\mdb_test\cg67Parc_data.mdb")
+    AnalytiqueDb._path = Path(r"\\h2o\local\4-transversal\BDD\mdb_test\Db_analytique.mdb")
+    CommunDb._path = Path(r"\\h2o\local\4-transversal\BDD\mdb_test\Commun_Data.mdb")
+
+    analytique_db = AnalytiqueDb(autocommit=False)
+    controles_db = ControlesDb(autocommit=False)
+    commun_db = CommunDb(autocommit=False)
+
+    for num_aff in ("175256", "175195"):
+        controles_db.execute("UPDATE tblCommandes SET sngAffaireIdMos = 0 WHERE [lngChantierId] = {} AND [bytCommandeId] = 1".format(num_aff))
+        controles_db.execute("UPDATE tblEtancheiteIntervs SET sngIntervIdMos = 0 WHERE [lngChantierId] = {} AND [bytCommandeId] = 1".format(num_aff))
+        controles_db.execute("UPDATE tblCompactageIntervs SET sngIntervIdMos = 0 WHERE [lngChantierId] = {} AND [bytCommandeId] = 1".format(num_aff))
+        controles_db.execute("UPDATE tblVideoIntervs SET sngIntervIdMos = 0 WHERE [lngChantierId] = {} AND [bytCommandeId] = 1".format(num_aff))
+        controles_db.commit()
+
+        affaire = analytique_db.first("SELECT DblAffaireId FROM tbl_Affaires WHERE strLiaisonControle='{}/1'".format(num_aff))
+        if affaire:
+            aff_id = affaire.DblAffaireId
+            analytique_db.execute("DELETE * FROM tbl_Intervention WHERE [DblAffaireId]={}".format(aff_id))
+            analytique_db.execute("DELETE * FROM tbl_Tarification WHERE [DblAffaireId]={}".format(aff_id))
+            analytique_db.execute("DELETE * FROM tbl_Affaires WHERE [DblAffaireId]={}".format(aff_id))
+            analytique_db.commit()
 
 

resources/test_wincan2ctrl.py

@@ -6,27 +6,28 @@ from path import Path
 
 from core.pde import ControlesDb, WincanDb
 
+if __name__ == "__main__":
 
-# reinitialise les données pour les tests de wincan2ctrl.py
+    # reinitialise les données pour les tests de wincan2ctrl.py
 
-# Ce script reinitialise les données des chantiers suivants:
-# * 175003-2 CHATENOIS
-# * 175005 ROUFFACH
+    # Ce script reinitialise les données des chantiers suivants:
+    # * 175003-2 CHATENOIS
+    # * 175005 ROUFFACH
 
-ControlesDb._path = Path(r"\\h2o\local\4-transversal\BDD\mdb_test\cg67Parc_data.mdb")
-WincanDb._path = Path(r"\\h2o\local\4-transversal\BDD\mdb_test\Wincan\parc_2007\DB\PARC_2007.mdb")
+    ControlesDb._path = Path(r"\\h2o\local\4-transversal\BDD\mdb_test\cg67Parc_data.mdb")
+    WincanDb._path = Path(r"\\h2o\local\4-transversal\BDD\mdb_test\Wincan\parc_2007\DB\PARC_2007.mdb")
 
-wincan_db = WincanDb(autocommit=False)
-controles_db = ControlesDb(autocommit=False)
+    wincan_db = WincanDb(autocommit=False)
+    controles_db = ControlesDb(autocommit=False)
 
-for chantier_id, interv_id in (("175003", 2), ("175005", 1)):
+    for chantier_id, interv_id in (("175003", 2), ("175005", 1)):
 
-    controles_db.execute("DELETE * FROM tblvideointervs WHERE lngChantierId={} AND bytIntervId={}".format(chantier_id, interv_id))
-    controles_db.execute("DELETE * FROM tblso_Rate_Analyse WHERE lngChantierId={} AND bytIntervId={}".format(chantier_id, interv_id))
-    controles_db.execute("UPDATE tblVideoBases SET blnWincan=False,bytNbInterv={} WHERE lngChantierId={}".format(interv_id - 1, chantier_id))
-    controles_db.execute("UPDATE tblChantiers SET bytFoncReseauId =Null, bytNatureReseauId=Null, bytTypeReseauId=Null WHERE lngChantierId={}".format(chantier_id))
+        controles_db.execute("DELETE * FROM tblvideointervs WHERE lngChantierId={} AND bytIntervId={}".format(chantier_id, interv_id))
+        controles_db.execute("DELETE * FROM tblso_Rate_Analyse WHERE lngChantierId={} AND bytIntervId={}".format(chantier_id, interv_id))
+        controles_db.execute("UPDATE tblVideoBases SET blnWincan=False,bytNbInterv={} WHERE lngChantierId={}".format(interv_id - 1, chantier_id))
+        controles_db.execute("UPDATE tblChantiers SET bytFoncReseauId =Null, bytNatureReseauId=Null, bytTypeReseauId=Null WHERE lngChantierId={}".format(chantier_id))
 
-    wincan_db.execute("UPDATE SI_T SET SI_Spare1=Null, SI_Spare2=Null WHERE SI_Spare1='{}' AND SI_Spare2='{}'".format(chantier_id, interv_id))
+        wincan_db.execute("UPDATE SI_T SET SI_Spare1=Null, SI_Spare2=Null WHERE SI_Spare1='{}' AND SI_Spare2='{}'".format(chantier_id, interv_id))
 
-controles_db.commit()
-wincan_db.commit()
+    controles_db.commit()
+    wincan_db.commit()