Commit 3af5ff67 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Nouveau paramètre pour le taux des congés payés

parent aad50e88
Loading
Loading
Loading
Loading
+6 −0
Changes for data/parametres.php: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ return [
        "VALEUR"      => "PREVU",
        "DESCRIPTION" => "Constatation du service fait",
    ],

    /* Paiepment */
    "centres_couts_paye"                         => [
        "VALEUR"      => "enseignement",
        "DESCRIPTION" => "Centres de coûts utilisés pour la paye",
@@ -112,6 +114,10 @@ return [
        "VALEUR"      => "22:00",
        "DESCRIPTION" => "Horaire à partir duquel les heures faites sont considérées comme nocturnes",
    ],
    "taux_conges_payes" => [
        "VALEUR"      => 0.1,
        "DESCRIPTION" => "Taux de majoration des heures pour prise en compte des congés payés",
    ],

    /* Documentations */
    "doc-intervenant-vacataires"                 => [
+6 −0
Changes for module/Application/src/Controller/ParametreController.php: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ class ParametreController extends AbstractController
            if (isset($posted['pourc_s1_pour_annee_civile'])) {
                $posted['pourc_s1_pour_annee_civile'] = floatToString(FloatFromString::run($posted['pourc_s1_pour_annee_civile']) / 100);
            }
            if (isset($posted['taux_conges_payes'])) {
                $posted['taux_conges_payes'] = floatToString(FloatFromString::run($posted['taux_conges_payes']) / 100);
            }
        } else {
            $posted = [];// rien ne peut être modifié!!
        }
@@ -98,6 +101,9 @@ class ParametreController extends AbstractController
                if ($parametre == 'pourc_s1_pour_annee_civile') {
                    $value = StringFromFloat::run(stringToFloat($value) * 100);
                }
                if ($parametre == 'taux_conges_payes') {
                    $value = StringFromFloat::run(stringToFloat($value) * 100);
                }
                $element = $form->get($parametre);
                if (!$canEdit) $element->setAttribute('disabled', true);
                $element->setValue($value);
+14 −0
Changes for module/Application/src/Form/ParametresForm.php: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -450,6 +450,20 @@ class ParametresForm extends AbstractForm
            ],
        ]);

        $this->add([
            'type'       => 'Text',
            'name'       => 'taux_conges_payes',
            'options'    => [
                'label' => "Taux pour prise en compte des congés payés",
                'suffix' => '%',
            ],
            'attributes' => [
                'class' => 'input-sm',
                'step'  => 'any',
                'min'   => 0,
                'max'   => 1,
            ],
        ]);

        $this->add([
            'name'    => 'indicateur_email_expediteur',
+5 −0
Changes for module/Application/view/application/parametre/generaux.phtml: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -241,6 +241,11 @@
                        <?= $this->formControlGroup($form->get('horaire_nocturne')); ?>
                    </div>
                </div>
                <div class="row">
                    <div class="col-md-6">
                        <?= $this->formControlGroup($form->get('taux_conges_payes')); ?>
                    </div>
                </div>
            </div>
        </div>