Loading doc/Connecteurs-Import/Octopus/SRC_AFFECTATION_RECHERCHE.sql +1 −1 Changes for doc/Connecteurs-Import/Octopus/SRC_AFFECTATION_RECHERCHE.sql: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -18,7 +18,7 @@ SELECT DISTINCT i.id intervenant_id, s.id structure_id, src.id source_id, i.id || '_' || s.id source_code, s.libelle_court labo_libelle s.libelle_long labo_libelle FROM affectation_recherche affrech JOIN source src ON src.code = 'Octopus' JOIN intervenant i Loading doc/Connecteurs-Import/Octopus/SRC_STRUCTURE.sql +18 −18 Changes for doc/Connecteurs-Import/Octopus/SRC_STRUCTURE.sql: 18 added lines, 18 removed lines. Original line number Diff line number Diff line CREATE OR REPLACE VIEW SRC_STRUCTURE AS --On recherche d'abord tout ce qui est rattaché au parent 'UNIV' SELECT s.code code, s.libelle_court libelle_court, s.libelle_long libelle_long, /*trim(sa.adresse1 || CASE WHEN sa.adresse1 IS NOT NULL AND sa.adresse2 IS NOT NULL THEN CHR(13) ELSE '' END || sa.adresse2 || CASE WHEN sa.adresse2 IS NOT NULL AND sa.adresse3 IS NOT NULL THEN CHR(13) ELSE '' END || sa.adresse3) adresse_precisions,*/ --null adresse_numero, --null adresse_numero_compl_id, --null adresse_voirie_id, --null adresse_voie, --null adresse_lieu_dit, --sa.code_postal adresse_code_postal, --sa.ville_nom adresse_commune, --sa.pays_id z_adresse_pays_id, src.id source_id, s.code source_code FROM structure@octoprod s Loading @@ -28,5 +12,21 @@ FROM structure@octoprod s JOIN source src ON src.code = 'Octopus' LEFT JOIN octo.structure_adresse@octoprod sa ON sa.structure_id = s.id WHERE SYSDATE BETWEEN s.date_ouverture AND COALESCE(s.date_fermeture, SYSDATE + 1) WHERE sysdate BETWEEN s.date_ouverture AND COALESCE(s.date_fermeture, sysdate + 1) UNION ALL -- On ajoute l'ensemble des laboratoires de recherches SELECT s.code code, s.libelle_court libelle_court, s.libelle_long libelle_long, src.id source_id, s.code source_code FROM structure@octoprod s JOIN structure_parent@octoprod sp ON s.id = sp.structure_id JOIN source src ON src.code = 'Octopus' LEFT JOIN octo.structure_adresse@octoprod sa ON sa.structure_id = s.id LEFT JOIN octo.structure_type@octoprod st ON st.id = s.type_id WHERE sysdate BETWEEN s.date_ouverture AND COALESCE(s.date_fermeture, sysdate + 1) AND st.code = 'SREC' Loading
doc/Connecteurs-Import/Octopus/SRC_AFFECTATION_RECHERCHE.sql +1 −1 Changes for doc/Connecteurs-Import/Octopus/SRC_AFFECTATION_RECHERCHE.sql: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -18,7 +18,7 @@ SELECT DISTINCT i.id intervenant_id, s.id structure_id, src.id source_id, i.id || '_' || s.id source_code, s.libelle_court labo_libelle s.libelle_long labo_libelle FROM affectation_recherche affrech JOIN source src ON src.code = 'Octopus' JOIN intervenant i Loading
doc/Connecteurs-Import/Octopus/SRC_STRUCTURE.sql +18 −18 Changes for doc/Connecteurs-Import/Octopus/SRC_STRUCTURE.sql: 18 added lines, 18 removed lines. Original line number Diff line number Diff line CREATE OR REPLACE VIEW SRC_STRUCTURE AS --On recherche d'abord tout ce qui est rattaché au parent 'UNIV' SELECT s.code code, s.libelle_court libelle_court, s.libelle_long libelle_long, /*trim(sa.adresse1 || CASE WHEN sa.adresse1 IS NOT NULL AND sa.adresse2 IS NOT NULL THEN CHR(13) ELSE '' END || sa.adresse2 || CASE WHEN sa.adresse2 IS NOT NULL AND sa.adresse3 IS NOT NULL THEN CHR(13) ELSE '' END || sa.adresse3) adresse_precisions,*/ --null adresse_numero, --null adresse_numero_compl_id, --null adresse_voirie_id, --null adresse_voie, --null adresse_lieu_dit, --sa.code_postal adresse_code_postal, --sa.ville_nom adresse_commune, --sa.pays_id z_adresse_pays_id, src.id source_id, s.code source_code FROM structure@octoprod s Loading @@ -28,5 +12,21 @@ FROM structure@octoprod s JOIN source src ON src.code = 'Octopus' LEFT JOIN octo.structure_adresse@octoprod sa ON sa.structure_id = s.id WHERE SYSDATE BETWEEN s.date_ouverture AND COALESCE(s.date_fermeture, SYSDATE + 1) WHERE sysdate BETWEEN s.date_ouverture AND COALESCE(s.date_fermeture, sysdate + 1) UNION ALL -- On ajoute l'ensemble des laboratoires de recherches SELECT s.code code, s.libelle_court libelle_court, s.libelle_long libelle_long, src.id source_id, s.code source_code FROM structure@octoprod s JOIN structure_parent@octoprod sp ON s.id = sp.structure_id JOIN source src ON src.code = 'Octopus' LEFT JOIN octo.structure_adresse@octoprod sa ON sa.structure_id = s.id LEFT JOIN octo.structure_type@octoprod st ON st.id = s.type_id WHERE sysdate BETWEEN s.date_ouverture AND COALESCE(s.date_fermeture, sysdate + 1) AND st.code = 'SREC'