Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/dist/.vite/manifest.json
#	public/dist/assets/main-DFMBTCJ0.js

code/test7.php

@@ -4,3 +4,11 @@
  * @var $this       \Application\View\Renderer\PhpRenderer
  * @var $container  \Psr\Container\ContainerInterface
  */
+
+//select * from v_tbl_paiement where intervenant_id = 826844 AND service_referentiel_id = 21673
+
+$stbl = $container->get(\UnicaenTbl\Service\TableauBordService::class);
+
+$data = ['INTERVENANT_ID' => 826844];
+
+$stbl->calculer('paiement', $data);
\ No newline at end of file

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "00ff9bc298c69f77e92b5892881a7db4",
+    "content-hash": "b1dec40219b9284fb87959cb1656f00e",
     "packages": [
         {
             "name": "apereo/phpcas",
@@ -2660,16 +2660,16 @@
         },
         {
             "name": "laminas/laminas-escaper",
-            "version": "2.15.0",
+            "version": "2.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-escaper.git",
-                "reference": "c612b0488ae486284c39885efca494c180f16351"
+                "reference": "9cf1f5317ca65b4fd5c6a3c2855e24a187b288c8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/c612b0488ae486284c39885efca494c180f16351",
-                "reference": "c612b0488ae486284c39885efca494c180f16351",
+                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/9cf1f5317ca65b4fd5c6a3c2855e24a187b288c8",
+                "reference": "9cf1f5317ca65b4fd5c6a3c2855e24a187b288c8",
                 "shasum": ""
             },
             "require": {
@@ -2681,12 +2681,11 @@
                 "zendframework/zend-escaper": "*"
             },
             "require-dev": {
-                "infection/infection": "^0.27.11",
+                "infection/infection": "^0.29.8",
                 "laminas/laminas-coding-standard": "~3.0.1",
-                "maglnet/composer-require-checker": "^3.8.0",
-                "phpunit/phpunit": "^9.6.22",
-                "psalm/plugin-phpunit": "^0.19.0",
-                "vimeo/psalm": "^5.26.1"
+                "phpunit/phpunit": "^10.5.45",
+                "psalm/plugin-phpunit": "^0.19.2",
+                "vimeo/psalm": "^6.6.2"
             },
             "type": "library",
             "autoload": {
@@ -2718,7 +2717,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2024-12-17T19:39:54+00:00"
+            "time": "2025-02-17T12:40:19+00:00"
         },
         {
             "name": "laminas/laminas-eventmanager",
@@ -5183,16 +5182,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.12.1",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
+                "reference": "024473a478be9df5fdaca2c793f2232fe788e414"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
-                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/024473a478be9df5fdaca2c793f2232fe788e414",
+                "reference": "024473a478be9df5fdaca2c793f2232fe788e414",
                 "shasum": ""
             },
             "require": {
@@ -5231,7 +5230,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.0"
             },
             "funding": [
                 {
@@ -5239,7 +5238,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-08T17:47:46+00:00"
+            "time": "2025-02-12T12:17:51+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -7865,11 +7864,11 @@
         },
         {
             "name": "unicaen/vue",
-            "version": "6.3.1",
+            "version": "6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://git.unicaen.fr/lib/unicaen/vue.git",
-                "reference": "711faf702e40cf43c7dfbe44671ae25ab31a7d64"
+                "reference": "2b7dc7c451203cb6e7b476fb18df39414f464ca1"
             },
             "type": "library",
             "autoload": {
@@ -7881,7 +7880,7 @@
                 ]
             },
             "description": "Module pour utiliser Vue.js",
-            "time": "2025-01-22T09:35:03+00:00"
+            "time": "2025-02-17T14:08:11+00:00"
         },
         {
             "name": "unicaen/zfc-user",
@@ -9068,16 +9067,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "2.0.0",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299"
+                "reference": "51087f87dcce2663e1fed4dfd4e56eccd580297e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/c00d78fb6b29658347f9d37ebe104bffadf36299",
-                "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/51087f87dcce2663e1fed4dfd4e56eccd580297e",
+                "reference": "51087f87dcce2663e1fed4dfd4e56eccd580297e",
                 "shasum": ""
             },
             "require": {
@@ -9109,9 +9108,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.2"
             },
-            "time": "2024-10-13T11:29:49+00:00"
+            "time": "2025-02-17T20:25:51+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

data/ddl/view/V_TBL_PAIEMENT.sql

@@ -192,8 +192,8 @@ SELECT
   CASE WHEN si.mode_enseignement_realise = 'semestriel' THEN 1 ELSE 0 END calcul_semestriel,
   mep.id                                      a_payer_id,
   i.annee_id                                  annee_id,
