Commit 7478617f authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge remote-tracking branch 'origin/b24' into b24

parents 094b134a 8d94389d

config/autoload/unicaen-vue.global.php

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ $hostUrl = $_ENV['DEV_VITE_URL'] ?? null; 


if (!$hostUrl) {

    $scheme = $_ENV['HTTP_X_FORWARDED_PROTO'] ?? $_ENV['REQUEST_SCHEME'] ?? 'http';

    $host = $_ENV['APP_HOST'] ?? 'localhost';

    $port = $_ENV['DEV_VITE_PORT'] ?? 5133;

    $host = ($_ENV['APP_HOST'] ?? 'localhost') ?: 'localhost';

    $port = ($_ENV['DEV_VITE_PORT'] ?? 5133) ?: 5133;



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

data/ddl/view/V_INDICATEUR_461.sql

+1 −1
Original line number Diff line number Diff line 
CREATE OR REPLACE FORCE VIEW V_INDICATEUR_461 AS

SELECT DISTINCT

  c.intervenant_id,

  c.structure_id

  COALESCE(c.structure_id, i.structure_id) structure_id

FROM

  contrat                c

  JOIN intervenant i ON c.intervenant_id = i.id

data/ddl/view/V_INDICATEUR_470.sql

+2 −1
Original line number Diff line number Diff line 
CREATE OR REPLACE FORCE VIEW V_INDICATEUR_470 AS

SELECT DISTINCT

  c.intervenant_id,

  c.structure_id

  COALESCE(c.structure_id, i.structure_id) structure_id

FROM

  contrat                c

  JOIN tbl_workflow w ON w.intervenant_id = c.intervenant_id AND (w.structure_id = c.structure_id OR w.structure_id is NULL) AND w.etape_code = 'CONTRAT' AND w.atteignable = 1

  JOIN validation v ON v.id = c.validation_id AND v.histo_destruction IS NULL

  JOIN intervenant i ON c.intervenant_id = i.id

  LEFT JOIN contrat_fichier cf ON cf.contrat_id = c.id

  LEFT JOIN fichier f ON f.id = cf.fichier_id AND f.histo_destruction IS NULL

WHERE

data/ddl/view/V_INDICATEUR_471.sql

+2 −1
Original line number Diff line number Diff line 
CREATE OR REPLACE FORCE VIEW V_INDICATEUR_471 AS

SELECT DISTINCT

  c.intervenant_id,

  c.structure_id

  COALESCE(c.structure_id, i.structure_id) structure_id

FROM

  contrat                c

  JOIN tbl_workflow w ON w.intervenant_id = c.intervenant_id AND (w.structure_id = c.structure_id OR w.structure_id is NULL) AND w.etape_code = 'CONTRAT' AND w.atteignable = 1

  JOIN validation v ON v.id = c.validation_id AND v.histo_destruction IS NULL

  JOIN intervenant i ON c.intervenant_id = i.id

  LEFT JOIN contrat_fichier cf ON cf.contrat_id = c.id

  LEFT JOIN fichier f ON f.id = cf.fichier_id AND f.histo_destruction IS NULL

WHERE

data/ddl/view/V_INDICATEUR_480.sql

+2 −1
Original line number Diff line number Diff line 
CREATE OR REPLACE FORCE VIEW V_INDICATEUR_480 AS

SELECT DISTINCT

  c.intervenant_id,

  c.structure_id

  COALESCE(c.structure_id, i.structure_id) structure_id

FROM

  contrat                c

  JOIN tbl_workflow w ON w.intervenant_id = c.intervenant_id AND (w.structure_id = c.structure_id OR w.structure_id is NULL) AND w.etape_code = 'CONTRAT' AND w.atteignable = 1

  JOIN validation v ON v.id = c.validation_id AND v.histo_destruction IS NULL

  JOIN contrat_fichier cf ON cf.contrat_id = c.id

  JOIN fichier f ON f.id = cf.fichier_id AND f.histo_destruction IS NULL

  JOIN intervenant i ON c.intervenant_id = i.id

WHERE

  c.histo_destruction IS NULL

  AND c.date_retour_signe IS NULL
 
 No newline at end of file