CCAR: mise a niveau du catalogue de test

diff --git a/Aster/Cata/petitcata/cata.py b/Aster/Cata/petitcata/cata.py
index a46adfed2aaf32ea05ac0f201ff39168dabfcadb..a19a9a1ac68dffd7d96a8c6d0f16759beca0e4a4 100755 (executable)
--- a/Aster/Cata/petitcata/cata.py
+++ b/Aster/Cata/petitcata/cata.py
@@ -31,7 +31,7 @@ except:
 
 #
 __version__="$Name:  $"
-__Id__="$Id: cata.py,v 1.1 2004/11/19 09:06:23 eficas Exp $"
+__Id__="$Id: cata.py,v 1.2 2005/05/19 12:18:47 eficas Exp $"
 #
 JdC = JDC_CATA(code='ASTER',
                execmodul=None,
@@ -397,7 +397,6 @@ class vect_elem_temp_r(vect_elem):pass
 DEBUT=MACRO(nom="DEBUT",op=ops.build_debut ,docu="U4.11.01-g",repetable='n',
             UIinfo={"groupes":("Gestion du travail",)},
            fr="Ouverture d une étude. Allocation des ressources mémoire et disque",
-          sd_prod=ops.DEBUT,
 
          PAR_LOT         =SIMP(fr="mode de traitement des commandes",statut='f',typ='TXM',
                            into=("OUI","NON"),defaut="OUI"),
@@ -506,6 +505,10 @@ TESTS_VALID=OPER(nom="TESTS_VALID",op=19,sd_prod=cara_elem,
   OrdList=SIMP(statut='o',typ='I',max='**',validators=OrdList("croissant")),
   OrdList2=SIMP(statut='o',typ='I',into=(1,2,3,4,5,6),max='**',validators=OrdList("croissant")),
   TypeVal=SIMP(statut='o',typ='I',validators=TypeVal(1)),
+  Compul=SIMP(statut='o',typ='I',max=5,validators=Compulsory((1,2))),
+  CompulInto=SIMP(statut='o',typ='I',max=5,into=(1,2,3,4,5),validators=Compulsory((1,2))),
+  Norep=SIMP(statut='o',typ='I',max=5,validators=NoRepeat()),
+  NorepInto=SIMP(statut='o',typ='I',max=5,into=(1,2,3,4,5),validators=NoRepeat()),
 ) ;
 
 PLS_BASE_NOREPEAT=OPER(nom="PLS_BASE_NOREPEAT",op=19,sd_prod=cara_pout,

diff --git a/Aster/Cata/pre74/FORM.py b/Aster/Cata/pre74/FORM.py
index 3506757c9b9958549023f9e54b4731d9bcef052a..6bdd699e92b24dea12f654f81acc972736058660 100644 (file)
--- a/Aster/Cata/pre74/FORM.py
+++ b/Aster/Cata/pre74/FORM.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #            CONFIGURATION MANAGEMENT OF EDF VERSION
 # ======================================================================
 # COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG

diff --git a/Aster/Cata/pre74/compoformule.py b/Aster/Cata/pre74/compoformule.py
index 1f6ac935f54bc897ed85fc2896a651743f022026..7d6b778a3fd2713b5b833a51fc947824fc3c359d 100644 (file)
--- a/Aster/Cata/pre74/compoformule.py
+++ b/Aster/Cata/pre74/compoformule.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #            CONFIGURATION MANAGEMENT OF EDF VERSION
 # ======================================================================
 # COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG

diff --git a/Aster/Cata/pre74/ongletpanel.py b/Aster/Cata/pre74/ongletpanel.py
index 64a68c22491c0ffae1f9872b5c191e2e70f28cd7..7b373641755e714c9d716c6e921fa9c9cf8fcaee 100644 (file)
--- a/Aster/Cata/pre74/ongletpanel.py
+++ b/Aster/Cata/pre74/ongletpanel.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #            CONFIGURATION MANAGEMENT OF EDF VERSION
 # ======================================================================
 # COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG