Refactoring de la complétude pour utiliser l'entité TblDossier

Mécanisme du passage automatique à l'étape suivante si l'intervenant finit de saisir son dossier

module/Application/src/Application/Assertion/IntervenantDossierAssertion.php

@@ -403,11 +403,10 @@ class IntervenantDossierAssertion extends AbstractAssertion
     {
 
         $intervenantDossier = $this->getServiceDossier()->getByIntervenant($intervenant);
-        $completudeDossier  = $this->getServiceDossier()->getCompletude($intervenantDossier);
         $isValidate         = $this->getServiceDossier()->getValidation($intervenant);
 
         return $this->asserts([
-            $completudeDossier['dossier'],
+            $intervenantDossier->getTblDossier()->getCompletude(),
             !$isValidate,
             $this->getRole()->hasPrivilege(Privileges::DOSSIER_VALIDATION),
         ]);

module/Application/src/Application/Controller/IntervenantDossierController.php

@@ -5,6 +5,7 @@ namespace Application\Controller;
 use Application\Constants;
 use Application\Entity\Db\IndicModifDossier;
 use Application\Entity\Db\Intervenant;
+use Application\Entity\Db\WfEtape;
 use Application\Form\Intervenant\DossierValidation;
 use Application\Form\Intervenant\Traits\AutresFormAwareTrait;
 use Application\Form\Intervenant\Traits\IntervenantDossierFormAwareTrait;
@@ -65,13 +66,16 @@ class IntervenantDossierController extends AbstractController
         }
         /* Récupération du dossier de l'intervenant */
         $intervenantDossier = $this->getServiceDossier()->getByIntervenant($intervenant);
+
         /*Si dossier n'a pas encore d'id alors on le save et on calcule la completude*/
         if (!$intervenantDossier->getId()) {
             $this->getServiceDossier()->save($intervenantDossier);
             $this->updateTableauxBord($intervenantDossier->getIntervenant());
         }
         $intervenantDossierValidation = $this->getServiceDossier()->getValidation($intervenant);
+        $tblDossier                   = $intervenantDossier->getTblDossier();
 
+        $lastCompleted = $tblDossier->getCompletude();
         /* Initialisation du formulaire */
         $form = $this->getIntervenantDossierForm($intervenant);
         $form->bind($intervenantDossier);
@@ -87,12 +91,21 @@ class IntervenantDossierController extends AbstractController
                 $this->getServiceDossier()->updateIndicModifDossier($intervenant, $intervenantDossier);
                 //Recalcul des tableaux de bord nécessaires
                 $this->updateTableauxBord($intervenantDossier->getIntervenant());
+                $this->em()->refresh($tblDossier);
+
                 /*On reinitialise le formulaire car le statut du dossier a
                 pu être changé donc les règles d'affichage ne sont plus les mêmes*/
                 $form = $this->getIntervenantDossierForm($intervenant);
                 $form->bind($intervenantDossier);
                 $this->flashMessenger()->addSuccessMessage('Enregistrement de vos données effectué');
                 //return $this->redirect()->toUrl($this->url()->fromRoute('intervenant/dossier', [], [], true));
+
+                if (!$lastCompleted && $tblDossier->getCompletude() && $role->getIntervenant()) { // on ne redirige que pour l'intervenant et seulement si le dossier a été nouvellement créé
+                    $nextEtape = $this->getServiceWorkflow()->getNextEtape(WfEtape::CODE_DONNEES_PERSO_SAISIE, $intervenant);
+                    if ($nextEtape && $url = $nextEtape->getUrl()) {
+                        return $this->redirect()->toUrl($url);
+                    }
+                }
             } else {
                 $this->flashMessenger()->addErrorMessage("Vos données n'ont pas été enregistré, veuillez vérifier les erreurs.");
             }
@@ -100,8 +113,8 @@ class IntervenantDossierController extends AbstractController
 
         $intervenantDossierStatut = $intervenantDossier->getStatut();
         //Règles pour afficher ou non les fieldsets
-        $champsAutres                 = $intervenantDossier->getStatut()->getChampsAutres();
-        $fieldsetRules                = [
+        $champsAutres  = $intervenantDossier->getStatut()->getChampsAutres();
+        $fieldsetRules = [
             'fieldset-identite-complementaire' => $intervenantDossier->getStatut()->getDossierIdentiteComplementaire(),
             'fieldset-adresse'                 => $intervenantDossier->getStatut()->getDossierAdresse(),
             'fieldset-contact'                 => $intervenantDossier->getStatut()->getDossierContact(),
@@ -110,7 +123,6 @@ class IntervenantDossierController extends AbstractController
             'fieldset-employeur'               => $intervenantDossier->getStatut()->getDossierEmployeur(),
             'fieldset-autres'                  => (!empty($champsAutres)) ? 1 : 0,//Si le statut intervenant a au moins 1 champs autre
         ];
-        $intervenantDossierCompletude = $this->getServiceDossier()->getCompletude($intervenantDossier);
 
         $iPrec    = $this->getServiceDossier()->intervenantVacataireAnneesPrecedentes($intervenant, 1);
         $lastHETD = $iPrec ? $this->getServiceService()->getTotalHetdIntervenant($iPrec) : 0;
@@ -135,7 +147,7 @@ class IntervenantDossierController extends AbstractController
             'intervenantDossier',
             'intervenantDossierValidation',
             'intervenantDossierStatut',
-            'intervenantDossierCompletude',
+            'tblDossier',
             'champsAutres',
             'fieldsetRules'
         );

module/Application/src/Application/Entity/Db/IntervenantDossier.php

@@ -2,12 +2,8 @@
 
 namespace Application\Entity\Db;
 
-use Application\Entity\Db\Traits\AnneeAwareTrait;
 use Application\Entity\Db\Traits\CiviliteAwareTrait;
-use Application\Entity\Db\Traits\DisciplineAwareTrait;
 use Application\Entity\Db\Traits\EmployeurAwareTrait;
-use Application\Entity\Db\Traits\GradeAwareTrait;
-use Application\Entity\Db\Traits\StructureAwareTrait;
 use Application\Entity\Traits\AdresseTrait;
 use Application\Interfaces\AdresseInterface;
 use Doctrine\Persistence\Mapping\ClassMetadata;
@@ -16,8 +12,6 @@ use Doctrine\Persistence\ObjectManagerAware;
 use UnicaenApp\Entity\HistoriqueAwareInterface;
 use UnicaenApp\Entity\HistoriqueAwareTrait;
 use UnicaenApp\Service\EntityManagerAwareTrait;
-use UnicaenImport\Entity\Db\Interfaces\ImportAwareInterface;
-use UnicaenImport\Entity\Db\Traits\ImportAwareTrait;
 use Zend\Permissions\Acl\Resource\ResourceInterface;
 
 /**
@@ -157,6 +151,11 @@ class IntervenantDossier implements HistoriqueAwareInterface, ResourceInterface,
      */
     protected $intervenant;
 