-  sr.id                                       service_id,
-  NULL                                        service_referentiel_id,
+  NULL                                        service_id,
+  sr.id                                       service_referentiel_id,
   NULL                                        mission_id,
   NULL                                        volume_horaire_id,
   si.type_intervenant_id                      type_intervenant_id,

module/Paiement/src/Tbl/Process/PaiementDebugger.php

@@ -19,6 +19,8 @@ use Paiement\Entity\Db\TauxRemu;
 use Paiement\Tbl\Process\Sub\ServiceAPayer;
 use Referentiel\Entity\Db\ServiceReferentiel;
 use Referentiel\Entity\Db\VolumeHoraireReferentiel;
+use Service\Entity\Db\EtatVolumeHoraire;
+use Service\Entity\Db\TypeVolumeHoraire;
 use UnicaenApp\Entity\HistoriqueAwareInterface;
 
 /**
@@ -365,10 +367,13 @@ class PaiementDebugger
           'Dernière modification par ' || u.display_name || ' le ' || to_char(vhr.histo_modification,'dd/mm/YYYY') histo
         FROM
           formule_resultat_volume_horaire frvh
+          JOIN formule_resultat_intervenant fri ON fri.id = frvh.formule_resultat_intervenant_id
+          JOIN type_volume_horaire tvh ON tvh.id = fri.type_volume_horaire_id AND tvh.code = '".TypeVolumeHoraire::CODE_REALISE."'
+          JOIN etat_volume_horaire evh ON evh.id = fri.etat_volume_horaire_id AND evh.code = '".EtatVolumeHoraire::CODE_VALIDE."'
           JOIN volume_horaire_ref vhr ON vhr.id = frvh.volume_horaire_ref_id
           JOIN utilisateur u ON u.id = vhr.histo_modificateur_id
         WHERE
-          frvh.id = :frsr
+          frvh.service_referentiel_id = :frsr
         ORDER BY
           frvh.id
         ";

module/Paiement/src/Tbl/Process/PaiementProcess.php

@@ -195,14 +195,19 @@ class PaiementProcess implements ProcessInterface
             $this->services[$key] = $sap;
         }
 
-        if (!array_key_exists($lapKey, $this->services[$key]->lignesAPayer)) {
         $lap             = new LigneAPayer();
         $tauxRemu        = (int)$data['TAUX_REMU_ID'];
         $horaireDebut    = (string)$data['HORAIRE_DEBUT'];
         $lap->tauxValeur = $this->getServiceTauxRemu()->tauxValeur($tauxRemu, $horaireDebut);
         $lap->pourcAA    = $this->repartiteur->fromBdd($data);
         $lap->fromBdd($data);
+        if (!array_key_exists($lapKey, $this->services[$key]->lignesAPayer)) {
+
             $this->services[$key]->lignesAPayer[$lapKey] = $lap;
+        }else{
+            $olap = &$this->services[$key]->lignesAPayer[$lapKey];
+            $olap->heuresAA += $lap->heuresAA;
+            $olap->heuresAC += $lap->heuresAC;
         }
 
         if ($mepKey > 0 && !array_key_exists($mepKey, $this->services[$key]->misesEnPaiement)) {

public/dist/.vite/manifest.json

 {
-  "_vendor-DcfRBLtF.js": {
-    "file": "assets/vendor-DcfRBLtF.js",
+  "_vendor-KzP7jRq0.js": {
+    "file": "assets/vendor-KzP7jRq0.js",
     "name": "vendor"
   },
   "main.js": {
-    "file": "assets/main-DFMBTCJ0.js",
+    "file": "assets/main-eCHYcd8Z.js",
     "name": "main",
     "src": "main.js",
     "isEntry": true,
     "imports": [
-      "_vendor-DcfRBLtF.js"
+      "_vendor-KzP7jRq0.js"
     ],
     "css": [
-      "assets/main-CloYvy8G.css"
+      "assets/main-kRnov-Gx.css"
     ]
   }
 }
\ No newline at end of file

public/dist/assets/main-CloYvy8G.css → public/dist/assets/main-kRnov-Gx.css

-.user-profile-select-form[data-v-cbfe77c3]{padding-left:25px}input.is-invalid[data-v-29c90e6d]{background-color:#dc4c64}.cartridge[data-v-ba77464f]{white-space:nowrap}.icon-attention[data-v-ba77464f]{font-size:50pt;float:left;margin-right:20pt;margin-top:0;line-height:42pt}.desactivee[data-v-ba77464f]{background-color:#fdfdfd;font-style:italic;color:#bbb}.code[data-v-f6c21cf6]{font-weight:400;font-size:7pt}.arrondi[data-v-717df7b7]{text-decoration:underline dotted}.arrondi-defaut[data-v-717df7b7]{color:#00f;background-color:#e6e6ff;text-decoration:underline dotted}.arrondi-exces[data-v-717df7b7]{color:red;background-color:#ffe6e6;text-decoration:underline dotted}table tr.details th[data-v-07a28351]{font-weight:700;background-color:#f8f8f8}.table-details tr.details th[data-v-07a28351]{font-size:8pt}.btn-choixtevh[data-v-07a28351]{width:100%;margin-bottom:6px}.total[data-v-07a28351]{text-align:right;font-weight:700}table.table-details[data-v-07a28351]{border-top:0px white solid}th.service[data-v-07a28351]{border-left:0px white solid;border-right:0px white solid;padding-top:1em;padding-bottom:2px}.types-interventions[data-v-060f5e4b]{overflow:scroll}.types-interventions table *[data-v-060f5e4b]{border-width:1px 1px}.types-interventions table th[data-v-060f5e4b],.types-interventions table td[data-v-060f5e4b]{min-width:5em;white-space:nowrap}.saisie[data-v-060f5e4b]{background-color:#fff8dc}.fvh th[data-v-060f5e4b]{font-size:8pt}.fvh td[data-v-060f5e4b]{white-space:nowrap;min-width:4em;padding:0}.fvh td .pourc[data-v-060f5e4b]{font-size:8pt}.spacer[data-v-060f5e4b]{max-width:5px!important;min-width:5px!important}.dinput[data-v-060f5e4b]{border:none;height:2em;width:100%;background-color:#fff8dc}.doutput[data-v-060f5e4b]{border:none;height:2em;width:100%;background-color:transparent}.res-mode[data-v-060f5e4b]{width:100%;min-width:300px}.resultats td[data-v-060f5e4b]{text-align:right}.debug-td[data-v-060f5e4b]{min-width:42em!important}.debug-cell[data-v-060f5e4b]{background-color:#ccc;color:#000;margin:2px;padding:3px;border-radius:5px;font-size:8pt;white-space:nowrap;float:left}.debug-val[data-v-060f5e4b]{background-color:#fff;padding:0 3px;border-top-right-radius:5px;border-bottom-right-radius:5px;color:#000;font-size:8pt}.importer[data-v-060f5e4b]{display:none}.actions .btn[data-v-060f5e4b]{width:100%}.actions label[data-v-060f5e4b]{display:block}table[data-v-f852d328]{margin-bottom:0}td.nombre[data-v-f852d328]{text-align:right}table.table-bordered *[data-v-f852d328]{border-width:1px}.sous-structures[data-v-046af32d]{padding-left:4em}.card-header h5[data-v-1735108d]{font-weight:500}.btn[data-v-1735108d]{margin-left:2px;margin-right:2px}.table tr[data-v-0606e4c1]{background-color:#f4f4f4;border-left:1px #ddd solid;border-right:1px #ddd solid}.table-hover tr[data-v-0606e4c1]:hover{background-color:#f7f7f7}.recherche[data-v-0606e4c1]{text-align:center}.recherche .btn-group[data-v-0606e4c1]{box-shadow:none;margin:auto}.recherche select.btn[data-v-0606e4c1]{padding-right:3em}.recherche #otherMois[data-v-0606e4c1]{width:12em}.recherche #otherAnnee[data-v-0606e4c1]{width:8em}th.nom-jour[data-v-0606e4c1]{width:1%;padding-left:3px}th.numero-jour[data-v-0606e4c1]{width:1%;padding-right:.5em}.recherche[data-v-0606e4c1]{justify-content:center;padding-bottom:5px}.event[data-v-0606e4c1]{display:flex;justify-content:space-between;align-items:center;margin-bottom:3px;border-left:10px #bbb solid;border-right:10px #bbb solid}.event[data-v-0606e4c1]:hover{background-color:#fff}.event-content[data-v-17cb1f29]{flex-grow:1}.event-content.valide[data-v-17cb1f29]{background-color:#ff0}.event-content p[data-v-17cb1f29]{margin-bottom:.2rem}.event-content p.mission[data-v-17cb1f29]{font-weight:700}.event-content p.horaires[data-v-17cb1f29]{font-style:italic;font-weight:lighter}.event-actions[data-v-17cb1f29]{align-self:flex-start}.table[data-v-d4a24889]{margin-bottom:1px}.lap[data-v-d4a24889]{padding-top:.5em;padding-bottom:.5em}.lap[data-v-d4a24889]:hover{background-color:#fff9de}
+.user-profile-select-form[data-v-cbfe77c3]{padding-left:25px}input.is-invalid[data-v-29c90e6d]{background-color:#dc4c64}.cartridge[data-v-ba77464f]{white-space:nowrap}.icon-attention[data-v-ba77464f]{font-size:50pt;float:left;margin-right:20pt;margin-top:0;line-height:42pt}.desactivee[data-v-ba77464f]{background-color:#fdfdfd;font-style:italic;color:#bbb}.code[data-v-f6c21cf6]{font-weight:400;font-size:7pt}.arrondi[data-v-717df7b7]{text-decoration:underline dotted}.arrondi-defaut[data-v-717df7b7]{color:#00f;background-color:#e6e6ff;text-decoration:underline dotted}.arrondi-exces[data-v-717df7b7]{color:red;background-color:#ffe6e6;text-decoration:underline dotted}table tr.details th[data-v-07a28351]{font-weight:700;background-color:#f8f8f8}.table-details tr.details th[data-v-07a28351]{font-size:8pt}.btn-choixtevh[data-v-07a28351]{width:100%;margin-bottom:6px}.total[data-v-07a28351]{text-align:right;font-weight:700}table.table-details[data-v-07a28351]{border-top:0px white solid}th.service[data-v-07a28351]{border-left:0px white solid;border-right:0px white solid;padding-top:1em;padding-bottom:2px}.types-interventions[data-v-060f5e4b]{overflow:scroll}.types-interventions table[data-v-060f5e4b] *{border-width:1px 1px}.types-interventions table th[data-v-060f5e4b],.types-interventions table td[data-v-060f5e4b]{min-width:5em;white-space:nowrap}.saisie[data-v-060f5e4b]{background-color:#fff8dc}.fvh th[data-v-060f5e4b]{font-size:8pt}.fvh td[data-v-060f5e4b]{white-space:nowrap;min-width:4em;padding:0}.fvh td .pourc[data-v-060f5e4b]{font-size:8pt}.spacer[data-v-060f5e4b]{max-width:5px!important;min-width:5px!important}.dinput[data-v-060f5e4b]{border:none;height:2em;width:100%;background-color:#fff8dc}.doutput[data-v-060f5e4b]{border:none;height:2em;width:100%;background-color:transparent}.res-mode[data-v-060f5e4b]{width:100%;min-width:300px}.resultats td[data-v-060f5e4b]{text-align:right}.debug-td[data-v-060f5e4b]{min-width:42em!important}.debug-cell[data-v-060f5e4b]{background-color:#ccc;color:#000;margin:2px;padding:3px;border-radius:5px;font-size:8pt;white-space:nowrap;float:left}.debug-val[data-v-060f5e4b]{background-color:#fff;padding:0 3px;border-top-right-radius:5px;border-bottom-right-radius:5px;color:#000;font-size:8pt}.importer[data-v-060f5e4b]{display:none}.actions .btn[data-v-060f5e4b]{width:100%}.actions label[data-v-060f5e4b]{display:block}table[data-v-f852d328]{margin-bottom:0}td.nombre[data-v-f852d328]{text-align:right}table.table-bordered[data-v-f852d328] *{border-width:1px}.sous-structures[data-v-046af32d]{padding-left:4em}.card-header h5[data-v-1735108d]{font-weight:500}.btn[data-v-1735108d]{margin-left:2px;margin-right:2px}.table tr[data-v-0606e4c1]{background-color:#f4f4f4;border-left:1px #ddd solid;border-right:1px #ddd solid}.table-hover tr[data-v-0606e4c1]:hover{background-color:#f7f7f7}.recherche[data-v-0606e4c1]{text-align:center}.recherche .btn-group[data-v-0606e4c1]{box-shadow:none;margin:auto}.recherche select.btn[data-v-0606e4c1]{padding-right:3em}.recherche #otherMois[data-v-0606e4c1]{width:12em}.recherche #otherAnnee[data-v-0606e4c1]{width:8em}th.nom-jour[data-v-0606e4c1]{width:1%;padding-left:3px}th.numero-jour[data-v-0606e4c1]{width:1%;padding-right:.5em}.recherche[data-v-0606e4c1]{justify-content:center;padding-bottom:5px}.event[data-v-0606e4c1]{display:flex;justify-content:space-between;align-items:center;margin-bottom:3px;border-left:10px #bbb solid;border-right:10px #bbb solid}.event[data-v-0606e4c1]:hover{background-color:#fff}.event-content[data-v-17cb1f29]{flex-grow:1}.event-content.valide[data-v-17cb1f29]{background-color:#ff0}.event-content p[data-v-17cb1f29]{margin-bottom:.2rem}.event-content p.mission[data-v-17cb1f29]{font-weight:700}.event-content p.horaires[data-v-17cb1f29]{font-style:italic;font-weight:lighter}.event-actions[data-v-17cb1f29]{align-self:flex-start}.table[data-v-d4a24889]{margin-bottom:1px}.lap[data-v-d4a24889]{padding-top:.5em;padding-bottom:.5em}.lap[data-v-d4a24889]:hover{background-color:#fff9de}