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

Restauration de l'usage des champs autres des données perso

parent 3a776412
Loading
Loading
Loading
Loading
+8
Changes for module/Application/src/Controller/IntervenantDossierController.php: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ class IntervenantDossierController extends AbstractController
    }



    public function indexAction()
    {
        $this->initFilters();
@@ -154,6 +155,7 @@ class IntervenantDossierController extends AbstractController
    }



    public function changeStatutDossierAction()
    {
        if ($this->getRequest()->isPost()) {
@@ -189,6 +191,7 @@ class IntervenantDossierController extends AbstractController
    }



    public function validerAction()
    {
        $this->initFilters();
@@ -213,6 +216,7 @@ class IntervenantDossierController extends AbstractController
    }



    public function devaliderAction()
    {
        $this->initFilters();
@@ -232,6 +236,7 @@ class IntervenantDossierController extends AbstractController
    }



    public function supprimerAction()
    {
        $this->initFilters();
@@ -252,6 +257,7 @@ class IntervenantDossierController extends AbstractController
    }



    public function differencesAction()
    {
        $intervenant = $this->getEvent()->getParam('intervenant');
@@ -279,6 +285,7 @@ class IntervenantDossierController extends AbstractController
    }



    public function purgerDifferencesAction()
    {
        $intervenant = $this->getEvent()->getParam('intervenant');
@@ -304,6 +311,7 @@ class IntervenantDossierController extends AbstractController
    }



    private function updateTableauxBord(Intervenant $intervenant, $validation = false)
    {
        $this->getServiceWorkflow()->calculerTableauxBord([
+1
Changes for module/Application/src/Entity/Db/IntervenantDossier.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ use Application\Interfaces\AdresseInterface;
use Doctrine\Persistence\Mapping\ClassMetadata;
use Doctrine\Persistence\ObjectManager;
use Doctrine\Persistence\ObjectManagerAware;
use Intervenant\Entity\Db\Statut;
use UnicaenApp\Entity\HistoriqueAwareInterface;
use UnicaenApp\Entity\HistoriqueAwareTrait;
use UnicaenApp\Service\EntityManagerAwareTrait;
+4 −1
Changes for module/Application/src/Form/Intervenant/IntervenantDossierForm.php: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ class IntervenantDossierForm extends AbstractForm
    protected Intervenant      $intervenant;



    public function initForm()
    {

@@ -102,7 +103,7 @@ class IntervenantDossierForm extends AbstractForm
        $this->dossierEmployeurFieldset = new EmployeurFieldset('DossierEmployeur');
        $this->dossierEmployeurFieldset->init();

        $this->dossierAutresFiedlset = new DossierAutresFieldset('DossierAutres', ['listChampsAutres' => []]);//$dossierIntervenant->getStatut()->getChampsAutres()]);
        $this->dossierAutresFiedlset = new DossierAutresFieldset('DossierAutres', ['listChampsAutres' => $dossierIntervenant->getStatut()->getChampsAutres()]);
        $this->dossierAutresFiedlset->init();


@@ -140,6 +141,7 @@ class IntervenantDossierForm extends AbstractForm
    }



    public function setIntervenant(Intervenant $intervenant): self
    {
        $this->intervenant = $intervenant;
@@ -148,6 +150,7 @@ class IntervenantDossierForm extends AbstractForm
    }



    /**
     * Should return an array specification compatible with
     * {@link \Laminas\InputFilter\Factory::createInputFilter()}.
+2 −1
Changes for module/Application/view/application/intervenant-dossier/index.phtml: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -281,7 +281,8 @@ $fieldsets = $form->getFieldsets();
            manageDepartementNaissance();


            function manageDepartementNaissance() {
            function manageDepartementNaissance()
            {
                var selectPays = $("select[name='DossierIdentiteComplementaire[paysNaissance]']");
                var selectDept = $("select[name='DossierIdentiteComplementaire[departementNaissance]']");
                var emptyDept = $("option[value='']", selectDept);
+1 −1
Changes for module/Application/view/application/intervenant-dossier/partial/formAutres.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@
 * @var $intervenant                  \Application\Entity\Db\Intervenant
 * @var $intervenantDossier           \Application\Entity\Db\IntervenantDossier
 * @var $tblDossier                   \Application\Entity\Db\TblDossier
 * @var $champsAutres                 \Application\Entity\Collection
 * @var $champsAutres                 \Application\Entity\Db\DossierAutre[]
 */
$form->prepare();
$dossierAutres = $form->get('DossierAutres');
Loading