Merge branch 'master' of https://git.unicaen.fr/open-source/OSE (33112fc6) · Commits · open-source / OSE

CHANGELOG.md

+6 −0

Changes for CHANGELOG.md: 6 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -39,9 +39,15 @@ Une nouvelle documentation sur les connecteurs est disponible ici : [Import de d

		# OSE 14.11

		## Nouveautés

		* Suppression du contrôle de la civilité sur le numéro INSEE dans les données personnelles
		* Ajout d'un nouveau privilège pour "Règles de validation par type d'intervenant" dans l'administration de OSE (Ticket #32637)

		## Corrections de bugs

		* Sur l'écran paramétrage d'un centre de coût d'un élément pédagogique (offre de formation), ne proposer que les centres de coûts de la composante d'appartenance de l'ELP. (Ticket #28958)
		* L'indicateur 340 était inopérant

		# OSE 14.10

module/Application/src/Application/Controller/IntervenantDossierController.php

+0 −1

Changes for module/Application/src/Application/Controller/IntervenantDossierController.php: 0 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -74,7 +74,6 @@ class IntervenantDossierController extends AbstractController
		if ($this->getRequest()->isPost()) {
		$data = $this->getRequest()->getPost();
		$form->setData($data);
		$valid = $form->isValid();
		if ($form->isValid()) {
		/* Traitement du formulaire */
		$completude = $this->getServiceDossier()->isComplete($intervenantDossier);

module/Application/src/Application/Form/Adresse/AdresseFieldset.php

+11 −3

Changes for module/Application/src/Application/Form/Adresse/AdresseFieldset.php: 11 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ class AdresseFieldset extends AbstractFieldset
		],
		],
		'attributes' => [
		'class' => 'dossierElement',
		'rows' => 2,
		],
		'type' => 'Textarea',
		@@ -69,6 +70,9 @@ class AdresseFieldset extends AbstractFieldset
		'options' => [
		'label' => 'Lieu dit',
		],
		'attributes' => [
		'class' => 'dossierElement',
		],
		'type' => 'Text',
		]);

		@@ -81,6 +85,7 @@ class AdresseFieldset extends AbstractFieldset
		'label' => 'N°',
		],
		'attributes' => [
		'class' => 'dossierElement',
		'placeholder' => 'N°',
		],
		'type' => 'Text',
		@@ -97,7 +102,7 @@ class AdresseFieldset extends AbstractFieldset
		'value_options' => \UnicaenApp\Util::collectionAsOptions($this->getServiceAdresseNumeroCompl()->getList()),
		],
		'attributes' => [
		'class' => 'selectpicker',
		'class' => 'selectpicker dossierElement',
		'data-live-search' => 'true',
		],
		'type' => 'Select',
		@@ -115,7 +120,7 @@ class AdresseFieldset extends AbstractFieldset
		'value_options' => \UnicaenApp\Util::collectionAsOptions($this->getServiceVoirie()->getList()),
		],
		'attributes' => [
		'class' => 'selectpicker',
		'class' => 'selectpicker dossierElement',
		'data-live-search' => 'true',
		'data-size' => 10,
		],
		@@ -131,6 +136,7 @@ class AdresseFieldset extends AbstractFieldset
		'label' => 'Voie',
		],
		'attributes' => [
		'class' => 'dossierElement',
		'placeholder' => 'nom de la voie',
		],
		'type' => 'Text',
		@@ -146,6 +152,7 @@ class AdresseFieldset extends AbstractFieldset
		'disable_html_escape' => true,
		],],
		'attributes' => [
		'class' => 'dossierElement',
		'placeholder' => 'Code postal',
		],
		'type' => 'Text',
		@@ -162,6 +169,7 @@ class AdresseFieldset extends AbstractFieldset
		'disable_html_escape' => true,
		],],
		'attributes' => [
		'class' => 'dossierElement',
		'placeholder' => 'Ville',
		],
		'type' => 'Text',
		@@ -180,7 +188,7 @@ class AdresseFieldset extends AbstractFieldset
		'disable_html_escape' => true,
		],],
		'attributes' => [
		'class' => 'selectpicker',
		'class' => 'selectpicker dossierElement',
		'data-live-search' => 'true',
		],
		'type' => 'Select',

module/Application/src/Application/Form/Intervenant/Dossier/DossierAutresFieldset.php

+3 −0

Changes for module/Application/src/Application/Form/Intervenant/Dossier/DossierAutresFieldset.php: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -46,6 +46,9 @@ class DossierAutresFieldset extends AbstractFieldset
		'label' => $champ->getLibelle(),
		'label_options' => ['disable_html_escape' => true],
		],
		'attributes' => [
		'class' => 'dossierElement',
		],
		'type' => ($champ->getType()->getCode() == 'texte') ? 'text' : 'select',
		]);

module/Application/src/Application/Form/Intervenant/Dossier/DossierBancaireFieldset.php

+3 −0

Changes for module/Application/src/Application/Form/Intervenant/Dossier/DossierBancaireFieldset.php: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ class DossierBancaireFieldset extends AbstractFieldset
		'attributes' => [
		'size' => 11,
		'maxlength' => 11,
		'class' => 'dossierElement',
		],
		'type' => 'Text',
		]);
		@@ -46,6 +47,7 @@ class DossierBancaireFieldset extends AbstractFieldset
		'attributes' => [
		'size' => 34,
		'maxlength' => 34,
		'class' => 'dossierElement',
		],
		'type' => 'Text',
		]);
		@@ -56,6 +58,7 @@ class DossierBancaireFieldset extends AbstractFieldset
		'label' => 'RIB hors zone SEPA',
		],
		'attributes' => [
		'class' => 'dossierElement',
		],
		'type' => 'Checkbox',
		]);