Merge remote-tracking branch 'origin/b24' into b24 (b78bd939) · Commits · open-source / OSE

config/autoload/unicaen-vue.global.php

+4 −2

Changes for config/autoload/unicaen-vue.global.php: 4 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		<?php


		$hostUrl = $_ENV['DEV_VITE_URL'] ?? null;

		if (!$hostUrl) {
		$scheme = $_ENV['HTTP_X_FORWARDED_PROTO'] ?? $_ENV['REQUEST_SCHEME'] ?? 'http';
		$host = $_ENV['APP_HOST'] ?? 'localhost' ?: 'localhost';
		$port = $_ENV['DEV_VITE_PORT'] ?? 5133 ?: 5133;
		$host = $_ENV['APP_HOST'] ?? 'localhost';
		$port = $_ENV['DEV_VITE_PORT'] ?? 5133;

		$hostUrl = $scheme . '://' . $host . ':' . $port;

		}


		return [
		'unicaen-vue' => [
		'host' => $hostUrl,

+0 −2

Changes for data/ddl/view/V_INDICATEUR_231.sql: 0 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		CREATE OR REPLACE FORCE VIEW V_INDICATEUR_231 AS
		SELECT DISTINCT
		MAX(i.NOM_USUEL),
		MAX(i.PRENOM),
		w.intervenant_id,
		i.structure_id,
		MAX(pj.histo_modification) AS "Date de modification"

+0 −2

Changes for data/ddl/view/V_INDICATEUR_241.sql: 0 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		CREATE OR REPLACE FORCE VIEW V_INDICATEUR_241 AS
		SELECT DISTINCT
		MAX(i.NOM_USUEL),
		MAX(i.PRENOM),
		w.intervenant_id,
		i.structure_id,
		MAX(pj.histo_modification) AS "Date de modification"

+1 −1

Changes for doc/Connecteurs-Import/Octopus/MV_INTERVENANT.sql: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -192,7 +192,7 @@ WITH i AS (
		MAX(indc.ldap_uid) KEEP (DENSE_RANK FIRST ORDER BY CASE WHEN regexp_like(ldap_uid, 'e[0-9]{8}') THEN 1 ELSE 0 END, indc.histo_creation) ldap_uid,
		MAX(indc.email) KEEP (DENSE_RANK FIRST ORDER BY CASE WHEN regexp_like(ldap_uid, 'e[0-9]{8}') THEN 1 ELSE 0 END,indc.histo_creation) email,
		MAX(indc.histo_creation) KEEP (DENSE_RANK FIRST ORDER BY CASE WHEN regexp_like(ldap_uid, 'e[0-9]{8}') THEN 1 ELSE 0 END,indc.histo_creation) histo_creation,
		MAX(vindcvc.date_fin) KEEP (DENSE_RANK FIRST ORDER BY vindcvc.date_fin DESC) date_fin
		MAX(vindcvc.date_desactivation) KEEP (DENSE_RANK FIRST ORDER BY vindcvc.date_desactivation DESC) date_fin
		FROM octo.individu_compte@octoprod indc
		JOIN octo.v_individu_cycle_vie_compte@octoprod vindcvc ON vindcvc.individu_id = indc.individu_id
		WHERE indc.statut_id = 1

+1 −1

Changes for doc/Connecteurs-Import/Octopus/MV_INTERVENANT_OSE.sql: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -173,7 +173,7 @@ WITH i AS (
		MAX(indc.ldap_uid) KEEP (DENSE_RANK FIRST ORDER BY CASE WHEN regexp_like(ldap_uid, 'e[0-9]{8}') THEN 1 ELSE 0 END, indc.histo_creation) ldap_uid,
		MAX(indc.email) KEEP (DENSE_RANK FIRST ORDER BY CASE WHEN regexp_like(ldap_uid, 'e[0-9]{8}') THEN 1 ELSE 0 END,indc.histo_creation) email,
		MAX(indc.histo_creation) KEEP (DENSE_RANK FIRST ORDER BY CASE WHEN regexp_like(ldap_uid, 'e[0-9]{8}') THEN 1 ELSE 0 END,indc.histo_creation) histo_creation,
		MAX(vindcvc.date_fin) KEEP (DENSE_RANK FIRST ORDER BY vindcvc.date_fin DESC) date_fin
		MAX(vindcvc.date_desactivation) KEEP (DENSE_RANK FIRST ORDER BY vindcvc.date_desactivation DESC) date_fin
		FROM octo.individu_compte@octoprod indc
		JOIN octo.v_individu_cycle_vie_compte@octoprod vindcvc ON vindcvc.individu_id = indc.individu_id
		WHERE indc.statut_id = 1