Rendre optionnel le choix du statut dans les données personnelles, notamment pour les étudiants (6cc0231a) · Commits · open-source / OSE

data/ddl/table/STATUT.php

+12 −0

Changes for data/ddl/table/STATUT.php: 12 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -537,6 +537,18 @@ return [
		'position' => 14,
		'commentaire' => NULL,
		],
		'DOSSIER_STATUT' => [
		'name' => 'DOSSIER_STATUT',
		'type' => 'bool',
		'bdd-type' => 'NUMBER',
		'length' => 0,
		'scale' => '0',
		'precision' => 1,
		'nullable' => FALSE,
		'default' => '1',
		'position' => 86,
		'commentaire' => NULL,
		],
		'DOSSIER_TEL_PERSO' => [
		'name' => 'DOSSIER_TEL_PERSO',
		'type' => 'bool',

data/ddl_columns_pos.php

+1 −0

Changes for data/ddl_columns_pos.php: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -1309,6 +1309,7 @@ return [
		'MISSION',
		'MISSION_REALISE_EDITION',
		'TAUX_REMU_ID',
		'DOSSIER_STATUT',
		],
		'STRUCTURE' => [
		'ID',

module/Application/src/Controller/IntervenantController.php

+2 −0

Changes for module/Application/src/Controller/IntervenantController.php: 2 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ use Application\Service\Traits\SourceServiceAwareTrait;
		use Application\Service\Traits\UtilisateurServiceAwareTrait;
		use Application\Service\Traits\ValidationServiceAwareTrait;
		use Application\Service\Traits\WorkflowServiceAwareTrait;
		use Dossier\Service\Traits\DossierServiceAwareTrait;
		use Intervenant\Service\NoteServiceAwareTrait;
		use Intervenant\Service\StatutServiceAwareTrait;
		use Laminas\View\Model\JsonModel;
		@@ -58,6 +59,7 @@ class IntervenantController extends AbstractController
		use ImportProcessusAwareTrait;
		use DifferentielServiceAwareTrait;
		use NoteServiceAwareTrait;
		use DossierServiceAwareTrait;


		public function indexAction()

module/Dossier/src/Controller/IntervenantDossierController.php

+19 −7

Changes for module/Dossier/src/Controller/IntervenantDossierController.php: 19 added lines, 7 removed lines.
Original line number	Diff line number	Diff line
		@@ -85,7 +85,11 @@ class IntervenantDossierController extends AbstractController
		$form->setData($data);
		if ($form->isValid()) {
		/* Traitement du formulaire */
		if (empty($intervenantDossier->getStatut()) && $intervenant->getStatut()->getCode() != 'AUTRES') {
		$intervenantDossier->setStatut($intervenant->getStatut());
		}
		$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->getFormIntervenantIntervenantDossier()->setIntervenant($intervenant)->initForm();
		@@ -116,6 +120,7 @@ class IntervenantDossierController extends AbstractController
		//Règles pour afficher ou non les fieldsets
		$champsAutres = $intervenantDossier->getStatut()->getChampsAutres();
		$fieldsetRules = [
		'fieldset-statut' => $intervenantDossier->getStatut()->getDossierStatut(),
		'fieldset-identite-complementaire' => $intervenantDossier->getStatut()->getDossierIdentiteComplementaire(),
		'fieldset-adresse' => $intervenantDossier->getStatut()->getDossierAdresse(),
		'fieldset-contact' => $intervenantDossier->getStatut()->getDossierContact(),
		@@ -156,7 +161,8 @@ class IntervenantDossierController extends AbstractController



		public function changeStatutDossierAction()
		public
		function changeStatutDossierAction()
		{
		if ($this->getRequest()->isPost()) {
		$data = $this->getRequest()->getPost();
		@@ -192,7 +198,8 @@ class IntervenantDossierController extends AbstractController



		public function validerAction()
		public
		function validerAction()
		{
		$this->initFilters();

		@@ -217,7 +224,8 @@ class IntervenantDossierController extends AbstractController



		public function devaliderAction()
		public
		function devaliderAction()
		{
		$this->initFilters();

		@@ -237,7 +245,8 @@ class IntervenantDossierController extends AbstractController



		public function supprimerAction()
		public
		function supprimerAction()
		{
		$this->initFilters();

		@@ -258,7 +267,8 @@ class IntervenantDossierController extends AbstractController



		public function differencesAction()
		public
		function differencesAction()
		{
		$intervenant = $this->getEvent()->getParam('intervenant');

		@@ -286,7 +296,8 @@ class IntervenantDossierController extends AbstractController



		public function purgerDifferencesAction()
		public
		function purgerDifferencesAction()
		{
		$intervenant = $this->getEvent()->getParam('intervenant');

		@@ -312,7 +323,8 @@ class IntervenantDossierController extends AbstractController



		private function updateTableauxBord(Intervenant $intervenant, $validation = false)
		private
		function updateTableauxBord(Intervenant $intervenant, $validation = false)
		{
		$this->getServiceWorkflow()->calculerTableauxBord([
		'dossier',

module/Dossier/src/Form/DossierStatutFieldset.php

+2 −1

Changes for module/Dossier/src/Form/DossierStatutFieldset.php: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ class DossierStatutFieldset extends AbstractFieldset
		'type' => 'Select',
		]);


		/** @var Statut $statut */
		$statut = $this->getOption('statut');
		$intervenant = $this->getOption('intervenant');
		@@ -70,7 +71,7 @@ class DossierStatutFieldset extends AbstractFieldset
		{
		$spec = [
		'statut' => [
		'required' => true,
		'required' => false,
		],
		];