Merge branch 'master' of https://git.unicaen.fr/open-source/OSE

admin/migration/MigrationStatutAutres.php

@@ -30,7 +30,6 @@ class MigrationStatutAutres extends AbstractMigration
         $statutAutres = current($bdd->select($sqlStatutAutres));
 
         return ($statutAutres['DOSSIER_ADRESSE'] ||
-            $statutAutres['DOSSIER_EMPLOYEUR'] ||
             $statutAutres['DOSSIER_CONTACT'] ||
             $statutAutres['DOSSIER_IBAN'] ||
             $statutAutres['DOSSIER_IDENTITE_COMP'] ||

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

 <?php
 
 /**
- * @var $this        \Application\View\Renderer\PhpRenderer
+ * @var $form                         \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $role                         \UnicaenAuth\Entity\Db\Role
+ * @var $intervenant                  \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier           \Application\Entity\Db\IntervenantDossier
+ * @var $intervenantDossierValidation \Application\Entity\Db\Validation
+ * @var $intervenantDossierStatut     \Application\Entity\Db\StatutIntervenant
  * @var $tblDossier                   \Application\Entity\Db\TblDossier
+ * @var $fieldsetRules                Array
+ * @var $champsAutres                 \Application\Entity\Collection
  */
 
+
 use Application\Assertion\IntervenantDossierAssertion;
 use Application\Entity\Db\WfEtape;
 

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

@@ -2,9 +2,11 @@
 
 /**
  * @var $this               \Application\View\Renderer\PhpRenderer
+ * @var $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
  * @var $tblDossier         \Application\Entity\Db\TblDossier
  */
-
 $form->prepare();
 $dossierAdresse = $form->get('DossierAdresse');
 ?>

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

@@ -2,8 +2,10 @@
 
 /**
  * @var $this               \Application\View\Renderer\PhpRenderer
+ * @var $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
  * @var $tblDossier         \Application\Entity\Db\TblDossier
- * @var \Application\Entity\Db\IntervenantDossier $intervenantDossier
  */
 
 use Application\Assertion\IntervenantDossierAssertion;

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

@@ -2,13 +2,12 @@
 
 /**
  * @var $this                         \Application\View\Renderer\PhpRenderer
- * @var $form                        \Application\Form\Intervenant\Dossier
- * @var $canValider                  boolean
- * @var $canDevalider                boolean
- * @var $canSupprimer                boolean
+ * @var $form                         \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant                  \Application\Entity\Db\Intervenant
  * @var $intervenantDossier           \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier                   \Application\Entity\Db\TblDossier
+ * @var $champsAutres                 \Application\Entity\Collection
  */
-
 $form->prepare();
 $dossierAutres = $form->get('DossierAutres');
 ?>

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

 <?php
 /**
  * @var $this               \Application\View\Renderer\PhpRenderer
+ * @var $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
  * @var $tblDossier         \Application\Entity\Db\TblDossier
  */
 

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

 <?php
 /**
- * @var \Application\Entity\Db\IntervenantDossier $intervenantDossier
+ * @var $this               \Application\View\Renderer\PhpRenderer
+ * @var $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier         \Application\Entity\Db\TblDossier
  */
 
 use Application\Assertion\IntervenantDossierAssertion;

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

@@ -2,11 +2,9 @@
 
 /**
  * @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 $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
  * @var $tblDossier         \Application\Entity\Db\TblDossier
  */
 

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

 <?php
 
+/**
+ * @var $this               \Application\View\Renderer\PhpRenderer
+ * @var $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier         \Application\Entity\Db\TblDossier
+ */
 
 use Application\Assertion\IntervenantDossierAssertion;
 

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

@@ -2,13 +2,11 @@
 
 /**
  * @var $this               \Application\View\Renderer\PhpRenderer
- * @var $form             \Application\Form\Intervenant\Dossier
- * @var $canValider       boolean
- * @var $canDevalider     boolean
- * @var $canSupprimer     boolean
+ * @var $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
  * @var $tblDossier         \Application\Entity\Db\TblDossier
  */
-
 //$Dossier = $dossier;
 
 $form->prepare();

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

 <?php
-
 /**
  * @var $this               \Application\View\Renderer\PhpRenderer
+ * @var $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
  * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier         \Application\Entity\Db\TblDossier
  */
 
 use Application\Assertion\IntervenantDossierAssertion;

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

@@ -2,6 +2,9 @@
 
 /**
  * @var $this               \Application\View\Renderer\PhpRenderer
+ * @var $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
  * @var $tblDossier         \Application\Entity\Db\TblDossier
  */
 

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

@@ -2,6 +2,9 @@
 
 /**
  * @var $this               \Application\View\Renderer\PhpRenderer
+ * @var $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
  * @var $tblDossier         \Application\Entity\Db\TblDossier
  */
 

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

 <?php
 
 /**
- * @var \Application\Entity\Db\IntervenantDossier $intervenantDossier
+ * @var $this               \Application\View\Renderer\PhpRenderer
+ * @var $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier         \Application\Entity\Db\TblDossier
  */
 
 use Application\Assertion\IntervenantDossierAssertion;

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

 <?php
 
 /**
- * @var \Application\Entity\Db\IntervenantDossier $intervenantDossier
+ * @var $this               \Application\View\Renderer\PhpRenderer
+ * @var $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier         \Application\Entity\Db\TblDossier
  */
 
 use Application\Assertion\IntervenantDossierAssertion;

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

@@ -2,6 +2,9 @@
 
 /**
  * @var $this               \Application\View\Renderer\PhpRenderer
+ * @var $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
  * @var $tblDossier         \Application\Entity\Db\TblDossier
  */
 

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

 <?php
 
 /**
- * @var \Application\Entity\Db\IntervenantDossier $intervenantDossier
+ * @var $this               \Application\View\Renderer\PhpRenderer
+ * @var $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier         \Application\Entity\Db\TblDossier
  */
 
 use Application\Assertion\IntervenantDossierAssertion;

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

@@ -2,9 +2,11 @@
 
 /**
  * @var $this               \Application\View\Renderer\PhpRenderer
+ * @var $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
  * @var $tblDossier         \Application\Entity\Db\TblDossier
  */
-
 $form->prepare();
 $dossierStatut = $form->get('DossierStatut');
 ?>

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

 <?php
 
+/**
+ * @var $this               \Application\View\Renderer\PhpRenderer
+ * @var $form               \Application\Form\Intervenant\IntervenantDossierForm
+ * @var $intervenant        \Application\Entity\Db\Intervenant
+ * @var $intervenantDossier \Application\Entity\Db\IntervenantDossier
+ * @var $tblDossier         \Application\Entity\Db\TblDossier
+ */
 
 $form->prepare();
 $dossierStatut = $form->get('DossierStatut');