diff --git a/code/GenDbStructure.php b/code/GenDbStructure.php
index e66eb08a2b7dfb0f0575c5de3b0c83e25edeae09..51ad995d5edd1c986c9258ae17e934501ff01216 100644
--- a/code/GenDbStructure.php
+++ b/code/GenDbStructure.php
@@ -15,6 +15,8 @@ include_once 'GenDbStructure/DataGen.php';
$sCodeGenerator = $sl->get('UnicaenCode\CodeGenerator');
/* @var $sCodeGenerator \UnicaenCode\Service\CodeGenerator */
+echo "<h1>Atention à bien se mettre sur OSE TEST BIEN à JOUR pour pouvoir générer les données!!!</h1>";
+
$em = $sl->get(Constants::BDD);
$dg = new \GenDbStructure\DdlGen($em);
diff --git a/code/GenDbStructure/DataGen.php b/code/GenDbStructure/DataGen.php
index 081ba38f99fd8bfa61fa394cd183e47743bbdf9a..635bf5f8de6d09294342191956cd6029f9b2e917 100644
--- a/code/GenDbStructure/DataGen.php
+++ b/code/GenDbStructure/DataGen.php
@@ -32,6 +32,7 @@ class DataGen
'DOMAINE_FONCTIONNEL' => '',
'ETABLISSEMENT' => '',
'ETAT_VOLUME_HORAIRE' => '',
+ 'ETAT_SORTIE' => "code IN ('winpaie', 'etat_paiement')",
'FONCTION_REFERENTIEL' => '',
'GRADE' => 'corps_id in (select c.id from corps c where c.histo_destruction is null)',
'GROUPE' => '',
@@ -73,7 +74,6 @@ class DataGen
'UTILISATEUR' => "username = '" . self::OSE_USER . "'",
'WF_ETAPE' => '',
'WF_ETAPE_DEP' => '',
- 'ETAT_SORTIE' => "code IN ('winpaie', 'etat_paiement')"
];
diff --git "a/data/D\303\251ploiement/ose-ddl.sql" "b/data/D\303\251ploiement/ose-ddl.sql"
index 772bf842d2f1e67b565e474ed8f69756341f70d4..92660f3999e4fa1682416251032a2ecbb7f4f9e0 100755
--- "a/data/D\303\251ploiement/ose-ddl.sql"
+++ "b/data/D\303\251ploiement/ose-ddl.sql"
@@ -18484,6 +18484,86 @@ INSERT INTO CIVILITE(ID, LIBELLE_COURT, LIBELLE_LONG, SEXE) VALUES (CIVILITE_ID_
-- Table ETAT_SORTIE
+INSERT INTO ETAT_SORTIE(ID, CODE, LIBELLE, FICHIER, REQUETE, CLE, CSV_PARAMS, PDF_TRAITEMENT, BLOC1_NOM, BLOC1_ZONE, BLOC2_NOM, BLOC1_REQUETE, BLOC2_ZONE, BLOC2_REQUETE, BLOC3_NOM, BLOC3_ZONE, BLOC3_REQUETE, BLOC4_NOM, BLOC4_ZONE, BLOC4_REQUETE, BLOC5_NOM, BLOC5_ZONE, BLOC5_REQUETE, BLOC6_NOM, BLOC6_REQUETE, BLOC6_ZONE, BLOC7_NOM, BLOC7_ZONE, BLOC7_REQUETE, BLOC8_NOM, BLOC8_ZONE, BLOC8_REQUETE, BLOC9_NOM, BLOC9_ZONE, BLOC9_REQUETE, BLOC10_NOM, BLOC10_ZONE, BLOC10_REQUETE, AUTO_BREAK) VALUES (ETAT_SORTIE_ID_SEQ.NEXTVAL, q'[etat_paiement]', q'[État de paiement]', NULL, q'[select * from V_ETAT_PAIEMENT]', NULL, q'[{
+ "ANNEE_ID" : { "visible": false },
+ "TYPE_INTERVENANT_ID" : { "visible": false },
+ "STRUCTURE_ID" : { "visible": false },
+ "PERIODE_ID" : { "visible": false },
+ "INTERVENANT_ID" : { "visible": false },
+ "CENTRE_COUT_ID" : { "visible": false },
+ "DOMAINE_FONCTIONNEL_ID" : { "visible": false },
+
+ "ANNEE" : { "libelle": "Année" },
+ "ETAT" : { "libelle": "État" },
+ "COMPOSANTE" : { "libelle": "Composante" },
+ "DATE_MISE_EN_PAIEMENT" : { "type": "date", "libelle": "Date de mise en paiement" },
+ "PERIODE" : { "libelle": "Période" },
+ "STATUT" : { "libelle": "Statut" },
+ "INTERVENANT_CODE" : { "libelle": "N° intervenant" },
+ "INTERVENANT_NOM" : { "libelle": "Intervenant" },
+ "INTERVENANT_NUMERO_INSEE" : { "libelle": "N° INSEE" },
+ "CENTRE_COUT_CODE" : { "libelle": "Centre de coûts ou EOTP (code)" },
+ "CENTRE_COUT_LIBELLE" : { "libelle": "Centre de coûts ou EOTP (libellé)" },
+ "DOMAINE_FONCTIONNEL_CODE" : { "libelle": "Domaine fonctionnel (code)" },
+ "DOMAINE_FONCTIONNEL_LIBELLE" : { "libelle": "Domaine fonctionnel (libelle)" },
+ "HETD" : { "type": "float", "libelle": "HETD" },
+ "HETD_POURC" : { "type": "float", "libelle": "HETD (%)" },
+ "HETD_MONTANT" : { "type": "float", "libelle": "HETD (€)" },
+ "REM_FC_D714" : { "type": "float", "libelle": "Rém. FC D714.60" },
+ "EXERCICE_AA" : { "type": "float", "libelle": "EXERCICE AA" },
+ "EXERCICE_AA_MONTANT" : { "type": "float", "libelle": "EXERCICE AA (€)" },
+ "EXERCICE_AC" : { "type": "float", "libelle": "EXERCICE AC" },
+ "EXERCICE_AC_MONTANT" : { "type": "float", "libelle": "EXERCICE AC (€)" }
+}]', q'[/data/Etats de sortie/etat_paiement.php]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1);
+INSERT INTO ETAT_SORTIE(ID, CODE, LIBELLE, FICHIER, REQUETE, CLE, CSV_PARAMS, PDF_TRAITEMENT, BLOC1_NOM, BLOC1_ZONE, BLOC2_NOM, BLOC1_REQUETE, BLOC2_ZONE, BLOC2_REQUETE, BLOC3_NOM, BLOC3_ZONE, BLOC3_REQUETE, BLOC4_NOM, BLOC4_ZONE, BLOC4_REQUETE, BLOC5_NOM, BLOC5_ZONE, BLOC5_REQUETE, BLOC6_NOM, BLOC6_REQUETE, BLOC6_ZONE, BLOC7_NOM, BLOC7_ZONE, BLOC7_REQUETE, BLOC8_NOM, BLOC8_ZONE, BLOC8_REQUETE, BLOC9_NOM, BLOC9_ZONE, BLOC9_REQUETE, BLOC10_NOM, BLOC10_ZONE, BLOC10_REQUETE, AUTO_BREAK) VALUES (ETAT_SORTIE_ID_SEQ.NEXTVAL, q'[winpaie]', q'[Extraction Winpaie]', NULL, q'[SELECT epw.*, 'Bonjour' champ_supp FROM V_EXPORT_PAIEMENT_WINPAIE epw]', NULL, q'[{
+ "ANNEE_ID": {
+ "visible": false
+ },
+ "TYPE_INTERVENANT_ID": {
+ "visible": false
+ },
+ "STRUCTURE_ID": {
+ "visible": false
+ },
+ "PERIODE_ID": {
+ "visible": false
+ },
+ "INTERVENANT_ID": {
+ "visible": false
+ },
+ "INSEE": {
+ "libelle": "Insee"
+ },
+ "NOM": {
+ "libelle": "Nom"
+ },
+ "CARTE": {
+ "libelle": "Carte"
+ },
+ "CODE_ORIGINE": {
+ "libelle": "Code origine"
+ },
+ "RETENUE": {
+ "libelle": "Retenue"
+ },
+ "SENS": {
+ "libelle": "Sens"
+ },
+ "MC": {
+ "libelle": "MC"
+ },
+ "NBU": {
+ "libelle": "NBU",
+ "type": "float"
+ },
+ "MONTANT": {
+ "libelle": "Montant",
+ "type": "float"
+ },
+ "LIBELLE": {
+ "libelle": "Libellé"
+ }
+}]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
-- Table ETAT_VOLUME_HORAIRE
@@ -30241,6 +30321,10 @@ INSERT INTO ROLE_PRIVILEGE(ROLE_ID, PRIVILEGE_ID) VALUES ((SELECT ID FROM ROLE W
INSERT INTO ROLE_PRIVILEGE(ROLE_ID, PRIVILEGE_ID) VALUES ((SELECT ID FROM ROLE WHERE ROWNUM = 1 AND CODE = q'[administrateur]'), (SELECT p.id FROM privilege p JOIN categorie_privilege cp ON p.categorie_id = cp.id WHERE cp.code || '-' || p.code = 'contrat-projet-generation'));
INSERT INTO ROLE_PRIVILEGE(ROLE_ID, PRIVILEGE_ID) VALUES ((SELECT ID FROM ROLE WHERE ROWNUM = 1 AND CODE = q'[gestionnaire-composante]'), (SELECT p.id FROM privilege p JOIN categorie_privilege cp ON p.categorie_id = cp.id WHERE cp.code || '-' || p.code = 'contrat-contrat-generation'));
INSERT INTO ROLE_PRIVILEGE(ROLE_ID, PRIVILEGE_ID) VALUES ((SELECT ID FROM ROLE WHERE ROWNUM = 1 AND CODE = q'[administrateur]'), (SELECT p.id FROM privilege p JOIN categorie_privilege cp ON p.categorie_id = cp.id WHERE cp.code || '-' || p.code = 'contrat-contrat-generation'));
+INSERT INTO ROLE_PRIVILEGE(ROLE_ID, PRIVILEGE_ID) VALUES ((SELECT ID FROM ROLE WHERE ROWNUM = 1 AND CODE = q'[administrateur]'), (SELECT p.id FROM privilege p JOIN categorie_privilege cp ON p.categorie_id = cp.id WHERE cp.code || '-' || p.code = 'centres-couts-administration-visualisation'));
+INSERT INTO ROLE_PRIVILEGE(ROLE_ID, PRIVILEGE_ID) VALUES ((SELECT ID FROM ROLE WHERE ROWNUM = 1 AND CODE = q'[administrateur]'), (SELECT p.id FROM privilege p JOIN categorie_privilege cp ON p.categorie_id = cp.id WHERE cp.code || '-' || p.code = 'centres-couts-administration-edition'));
+INSERT INTO ROLE_PRIVILEGE(ROLE_ID, PRIVILEGE_ID) VALUES ((SELECT ID FROM ROLE WHERE ROWNUM = 1 AND CODE = q'[administrateur]'), (SELECT p.id FROM privilege p JOIN categorie_privilege cp ON p.categorie_id = cp.id WHERE cp.code || '-' || p.code = 'etat-sortie-administration-visualisation'));
+INSERT INTO ROLE_PRIVILEGE(ROLE_ID, PRIVILEGE_ID) VALUES ((SELECT ID FROM ROLE WHERE ROWNUM = 1 AND CODE = q'[administrateur]'), (SELECT p.id FROM privilege p JOIN categorie_privilege cp ON p.categorie_id = cp.id WHERE cp.code || '-' || p.code = 'etat-sortie-administration-edition'));
-- Table TAUX_HORAIRE_HETD
diff --git "a/data/Mises \303\240 jour/08.0.sql" "b/data/Mises \303\240 jour/08.0.sql"
index 8bb08580ac9012b2fc81b704c4a35031ce75cb5e..81962772484ab0b38f0ee09bb953f47ad83da3aa 100644
--- "a/data/Mises \303\240 jour/08.0.sql"
+++ "b/data/Mises \303\240 jour/08.0.sql"
@@ -96,6 +96,91 @@ CREATE TABLE "ETAT_SORTIE"
"BLOC10_REQUETE" VARCHAR2(4000 CHAR),
"AUTO_BREAK" NUMBER(1,0) DEFAULT 1 NOT NULL ENABLE
)
+/
+
+-- Table ETAT_SORTIE
+INSERT INTO ETAT_SORTIE(ID, CODE, LIBELLE, FICHIER, REQUETE, CLE, CSV_PARAMS, PDF_TRAITEMENT, BLOC1_NOM, BLOC1_ZONE, BLOC2_NOM, BLOC1_REQUETE, BLOC2_ZONE, BLOC2_REQUETE, BLOC3_NOM, BLOC3_ZONE, BLOC3_REQUETE, BLOC4_NOM, BLOC4_ZONE, BLOC4_REQUETE, BLOC5_NOM, BLOC5_ZONE, BLOC5_REQUETE, BLOC6_NOM, BLOC6_REQUETE, BLOC6_ZONE, BLOC7_NOM, BLOC7_ZONE, BLOC7_REQUETE, BLOC8_NOM, BLOC8_ZONE, BLOC8_REQUETE, BLOC9_NOM, BLOC9_ZONE, BLOC9_REQUETE, BLOC10_NOM, BLOC10_ZONE, BLOC10_REQUETE, AUTO_BREAK) VALUES (ETAT_SORTIE_ID_SEQ.NEXTVAL, q'[etat_paiement]', q'[État de paiement]', NULL, q'[select * from V_ETAT_PAIEMENT]', NULL, q'[{
+ "ANNEE_ID" : { "visible": false },
+ "TYPE_INTERVENANT_ID" : { "visible": false },
+ "STRUCTURE_ID" : { "visible": false },
+ "PERIODE_ID" : { "visible": false },
+ "INTERVENANT_ID" : { "visible": false },
+ "CENTRE_COUT_ID" : { "visible": false },
+ "DOMAINE_FONCTIONNEL_ID" : { "visible": false },
+
+ "ANNEE" : { "libelle": "Année" },
+ "ETAT" : { "libelle": "État" },
+ "COMPOSANTE" : { "libelle": "Composante" },
+ "DATE_MISE_EN_PAIEMENT" : { "type": "date", "libelle": "Date de mise en paiement" },
+ "PERIODE" : { "libelle": "Période" },
+ "STATUT" : { "libelle": "Statut" },
+ "INTERVENANT_CODE" : { "libelle": "N° intervenant" },
+ "INTERVENANT_NOM" : { "libelle": "Intervenant" },
+ "INTERVENANT_NUMERO_INSEE" : { "libelle": "N° INSEE" },
+ "CENTRE_COUT_CODE" : { "libelle": "Centre de coûts ou EOTP (code)" },
+ "CENTRE_COUT_LIBELLE" : { "libelle": "Centre de coûts ou EOTP (libellé)" },
+ "DOMAINE_FONCTIONNEL_CODE" : { "libelle": "Domaine fonctionnel (code)" },
+ "DOMAINE_FONCTIONNEL_LIBELLE" : { "libelle": "Domaine fonctionnel (libelle)" },
+ "HETD" : { "type": "float", "libelle": "HETD" },
+ "HETD_POURC" : { "type": "float", "libelle": "HETD (%)" },
+ "HETD_MONTANT" : { "type": "float", "libelle": "HETD (€)" },
+ "REM_FC_D714" : { "type": "float", "libelle": "Rém. FC D714.60" },
+ "EXERCICE_AA" : { "type": "float", "libelle": "EXERCICE AA" },
+ "EXERCICE_AA_MONTANT" : { "type": "float", "libelle": "EXERCICE AA (€)" },
+ "EXERCICE_AC" : { "type": "float", "libelle": "EXERCICE AC" },
+ "EXERCICE_AC_MONTANT" : { "type": "float", "libelle": "EXERCICE AC (€)" }
+}]', q'[/data/Etats de sortie/etat_paiement.php]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1);
+
+INSERT INTO ETAT_SORTIE(ID, CODE, LIBELLE, FICHIER, REQUETE, CLE, CSV_PARAMS, PDF_TRAITEMENT, BLOC1_NOM, BLOC1_ZONE, BLOC2_NOM, BLOC1_REQUETE, BLOC2_ZONE, BLOC2_REQUETE, BLOC3_NOM, BLOC3_ZONE, BLOC3_REQUETE, BLOC4_NOM, BLOC4_ZONE, BLOC4_REQUETE, BLOC5_NOM, BLOC5_ZONE, BLOC5_REQUETE, BLOC6_NOM, BLOC6_REQUETE, BLOC6_ZONE, BLOC7_NOM, BLOC7_ZONE, BLOC7_REQUETE, BLOC8_NOM, BLOC8_ZONE, BLOC8_REQUETE, BLOC9_NOM, BLOC9_ZONE, BLOC9_REQUETE, BLOC10_NOM, BLOC10_ZONE, BLOC10_REQUETE, AUTO_BREAK) VALUES (ETAT_SORTIE_ID_SEQ.NEXTVAL, q'[winpaie]', q'[Extraction Winpaie]', NULL, q'[SELECT epw.*, 'Bonjour' champ_supp FROM V_EXPORT_PAIEMENT_WINPAIE epw]', NULL, q'[{
+ "ANNEE_ID": {
+ "visible": false
+ },
+ "TYPE_INTERVENANT_ID": {
+ "visible": false
+ },
+ "STRUCTURE_ID": {
+ "visible": false
+ },
+ "PERIODE_ID": {
+ "visible": false
+ },
+ "INTERVENANT_ID": {
+ "visible": false
+ },
+ "INSEE": {
+ "libelle": "Insee"
+ },
+ "NOM": {
+ "libelle": "Nom"
+ },
+ "CARTE": {
+ "libelle": "Carte"
+ },
+ "CODE_ORIGINE": {
+ "libelle": "Code origine"
+ },
+ "RETENUE": {
+ "libelle": "Retenue"
+ },
+ "SENS": {
+ "libelle": "Sens"
+ },
+ "MC": {
+ "libelle": "MC"
+ },
+ "NBU": {
+ "libelle": "NBU",
+ "type": "float"
+ },
+ "MONTANT": {
+ "libelle": "Montant",
+ "type": "float"
+ },
+ "LIBELLE": {
+ "libelle": "Libellé"
+ }
+}]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
+
/
@@ -3222,7 +3307,7 @@ INSERT INTO parametre (
) VALUES (
parametre_id_seq.nextval,
'es_etat_paiement',
- (select id from etat_sortie where code = 'etat-paiement'),
+ (select id from etat_sortie where code = 'etat_paiement'),
'État de sortie pour les états de paiement',
sysdate,
(select id from utilisateur where username='oseappli'),