Loading data/ddl/table/STATUT.php +18 −6 Changes for data/ddl/table/STATUT.php: 18 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -938,12 +938,24 @@ return [ 'type' => 'float', 'bdd-type' => 'FLOAT', 'length' => 0, 'scale' => NULL, 'scale' => null, 'precision' => 126, 'nullable' => FALSE, 'nullable' => false, 'default' => '1', 'position' => 10, 'commentaire' => NULL, 'commentaire' => null, ], 'TAUX_CHARGES_TTC' => [ 'name' => 'TAUX_CHARGES_TTC', 'type' => 'float', 'bdd-type' => 'FLOAT', 'length' => 0, 'scale' => null, 'precision' => 126, 'nullable' => false, 'default' => '1', 'position' => 80, 'commentaire' => null, ], 'TYPE_INTERVENANT_ID' => [ 'name' => 'TYPE_INTERVENANT_ID', Loading @@ -951,9 +963,9 @@ return [ 'bdd-type' => 'NUMBER', 'length' => 0, 'scale' => '0', 'precision' => NULL, 'nullable' => FALSE, 'default' => NULL, 'precision' => null, 'nullable' => false, 'default' => null, 'position' => 4, 'commentaire' => NULL, ], Loading module/Intervenant/src/Entity/Db/Mapping/Intervenant.Entity.Db.Statut.dcm.xml +1 −0 Changes for module/Intervenant/src/Entity/Db/Mapping/Intervenant.Entity.Db.Statut.dcm.xml: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -22,6 +22,7 @@ <field name="serviceStatutaire" type="float" column="SERVICE_STATUTAIRE" precision="126" scale="0" nullable="false"/> <field name="depassementServiceDuSansHC" type="boolean" column="DEPASSEMENT_SERVICE_DU_SANS_HC" nullable="false"/> <field name="tauxChargesPatronales" type="float" column="TAUX_CHARGES_PATRONALES" precision="126" scale="0" nullable="false"/> <field name="tauxChargesTTC" type="float" column="TAUX_CHARGES_TTC" precision="126" scale="0" nullable="true"/> <field name="dossier" type="boolean" column="DOSSIER" nullable="false"/> <field name="dossierVisualisation" type="boolean" column="DOSSIER_VISUALISATION" nullable="false"/> Loading module/Intervenant/src/Entity/Db/Statut.php +18 −0 Changes for module/Intervenant/src/Entity/Db/Statut.php: 18 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -41,6 +41,8 @@ class Statut implements ParametreEntityInterface, RoleInterface, ResourceInterfa private float $tauxChargesPatronales = 1.0; private float $tauxChargesTTC = 1.0; private bool $dossier = true; private bool $dossierVisualisation = true; Loading Loading @@ -326,6 +328,22 @@ class Statut implements ParametreEntityInterface, RoleInterface, ResourceInterfa public function getTauxChargesTTC(): float { return $this->tauxChargesTTC; } public function setTauxChargesTTC(float $tauxChargesTTC): Statut { $this->tauxChargesTTC = $tauxChargesTTC; return $this; } public function getDossier(): bool { return $this->dossier; Loading module/Intervenant/src/Form/StatutSaisieForm.php +21 −0 Changes for module/Intervenant/src/Form/StatutSaisieForm.php: 21 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -27,6 +27,7 @@ class StatutSaisieForm extends AbstractForm 'serviceStatutaire' => 'Nombre d\'heures de service statutaire', 'depassementServiceDuSansHC' => 'Le dépassement du service statutaire n\'occasionne aucune heure complémentaire', 'tauxChargesPatronales' => 'Taux de charges patronales', 'tauxChargesTTC' => 'Taux de charges TTC', 'dossier' => '', 'servicePrevu' => 'Prévisionnel', 'serviceRealise' => 'Réalisé', Loading Loading @@ -129,6 +130,25 @@ class StatutSaisieForm extends AbstractForm ], ]]); $this->spec(['tauxChargesTTC' => [ 'type' => 'Text', 'name' => 'tauxChargesTTC', 'attributes' => [ 'pattern' => '[0-9]*', ], 'hydrator' => [ 'getter' => function (Statut $statut, string $name) { $taux = $statut->getTauxChargesTTC(); return $taux * 100; }, 'setter' => function (Statut $statut, $value, string $name) { $taux = $value / 100; $statut->setTauxChargesTTC($taux); }, ], ]]); foreach ($dveElements as $dveElement) { $this->spec([$dveElement => [ 'type' => 'Select', Loading Loading @@ -383,6 +403,7 @@ class StatutSaisieForm extends AbstractForm $this->addSubmit(); $this->get('serviceStatutaire')->setOption('suffix', 'HETD'); $this->get('tauxChargesPatronales')->setOption('suffix', '%'); $this->get('tauxChargesTTC')->setOption('suffix', '%'); $this->get('conseilRestreintDureeVie')->setOption('suffix', 'an(s)'); $this->get('conseilAcademiqueDureeVie')->setOption('suffix', 'an(s)'); $this->setLabels($labels); Loading module/Intervenant/view/intervenant/statut/saisie.phtml +3 −0 Changes for module/Intervenant/view/intervenant/statut/saisie.phtml: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -67,6 +67,9 @@ $canAdd = $this->isAllowed(Privileges::getResourceId(Privileges::INTERVENANT_STA <div class="col-md-4"> <?= $this->formControlGroup($form->get('tauxChargesPatronales')); ?> </div> <div class="col-md-4"> <?= $this->formControlGroup($form->get('tauxChargesTTC')); ?> </div> </div> <div class="row"> <?php for ($i = 1; $i <= 4; $i++): if ($form->has('codesCorresp' . $i)): ?> Loading Loading
data/ddl/table/STATUT.php +18 −6 Changes for data/ddl/table/STATUT.php: 18 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -938,12 +938,24 @@ return [ 'type' => 'float', 'bdd-type' => 'FLOAT', 'length' => 0, 'scale' => NULL, 'scale' => null, 'precision' => 126, 'nullable' => FALSE, 'nullable' => false, 'default' => '1', 'position' => 10, 'commentaire' => NULL, 'commentaire' => null, ], 'TAUX_CHARGES_TTC' => [ 'name' => 'TAUX_CHARGES_TTC', 'type' => 'float', 'bdd-type' => 'FLOAT', 'length' => 0, 'scale' => null, 'precision' => 126, 'nullable' => false, 'default' => '1', 'position' => 80, 'commentaire' => null, ], 'TYPE_INTERVENANT_ID' => [ 'name' => 'TYPE_INTERVENANT_ID', Loading @@ -951,9 +963,9 @@ return [ 'bdd-type' => 'NUMBER', 'length' => 0, 'scale' => '0', 'precision' => NULL, 'nullable' => FALSE, 'default' => NULL, 'precision' => null, 'nullable' => false, 'default' => null, 'position' => 4, 'commentaire' => NULL, ], Loading
module/Intervenant/src/Entity/Db/Mapping/Intervenant.Entity.Db.Statut.dcm.xml +1 −0 Changes for module/Intervenant/src/Entity/Db/Mapping/Intervenant.Entity.Db.Statut.dcm.xml: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -22,6 +22,7 @@ <field name="serviceStatutaire" type="float" column="SERVICE_STATUTAIRE" precision="126" scale="0" nullable="false"/> <field name="depassementServiceDuSansHC" type="boolean" column="DEPASSEMENT_SERVICE_DU_SANS_HC" nullable="false"/> <field name="tauxChargesPatronales" type="float" column="TAUX_CHARGES_PATRONALES" precision="126" scale="0" nullable="false"/> <field name="tauxChargesTTC" type="float" column="TAUX_CHARGES_TTC" precision="126" scale="0" nullable="true"/> <field name="dossier" type="boolean" column="DOSSIER" nullable="false"/> <field name="dossierVisualisation" type="boolean" column="DOSSIER_VISUALISATION" nullable="false"/> Loading
module/Intervenant/src/Entity/Db/Statut.php +18 −0 Changes for module/Intervenant/src/Entity/Db/Statut.php: 18 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -41,6 +41,8 @@ class Statut implements ParametreEntityInterface, RoleInterface, ResourceInterfa private float $tauxChargesPatronales = 1.0; private float $tauxChargesTTC = 1.0; private bool $dossier = true; private bool $dossierVisualisation = true; Loading Loading @@ -326,6 +328,22 @@ class Statut implements ParametreEntityInterface, RoleInterface, ResourceInterfa public function getTauxChargesTTC(): float { return $this->tauxChargesTTC; } public function setTauxChargesTTC(float $tauxChargesTTC): Statut { $this->tauxChargesTTC = $tauxChargesTTC; return $this; } public function getDossier(): bool { return $this->dossier; Loading
module/Intervenant/src/Form/StatutSaisieForm.php +21 −0 Changes for module/Intervenant/src/Form/StatutSaisieForm.php: 21 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -27,6 +27,7 @@ class StatutSaisieForm extends AbstractForm 'serviceStatutaire' => 'Nombre d\'heures de service statutaire', 'depassementServiceDuSansHC' => 'Le dépassement du service statutaire n\'occasionne aucune heure complémentaire', 'tauxChargesPatronales' => 'Taux de charges patronales', 'tauxChargesTTC' => 'Taux de charges TTC', 'dossier' => '', 'servicePrevu' => 'Prévisionnel', 'serviceRealise' => 'Réalisé', Loading Loading @@ -129,6 +130,25 @@ class StatutSaisieForm extends AbstractForm ], ]]); $this->spec(['tauxChargesTTC' => [ 'type' => 'Text', 'name' => 'tauxChargesTTC', 'attributes' => [ 'pattern' => '[0-9]*', ], 'hydrator' => [ 'getter' => function (Statut $statut, string $name) { $taux = $statut->getTauxChargesTTC(); return $taux * 100; }, 'setter' => function (Statut $statut, $value, string $name) { $taux = $value / 100; $statut->setTauxChargesTTC($taux); }, ], ]]); foreach ($dveElements as $dveElement) { $this->spec([$dveElement => [ 'type' => 'Select', Loading Loading @@ -383,6 +403,7 @@ class StatutSaisieForm extends AbstractForm $this->addSubmit(); $this->get('serviceStatutaire')->setOption('suffix', 'HETD'); $this->get('tauxChargesPatronales')->setOption('suffix', '%'); $this->get('tauxChargesTTC')->setOption('suffix', '%'); $this->get('conseilRestreintDureeVie')->setOption('suffix', 'an(s)'); $this->get('conseilAcademiqueDureeVie')->setOption('suffix', 'an(s)'); $this->setLabels($labels); Loading
module/Intervenant/view/intervenant/statut/saisie.phtml +3 −0 Changes for module/Intervenant/view/intervenant/statut/saisie.phtml: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -67,6 +67,9 @@ $canAdd = $this->isAllowed(Privileges::getResourceId(Privileges::INTERVENANT_STA <div class="col-md-4"> <?= $this->formControlGroup($form->get('tauxChargesPatronales')); ?> </div> <div class="col-md-4"> <?= $this->formControlGroup($form->get('tauxChargesTTC')); ?> </div> </div> <div class="row"> <?php for ($i = 1; $i <= 4; $i++): if ($form->has('codesCorresp' . $i)): ?> Loading