+    /**
+     * @var TblDossier
+     */
+    protected $tblDossier;
+
 
 
     /**
@@ -831,6 +830,13 @@ class IntervenantDossier implements HistoriqueAwareInterface, ResourceInterface,
 
 
 
+    public function getTblDossier(): ?TblDossier
+    {
+        return $this->tblDossier;
+    }
+
+
+
     /**
      *
      * @param \Application\Entity\Db\Intervenant $intervenant

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.IntervenantDossier.dcm.xml

@@ -64,6 +64,7 @@
         <field name="autre4" type="string" column="AUTRE_4" length="1000" nullable="true"/>
         <field name="autre5" type="string" column="AUTRE_5" length="1000" nullable="true"/>
 
+        <one-to-one field="tblDossier" target-entity="Application\Entity\Db\TblDossier" mapped-by="dossier" />
 
         <many-to-one field="employeur" target-entity="Application\Entity\Db\Employeur">
             <join-column name="EMPLOYEUR_ID" referenced-column-name="ID"/>

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.TblDossier.dcm.xml

@@ -3,17 +3,11 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Application\Entity\Db\TblDossier" table="TBL_DOSSIER">
-        <indexes>
-            <index name="IDX_126E18FDAA401F5C" columns="ANNEE_ID"/>
-            <index name="IDX_126E18FD52CE5789" columns="DOSSIER_ID"/>
-            <index name="IDX_126E18FDBC260C55" columns="VALIDATION_ID"/>
-        </indexes>
         <unique-constraints>
             <unique-constraint name="tbl_dossier__un" columns="INTERVENANT_ID"/>
         </unique-constraints>
         <id name="id" type="integer" column="ID">
             <generator strategy="SEQUENCE"/>
-            <sequence-generator sequence-name="TBL_DOSSIER_ID_seq" allocation-size="1" initial-value="1"/>
         </id>
         <field name="peutSaisirDossier" type="boolean" column="PEUT_SAISIR_DOSSIER" nullable="false">
             <options>
@@ -30,11 +24,14 @@
                 <join-column name="INTERVENANT_ID" referenced-column-name="ID"/>
             </join-columns>
         </many-to-one>
-        <many-to-one field="dossier" target-entity="Application\Entity\Db\IntervenantDossier" fetch="LAZY">
+        <!--<one-to-one field="dossier" target-entity="Application\Entity\Db\IntervenantDossier" fetch="LAZY">
             <join-columns>
                 <join-column name="DOSSIER_ID" referenced-column-name="ID"/>
             </join-columns>
-        </many-to-one>
+        </one-to-one>-->
+        <one-to-one field="dossier" target-entity="Application\Entity\Db\IntervenantDossier" inversed-by="tblDossier">
+            <join-column name="DOSSIER_ID" referenced-column-name="ID" />
+        </one-to-one>
         <many-to-one field="annee" target-entity="Application\Entity\Db\Annee" fetch="LAZY">
             <join-columns>
                 <join-column name="ANNEE_ID" referenced-column-name="ID"/>
@@ -49,7 +46,5 @@
         <field name="completudeEmployeur" type="boolean" column="COMPLETUDE_EMPLOYEUR" nullable="false"/>
         <field name="completudeAutres" type="boolean" column="COMPLETUDE_AUTRES" nullable="false"/>
         <field name="completudeStatut" type="boolean" column="COMPLETUDE_STATUT" nullable="false"/>
-
-
     </entity>
 </doctrine-mapping>

module/Application/src/Application/Entity/Db/TblDossier.php

@@ -28,7 +28,7 @@ class TblDossier
     private $intervenant;
 
     /**
-     * @var \Application\Entity\Db\Dossier
+     * @var \Application\Entity\Db\IntervenantDossier
      */
     private $dossier;
 
@@ -135,7 +135,7 @@ class TblDossier
     /**
      * Get dossier
      *
-     * @return \Application\Entity\Db\Dossier
+     * @return \Application\Entity\Db\IntervenantDossier
      */
     public function getDossier()
     {
@@ -270,5 +270,20 @@ class TblDossier
     {
         return $this->completudeStatut;
     }
+
+
+
+    public function getCompletude(): bool
+    {
+        return $this->getCompletudeIdentite() &&
+            $this->getCompletudeIdentiteComp() &&
+            $this->getCompletudeAdresse() &&
+            $this->getCompletudeContact() &&
+            $this->getCompletudeInsee() &&
+            $this->getCompletudeIban() &&
+            $this->getCompletudeEmployeur() &&
+            $this->getCompletudeAutres() &&
+            $this->getCompletudeStatut();
+    }
 }
 

module/Application/src/Application/Service/DossierService.php

@@ -162,74 +162,6 @@ class DossierService extends AbstractEntityService
 
 
 
-    public function getCompletude(IntervenantDossier $intervenantDossier)
-    {
-        $qb = $this->getEntityManager()->getRepository('Application\Entity\Db\TblDossier')->createQueryBuilder('tbld');
-        $qb->where("tbld.intervenant = :intervenant");
-        $qb->setParameter('intervenant', $intervenantDossier->getIntervenant());
-        try {
-            $tblDossierIntervenant = $qb->getQuery()->setMaxResults(1)->getSingleResult();;
-        } catch (NoResultException $e) {
-            throw new \Exception('Impossible de trouver la complétude du dossier dans tbl_dossier');
-        }
-        /**
-         * }
-         * @var TblDossier $tblDossierIntervenant
-         */
-
-        $completudeDossierIdentite               = $tblDossierIntervenant->getCompletudeIdentite();
-        $completudeDossierIdentiteComplementaire = $tblDossierIntervenant->getCompletudeIdentiteComp();
-        $completudeDossierAdresse                = $tblDossierIntervenant->getCompletudeAdresse();
-        $completudeDossierContact                = $tblDossierIntervenant->getCompletudeContact();
-        $completudeDossierInsee                  = $tblDossierIntervenant->getCompletudeInsee();
-        $completudeDossierIban                   = $tblDossierIntervenant->getCompletudeIban();
-        $completudeDossierEmployeur              = $tblDossierIntervenant->getCompletudeEmployeur();
-        $completudeDossierAutre                  = $tblDossierIntervenant->getCompletudeAutres();
-        $completudeDossierStatut                 = $tblDossierIntervenant->getCompletudeStatut();
-
-
-        $completudeDossier = ($completudeDossierIdentite &&
-            $completudeDossierIdentiteComplementaire &&
-            $completudeDossierAdresse &&
-            $completudeDossierContact &&
-            $completudeDossierInsee &&
-            $completudeDossierIban &&
-            $completudeDossierEmployeur &&
-            $completudeDossierAutre &&
-            $completudeDossierStatut) ? true : false;
-
-        $completude = ['dossier'                       => $completudeDossier,
-                       'dossierIdentite'               => $completudeDossierIdentite,
-                       'dossierIdentiteComplementaire' => $completudeDossierIdentiteComplementaire,
-                       'dossierAdresse'                => $completudeDossierAdresse,
-                       'dossierContact'                => $completudeDossierContact,
-                       'dossierInsee'                  => $completudeDossierInsee,
-                       'dossierIban'                   => $completudeDossierIban,
-                       'dossierEmployeur'              => $completudeDossierEmployeur,
-                       'dossierAutres'                 => $completudeDossierAutre,
-                       'dossierStatut'                 => $completudeDossierStatut,
-        ];
-
-        return $completude;
-    }
-
-
-
-    public function isComplete(IntervenantDossier $intervenantDossier)
-    {
-        $completude = $this->getCompletude($intervenantDossier);
-
-        foreach ($completude as $v) {
-            if ($v === false) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-
-
     /**
      * Suppression (historisation) de l'historique des modifications sur les données perso d'un intervenant.
      *

module/Application/view/application/intervenant-dossier/index.phtml

 <?php
 
+/**
+ * @var $this        \Application\View\Renderer\PhpRenderer
+ * @var $tblDossier  \Application\Entity\Db\TblDossier
+ */
 
 use Application\Assertion\IntervenantDossierAssertion;
 use Application\Entity\Db\WfEtape;
@@ -14,15 +18,8 @@ $canValider    = $this->isAllowed($intervenant, IntervenantDossierAssertion::PRI
 $canDevalider  = $this->isAllowed($intervenant, IntervenantDossierAssertion::PRIV_CAN_DEVALIDE);
 $canEdit       = $this->isAllowed($intervenant, IntervenantDossierAssertion::PRIV_CAN_EDIT);
 $canSupprimer  = $this->isAllowed($intervenant, IntervenantDossierAssertion::PRIV_CAN_SUPPRIME);
-$isComplete    = true;
 $formErrors    = $this->formErrors($form);
 
-foreach ($intervenantDossierCompletude as $value) {
-    if (!$value) {
-        $isComplete = false;
-    }
-}
-
 $nextEtape = $intervenantDossierValidation ? WfEtape::CODE_DONNEES_PERSO_VALIDATION : WfEtape::CODE_DONNEES_PERSO_SAISIE;
 $this->headTitle()->append($intervenant->getPrenom() . " " . $intervenant->getNomUsuel())->append("Données personnelles");
 $fieldsets = $form->getFieldsets();
@@ -85,11 +82,11 @@ $fieldsets = $form->getFieldsets();
     <?php if (!empty($formErrors)): ?>
         <?= $this->formErrors($form); ?>
     <?php else: ?>
-        <div class="messenger alert <?= ($isComplete) ? 'alert-success' : 'alert-warning' ?> ">
-            <?php if ($isComplete && $intervenantDossierValidation): ?>
+        <div class="messenger alert <?= ($tblDossier->getCompletude()) ? 'alert-success' : 'alert-warning' ?> ">
+            <?php if ($tblDossier->getCompletude() && $intervenantDossierValidation): ?>
                 Votre dossier est maintenant <span style="font-size:1em;" class="label label-success">Complet</span> et <span
                         style="font-size:1em;" class="label label-success">Validé</span>
-            <?php elseif ($isComplete && !$intervenantDossierValidation): ?>
+            <?php elseif ($tblDossier->getCompletude() && !$intervenantDossierValidation): ?>
                 Votre dossier est maintenant <span style="font-size:1em;"
                                                    class="label label-success">Complet</span> et en attente de validation par nos services
             <?php else: ?>
@@ -106,9 +103,9 @@ $fieldsets = $form->getFieldsets();
     <div class="row">
         <?php
         if ($canEdit) {
-            echo $this->partial('application/intervenant-dossier/partial/formStatut', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude',));
+            echo $this->partial('application/intervenant-dossier/partial/formStatut', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier',));
         } else {
-            echo $this->partial('application/intervenant-dossier/partial/formStatutView', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude'));
+            echo $this->partial('application/intervenant-dossier/partial/formStatutView', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier'));
         }
         ?>
     </div>
@@ -124,63 +121,63 @@ $fieldsets = $form->getFieldsets();
             /*Fiedlset identite (toujours affiché)*/
 
             if ($editIdentite) {
-                echo $this->partial('application/intervenant-dossier/partial/formIdentite', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude'));
+                echo $this->partial('application/intervenant-dossier/partial/formIdentite', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier'));
             } else {
-                echo $this->partial('application/intervenant-dossier/partial/formIdentiteView', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude'));
+                echo $this->partial('application/intervenant-dossier/partial/formIdentiteView', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier'));
             }
             /*Fiedlset identite complementaire*/
 
             if ($fieldsetRules['fieldset-identite-complementaire']) {
                 if ($editIdentite) {
-                    echo $this->partial('application/intervenant-dossier/partial/formIdentiteComplementaire', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude'));
+                    echo $this->partial('application/intervenant-dossier/partial/formIdentiteComplementaire', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier'));
                 } else {
-                    echo $this->partial('application/intervenant-dossier/partial/formIdentiteComplementaireView', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude'));
+                    echo $this->partial('application/intervenant-dossier/partial/formIdentiteComplementaireView', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier'));
                 }
             }
 
             /*Fieldset Contact*/
             if ($fieldsetRules['fieldset-contact']) {
                 if ($editContact) {
-                    echo $this->partial('application/intervenant-dossier/partial/formContact', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude'));
+                    echo $this->partial('application/intervenant-dossier/partial/formContact', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier'));
                 } else {
-                    echo $this->partial('application/intervenant-dossier/partial/formContactView', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude'));
+                    echo $this->partial('application/intervenant-dossier/partial/formContactView', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier'));
                 }
             }
 
             /*Fieldset Adresse*/
             if ($fieldsetRules['fieldset-adresse']) {
                 if ($editAdresse) {
-                    echo $this->partial('application/intervenant-dossier/partial/formAdresse', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude'));
+                    echo $this->partial('application/intervenant-dossier/partial/formAdresse', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier'));
                 } else {
-                    echo $this->partial('application/intervenant-dossier/partial/formAdresseView', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude'));
+                    echo $this->partial('application/intervenant-dossier/partial/formAdresseView', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier'));
                 }
             }
             /*Fiedlset Insee*/
             if ($fieldsetRules['fieldset-insee']) {
                 if ($editInsee) {
-                    echo $this->partial('application/intervenant-dossier/partial/formInsee', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude'));
+                    echo $this->partial('application/intervenant-dossier/partial/formInsee', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier'));
                 } else {
-                    echo $this->partial('application/intervenant-dossier/partial/formInseeView', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude'));
+                    echo $this->partial('application/intervenant-dossier/partial/formInseeView', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier'));
                 }
             }
             if ($fieldsetRules['fieldset-iban']) {
                 if ($editIban) {
-                    echo $this->partial('application/intervenant-dossier/partial/formBancaire', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude'));
+                    echo $this->partial('application/intervenant-dossier/partial/formBancaire', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier'));
                 } else {
-                    echo $this->partial('application/intervenant-dossier/partial/formBancaireView', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude'));
+                    echo $this->partial('application/intervenant-dossier/partial/formBancaireView', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier'));
                 }
             }
             /*Fiedlset Employeur*/
             if ($fieldsetRules['fieldset-employeur']) {
                 if ($editEmployeur) {
-                    echo $this->partial('application/intervenant-dossier/partial/formEmployeur', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude'));
+                    echo $this->partial('application/intervenant-dossier/partial/formEmployeur', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier'));
                 } else {
-                    echo $this->partial('application/intervenant-dossier/partial/formEmployeurView', compact('form', 'intervenant', 'intervenantDossier', 'intervenantDossierCompletude'));
+                    echo $this->partial('application/intervenant-dossier/partial/formEmployeurView', compact('form', 'intervenant', 'intervenantDossier', 'tblDossier'));
                 }
             }
             /*Fieldset Autres*/
             if ($fieldsetRules['fieldset-autres']) {
-                echo $this->partial('application/intervenant-dossier/partial/formAutres', compact('form', 'intervenant', 'intervenantDossier', 'champsAutres', 'intervenantDossierCompletude'));
+                echo $this->partial('application/intervenant-dossier/partial/formAutres', compact('form', 'intervenant', 'intervenantDossier', 'champsAutres', 'tblDossier'));
             }
 
             ?>

module/Application/view/application/intervenant-dossier/partial/formAdresse.phtml

 <?php
 
+/**
+ * @var $this        \Application\View\Renderer\PhpRenderer
+ * @var $tblDossier  \Application\Entity\Db\TblDossier
+ */
 
 $form->prepare();
 $dossierAdresse = $form->get('DossierAdresse');
@@ -10,7 +14,7 @@ $dossierAdresse = $form->get('DossierAdresse');
     <div class="panel panel-default">
         <div class="panel-heading">
             ADRESSE
-            <?php if (!$intervenantDossierCompletude['dossierAdresse']): ?>
+            <?php if (!$tblDossier->getCompletudeAdresse()): ?>
                 <span class="label label-warning">A compléter</span>
             <?php else: ?>
                 <span class="label label-success">Complet</span>

module/Application/view/application/intervenant-dossier/partial/formAdresseView.phtml

 <?php
+
 /**
+ * @var                                           $this        \Application\View\Renderer\PhpRenderer
+ * @var                                           $tblDossier  \Application\Entity\Db\TblDossier
  * @var \Application\Entity\Db\IntervenantDossier $intervenantDossier
  */
 
@@ -16,7 +19,7 @@ $dossierAdresse = $form->get('DossierAdresse'); /* @var $dossier \Application\Fo
     <div class="panel panel-default">
         <div class="panel-heading">
             ADRESSE
-            <?php if (!$intervenantDossierCompletude['dossierAdresse']): ?>
+            <?php if (!$intervenantDossier->getTblDossier()->getCompletudeAdresse()): ?>
                 <span class="label label-warning">A compléter</span>
             <?php else: ?>
                 <span class="label label-success">Complet</span>

module/Application/view/application/intervenant-dossier/partial/formAutres.phtml

 <?php
 
-use Application\Assertion\IntervenantDossierAssertion;
-
-
 /**
- * @var $this             \Application\View\Renderer\PhpRenderer
- * @var $form             \Application\Form\Intervenant\Dossier
- * @var $canValider       boolean
- * @var $canDevalider     boolean
- * @var $canSupprimer     boolean
- * @var $dossier          Dossier
+ * @var $this                        \Application\View\Renderer\PhpRenderer
+ * @var $form                        \Application\Form\Intervenant\Dossier
+ * @var $canValider                  boolean
+ * @var $canDevalider                boolean
+ * @var $canSupprimer                boolean
+ * @var $intervenantDossier          \Application\Entity\Db\IntervenantDossier
  */
 
-//$Dossier = $dossier;
-
 $form->prepare();
 $dossierAutres = $form->get('DossierAutres');
 ?>
@@ -37,7 +32,7 @@ $dossierAutres = $form->get('DossierAutres');
 
             <div class="panel-heading">
                 AUTRES
-                <?php if (!$intervenantDossierCompletude['dossierAutres']): ?>
+                <?php if (!$intervenantDossier->getTblDossier()->getCompletudeAutres()): ?>
                     <span class="label label-warning">A compléter</span>
                 <?php else: ?>
                     <span class="label label-success">Complet</span>

module/Application/view/application/intervenant-dossier/partial/formBancaire.phtml

 <?php
+/**
+ * @var $this        \Application\View\Renderer\PhpRenderer
+ * @var $tblDossier  \Application\Entity\Db\TblDossier
+ */
 
 $form->prepare();
 $dossierBancaire = $form->get('DossierBancaire');
@@ -20,7 +24,7 @@ $dossierBancaire = $form->get('DossierBancaire');
     <div class="panel panel-default ">
         <div class="panel-heading">
             COORDONNÉES BANCAIRES
-            <?php if (!$intervenantDossierCompletude['dossierIban']): ?>
+            <?php if (!$tblDossier->getCompletudeIban()): ?>
                 <span class="label label-warning">A compléter</span>
             <?php else: ?>
                 <span class="label label-success">Complet</span>

module/Application/view/application/intervenant-dossier/partial/formBancaireView.phtml

 <?php
-
 /**
  * @var \Application\Entity\Db\IntervenantDossier $intervenantDossier
  */
@@ -17,7 +16,7 @@ $dossierBancaire = $form->get('DossierBancaire');
     <div class="panel panel-default ">
         <div class="panel-heading">
             COORDONNÉES BANCAIRES
-            <?php if (!$intervenantDossierCompletude['dossierIban']): ?>
+            <?php if (!$intervenantDossier->getTblDossier()->getCompletudeIban()): ?>
                 <span class="label label-warning">A compléter</span>
             <?php else: ?>
                 <span class="label label-success">Complet</span>

module/Application/view/application/intervenant-dossier/partial/formContact.phtml

@@ -7,6 +7,7 @@
  * @var $canDevalider     boolean
  * @var $canSupprimer     boolean
  * @var $dossier          Dossier
+ * @var $tblDossier       \Application\Entity\Db\TblDossier
  */
 
 //$Dossier = $dossier;
@@ -31,7 +32,7 @@ $dossierContact = $form->get('DossierContact');
     <div class="panel panel-default ">
         <div class="panel-heading">
             CONTACT
-            <?php if (!$intervenantDossierCompletude['dossierContact']): ?>
+            <?php if (!$tblDossier->getCompletudeContact()): ?>
                 <span class="label label-warning">A compléter</span>
             <?php else: ?>
                 <span class="label label-success">Complet</span>

module/Application/view/application/intervenant-dossier/partial/formContactView.phtml

@@ -20,7 +20,7 @@ $dossierContact = $form->get('DossierContact');
     <div class="panel panel-default ">
         <div class="panel-heading">
             CONTACT
-            <?php if (!$intervenantDossierCompletude['dossierContact']): ?>
+            <?php if (!$intervenantDossier->getTblDossier()->getCompletudeContact()): ?>
                 <span class="label label-warning">A compléter</span>
             <?php else: ?>
                 <span class="label label-success">Complet</span>

module/Application/view/application/intervenant-dossier/partial/formEmployeur.phtml

@@ -6,7 +6,7 @@
  * @var $canValider       boolean
  * @var $canDevalider     boolean
  * @var $canSupprimer     boolean