Merge branch 'master' into alc-unicaen-mail (15cd4ff4) · Commits · JACQUOT Frederic / OSE

CHANGELOG.md

+3 −2

Original line number	Diff line number	Diff line
		# Version stable

		[OSE 20.3](#ose-203-23052023)
		[OSE 20.3](#ose-204-05062023)


		# OSE 21 (juin 2023)
		@@ -42,7 +42,7 @@



		# OSE 20.4 (début juin 2023)
		# OSE 20.4 (05/06/2023)

		## Corrections de bugs

		@@ -51,6 +51,7 @@
		* Formulaire d'édition des états de sortie réparé au niveau de l'affichage des sous-requêtes
		* Correction de la formule de Picardie
		* Correction de la formule de calcul de Lyon 2
		* Correction de la formule de Paris 1

+1 −1

Original line number	Diff line number	Diff line
		@@ -156,7 +156,7 @@ CREATE OR REPLACE PACKAGE BODY "OSE_PAIEMENT" AS

		EXCEPTION
		WHEN OTHERS THEN
		RETURN to_date('00/00/0000', 'dd/mm/YYYY');
		RETURN to_date('01/01/0001', 'dd/mm/YYYY');
		END get_taux_horaire_date;

		END ose_paiement;
		No newline at end of file

+8 −1

Original line number	Diff line number	Diff line
		@@ -59,6 +59,9 @@ SELECT ct.annee_id,
		ct."tauxNom",
		ct."debutValidite",
		ct."finValidite",
		ct."pays_nationalite",
		ct."date_creation",
		ct."date_contrat_lie",
		CASE ct.est_contrat
		WHEN 1 THEN -- contrat
		'Contrat de travail'
		@@ -135,7 +138,10 @@ FROM ( SELECT c.*,
		CASE WHEN LOWER(si.codes_corresp_2) = 'oui' THEN 1 ELSE 0 END est_atv,
		tm.libelle "missionNom",
		to_char(c.debut_validite, 'dd/mm/YYYY') "debutValidite",
		to_char(c.fin_validite, 'dd/mm/YYYY') "finValidite"
		to_char(c.fin_validite, 'dd/mm/YYYY') "finValidite",
		p.libelle "pays_nationalite",
		COALESCE(v.histo_creation,c.histo_creation) "date_creation",
		cp.date_retour_signe "date_contrat_lie"
		FROM
		contrat c
		JOIN type_contrat tc ON tc.id = c.type_contrat_id
		@@ -145,6 +151,7 @@ FROM ( SELECT c.*,
		LEFT JOIN taux_remu trs ON si.taux_remu_id = trs.id
		JOIN STRUCTURE s ON s.id = c.structure_id
		LEFT JOIN intervenant_dossier d ON d.intervenant_id = i.id AND d.histo_destruction IS NULL
		LEFT JOIN pays p ON d.pays_nationalite_id = p.id
		JOIN civilite civ ON civ.id = COALESCE(d.civilite_id,i.civilite_id)
		LEFT JOIN validation v ON v.id = c.validation_id AND v.histo_destruction IS NULL
		JOIN type_volume_horaire tvh ON tvh.code = 'PREVU'

+2 −1

Original line number	Diff line number	Diff line
		@@ -355,7 +355,8 @@ SELECT i.id
		FROM validation v
		JOIN intervenant i ON i.id = v.intervenant_id
		JOIN utilisateur u ON u.id = v.histo_createur_id
		WHERE v.histo_destruction IS NULL
		JOIN type_validation tv ON tv.id = v.type_validation_id
		WHERE v.histo_destruction IS NULL AND tv.code = 'CLOTURE_REALISE'
		GROUP BY i.id

		UNION ALL

+1 −1

Original line number	Diff line number	Diff line
		@@ -227,7 +227,7 @@ export default {
		} else if (this.mission.heuresValidees == 0) {
		return Util.formattedHeures(this.mission.heures) + ' heures (non validées)';
		} else {
		return Util.formattedHeures(this.mission.heures) + ' heures (' + Util.formattedHeures(this.mission.heuresValidees) + ' validées)';
		return '<span class="bg-info">'+Util.formattedHeures(this.mission.heures) + '</span> heures (' + Util.formattedHeures(this.mission.heuresValidees) + ' validées)';
		}
		}
		},