Loading CHANGELOG.md +1 −0 Changes for CHANGELOG.md: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -38,6 +38,7 @@ * Le plafond relatif aux charges / services saisis est maintenant opérationnel * Lors de la saisie d'enseignement, les elements pedagogique sur lesquels il est impossible de saisir des heures seront surlignés en rouge * Il est de nouveau possible de saisir des taux de charge TTC et des taux de charge patronale a virgule * Modification du filtre des status séléctionnables dans les données personnelles (#48151) ## Notes de mise à jour Loading code/test3.php +54 −0 Changes for code/test3.php: 54 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -7,3 +7,57 @@ * @var $viewName string * @var $viewFile string */ $form = new \Laminas\Form\Form(); $form->add([ 'type' => 'Date', 'name' => 'd1', 'options' => [ 'label' => 'Date de début', ], 'attributes' => [ 'step' => '1', ], ]); $form->add([ 'type' => 'DateTime', 'name' => 'd2', 'options' => [ 'label' => 'Date de début', ], 'attributes' => [ 'step' => '60', ], ]); $form->add([ 'name' => 'submit', 'type' => 'Submit', 'attributes' => [ 'value' => 'Enregistrer', 'class' => 'btn btn-primary', ], ]); //$form->inpu var_dump($_POST); if (isset($_POST['d1'])) { $d1 = \Application\Filter\DateTimeFromString::run($_POST['d1']); var_dump($d1); } if (isset($_POST['d2'])) { $d2 = \Application\Filter\DateTimeFromString::run($_POST['d2']); var_dump($d2); } $form->get('d1')->setValue($d1?->format('Y-m-d\TH:i')); $form->get('d2')->setValue($d2?->format('Y-m-d\TH:i')); echo $this->form($form); No newline at end of file config/autoload/laminas-developer-tools.dev.php +1 −1 Changes for config/autoload/laminas-developer-tools.dev.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -103,7 +103,7 @@ return [ * Expects: bool * Default: false */ 'enabled' => false, 'enabled' => true, /** * If enabled, every empty collector will be hidden. Loading data/Etats de sortie/export_services_csv.php +2 −6 Changes for data/Etats de sortie/export_services_csv.php: 2 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -116,12 +116,8 @@ foreach ($data as $d) { 'date-cloture-service-realise' => $d['DATE_CLOTURE_REALISE'], ]; if ( $ds['heures-service-statutaire'] > 0 && $ds['heures-service-statutaire'] + $ds['heures-service-du-modifie'] == 0 && empty($ds['etape-code']) ) { $ds['__total__']++; // pour que le cas spécifique des décharges totales soit pris en compte if ($ds['heures-service-du-modifie'] != 0) { $ds['__total__']++; // pour que les modifs de service apparaissent } if ($d['TYPE_INTERVENTION_ID'] != null) { Loading data/ddl/view/V_EXPORT_SERVICE.sql +6 −7 Changes for data/ddl/view/V_EXPORT_SERVICE.sql: 6 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -164,7 +164,7 @@ SELECT 0 heures_compl_fc_majorees, NULL heures_compl_referentiel, 0 total, 0 solde, si.service_statutaire + SUM(msd.heures * mms.multiplicateur) solde, NULL service_ref_formation, NULL commentaires FROM Loading @@ -172,16 +172,15 @@ FROM JOIN statut si ON si.id = i.statut_id JOIN etat_volume_horaire evh ON evh.code IN ('saisi','valide') JOIN type_volume_horaire tvh ON tvh.code IN ('PREVU','REALISE') LEFT JOIN modification_service_du msd ON msd.intervenant_id = i.id AND msd.histo_destruction IS NULL LEFT JOIN motif_modification_service mms ON mms.id = msd.motif_id JOIN modification_service_du msd ON msd.intervenant_id = i.id AND msd.histo_destruction IS NULL JOIN motif_modification_service mms ON mms.id = msd.motif_id LEFT JOIN formule_resultat fr ON fr.intervenant_id = i.id AND fr.type_volume_horaire_id = tvh.id AND fr.etat_volume_horaire_id = evh.id WHERE i.histo_destruction IS NULL AND si.service_statutaire > 0 AND COALESCE(fr.total,0) = 0 AND msd.heures <> 0 GROUP BY i.id, si.service_statutaire, evh.id, tvh.id HAVING si.service_statutaire + SUM(msd.heures * mms.multiplicateur) = 0 ), ponds AS ( SELECT Loading Loading
CHANGELOG.md +1 −0 Changes for CHANGELOG.md: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -38,6 +38,7 @@ * Le plafond relatif aux charges / services saisis est maintenant opérationnel * Lors de la saisie d'enseignement, les elements pedagogique sur lesquels il est impossible de saisir des heures seront surlignés en rouge * Il est de nouveau possible de saisir des taux de charge TTC et des taux de charge patronale a virgule * Modification du filtre des status séléctionnables dans les données personnelles (#48151) ## Notes de mise à jour Loading
code/test3.php +54 −0 Changes for code/test3.php: 54 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -7,3 +7,57 @@ * @var $viewName string * @var $viewFile string */ $form = new \Laminas\Form\Form(); $form->add([ 'type' => 'Date', 'name' => 'd1', 'options' => [ 'label' => 'Date de début', ], 'attributes' => [ 'step' => '1', ], ]); $form->add([ 'type' => 'DateTime', 'name' => 'd2', 'options' => [ 'label' => 'Date de début', ], 'attributes' => [ 'step' => '60', ], ]); $form->add([ 'name' => 'submit', 'type' => 'Submit', 'attributes' => [ 'value' => 'Enregistrer', 'class' => 'btn btn-primary', ], ]); //$form->inpu var_dump($_POST); if (isset($_POST['d1'])) { $d1 = \Application\Filter\DateTimeFromString::run($_POST['d1']); var_dump($d1); } if (isset($_POST['d2'])) { $d2 = \Application\Filter\DateTimeFromString::run($_POST['d2']); var_dump($d2); } $form->get('d1')->setValue($d1?->format('Y-m-d\TH:i')); $form->get('d2')->setValue($d2?->format('Y-m-d\TH:i')); echo $this->form($form); No newline at end of file
config/autoload/laminas-developer-tools.dev.php +1 −1 Changes for config/autoload/laminas-developer-tools.dev.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -103,7 +103,7 @@ return [ * Expects: bool * Default: false */ 'enabled' => false, 'enabled' => true, /** * If enabled, every empty collector will be hidden. Loading
data/Etats de sortie/export_services_csv.php +2 −6 Changes for data/Etats de sortie/export_services_csv.php: 2 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -116,12 +116,8 @@ foreach ($data as $d) { 'date-cloture-service-realise' => $d['DATE_CLOTURE_REALISE'], ]; if ( $ds['heures-service-statutaire'] > 0 && $ds['heures-service-statutaire'] + $ds['heures-service-du-modifie'] == 0 && empty($ds['etape-code']) ) { $ds['__total__']++; // pour que le cas spécifique des décharges totales soit pris en compte if ($ds['heures-service-du-modifie'] != 0) { $ds['__total__']++; // pour que les modifs de service apparaissent } if ($d['TYPE_INTERVENTION_ID'] != null) { Loading
data/ddl/view/V_EXPORT_SERVICE.sql +6 −7 Changes for data/ddl/view/V_EXPORT_SERVICE.sql: 6 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -164,7 +164,7 @@ SELECT 0 heures_compl_fc_majorees, NULL heures_compl_referentiel, 0 total, 0 solde, si.service_statutaire + SUM(msd.heures * mms.multiplicateur) solde, NULL service_ref_formation, NULL commentaires FROM Loading @@ -172,16 +172,15 @@ FROM JOIN statut si ON si.id = i.statut_id JOIN etat_volume_horaire evh ON evh.code IN ('saisi','valide') JOIN type_volume_horaire tvh ON tvh.code IN ('PREVU','REALISE') LEFT JOIN modification_service_du msd ON msd.intervenant_id = i.id AND msd.histo_destruction IS NULL LEFT JOIN motif_modification_service mms ON mms.id = msd.motif_id JOIN modification_service_du msd ON msd.intervenant_id = i.id AND msd.histo_destruction IS NULL JOIN motif_modification_service mms ON mms.id = msd.motif_id LEFT JOIN formule_resultat fr ON fr.intervenant_id = i.id AND fr.type_volume_horaire_id = tvh.id AND fr.etat_volume_horaire_id = evh.id WHERE i.histo_destruction IS NULL AND si.service_statutaire > 0 AND COALESCE(fr.total,0) = 0 AND msd.heures <> 0 GROUP BY i.id, si.service_statutaire, evh.id, tvh.id HAVING si.service_statutaire + SUM(msd.heures * mms.multiplicateur) = 0 ), ponds AS ( SELECT Loading