diff --git a/CHANGELOG.md b/CHANGELOG.md index 43c4995c09e6f7d8f5c2819a94209559f8bb50d1..03c49ea472b4a2afd0e0c2bd37e12548c2e8af11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Journal des modifications ========================= +1.3.7 +----- +- Rétablissement de la possibilité d'importer les origines de financement. + 1.3.6 ----- - Logging possible des requêtes reçues et des temps de traitements (SQL, génération HAL). diff --git a/doc/release-notes/v1.3.7.md b/doc/release-notes/v1.3.7.md new file mode 100644 index 0000000000000000000000000000000000000000..05928d825d2132d93c9fc3e972b90fa8457d9a74 --- /dev/null +++ b/doc/release-notes/v1.3.7.md @@ -0,0 +1,102 @@ +# Version 1.3.7 + +## Sources PHP + +Sur le serveur, placez-vous dans le répertoire du web service (sans doute `/var/www/sygal-import-ws`) +puis lancez les commandes suivantes pour installer la nouvelle version : +```bash +git fetch && git fetch --tags && git checkout --force 1.3.7 && bash install.sh +``` + +Selon le moteur PHP que vous avez installé, rechargez le service, exemple : + - php7.0-fpm : `service php7.0-fpm reload` + - apache2-mod-php7.0 : `service apache2 reload` + + +## Base de données + +### Apogée + +```sql +create or replace view V_SYGAL_ORIGINE_FINANCEMENT as +with tmp(ID, SOURCE_ID, COD_OFI, LIC_OFI, LIB_OFI) as ( + select '10', 'apogee', '10', 'SALARIE', 'Etudiant salarié' from dual union all + select '11', 'apogee', '11', 'SANS FIN', 'Sans financement' from dual union all + select '13', 'apogee', '13', 'DOT EPSCP', 'Dotation des EPSCP' from dual union all + select '14', 'apogee', '14', 'DOT EPST', 'Dotation des EPST' from dual union all + select '15', 'apogee', '15', 'POLYTECH', 'Programmes Spé. Normaliens, Polytechnici' from dual union all + select '16', 'apogee', '16', 'HANDICAP', 'Programme Spécifique Handicap' from dual union all + select '17', 'apogee', '17', 'DEFENSE', 'Ministère de la Défense (dont DGA)' from dual union all + select '18', 'apogee', '18', 'AGRICULTUR', 'Ministère de l''Agriculture' from dual union all + select '19', 'apogee', '19', 'AFF ETRANG', 'Ministère des Affaires Etrangères' from dual union all + select '20', 'apogee', '20', 'SANTE', 'Ministère de la Santé' from dual union all + select '21', 'apogee', '21', 'AUTRES MIN', 'Autres Ministères' from dual union all + select '22', 'apogee', '22', 'DOT EPIC', 'Dotation des EPIC' from dual union all + select '23', 'apogee', '23', 'DOT EPA', 'Dotation des EPA' from dual union all + select '24', 'apogee', '24', 'NORMANDIE', 'Région Normandie' from dual union all + select '25', 'apogee', '25', 'AUT COLLEC', 'Autre Collectivité Territoriale' from dual union all + select '26', 'apogee', '26', 'ANR', 'ANR' from dual union all + select '27', 'apogee', '27', 'IDEX', 'IDEX' from dual union all + select '28', 'apogee', '28', 'PIA', 'Autres dispositifs du PIA (dont LABEX)' from dual union all + select '29', 'apogee', '29', 'AUT AFFPR', 'Autres Finan. Pub. d''Agences Françaises' from dual union all + select '30', 'apogee', '30', 'FI PUB PRV', 'Financements Mixtes Public Privé' from dual union all + select '31', 'apogee', '31', 'CIFRE', 'Conventions CIFRE' from dual union all + select '32', 'apogee', '32', 'PART RECH', 'Partenariat de Recherche' from dual union all + select '33', 'apogee', '33', 'MECENAT', 'Mécénat y compris Fondations et Asso.' from dual union all + select '34', 'apogee', '34', 'ERC', 'ERC' from dual union all + select '35', 'apogee', '35', 'MARIE CURI', 'Actions Marie Sklodowska Curie' from dual union all + select '36', 'apogee', '36', 'ERASMUS', 'ERASMUS' from dual union all + select '37', 'apogee', '37', 'AUT PRO EU', 'Autre Programme Européen' from dual union all + select '38', 'apogee', '38', 'GOUV EUROP', 'Gouvernement Etranger Européen' from dual union all + select '39', 'apogee', '39', 'GOUV NON E', 'Gouvernement Etranger Hors Europe' from dual union all + select '40', 'apogee', '40', 'AUT FI ETR', 'Autres Financements Etrangers' from dual union all + select '41', 'apogee', '41', 'ENT ETR', 'Entreprise Etrangère' from dual union all + select '42', 'apogee', '42', 'ORG FC', 'Financements Organismes FC' from dual union all + select '43', 'apogee', '43', 'ORG INTER', 'Organismes Internationaux' from dual +) +select * from tmp +/ +``` + +### Physalis + +```sql +CREATE OR REPLACE FORCE EDITIONABLE VIEW "API_SCOLARITE"."V_SYGAL_ORIGINE_FINANCEMENT" ("ID", "SOURCE_ID", "COD_OFI", "LIC_OFI", "LIB_OFI") AS + with tmp(ID, SOURCE_ID, COD_OFI, LIC_OFI, LIB_OFI) as ( + select '10', 'physalis', '10', 'SALARIE', 'Etudiant salarié' from dual union all + select '11', 'physalis', '11', 'SANS FIN', 'Sans financement' from dual union all + select '13', 'physalis', '13', 'DOT EPSCP', 'Dotation des EPSCP' from dual union all + select '14', 'physalis', '14', 'DOT EPST', 'Dotation des EPST' from dual union all + select '15', 'physalis', '15', 'POLYTECH', 'Programmes Spé. Normaliens, Polytechnici' from dual union all + select '16', 'physalis', '16', 'HANDICAP', 'Programme Spécifique Handicap' from dual union all + select '17', 'physalis', '17', 'DEFENSE', 'Ministère de la Défense (dont DGA)' from dual union all + select '18', 'physalis', '18', 'AGRICULTUR', 'Ministère de l''Agriculture' from dual union all + select '19', 'physalis', '19', 'AFF ETRANG', 'Ministère des Affaires Etrangères' from dual union all + select '20', 'physalis', '20', 'SANTE', 'Ministère de la Santé' from dual union all + select '21', 'physalis', '21', 'AUTRES MIN', 'Autres Ministères' from dual union all + select '22', 'physalis', '22', 'DOT EPIC', 'Dotation des EPIC' from dual union all + select '23', 'physalis', '23', 'DOT EPA', 'Dotation des EPA' from dual union all + select '24', 'physalis', '24', 'NORMANDIE', 'Région Normandie' from dual union all + select '25', 'physalis', '25', 'AUT COLLEC', 'Autre Collectivité Territoriale' from dual union all + select '26', 'physalis', '26', 'ANR', 'ANR' from dual union all + select '27', 'physalis', '27', 'IDEX', 'IDEX' from dual union all + select '28', 'physalis', '28', 'PIA', 'Autres dispositifs du PIA (dont LABEX)' from dual union all + select '29', 'physalis', '29', 'AUT AFFPR', 'Autres Finan. Pub. d''Agences Françaises' from dual union all + select '30', 'physalis', '30', 'FI PUB PRV', 'Financements Mixtes Public Privé' from dual union all + select '31', 'physalis', '31', 'CIFRE', 'Conventions CIFRE' from dual union all + select '32', 'physalis', '32', 'PART RECH', 'Partenariat de Recherche' from dual union all + select '33', 'physalis', '33', 'MECENAT', 'Mécénat y compris Fondations et Asso.' from dual union all + select '34', 'physalis', '34', 'ERC', 'ERC' from dual union all + select '35', 'physalis', '35', 'MARIE CURI', 'Actions Marie Sklodowska Curie' from dual union all + select '36', 'physalis', '36', 'ERASMUS', 'ERASMUS' from dual union all + select '37', 'physalis', '37', 'AUT PRO EU', 'Autre Programme Européen' from dual union all + select '38', 'physalis', '38', 'GOUV EUROP', 'Gouvernement Etranger Européen' from dual union all + select '39', 'physalis', '39', 'GOUV NON E', 'Gouvernement Etranger Hors Europe' from dual union all + select '40', 'physalis', '40', 'AUT FI ETR', 'Autres Financements Etrangers' from dual union all + select '41', 'physalis', '41', 'ENT ETR', 'Entreprise Etrangère' from dual union all + select '42', 'physalis', '42', 'ORG FC', 'Financements Organismes FC' from dual union all + select '43', 'physalis', '43', 'ORG INTER', 'Organismes Internationaux' from dual + ) +select "ID","SOURCE_ID","COD_OFI","LIC_OFI","LIB_OFI" from tmp +/ +```