Correction bug référentiel multi-volumes horaires (3789c2c9) · Commits · open-source / OSE

data/ddl/view/V_TBL_PAIEMENT.sql

+4 −4

Original line number	Diff line number	Diff line
		@@ -131,12 +131,12 @@ SELECT
		-- paiements sur des heures de référentiel
		'r' \|\| '-' \|\| sr.id \|\| '-' \|\| th.id KEY,
		1 calcul_semestriel,
		sr.id a_payer_id,
		frvh.volume_horaire_ref_id a_payer_id,
		i.annee_id annee_id,
		NULL service_id,
		frvh.service_referentiel_id service_referentiel_id,
		NULL mission_id,
		NULL volume_horaire_id,
		frvh.volume_horaire_ref_id volume_horaire_id,
		si.type_intervenant_id type_intervenant_id,
		i.id intervenant_id,
		sr.structure_id structure_id,

front/Paiement/DetailsCalculs.vue

+1 −7

Original line number	Diff line number	Diff line
		@@ -48,19 +48,13 @@
		</thead>
		<tbody>
		<tr>
		<td v-if="sap.type!='Référentiel'"><abbr class="badge bg-secondary"
		<td><abbr class="badge bg-secondary"
		:title="lap.volumeHoraireHisto">{{
		lap.volumeHoraireId
		}}</abbr> {{
		lap.volumeHoraire
		}}
		</td>
		<td v-else>
		<div v-for="vhr in lap.volumeHoraireId">
		<abbr class="badge bg-secondary" :title="vhr.HISTO">{{ vhr.ID }}</abbr>
		{{ vhr.HEURES }}h
		</div>
		</td>
		<td>{{ lap.tauxRemu }}</td>
		<td>{{ lap.tauxValeur }}€</td>
		<td>{{ lap.heures }}</td>

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

+4 −29

Original line number	Diff line number	Diff line
		@@ -238,12 +238,14 @@ class PaiementDebugger
		$entity = $this->getEntity(VolumeHoraireMission::class, $l['volumeHoraireId']);
		$l['volumeHoraire'] = $this->vhLibelle($entity);
		}
		if ($service->serviceReferentiel){
		$entity = $this->getEntity(VolumeHoraireReferentiel::class, $l['volumeHoraireId']);
		$l['volumeHoraire'] = $this->vhLibelle($entity);
		}
		if ($entity){
		/** @var $entity HistoriqueAwareInterface */
		$l['volumeHoraireHisto'] = 'Dernière modification par '.$entity->getHistoModificateur().' le '.$entity->getHistoModification()->format('d/m/Y');
		}
		}elseif($service->serviceReferentiel){
		$l['volumeHoraireId'] = $this->getReferentielVhs($service->serviceReferentiel);
		}
		$l['tauxRemu'] = (string)$this->getEntity(TauxRemu::class, $l['tauxRemu']);
		$l['tauxValeur'] = $this->fts($l['tauxValeur']);
		@@ -356,33 +358,6 @@ class PaiementDebugger



		protected function getReferentielVhs(int $formuleResultatServiceRefId)
		{
		$conn = $this->process->getServiceBdd()->getEntityManager()->getConnection();

		$sql = "
		SELECT
		vhr.id,
		vhr.heures,
		'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.service_referentiel_id = :frsr
		ORDER BY
		frvh.id
		";

		return $conn->fetchAllAssociative($sql, ['frsr' => $formuleResultatServiceRefId]);
		}



		protected function fts(float $value): string
		{
		return number_format($value, 2, ',', ' ');

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -210,11 +210,6 @@ class PaiementProcess implements ProcessInterface
		$lap->fromBdd($data);
		if (!array_key_exists($lapKey, $this->services[$key]->lignesAPayer)) {
		$this->services[$key]->lignesAPayer[$lapKey] = $lap;
		}else{
		$oldLap = $this->services[$key]->lignesAPayer[$lapKey];

		$oldLap->heuresAA = round($oldLap->heuresAA + $lap->heuresAA,2);
		$oldLap->heuresAC = round($oldLap->heuresAC + $lap->heuresAC,2);
		}

		if ($mepKey > 0 && !array_key_exists($mepKey, $this->services[$key]->misesEnPaiement)) {

public/dist/.vite/manifest.json

+2 −2

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		"name": "vendor"
		},
		"main.js": {
		"file": "assets/main-BfSVsre9.js",
		"file": "assets/main-DRaWuXkR.js",
		"name": "main",
		"src": "main.js",
		"isEntry": true,
		@@ -12,7 +12,7 @@
		"_vendor-KzP7jRq0.js"
		],
		"css": [
		"assets/main-B4fe_-DB.css"
		"assets/main-DNNuuxg0.css"
		]
		}
		}
		No newline at end of file