Skip to content
Snippets Groups Projects
Commit de99c42d authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Modification de intervenant dossier, pour ne sauvegarder un nouveau dossier...

Modification de intervenant dossier, pour ne sauvegarder un nouveau dossier uniquement lorsque une action d'enregistrement est demandée par l'utilisateur, pour éviter de créer des dossiers en base automatiquement juste au première affichage (#38835).
parent b3ce9691
Branches
Tags
No related merge requests found
Showing
with 136 additions and 95 deletions
...@@ -406,7 +406,7 @@ class IntervenantDossierAssertion extends AbstractAssertion ...@@ -406,7 +406,7 @@ class IntervenantDossierAssertion extends AbstractAssertion
$isValidate = $this->getServiceDossier()->getValidation($intervenant); $isValidate = $this->getServiceDossier()->getValidation($intervenant);
return $this->asserts([ return $this->asserts([
$intervenantDossier->getTblDossier()->getCompletude(), (!empty($intervenantDossier->getTblDossier())) ? $intervenantDossier->getTblDossier()->getCompletude() : false,
!$isValidate, !$isValidate,
$this->getRole()->hasPrivilege(Privileges::DOSSIER_VALIDATION), $this->getRole()->hasPrivilege(Privileges::DOSSIER_VALIDATION),
]); ]);
......
...@@ -66,41 +66,38 @@ class IntervenantDossierController extends AbstractController ...@@ -66,41 +66,38 @@ class IntervenantDossierController extends AbstractController
} }
/* Récupération du dossier de l'intervenant */ /* Récupération du dossier de l'intervenant */
$intervenantDossier = $this->getServiceDossier()->getByIntervenant($intervenant); $intervenantDossier = $this->getServiceDossier()->getByIntervenant($intervenant);
/* Récupération de la validation du dossier si elle existe */
/*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); $intervenantDossierValidation = $this->getServiceDossier()->getValidation($intervenant);
$tblDossier = $intervenantDossier->getTblDossier(); $tblDossier = $intervenantDossier->getTblDossier();
if (!$tblDossier) { if (!$tblDossier and $intervenantDossier->getId()) {
$this->em()->refresh($intervenantDossier); //$this->em()->refresh($intervenantDossier);
$tblDossier = $intervenantDossier->getTblDossier(); $tblDossier = $intervenantDossier->getTblDossier();
} }
$lastCompleted = (!empty($tblDossier)) ? $tblDossier->getCompletude() : '';
$lastCompleted = $tblDossier->getCompletude();
/* Initialisation du formulaire */ /* Initialisation du formulaire */
$form = $this->getIntervenantDossierForm($intervenant); $form = $this->getIntervenantDossierForm($intervenant);
$form->bind($intervenantDossier); $form->bind($intervenantDossier);
//si on vient de post //si on vient de post et que le dossier n'est pas encore validé
if ($this->getRequest()->isPost()) { if ($this->getRequest()->isPost() && empty($intervenantDossierValidation)) {
$data = $this->getRequest()->getPost(); $data = $this->getRequest()->getPost();
$form->setData($data); $form->setData($data);
if ($form->isValid()) { if ($form->isValid()) {
/* Traitement du formulaire */ /* Traitement du formulaire */
$intervenantDossier = $this->getServiceDossier()->save($intervenantDossier); $intervenantDossier = $this->getServiceDossier()->save($intervenantDossier);
/*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);
//Alimentation de la table INDIC_MODIF_DOSSIER //Alimentation de la table INDIC_MODIF_DOSSIER
$this->getServiceDossier()->updateIndicModifDossier($intervenant, $intervenantDossier); $this->getServiceDossier()->updateIndicModifDossier($intervenant, $intervenantDossier);
//Recalcul des tableaux de bord nécessaires //Recalcul des tableaux de bord nécessaires
$this->updateTableauxBord($intervenantDossier->getIntervenant()); $this->updateTableauxBord($intervenantDossier->getIntervenant());
$this->em()->refresh($tblDossier); $this->em()->refresh($intervenantDossier);
$tblDossier = $intervenantDossier->getTblDossier();
$lastCompleted = $tblDossier->getCompletude();
/*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é'); $this->flashMessenger()->addSuccessMessage('Enregistrement de vos données effectué');
//return $this->redirect()->toUrl($this->url()->fromRoute('intervenant/dossier', [], [], true)); //return $this->redirect()->toUrl($this->url()->fromRoute('intervenant/dossier', [], [], true));
......
...@@ -90,6 +90,7 @@ $fieldsets = $form->getFieldsets(); ...@@ -90,6 +90,7 @@ $fieldsets = $form->getFieldsets();
<?php if (!empty($formErrors)): ?> <?php if (!empty($formErrors)): ?>
<?= $this->formErrors($form); ?> <?= $this->formErrors($form); ?>
<?php else: ?> <?php else: ?>
<?php if (!empty($tblDossier)): ?>
<div class="messenger alert <?= ($tblDossier->getCompletude()) ? 'alert-success' : 'alert-warning' ?> "> <div class="messenger alert <?= ($tblDossier->getCompletude()) ? 'alert-success' : 'alert-warning' ?> ">
<?php if ($tblDossier->getCompletude() && $intervenantDossierValidation): ?> <?php if ($tblDossier->getCompletude() && $intervenantDossierValidation): ?>
Votre dossier est maintenant <span style="font-size:1em;" class="label label-success">Complet</span> et <span Votre dossier est maintenant <span style="font-size:1em;" class="label label-success">Complet</span> et <span
...@@ -102,6 +103,12 @@ $fieldsets = $form->getFieldsets(); ...@@ -102,6 +103,12 @@ $fieldsets = $form->getFieldsets();
<span style="font-size:1em;" class="label label-warning">A compléter</span> <span style="font-size:1em;" class="label label-warning">A compléter</span>
<?php endif; ?> <?php endif; ?>
</div> </div>
<?php else: ?>
<div class="messenger alert alert-warning">
Veuillez vérifier / compléter vos données personnelles pré-renseignées et enregistrer celles-ci pour initialiser votre dossier.
</div>
<?php endif; ?>
<?php endif; ?> <?php endif; ?>
......
...@@ -16,11 +16,13 @@ $dossierAdresse = $form->get('DossierAdresse'); ...@@ -16,11 +16,13 @@ $dossierAdresse = $form->get('DossierAdresse');
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
ADRESSE ADRESSE
<?php if (!empty($tblDossier)): ?>
<?php if (!$tblDossier->getCompletudeAdresse()): ?> <?php if (!$tblDossier->getCompletudeAdresse()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
......
...@@ -21,11 +21,13 @@ $dossierAdresse = $form->get('DossierAdresse'); /* @var $dossier \Application\Fo ...@@ -21,11 +21,13 @@ $dossierAdresse = $form->get('DossierAdresse'); /* @var $dossier \Application\Fo
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
ADRESSE ADRESSE
<?php if (!empty($tblDossier)): ?>
<?php if (!$intervenantDossier->getTblDossier()->getCompletudeAdresse()): ?> <?php if (!$intervenantDossier->getTblDossier()->getCompletudeAdresse()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
......
...@@ -31,11 +31,13 @@ $dossierAutres = $form->get('DossierAutres'); ...@@ -31,11 +31,13 @@ $dossierAutres = $form->get('DossierAutres');
<div class="panel-heading"> <div class="panel-heading">
AUTRES AUTRES
<?php if (!empty($tblDossier)): ?>
<?php if (!$intervenantDossier->getTblDossier()->getCompletudeAutres()): ?> <?php if (!$intervenantDossier->getTblDossier()->getCompletudeAutres()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
......
...@@ -27,11 +27,14 @@ $dossierBancaire = $form->get('DossierBancaire'); ...@@ -27,11 +27,14 @@ $dossierBancaire = $form->get('DossierBancaire');
<div class="panel panel-default "> <div class="panel panel-default ">
<div class="panel-heading"> <div class="panel-heading">
COORDONNÉES BANCAIRES COORDONNÉES BANCAIRES
<?php if (!empty($tblDossier)): ?>
<?php if (!$tblDossier->getCompletudeIban()): ?> <?php if (!$tblDossier->getCompletudeIban()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<?php <?php
......
...@@ -20,11 +20,13 @@ $dossierBancaire = $form->get('DossierBancaire'); ...@@ -20,11 +20,13 @@ $dossierBancaire = $form->get('DossierBancaire');
<div class="panel panel-default "> <div class="panel panel-default ">
<div class="panel-heading"> <div class="panel-heading">
COORDONNÉES BANCAIRES COORDONNÉES BANCAIRES
<?php if (!empty($tblDossier)): ?>
<?php if (!$intervenantDossier->getTblDossier()->getCompletudeIban()): ?> <?php if (!$intervenantDossier->getTblDossier()->getCompletudeIban()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="form-group"> <div class="form-group">
......
...@@ -30,11 +30,13 @@ $dossierContact = $form->get('DossierContact'); ...@@ -30,11 +30,13 @@ $dossierContact = $form->get('DossierContact');
<div class="panel panel-default "> <div class="panel panel-default ">
<div class="panel-heading"> <div class="panel-heading">
CONTACT CONTACT
<?php if (!empty($tblDossier)): ?>
<?php if (!$tblDossier->getCompletudeContact()): ?> <?php if (!$tblDossier->getCompletudeContact()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<?php <?php
......
...@@ -27,11 +27,13 @@ $dossierContact = $form->get('DossierContact'); ...@@ -27,11 +27,13 @@ $dossierContact = $form->get('DossierContact');
<div class="panel panel-default "> <div class="panel panel-default ">
<div class="panel-heading"> <div class="panel-heading">
CONTACT CONTACT
<?php if (!empty($tblDossier)): ?>
<?php if (!$intervenantDossier->getTblDossier()->getCompletudeContact()): ?> <?php if (!$intervenantDossier->getTblDossier()->getCompletudeContact()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="form-group"> <div class="form-group">
......
...@@ -30,11 +30,13 @@ $dossierInsee = $form->get('DossierEmployeur'); ...@@ -30,11 +30,13 @@ $dossierInsee = $form->get('DossierEmployeur');
<div class="panel panel-default "> <div class="panel panel-default ">
<div class="panel-heading"> <div class="panel-heading">
EMPLOYEUR EMPLOYEUR
<?php if (!empty($tblDossier)): ?>
<?php if (!$tblDossier->getCompletudeEmployeur()): ?> <?php if (!$tblDossier->getCompletudeEmployeur()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="well" role="alert">Saissisez les premières lettres de votre employeur ou directement le N° de SIREN. <div class="well" role="alert">Saissisez les premières lettres de votre employeur ou directement le N° de SIREN.
......
...@@ -20,11 +20,14 @@ $dossierEmployeur = $form->get('DossierEmployeur'); ...@@ -20,11 +20,14 @@ $dossierEmployeur = $form->get('DossierEmployeur');
<div class="panel panel-default "> <div class="panel panel-default ">
<div class="panel-heading"> <div class="panel-heading">
EMPLOYEUR EMPLOYEUR
<?php if (!empty($tblDossier)): ?>
<?php if (!$intervenantDossier->getTblDossier()->getCompletudeEmployeur()): ?> <?php if (!$intervenantDossier->getTblDossier()->getCompletudeEmployeur()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="form-group"> <div class="form-group">
......
...@@ -22,11 +22,13 @@ $dossierIdentite = $form->get('DossierIdentite'); ...@@ -22,11 +22,13 @@ $dossierIdentite = $form->get('DossierIdentite');
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
IDENTITÉ IDENTITÉ
<?php if (!empty($tblDossier)): ?>
<?php if (!$tblDossier->getCompletudeIdentite()): ?> <?php if (!$tblDossier->getCompletudeIdentite()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
......
...@@ -22,11 +22,13 @@ $dossierIdentiteComplementaire = $form->get('DossierIdentiteComplementaire'); ...@@ -22,11 +22,13 @@ $dossierIdentiteComplementaire = $form->get('DossierIdentiteComplementaire');
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
IDENTITÉ COMPLEMENTAIRE IDENTITÉ COMPLEMENTAIRE
<?php if (!empty($tblDossier)): ?>
<?php if (!$tblDossier->getCompletudeIdentiteComp()): ?> <?php if (!$tblDossier->getCompletudeIdentiteComp()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
......
...@@ -30,11 +30,14 @@ $dossierIdentiteComplementaire = $form->get('DossierIdentiteComplementaire'); ...@@ -30,11 +30,14 @@ $dossierIdentiteComplementaire = $form->get('DossierIdentiteComplementaire');
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
IDENTITÉ COMPLEMENTAIRE IDENTITÉ COMPLEMENTAIRE
<?php if (!empty($tblDossier)): ?>
<?php if (!$intervenantDossier->getTblDossier()->getCompletudeIdentiteComp()): ?> <?php if (!$intervenantDossier->getTblDossier()->getCompletudeIdentiteComp()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
......
...@@ -30,11 +30,13 @@ $dossierIdentite = $form->get('DossierIdentite'); ...@@ -30,11 +30,13 @@ $dossierIdentite = $form->get('DossierIdentite');
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
IDENTITÉ IDENTITÉ
<?php if (!empty($tblDossier)): ?>
<?php if (!$intervenantDossier->getTblDossier()->getCompletudeIdentite()): ?> <?php if (!$intervenantDossier->getTblDossier()->getCompletudeIdentite()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
......
...@@ -28,11 +28,13 @@ $dossierInsee = $form->get('DossierInsee'); ...@@ -28,11 +28,13 @@ $dossierInsee = $form->get('DossierInsee');
<div class="panel panel-default "> <div class="panel panel-default ">
<div class="panel-heading"> <div class="panel-heading">
INSEE INSEE
<?php if (!empty($tblDossier)): ?>
<?php if (!$tblDossier->getCompletudeInsee()): ?> <?php if (!$tblDossier->getCompletudeInsee()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<?php <?php
......
...@@ -25,11 +25,13 @@ $dossierInsee = $form->get('DossierInsee'); ...@@ -25,11 +25,13 @@ $dossierInsee = $form->get('DossierInsee');
<div class="panel panel-default "> <div class="panel panel-default ">
<div class="panel-heading"> <div class="panel-heading">
INSEE INSEE
<?php if (!empty($tblDossier)): ?>
<?php if (!$intervenantDossier->getTblDossier()->getCompletudeInsee()): ?> <?php if (!$intervenantDossier->getTblDossier()->getCompletudeInsee()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="form-group"> <div class="form-group">
......
...@@ -27,11 +27,13 @@ $dossierStatut = $form->get('DossierStatut'); ...@@ -27,11 +27,13 @@ $dossierStatut = $form->get('DossierStatut');
<div class="panel panel-default "> <div class="panel panel-default ">
<div class="panel-heading"> <div class="panel-heading">
STATUT STATUT
<?php if (!empty($tblDossier)): ?>
<?php if (!$tblDossier->getCompletudeStatut()): ?> <?php if (!$tblDossier->getCompletudeStatut()): ?>
<span class="label label-warning">A compléter</span> <span class="label label-warning">A compléter</span>
<?php else: ?> <?php else: ?>
<span class="label label-success">Complet</span> <span class="label label-success">Complet</span>
<?php endif; ?> <?php endif; ?>
<?php endif; ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<?php <?php
......
...@@ -180,7 +180,9 @@ Util = { ...@@ -180,7 +180,9 @@ Util = {
{}, {},
function () function ()
{ {
window.location.reload(); //Préférable pour éviter de re-soumettre des posts lors d'un changement d'année
window.location = window.location.href;
//window.location.reload();
} }
); );
}, },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment