Commit 9d7ed247 authored by Stéphane Bouvry's avatar Stéphane Bouvry
Browse files

Possibilité de masquer certains champs à la saisie des activités

parent 97566ab2
Loading
Loading
Loading
Loading
+2 −0
Changes for config/autoload/global.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ return array(
            'person' => []
        ],

        'activity_hidden_fields' => [],

        'closedDays' => function(&$joursFeries, $annee, $mois){
            $feries = [
                '1' => [
+27 −0
Changes for doc/configuration.md: 27 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -153,3 +153,30 @@ Configuration des options pour la feuille de temps
Pour modifier les numéros qui sont sous la forme **2018DRI00001**.

[Modifier le formalisme de la numérotation Oscar](./numérotation.md)


## Activité > Formulaire de saisie

Une option permet de masquer certains champs : 

 - Discipline
 - Frais de gestion
 
Pour cela, modifier le configuration Oscar dans le fichier `config/autoload/local.php` : 

```php
<?php
// ./config/autoload/local.php
return array(
    // ...

    // Oscar
    'oscar' => [
        
        'activity_hidden_fields' => [
            'disciplines', 
            'fraisDeGestion'],
    // ...
    ]
);
```
+9 −0
Changes for module/Oscar/src/Oscar/Controller/ProjectGrantController.php: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -169,8 +169,13 @@ class ProjectGrantController extends AbstractOscarController
     */
    public function editAction()
    {


        $id = $this->params()->fromRoute('id');
        $projectGrant = $this->getProjectGrantService()->getGrant($id);
        $hidden = $this->getConfiguration('oscar.activity_hidden_fields');


        $form = new ProjectGrantForm();
        $form->setServiceLocator($this->getServiceLocator());
        $form->init();
@@ -191,6 +196,7 @@ class ProjectGrantController extends AbstractOscarController
        }

        $view = new ViewModel([
            'hidden' => $hidden,
            'form' => $form,
            'activity' => $projectGrant,
            'numbers_keys' => $keys = $this->getActivityService()->getDistinctNumbersKey()
@@ -606,6 +612,8 @@ class ProjectGrantController extends AbstractOscarController
        // Récupération du projet (si précisé)
        $projectId = $this->params()->fromRoute('projectid', null);

        $hidden = $this->getConfiguration('oscar.activity_hidden_fields');

        // Contrôle des droits
        if ($projectId) {
            $project = $this->getProjectService()->getProject($projectId);
@@ -650,6 +658,7 @@ class ProjectGrantController extends AbstractOscarController

        $view = new ViewModel([
            'form' => $form,
            'hidden' => $hidden,
            'activity' => $projectGrant,
            'project' => $project,
        ]);
+5 −0
Changes for module/Oscar/view/oscar/project-grant/form.phtml: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@
<link rel="stylesheet" type="text/css"
      href="<?= $this->basePath() . '/js/vendor/bootstrap-datepicker/dist/css/bootstrap-datepicker3.min.css' ?>" />
<div class="container">
    <pre><?php var_dump($hidden) ?></pre>
    <h1>
        <?php if($activity->getProject()): ?>
            <small class="text-light">
@@ -46,9 +47,11 @@
                <?php echo $this->formElementErrors($form->get('activityType')); ?>
            </div>
            <div class="col-md-3">
                <?php if( !in_array('disciplines', $hidden)): ?>
                <?php echo $this->formLabel($form->get('disciplines'));?>
                <?php echo $this->formSelect($form->get('disciplines'));?>
                <?php echo $this->formElementErrors($form->get('disciplines')); ?>
                <?php endif; ?>
            </div>
        </div>

@@ -70,7 +73,9 @@
                <?= $this->formControlGroup($form->get('tva')); ?>
            </div>
            <div class="col-md-4">
                <?php if( !in_array('fraisDeGestion', $hidden)): ?>
                <?= $this->formControlGroup($form->get('fraisDeGestion')); ?>
                <?php endif; ?>
            </div>
            <div class="col-md-4">
                <?= $this->formControlGroup($form->get('assietteSubventionnable')); ?>