22-06

[tools/eficas.git] / Validation / V_JDC.py

diff --git a/Validation/V_JDC.py b/Validation/V_JDC.py
index db34d99b4e347e96bbdccb859c698edc2da39d1f..0837aabc1e282b8b1a63445dea95221bab313c14 100644 (file)
--- a/Validation/V_JDC.py
+++ b/Validation/V_JDC.py
@@ -45,8 +45,10 @@ class JDC(V_MCCOMPO.MCCOMPO):
             Methode pour generation d un rapport de validite
         """
         self.cr.purge()
-        self.cr.debut = "DEBUT CR validation : " + self.nom
-        self.cr.fin = "FIN CR validation :" + self.nom
+        #self.cr.debut = "DEBUT CR validation : " + self.nom
+        #self.cr.fin = "FIN CR validation :" + self.nom
+        self.cr.debut = "BEGIN validation report : " + self.nom
+        self.cr.fin = "END validation report :" + self.nom
         for e in self.etapes:
             if e.isactif():
                 self.cr.add(e.report())
@@ -67,7 +69,8 @@ class JDC(V_MCCOMPO.MCCOMPO):
             texte, test = self.verif_regles()
             if test == 0:
                 if cr == 'oui':
-                    self.cr.fatal(' '.strip(texte))
+                    if texte != "" and (' '.strip(texte) == "") : self.cr.fatal(texte)
+                    else : self.cr.fatal(' '.strip(texte))
                 valid = 0
             if valid:
                 for e in self.etapes: