.changes/2.5.0.md

@@ -1,3 +0,0 @@
-## 2.5.0 - 2024-12-09
-### Release
-* Update bundles to v3.5.0

CHANGELOG.md

@@ -6,10 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
-## 2.5.0 - 2024-12-09
-### Release
-* Update bundles to v3.5.0
-
 ## 2.4.0 - 2024-11-01
 ### Feature
 * Update chill bundles to v3.2.2: new feature gender entity"

composer.json

@@ -9,7 +9,7 @@
     "ext-iconv": "*",
     "champs-libres/wopi-bundle": "dev-master@dev",
     "champs-libres/wopi-lib": "dev-master@dev",
-    "chill-project/chill-bundles": "3.5.0",
+    "chill-project/chill-bundles": "v3.2.2@dev",
     "chill-project/chill-deploy": "^1.0",
     "graylog2/gelf-php": "^2.0",
     "symfony/console": "5.4.*",

config/packages/workflow.yaml

@@ -8,11 +8,12 @@ framework:
                     - Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork
                     - Chill\DocStoreBundle\Entity\AccompanyingCourseDocument
                 label:
-                    fr: 'Suivi CD85'
+                    fr: 'Suivi'
             support_strategy: Chill\MainBundle\Workflow\RelatedEntityWorkflowSupportsStrategy
-            marking_store:
-                service: Chill\MainBundle\Workflow\EntityWorkflowMarkingStore
             initial_marking: 'initial'
+            marking_store:
+                type: method
+                property: step
             places:
                 initial:
                     metadata:
@@ -42,6 +43,14 @@ framework:
                             forward: {fr: Visa accordé}
                             backward: {fr: Visa refusé}
                             neutral: {fr: Autre}
+                attenteSignature:
+                    metadata:
+                        label:
+                            fr: En attente de signature
+                        validationFilterInputLabels:
+                            forward: {fr: Signature accordée}
+                            backward: {fr: Signature refusée}
+                            neutral: {fr: Autre}
                 attenteTraitement:
                     metadata:
                         label:
@@ -66,16 +75,6 @@ framework:
                             forward: {fr: Validation de la mise en forme}
                             backward: {fr: Refus de validation de la mise en forme}
                             neutral: {fr: Autre}
-                attenteReceptionExternal:
-                    metadata:
-                        isSentExternal: true
-                        onExternalView: clotureApresLectureEnvoiExterne
-                        label:
-                            fr: En attente d'ouverture par un destinataire externe
-                        validationFilterInputLabels:
-                            forward: {fr: Document reçu par un destinataire externe}
-                            backward: {fr: Document non reçu par un destinataire externe}
-                            neutral: {fr: Autre}
                 annule:
                     metadata:
                         isFinal: true
@@ -121,12 +120,22 @@ framework:
                         - attenteModification
                         - attenteMiseEnForme
                         - attenteValidationMiseEnForme
-                        - attenteTraitement
                     to: attenteVisa
                     metadata:
                         label:
                             fr: Demande de visa
                         isForward: true
+                demandeSignature:
+                    from:
+                        - initial
+                        - attenteModification
+                        - attenteMiseEnForme
+                        - attenteValidationMiseEnForme
+                        - attenteVisa
+                    to: attenteSignature
+                    metadata:
+                        label: {fr: Demande de signature}
+                        isForward: true
                 demandeTraitement:
                     from:
                         - initial
@@ -134,6 +143,7 @@ framework:
                         - attenteMiseEnForme
                         - attenteValidationMiseEnForme
                         - attenteVisa
+                        - attenteSignature
                     to: attenteTraitement
                     metadata:
                         label: {fr: Demande de traitement}
@@ -145,32 +155,12 @@ framework:
                         - attenteMiseEnForme
                         - attenteValidationMiseEnForme
                         - attenteVisa
+                        - attenteSignature
                         - attenteTraitement
                     to: attenteEnvoi
                     metadata:
                         label: {fr: Demande d'envoi}
                         isForward: true
-                demandeEnvoiExterne:
-                    from:
-                        - initial
-                        - attenteModification
-                        - attenteMiseEnForme
-                        - attenteValidationMiseEnForme
-                        - attenteVisa
-                        - attenteTraitement
-                    to: attenteReceptionExternal
-                    metadata:
-                        label: {fr: Envoi sécurisé par courrier électronique}
-                        isForward: true
-                clotureApresLectureEnvoiExterne:
-                    from:
-                        - attenteReceptionExternal
-                    to:
-                        - final
-                    metadata:
-                        transitionGuard: system
-                        isForward:  true
-                        label: {fr: Consultation de l'envoi sécurisé}
                 annulation:
                     from:
                         - initial
@@ -178,13 +168,13 @@ framework:
                         - attenteMiseEnForme
                         - attenteValidationMiseEnForme
                         - attenteVisa
+                        - attenteSignature
                         - attenteTraitement
                         - attenteEnvoi
                     to: annule
                     metadata:
                         label: {fr: Annulation}
                         isForward: false
-                        transitionGuard: 'system+only-dest' # can be 'system+only-dest' or 'only-dest' (only-dest is default)
                 # transitions qui répètent l'étape
                 demandeMiseEnFormeSupplementaire:
                     from:
@@ -200,6 +190,12 @@ framework:
                     metadata:
                         label: {fr: Demande de visa supplémentaire}
                         isForward: true
+                demandeSignatureSupplementaire:
+                    from:
+                        - attenteSignature
+                    to: attenteSignature
+                    metadata:
+                        label: {fr: Demande de signature supplémentaire}
                 demandeTraitementSupplementaire:
                     from:
                         - attenteTraitement
@@ -210,6 +206,7 @@ framework:
                 refusEtModificationDocument:
                     from:
                         - attenteVisa
+                        - attenteSignature
                         - attenteTraitement
                         - attenteEnvoi
                     to: attenteModification
@@ -220,6 +217,7 @@ framework:
                 refusEtDemandeMiseEnForme:
                     from:
                         - attenteVisa
+                        - attenteSignature
                         - attenteTraitement
                         - attenteEnvoi
                     to: attenteMiseEnForme
@@ -228,11 +226,21 @@ framework:
                         isForward: false
                 refusEtDemandeVisa:
                     from:
+                        - attenteSignature
+                        - attenteTraitement
                         - attenteEnvoi
                     to: attenteVisa
                     metadata:
                         label: {fr: Refus et demande de visa}
                         isForward: false
+                refusEtDemandeSignature:
+                    from:
+                        - attenteTraitement
+                        - attenteEnvoi
+                    to: attenteSignature
+                    metadata:
+                        label: {fr: Refus et demande de signature}
+                        isForward: false
                 refusEtDemandeTraitement:
                     from:
                         - attenteEnvoi
@@ -263,17 +271,24 @@ framework:
                     metadata:
                         label: {fr: Accorde le visa et cloture positive}
                         isForward: true
+                attenteSignatureToFinal:
+                    from:
+                        - attenteSignature
+                    to: final
+                    metadata:
+                        label: {fr: Accorde la signature et cloture positive}
+                        isForward: true
                 attenteTraitementToFinal:
                     from:
                         - attenteTraitement
                     to: final
                     metadata:
-                        label: {fr: Traitement terminé et cloture positive}
+                        label: {fr: Traitement terminé et cloture postive}
                         isForward: true
                 attenteEnvoiToFinal:
                     from:
                         - attenteEnvoi
                     to: final
                     metadata:
-                        label: {fr: Envoyé et cloture positive}
+                        label: {fr: Envoyé et cloture postive}
                         isForward: true