Commit c1f9baaf authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

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

parents fe7e161c 2deb8401

admin/migration/MigrationStatutAutres.php

+0 −1
Original line number Diff line number Diff line
@@ -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

+10 −2
Original line number Diff line number Diff line 
<?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

+5 −3
Original line number Diff line number Diff line
@@ -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

+5 −3
Original line number Diff line number Diff line
@@ -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

+6 −7
Original line number Diff line number Diff line
@@ -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');

?>