CCAR: correction d'un probleme de mise a jour de contexte lors d'une insertion

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

diff --git a/Validation/V_JDC.py b/Validation/V_JDC.py
index 1f4edeaf281fa2bd05b1f379fb2adf05d62d3d6c..b0536d6fa3b83b982158f66fffae5ccc93adf90f 100644 (file)
--- a/Validation/V_JDC.py
+++ b/Validation/V_JDC.py
@@ -1,3 +1,26 @@
+#@ MODIF V_JDC Validation  DATE 14/09/2004   AUTEUR MCOURTOI M.COURTOIS 
+# -*- coding: iso-8859-1 -*-
+#            CONFIGURATION MANAGEMENT OF EDF VERSION
+# ======================================================================
+# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
+# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
+# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
+# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR   
+# (AT YOUR OPTION) ANY LATER VERSION.                                 
+#
+# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT 
+# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF          
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU    
+# GENERAL PUBLIC LICENSE FOR MORE DETAILS.                            
+#
+# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE   
+# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,       
+#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.      
+#                                                                       
+#                                                                       
+# ======================================================================
+
+

 """
    Ce module contient la classe mixin JDC qui porte les méthodes
    nécessaires pour réaliser la validation d'un objet de type JDC
 """
    Ce module contient la classe mixin JDC qui porte les méthodes
    nécessaires pour réaliser la validation d'un objet de type JDC


@@ -25,11 +48,11 @@ class JDC(V_MCCOMPO.MCCOMPO):
       self.cr.purge()
       self.cr.debut="DEBUT CR validation : "+self.nom
       self.cr.fin="FIN CR validation :"+self.nom
       self.cr.purge()
       self.cr.debut="DEBUT CR validation : "+self.nom
       self.cr.fin="FIN CR validation :"+self.nom

-      self.state = 'modified'
-      self.isvalid(cr='oui')

       for e in self.etapes :
         if e.isactif():
           self.cr.add(e.report())
       for e in self.etapes :
         if e.isactif():
           self.cr.add(e.report())

+      self.state = 'modified'
+      self.isvalid(cr='oui')

       return self.cr
 
    def isvalid(self,cr='non'):
       return self.cr
 
    def isvalid(self,cr='non'):


@@ -52,6 +75,7 @@ class JDC(V_MCCOMPO.MCCOMPO):
             if not e.isvalid():
               valid = 0
               break
             if not e.isvalid():
               valid = 0
               break

+        self.state="unchanged"

         self.valid = valid
         return self.valid
 
         self.valid = valid
         return self.valid