Skip to content
Snippets Groups Projects
Commit 3b7daa7a authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Ajout d'une configuration permettant de rendre obligatoire le pays / Le type... 

 Ajout d'une configuration permettant de rendre obligatoire le pays / Le type de structure en passant par le formulaire d'ajout/modification
parent 22795450
No related branches found
No related tags found
No related merge requests found
Pipeline #37656 passed
Stage: test
Show whitespace changes
Inline Side-by-side
Showing
with 203 additions and 95 deletions
module/Oscar/src/Oscar/Controller/AdministrationController.php
+ 17
− 2
View file @ 3b7daa7a
......@@ -352,6 +352,16 @@ class AdministrationController extends AbstractOscarController implements UsePro
if ($this->getHttpXMethod() == "POST") {
$option = $this->params()->fromPost('parameter_name');
switch ($option) {
case OscarConfigurationService::ORGANIZATION_REQUIRED:
$this->getLoggerService()->info("Enregistrement des options des organisations");
$typeRequired = $this->params()->fromPost('organization_type') == "on";
$countryRequired = $this->params()->fromPost('organization_country') == "on";
$this->getOscarConfigurationService()
->saveEditableConfKey("organization_require_type", $typeRequired);
$this->getOscarConfigurationService()
->saveEditableConfKey("organization_require_country", $countryRequired);
return $this->redirect()->toRoute('administration/parameters');
case OscarConfigurationService::allow_node_selection:
$value = $this->params()->fromPost('parameter_value') == "on";
$this->getOscarConfigurationService()->setAllowNodeSelection($value);
......@@ -427,9 +437,10 @@ class AdministrationController extends AbstractOscarController implements UsePro
);
}
return $this->redirect()->toRoute('administration/parameters');
case OscarConfigurationService::ORGANIZATION_REQUIRED:
throw new OscarException("A faire");
default:
return $this->getResponseBadRequest("Paramètres non-reconnue");
return $this->getResponseBadRequest("Paramètres $option non-reconnue");
}
}
......@@ -466,6 +477,10 @@ class AdministrationController extends AbstractOscarController implements UsePro
)->getConfiguration('validation.pfi'),
"allow_node_selection" => $this->getOscarConfigurationService(
)->isAllowNodeSelection(),
"organizationRequire" => [
"type" => $this->getOscarConfigurationService()->getOrganizationRequired()['type'],
"country" => $this->getOscarConfigurationService()->getOrganizationRequired()['country']
]
];
}
......
module/Oscar/src/Oscar/Controller/OrganizationController.php
+ 2
− 0
View file @ 3b7daa7a
......@@ -498,6 +498,7 @@ class OrganizationController extends AbstractOscarController implements UseOrgan
$this->getOrganizationService(),
$this->getOrganizationService()->getOrganizationTypesObject()
);
$form->configureRequired($this->getOscarConfigurationService()->getRequiredOrganization());
$entity = new Organization();
$form->init();
$form->bind($entity);
......@@ -883,6 +884,7 @@ class OrganizationController extends AbstractOscarController implements UseOrgan
$this->getOrganizationService(),
$this->getOrganizationService()->getOrganizationTypesObject()
);
$form->configureRequired($this->getOscarConfigurationService()->getRequiredOrganization());
$form->init();
$form->bind($entity);
......
module/Oscar/src/Oscar/Entity/Country3166Repository.php
+ 2
− 2
View file @ 3b7daa7a
......@@ -29,9 +29,9 @@ class Country3166Repository extends EntityRepository
return $q->getQuery()->getResult();
}
public function getAllForSelects()
public function getAllForSelects() :array
{
$out = ["" => "Non-définit"];
$out = ["" => "Non défini"];
/** @var Country3166 $country */
foreach ($this->getAll() as $country) {
$out[$country->getFr()] = $country->getFr();
......
module/Oscar/src/Oscar/Form/OrganizationIdentificationForm.php
+ 110
− 67
View file @ 3b7daa7a
......@@ -2,6 +2,8 @@
namespace Oscar\Form;
use Laminas\Validator\GreaterThan;
use Laminas\Validator\NotEmpty;
use Oscar\Hydrator\OrganizationFormHydrator;
use Oscar\Service\OrganizationService;
use Laminas\Form\Element;
......@@ -19,8 +21,10 @@ class OrganizationIdentificationForm extends \Laminas\Form\Form implements Input
private $connectors = [];
private $types = [];
private $countries = [];
private bool $countryRequired = false;
private bool $typeRequired = false;
function __construct(OrganizationService $organizationService, $types = [])
public function __construct(OrganizationService $organizationService, $types = [])
{
parent::__construct('organization');
$this->connectors = $organizationService->getConnectorsList();
......@@ -28,7 +32,14 @@ class OrganizationIdentificationForm extends \Laminas\Form\Form implements Input
$this->types = $types;
}
public function init(){
public function configureRequired(array $params): void
{
$this->countryRequired = $params['country'] == true;
$this->typeRequired = $params['type'] == true;
}
public function init(): void
{
$this->setHydrator(new OrganizationFormHydrator($this->connectors, $this->types, $this->countries));
$typesSelect = [];
......@@ -185,7 +196,6 @@ class OrganizationIdentificationForm extends \Laminas\Form\Form implements Input
]);
$eotp = new Element\Text('code');
$eotp->setAttributes([
'class' => 'form-control',
......@@ -285,7 +295,7 @@ class OrganizationIdentificationForm extends \Laminas\Form\Form implements Input
public function getInputFilterSpecification()
{
return [
$filterSpecification = [
'dateStart' => [
'required' => false,
],
......@@ -295,12 +305,45 @@ class OrganizationIdentificationForm extends \Laminas\Form\Form implements Input
],
'country' => [
'required' => $this->countryRequired,
'validators' => [
[
'name' => NotEmpty::class,
'options' => [
'messages' => [
NotEmpty::IS_EMPTY => "Vous devez définir un pays"
]
]
]
]
],
'type' => [
'required' => false
],
'type' => [
'typeObj' => [
'required' => false
]
];
if ($this->typeRequired) {
$filterSpecification['typeObj'] = [
'required' => true,
'validators' => [
[
'name' => \Laminas\Validator\GreaterThan::class,
'options' => [
'min' => 1,
'inclusive' => true,
'messages' => [
GreaterThan::NOT_GREATER_INCLUSIVE => "Vous devez choisir un type d'organisation"
]
]
]
]
];
}
return $filterSpecification;
}
}
\ No newline at end of file
module/Oscar/src/Oscar/Service/OscarConfigurationService.php
+ 31
− 10
View file @ 3b7daa7a
......@@ -45,9 +45,19 @@ class OscarConfigurationService implements ServiceLocatorAwareInterface
const spent_effective_clause = 'spent_effective_clause';
const spent_predicted_clause = 'spent_predicted_clause';
const ORGANIZATION_REQUIRED = 'organization_required';
const theme = 'theme';
public function getOrganizationRequired(): array
{
return [
'type' => $this->getEditableConfKey('organization_require_type', false),
'country' => $this->getEditableConfKey('organization_require_country', false),
];
}
public function emptyProjectRequireValidation(): bool
{
return $this->getConfiguration(self::empty_project_require_validation);
......@@ -299,7 +309,9 @@ class OscarConfigurationService implements ServiceLocatorAwareInterface
$conf = $this->getEditableConfRoot();
$conf[$key] = $value;
$writer = new Dumper();
file_put_contents($this->getYamlConfigPath(), $writer->dump($conf));
if (!file_put_contents($this->getYamlConfigPath(), $writer->dump($conf))) {
throw new OscarException("Impossible d'enregistrer la configuration");
}
return $this;
}
......@@ -954,4 +966,13 @@ class OscarConfigurationService implements ServiceLocatorAwareInterface
{
return $this->getServiceLocator()->get('Config')['unicaen-signature']['enabled'] == true;
}
public function getRequiredOrganization()
{
return [
'type' => $this->getEditableConfKey('organization_require_type') == true,
'country' => $this->getEditableConfKey('organization_require_country') == true
];
}
}
\ No newline at end of file
module/Oscar/view/oscar/administration/parameters.phtml
+ 41
− 14
View file @ 3b7daa7a
......@@ -8,20 +8,6 @@
?>
<style>
/*
.two-tile {
display: flex;
flex-direction: row;
flex-wrap: wrap;
width: 100%;
}
.two-tile > .tile {
display: flex;
flex-direction: column;
flex-basis: 100%;
min-width: 40%;
flex: 1;
}*/
.nav-link:target {
background: red !important;
......@@ -56,6 +42,10 @@
aria-controls="nav-contact" aria-selected="false">
Feuille de temps
</a>
<a class="nav-link" id="nav-contact-tab" data-toggle="tab" href="#nav-organization" role="tab"
aria-controls="nav-contact" aria-selected="false">
Organisations
</a>
</div>
</nav>
<div class="tab-content" id="nav-tabContent">
......@@ -449,6 +439,43 @@
</form>
</article>
</div>
<div class="tab-pane active" id="nav-organization" role="tabpanel" aria-labelledby="nav-organization-tab">
<h2>Organisation</h2>
<h3><i class="icon-key"></i>Champs obligatoires</h3>
<p class="help-message">
<i class="icon-help-circled"></i>
Ces options ne sont effectives QUE pour la création et l'édition des fiches, les oraganisations importées via les connecteurs ne sont pas soumises à ces régles
</p>
<form action="" method="post" class="form">
<input type="hidden" name="parameter_name" value="organization_required" />
<div class="row">
<div class="col-md-7 col-md-push-1">
<strong>Type d'organisation</strong>
</div>
<div class="col-md-4">
<div class="material-switch">
<input id="organization_type" name="organization_type"
type="checkbox" <?= $organizationRequire['type'] ? "checked" : "" ?> />
<label for="organization_type" class="label-primary"></label>
</div>
</div>
</div>
<div class="row">
<div class="col-md-7 col-md-push-1">
<strong>Pays de l'organisation</strong>
</div>
<div class="col-md-4">
<div class="material-switch">
<input id="organization_country" name="organization_country"
type="checkbox" <?= $organizationRequire['country'] ? "checked" : "" ?> />
<label for="organization_country" class="label-primary"></label>
</div>
</div>
</div>
<button class="btn btn-primary"><i class="icon-floppy"></i> Enregistrer</button>
</form>
</div>
</div>
</div>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment