Correction sur les demandes de mise en paiement pour prendre en compte le... (977986e7) · Commits · open-source / OSE

front/Paiement/DemandeMiseEnPaiementStructure.vue

+5 −1

Changes for front/Paiement/DemandeMiseEnPaiementStructure.vue: 5 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@
		<div v-for="(enseignement,codeEnseignement) in etape.enseignements">
		<div class="cartridge gray bordered" style="padding-bottom: 5px">
		<span>Enseignement</span>
		<span v-html="codeEtape + ' - ' + shorten(etape.libelle, 50)"></span>
		<span v-html="codeEtape + ' - ' + shorten(etape.libelle, 40)"></span>
		<span>{{ codeEnseignement + ' - ' + enseignement.libelle }}</span>
		</div>
		<div class="container">
		@@ -794,6 +794,10 @@ export default {
		},
		shorten(chaine, length = 20)
		{
		if (chaine === null) {
		return chaine;
		}

		if (chaine.length > length) {

		var centreCout = '<span title="' + chaine + '"';

module/Paiement/src/Service/DemandesService.php

+78 −1

Changes for module/Paiement/src/Service/DemandesService.php: 78 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -205,7 +205,8 @@ class DemandesService extends AbstractService
		MAX(s.libelle_long) structure_libelle,
		MAX(s.libelle_court) structure_libelle_court,
		CASE
		WHEN MAX(tp.service_id) IS NOT NULL THEN 'enseignement'
		WHEN MAX(tp.service_id) IS NOT NULL AND MAX(s.element_pedagogique_id) IS NOT NULL THEN 'enseignement'
		WHEN MAX(tp.service_id) IS NOT NULL AND MAX(s.element_pedagogique_id) IS NULL THEN 'enseignement-exterieur'
		WHEN MAX(tp.service_referentiel_id) IS NOT NULL THEN 'referentiel'
		ELSE 'mission'
		END typage,
		@@ -215,6 +216,9 @@ class DemandesService extends AbstractService
		MAX(ep.id) element_id,
		ep.code element_code,
		MAX(ep.libelle) element_libelle,
		MAX(etab.libelle) etab_libelle,
		MAX(etab.source_code) etab_code,
		MAX(s.description) enseignement_ext_libelle,
		MAX(fr.id) fonction_id,
		fr.code fonction_code,
		MAX(fr.libelle_long) fonction_libelle,
		@@ -263,6 +267,7 @@ class DemandesService extends AbstractService
		LEFT JOIN periode p ON p.id = tp.periode_paiement_id
		LEFT JOIN mission m ON m.id = tp.mission_id
		LEFT JOIN type_mission tm ON tm.id = m.type_mission_id
		LEFT JOIN etablissement etab ON etab.id = s.etablissement_id
		WHERE
		tp.intervenant_id = :intervenant ";

		@@ -384,6 +389,78 @@ class DemandesService extends AbstractService
		],
		];
		}
		} elseif ($value['TYPAGE'] == "enseignement-exterieur") {
		$ensCode = 1;
		//Partie enseignements exterieurs
		$dmep[$value['STRUCTURE_CODE']]['code'] = $value['STRUCTURE_CODE'];
		$dmep[$value['STRUCTURE_CODE']]['id'] = $value['STRUCTURE_ID'];
		$dmep[$value['STRUCTURE_CODE']]['libelle'] = $value['STRUCTURE_LIBELLE'];
		$dmep[$value['STRUCTURE_CODE']]['libelleCourt'] = $value['STRUCTURE_LIBELLE_COURT'];
		$dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAB_CODE']]['libelle'] = $value['ETAB_LIBELLE'];
		$dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAB_CODE']]['enseignements'][$ensCode]['libelle'] = $value['ENSEIGNEMENT_EXT_LIBELLE'];
		$dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAB_CODE']]['enseignements'][$ensCode]['typeHeure'][$value['TYPE_HEURE_CODE']]['libelle'] = $value['TYPE_HEURE_LIBELLE'];
		if (!array_key_exists('heures', $dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAB_CODE']]['enseignements'][$ensCode]['typeHeure'][$value['TYPE_HEURE_CODE']])) {
		$dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAB_CODE']]['enseignements'][$ensCode]['typeHeure'][$value['TYPE_HEURE_CODE']]['heures'] = [];
		}
		//Heure déjà mise en paiement
		if (!empty($value['MEP_ID'])) {
		$dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAB_CODE']]['enseignements'][$ensCode]['typeHeure'][$value['TYPE_HEURE_CODE']]['heures']['mep_id_' . $value['MEP_ID']] = [
		'mepId' => $value['MEP_ID'],
		'typeHeureId' => $value['TYPE_HEURE_ID'],
		'typeHeureCode' => $value['TYPE_HEURE_CODE'],
		'serviceId' => $value['SERVICE_ID'],
		'serviceReferentielId' => $value['SERVICE_REFERENTIEL_ID'],
		'missionId' => $value['MISSION_ID'],
		'heuresAPayer' => $value['HEURES_A_PAYER'],
		'heuresDemandees' => $value['HEURES_DEMANDEES'],
		'heuresPayees' => $value['HEURES_PAYEES'],
		'periodeLibelle' => $value['PERIODE_LIBELLE'],
		'periodeCode' => $value['PERIODE_CODE'],
		'datePaiement' => $value['DATE_PAIEMENT'],
		'dateDemande' => $value['DATE_DEMANDE'],
		'domaineFonctionnel' => [
		'domaineFonctionnelId' => $value['DOMAINE_FONCTIONNEL_ID'] ?: '',
		'libelle' => $value['DOMAINE_FONCTIONNEL_LIBELLE'] ?: '',
		'code' => $value['DOMAINE_FONCTIONNEL_CODE'] ?: '',
		],
		'centreCout' => [
		'centreCoutId' => $value['CENTRE_COUT_ID'] ?: '',
		'libelle' => $value['CENTRE_COUT_LIBELLE'] ?: '',
		'code' => $value['CENTRE_COUT_CODE'] ?: '',
		'typeRessourceCode' => $value['CENTRE_COUT_LIBELLE'] ?: '',
		'typeRessourceLibelle' => $value['CENTRE_COUT_LIBELLE'] ?: '',
		],
		];
		} else {
		$dmep[$value['STRUCTURE_CODE']]['etapes'][$value['ETAB_CODE']]['enseignements'][$ensCode]['typeHeure'][$value['TYPE_HEURE_CODE']]['heures']['a_demander'] = [
		'mepId' => '',
		'typeHeureId' => $value['TYPE_HEURE_ID'],
		'typeHeureCode' => $value['TYPE_HEURE_CODE'],
		'serviceId' => $value['SERVICE_ID'],
		'serviceReferentielId' => $value['SERVICE_REFERENTIEL_ID'],
		'missionId' => $value['MISSION_ID'],
		'heuresAPayer' => $value['HEURES_A_PAYER'],
		'heuresDemandees' => $value['HEURES_DEMANDEES'],
		'heuresPayees' => $value['HEURES_PAYEES'],
		'periodeLibelle' => $value['PERIODE_LIBELLE'],
		'periodeCode' => $value['PERIODE_CODE'],
		'datePaiement' => $value['DATE_PAIEMENT'],
		'dateDemande' => $value['DATE_DEMANDE'],
		'domaineFonctionnel' => [
		'domaineFonctionnelId' => $value['DOMAINE_FONCTIONNEL_ID'] ?: '',
		'libelle' => $value['DOMAINE_FONCTIONNEL_LIBELLE'] ?: '',
		'code' => $value['DOMAINE_FONCTIONNEL_CODE'] ?: '',
		],
		'centreCout' => [
		'centreCoutId' => $value['CENTRE_COUT_ID'] ?: '',
		'libelle' => $value['CENTRE_COUT_LIBELLE'] ?: '',
		'code' => $value['CENTRE_COUT_CODE'] ?: '',
		'typeRessourceCode' => $value['CENTRE_COUT_LIBELLE'] ?: '',
		'typeRessourceLibelle' => $value['CENTRE_COUT_LIBELLE'] ?: '',
		],
		];
		}
		$ensCode++;
		} elseif ($value['TYPAGE'] == "referentiel") {
		//Partie référentiel
		$dmep[$value['STRUCTURE_CODE']]['code'] = $value['STRUCTURE_CODE'];

public/dist/.vite/manifest.json

+1 −1

Changes for public/dist/.vite/manifest.json: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		"name": "vendor"
		},
		"main.js": {
		"file": "assets/main-BWb-s9hR.js",
		"file": "assets/main-BfSVsre9.js",
		"name": "main",
		"src": "main.js",
		"isEntry": true,

public/dist/assets/main-BWb-s9hR.js→public/dist/assets/main-BfSVsre9.js

+1 −1

File changed and moved.

Preview size limit exceeded, changes collapsed.