From 16432b445fb1be9f41839499021f480225198a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 22 Oct 2013 11:23:34 +0200 Subject: [PATCH] simplify 'acteurs' section to only have a single field --- AvisSimplif.odt | Bin 49967 -> 49938 bytes AvisSimplif.py | 62 +++------------------------------ skins/Avis/avissimplif_edit.pt | 5 +-- skins/Avis/avissimplif_view.pt | 16 ++------- 4 files changed, 9 insertions(+), 74 deletions(-) diff --git a/AvisSimplif.odt b/AvisSimplif.odt index b61faadbb8fe1e48f712adcaa0a3c181ebcf990c..ef9bd465c7170caf17b4f47a3b9ee41d52127d06 100644 GIT binary patch delta 4987 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 F0048?ky!u$ delta 5007 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 Zlbpgw0@Aya(YqIu{K60hV!Z$W006_*z*_(S diff --git a/AvisSimplif.py b/AvisSimplif.py index 16babba..7d7d94a 100644 --- a/AvisSimplif.py +++ b/AvisSimplif.py @@ -91,14 +91,10 @@ defaultAnalysisValues = { {'yes': "", 'no': '' }, - 'acteursProcedure': \ + 'acteurs': \ {'yes': "", 'no': '' }, - 'acteursImpact': \ - {'yes': u"Le texte en projet va sans conteste générer de nouvelles obligations pour...", - 'no': '' - }, 'formulairePrevu': \ {'yes': u"Un formulaire est prévu.", 'no': '' @@ -447,9 +443,7 @@ schema = Schema(( name='acteurs', widget=MasterSelectWidget( label=u"Est-il pertinent d'aborder la question de la prise en compte des acteurs ?", - slave_fields= slaveFields('showIfYes', - 'acteursProcedure', 'acteursProcedureAnalyse', 'acteursImpact', - 'acteursImpactAnalyse'), + slave_fields= slaveFields('showIfYes', 'acteursAnalyse'), label_msgid='Avis_label_acteurs', i18n_domain='Avis', ), @@ -458,54 +452,16 @@ schema = Schema(( required=True ), - StringField( - name='acteursProcedure', - widget=MasterSelectWidget( - label=u"Y a-t-il une procédure de prise en compte des acteurs prévue ?", - slave_fields=slaveFields('setValue', 'acteursProcedureAnalyse'), - label_msgid='Avis_label_acteursProcedure', - i18n_domain='Avis', - ), - enforceVocabulary=True, - vocabulary='getResponses', - required=True - ), - TextField( - name='acteursProcedureAnalyse', + name='acteursAnalyse', widget=TextAreaWidget( label=u"Analyse", - label_msgid='Avis_label_acteursProcedureAnalyse', + label_msgid='Avis_label_acteursAnalyse', i18n_domain='Avis', rows=10, ), default_output_type="text/html", - default=defaultAnalysisValues['acteursProcedure']['no'] - ), - - StringField( - name='acteursImpact', - widget=MasterSelectWidget( - label=u"Y a-t-il un impact logistique et/ou organisationnel pour l'Administration ?", - slave_fields=slaveFields('setValue', 'acteursImpactAnalyse'), - label_msgid='Avis_label_acteursImpact', - i18n_domain='Avis', - ), - enforceVocabulary=True, - vocabulary='getResponses', - required=True - ), - - TextField( - name='acteursImpactAnalyse', - widget=TextAreaWidget( - label=u"Analyse", - label_msgid='Avis_label_acteursImpactAnalyse', - i18n_domain='Avis', - rows=10, - ), - default_output_type="text/html", - default=defaultAnalysisValues['acteursImpact']['no'] + default=defaultAnalysisValues['acteurs']['no'] ), # Formulaires -------------------------------------------------------------- @@ -809,14 +765,6 @@ class AvisSimplif(BaseContent, AvisOdt): if self.simulBrochureAnalyse(): return unicode(self.simulBrochureAnalyse(), 'utf-8') return defaultAnalysisValues['simulBrochure'][simulBrochureCP] - def defoacteursProcedure(self, acteursProcedureCP): - if self.acteursProcedureAnalyse(): return unicode(self.acteursProcedureAnalyse(), 'utf-8') - return defaultAnalysisValues['acteursProcedure'][acteursProcedureCP] - - def defoacteursImpact(self, acteursImpactCP): - if self.acteursImpactAnalyse(): return unicode(self.acteursImpactAnalyse(), 'utf-8') - return defaultAnalysisValues['acteursImpact'][acteursImpactCP] - def defoformulairePrevu(self, formulairePrevuCP): if self.formulairePrevuAnalyse(): return unicode(self.formulairePrevuAnalyse(), 'utf-8') return defaultAnalysisValues['formulairePrevu'][formulairePrevuCP] diff --git a/skins/Avis/avissimplif_edit.pt b/skins/Avis/avissimplif_edit.pt index 8118a18..33025f0 100644 --- a/skins/Avis/avissimplif_edit.pt +++ b/skins/Avis/avissimplif_edit.pt @@ -64,10 +64,7 @@
La prise en compte des acteurs - - - - +
Formulaires diff --git a/skins/Avis/avissimplif_view.pt b/skins/Avis/avissimplif_view.pt index 8e834bf..5f203e9 100644 --- a/skins/Avis/avissimplif_view.pt +++ b/skins/Avis/avissimplif_view.pt @@ -156,23 +156,13 @@ -
-   -
-
+
-
-
- -
-   -
-
- -
+
+