diff --git a/conf/_install/dependency.xml b/conf/_install/dependency.xml
index 11848b0b9701ab7ada2328ecff5db9b5de2b8148..c96e2f043a10b23b37bc506d58ab0a350a97fd6f 100755
--- a/conf/_install/dependency.xml
+++ b/conf/_install/dependency.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Application -->
-<installer>
- <dependenciesCollection>
- <dependency>
- <nature>framework</nature>
- <name>vitis</name>
- <version>next_version</version>
- </dependency>
- <dependency>
- <nature>modules</nature>
- <name>module_extraction</name>
- <version>next_version</version>
- </dependency>
- </dependenciesCollection>
-</installer>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Application -->
+<installer>
+ <dependenciesCollection>
+ <dependency>
+ <nature>framework</nature>
+ <name>vitis</name>
+ <version>app_extraction</version>
+ </dependency>
+ <dependency>
+ <nature>modules</nature>
+ <name>module_extraction</name>
+ <version>app_extraction</version>
+ </dependency>
+ </dependenciesCollection>
+</installer>
diff --git a/push_subtrees.sh b/push_subtrees.sh
old mode 100644
new mode 100755
diff --git a/src/module_extraction/module/forms/extraction_depot/extraction_depot_extraction_extraction_depot.js b/src/module_extraction/module/forms/extraction_depot/extraction_depot_extraction_extraction_depot.js
index 3f2fd830bdda95ed2619d9a2e8aea9418090dd04..4b6c36e388f708f89ea5ec7df7eb9addd21813f7 100755
--- a/src/module_extraction/module/forms/extraction_depot/extraction_depot_extraction_extraction_depot.js
+++ b/src/module_extraction/module/forms/extraction_depot/extraction_depot_extraction_extraction_depot.js
@@ -129,7 +129,7 @@ var constructor_form = function (scope, s_url) {
var aSelectedNode = $("#Element_0_2_1_treeview")["treeview"]('getSelected');
var sFileName = aSelectedNode[0]["text"];
var aNodeParent = $("#Element_0_2_1_treeview")["treeview"]('getNode', aSelectedNode[0]["parentId"]);
-
+
if (aSelectedNode[0]["parentId"] == "")
{
if (sFileName != "")
diff --git a/src/module_extraction/module/templates/depositDirectoryTpl.html b/src/module_extraction/module/templates/depositDirectoryTpl.html
deleted file mode 100755
index 14d9fd0cb85452098669a5ff971e9109af652e63..0000000000000000000000000000000000000000
--- a/src/module_extraction/module/templates/depositDirectoryTpl.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div data-app-deposit-directory="" id="deposit-directory" class="row no-bs-row-margin deposit-directory">
- <div class="col-xs-12 no_bs_padding">
- <!-- Titre -->
- <div id="deposit_directory_title_container" class="row">
- <div class="col-xs-12 deposit-directory-title">Dépôt {{oFormValues[sFormDefinitionName].name}}</div>
- </div>
- <!-- Treeview -->
- <div id="deposit-directory-treeview-container" class="row deposit-directory-treeview-container">
- <div data-app-deposit-directory-treeview="" class="col-xs-12 deposit-directory-treeview"></div>
- </div>
- <!-- Formulaire (upload) -->
- <div id="deposit_directory_form_container" class="row deposit-directory-upload-form-container">
- <div data-app-deposit-directory-form="" class="col-xs-{{oFormDefinition[sFormDefinitionName].nb_cols}}"></div>
- </div>
- </div>
-</div>
\ No newline at end of file
diff --git a/src/module_extraction/web_service/sql/sqlQueries.xml b/src/module_extraction/web_service/sql/sqlQueries.xml
index 04344a798894340f9fe84636ecf1877ed2aced9f..8e670ca0bc49b68c16652a51c89d590d64b6aa17 100755
--- a/src/module_extraction/web_service/sql/sqlQueries.xml
+++ b/src/module_extraction/web_service/sql/sqlQueries.xml
@@ -11,19 +11,17 @@
--Partie pour le module extraction version 2017-01-01 généré par WAB le 18/07/2017 à 09:52:00
CREATE SCHEMA s_extraction AUTHORIZATION u_vitis;
GRANT ALL ON SCHEMA s_extraction TO u_vitis;
+
GRANT USAGE ON SCHEMA s_extraction TO extraction_admin;
GRANT USAGE ON SCHEMA s_extraction TO extraction_user;
+
CREATE SEQUENCE s_extraction.bo_id_extraction_seq START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1;
ALTER TABLE s_extraction.bo_id_extraction_seq OWNER TO u_vitis;
GRANT ALL ON SEQUENCE s_extraction.bo_id_extraction_seq TO u_vitis;
GRANT ALL ON SEQUENCE s_extraction.bo_id_extraction_seq TO extraction_admin;
GRANT ALL ON SEQUENCE s_extraction.bo_id_extraction_seq TO extraction_user;
- CREATE SEQUENCE s_extraction.seq_common START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1;
- ALTER TABLE s_extraction.seq_common OWNER TO u_vitis;
- GRANT ALL ON SEQUENCE s_extraction.seq_common TO u_vitis;
- GRANT ALL ON SEQUENCE s_extraction.seq_common TO extraction_admin;
- GRANT ALL ON SEQUENCE s_extraction.seq_common TO extraction_user;
- CREATE TABLE s_extraction.extraction (bo_id integer NOT NULL, status character varying(100), history text, creation_date date DEFAULT ('now'::text)::date, requestor character varying(50) DEFAULT "current_user"(), ae character varying(255), extent text, company character varying(50), layers text, vector_format_id character varying(100), coordsys_id character varying(50), note text, note_line text, raster_format_id character varying(100), extent_method character varying(50), signed boolean, accepted_by_cpa boolean, identification_complete boolean, definition_complete boolean, comment text, priority_id integer, id_com text, id_conseil text, email varchar(100),status_id integer);
+
+ CREATE TABLE s_extraction.extraction (bo_id integer NOT NULL, status character varying(100), history text, creation_date date DEFAULT ('now'::text)::date, requestor character varying(50) DEFAULT "current_user"(), ae character varying(255), extent text, company character varying(50), layers text, vector_format_id character varying(100), coordsys_id character varying(50), note text, note_line text, raster_format_id character varying(100), extent_method character varying(50), signed boolean, accepted_by_cpa boolean, identification_complete boolean, definition_complete boolean, comment text, priority_id integer, id_com text, id_conseil text);
ALTER TABLE s_extraction.extraction OWNER TO u_vitis;
CREATE TABLE s_extraction.rt_coordsys (coordsys_id character varying(50) NOT NULL, coordsys character varying(100));
ALTER TABLE s_extraction.rt_coordsys OWNER TO u_vitis;
@@ -88,6 +86,7 @@
INSERT INTO s_extraction.rt_layer (layer_id, layer, category, restriction, unused_attributes) VALUES ('geofla.arrondissement', 'Arrondissement', 'Arrondissement', 'interne', 'x_centroid;y_centroid');
INSERT INTO s_extraction.rt_layer (layer_id, layer, category, restriction, unused_attributes) VALUES ('geofla.canton', 'Canton', 'Arrondissement', 'restreinit', 'x_centroid;y_centroid');
INSERT INTO s_extraction.rt_layer (layer_id, layer, category, restriction, unused_attributes) VALUES ('geofla.commune', 'Commune', 'Commune', 'public', 'x_centroid;y_centroid');
+
ALTER TABLE ONLY s_extraction.extraction ADD CONSTRAINT pk_plan_bo_id PRIMARY KEY (bo_id);
ALTER TABLE ONLY s_extraction.rt_layer ADD CONSTRAINT pk_projet_type PRIMARY KEY (layer_id);
ALTER TABLE ONLY s_extraction.rt_format ADD CONSTRAINT pk_reseau PRIMARY KEY (format_id);
@@ -95,6 +94,7 @@
ALTER TABLE ONLY s_extraction.rt_feature_model ADD CONSTRAINT pk_rt_feature_model PRIMARY KEY (feature_type, attribute_name);
ALTER TABLE ONLY s_extraction.extraction ADD CONSTRAINT fk_coordsys_id FOREIGN KEY (coordsys_id) REFERENCES s_extraction.rt_coordsys(coordsys_id);
ALTER TABLE ONLY s_extraction.extraction ADD CONSTRAINT fk_format_id FOREIGN KEY (vector_format_id) REFERENCES s_extraction.rt_format(format_id);
+
GRANT ALL ON TABLE s_extraction.extraction TO u_vitis;
GRANT ALL ON TABLE s_extraction.extraction TO extraction_user;
GRANT ALL ON TABLE s_extraction.rt_coordsys TO u_vitis;
@@ -104,16 +104,185 @@
GRANT ALL ON TABLE s_extraction.rt_format TO u_vitis;
GRANT ALL ON TABLE s_extraction.rt_format TO extraction_admin;
GRANT ALL ON TABLE s_extraction.rt_layer TO u_vitis;
- GRANT ALL ON TABLE s_extraction.rt_layer TO extraction_admin;
+ GRANT ALL ON TABLE s_extraction.rt_layer TO extraction_admin;
+
+ CREATE SEQUENCE s_extraction.seq_common START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1;
+ ALTER TABLE s_extraction.seq_common OWNER TO u_vitis;
+ GRANT ALL ON SEQUENCE s_extraction.seq_common TO u_vitis;
+ GRANT ALL ON SEQUENCE s_extraction.seq_common TO extraction_admin;
+ GRANT ALL ON SEQUENCE s_extraction.seq_common TO extraction_user;
+
CREATE TABLE s_extraction.rt_extraction_status (status_id int4 NOT NULL DEFAULT nextval('s_extraction.seq_common'::regclass), name varchar(50) NOT NULL, progress int4 NOT NULL, PRIMARY KEY (status_id));
- ALTER TABLE s_extraction.rt_extraction_status OWNER TO u_vitis;
+ GRANT ALL ON TABLE s_extraction.rt_extraction_status TO u_vitis;
GRANT ALL ON TABLE s_extraction.rt_extraction_status TO extraction_admin;
+ INSERT INTO s_extraction.rt_extraction_status(name, progress) VALUES('START', 0);
+ INSERT INTO s_extraction.rt_extraction_status(name, progress) VALUES('Nouveau', 10);
+ INSERT INTO s_extraction.rt_extraction_status(name, progress) VALUES('AE Demandé', 20);
+ INSERT INTO s_extraction.rt_extraction_status(name, progress) VALUES('AE Généré', 30);
+ INSERT INTO s_extraction.rt_extraction_status(name, progress) VALUES('AE Soumis', 40);
+ INSERT INTO s_extraction.rt_extraction_status(name, progress) VALUES('Autorisée', 70);
+ INSERT INTO s_extraction.rt_extraction_status(name, progress) VALUES('Refusée', 100);
+ INSERT INTO s_extraction.rt_extraction_status(name, progress) VALUES('Terminée', 100);
+
+ --Partie s_vitis généré par WAB le 18/07/2017 à 09:52:00
+ DELETE FROM s_vitis.vm_section WHERE label_id ~ '^extraction_([0-9]+)$';
+ DELETE FROM s_vitis.vm_table_field WHERE label_id ~ '^extraction_([0-9]+)$';
+ DELETE FROM s_vitis.vm_table_button WHERE label_id ~ '^extraction_([0-9]+)$';
+ DELETE FROM s_vitis.vm_module WHERE module_id='extraction';
+ DELETE FROM s_vitis.vm_string WHERE string_id ~ '^extraction_([0-9]+)$';
+ INSERT INTO s_vitis.vm_module (module_id, description, version, label) VALUES ('extraction','Module Extraction',0.1,'extraction');
+ INSERT INTO s_vitis.group (group_id, name) SELECT (SELECT nextval('s_vitis.seq_common'::regclass)), 'demandeur' WHERE NOT EXISTS (SELECT group_id FROM s_vitis.group WHERE name='demandeur');
+ INSERT INTO s_vitis.group (group_id, name) SELECT (SELECT nextval('s_vitis.seq_common'::regclass)), 'controleur' WHERE NOT EXISTS (SELECT group_id FROM s_vitis.group WHERE name='controleur');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('Section General', 'extraction_1');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field bo_id', 'extraction_4');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field status', 'extraction_6');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('objet extraction_extraction', 'extraction_0');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field progress_level', 'extraction_7');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('Boutton Supprimer', 'extraction_2');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field company', 'extraction_8');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('Boutton Ajout', 'extraction_3');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field requestor', 'extraction_5');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field layers', 'extraction_9');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('objet extraction_coordsys', 'extraction_10');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('Section General', 'extraction_11');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('Boutton Supprimer', 'extraction_12');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('Boutton Ajout', 'extraction_13');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('objet extraction_format', 'extraction_14');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('Section General', 'extraction_15');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('Boutton Supprimer', 'extraction_16');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('Boutton Ajout', 'extraction_17');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('objet extraction_layer', 'extraction_18');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('Section General', 'extraction_19');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('Boutton Supprimer', 'extraction_20');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('Boutton Ajout', 'extraction_21');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field coordsys_id', 'extraction_22');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field coordsys', 'extraction_23');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field format_id', 'extraction_24');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field format', 'extraction_25');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field use_for_raster', 'extraction_26');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field use_for_vector', 'extraction_27');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field layer_id', 'extraction_28');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field layer', 'extraction_29');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field category', 'extraction_30');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field restriction', 'extraction_31');
+ INSERT INTO s_vitis.vm_string (string, string_id) VALUES ('field unused_attributes', 'extraction_32');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_1','en','General');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_1','fr','Informations générales');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_0','fr','Extraction');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_0','en','Extraction');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_2','fr','Supprimer les plans');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_2','en','Supprimer les plans');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_3','fr','Ajouter une extraction');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_3','en','Ajouter une extraction');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_4','en','ID');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_4','fr','ID');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_5','en','Demandeur');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_5','fr','Demandeur');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_6','fr','Etat');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_6','en','Status');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_7','fr','Avancement');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_7','en','Progress level');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_8','fr','Organisme');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_8','en','Company');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_9','fr','Couches');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_9','en','Layers');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_10','en','Coordinate systems');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_10','fr','Systèmes de coordonnées');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_11','en','General');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_11','fr','Informations générales');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_12','en','Delete coordinate systems');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_12','fr','Supprimer les systèmes de coordonnées');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_13','en','Add coordinate systems');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_13','fr','Ajouter un système de coordonnées');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_14','en','Formats');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_14','fr','Formats');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_15','en','General');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_15','fr','Informations générales');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_16','en','Delete formats');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_16','fr','Supprimer les formats');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_17','en','Add format');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_17','fr','Ajouter un format');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_18','en','Layers');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_18','fr','Couches');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_19','en','General');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_19','fr','Informations générales');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_20','en','Delete layers');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_20','fr','Supprimer les couches');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_21','en','Add layer');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_21','fr','Ajouter une couche');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_22','en','ID');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_22','fr','ID');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_23','en','Name');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_23','fr','Nom');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_24','en','ID');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_24','fr','ID');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_25','en','Name');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_25','fr','Nom');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_26','en','Raster');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_26','fr','Raster');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_27','en','Vector');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_27','fr','Vecteur');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_28','en','ID');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_28','fr','ID');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_29','en','Name');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_29','fr','Nom');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_30','en','Category');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_30','fr','Catégorie');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_31','en','Restriction');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_31','fr','Restriction');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_32','en','Unused attributes');
+ INSERT INTO s_vitis.vm_translation (translation_id, lang, translation) VALUES ('extraction_32','fr','Attributs inutilisés');
+ INSERT INTO s_vitis.vm_mode (mode_id, module_id) VALUES ('extraction','extraction');
+ INSERT INTO s_vitis.vm_mode (mode_id, module_id) VALUES ('extraction_ref','extraction');
+ INSERT INTO s_vitis.vm_mode_rolname(index, mode_id, rolname) VALUES (0, 'extraction', 'extraction_user');
+ INSERT INTO s_vitis.vm_mode_rolname(index, mode_id, rolname) VALUES (45, 'extraction_ref', 'extraction_admin');
+ INSERT INTO s_vitis.vm_tab (tab_id, event, index, mode_id, label_id, ressource_id, edit_column, show_column, sorted_by, sorted_dir, name) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)),'loadList()', 0, 'extraction', 'extraction_0', 'extraction/extractions', 'editSectionForm', 'showSectionForm', 'bo_id', 'ASC', 'extraction_extraction');
+ INSERT INTO s_vitis.vm_tab (tab_id, event, index, mode_id, label_id, ressource_id, edit_column, show_column, sorted_by, sorted_dir, name) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)),'loadList()', 0, 'extraction_ref', 'extraction_10', 'extraction/coordsyss', 'editSectionForm', 'showSectionForm', 'coordsys_id', 'ASC', 'extraction_coordsys');
+ INSERT INTO s_vitis.vm_tab (tab_id, event, index, mode_id, label_id, ressource_id, edit_column, show_column, sorted_by, sorted_dir, name) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)),'loadList()', 1, 'extraction_ref', 'extraction_14', 'extraction/formats', 'editSectionForm', 'showSectionForm', 'format_id', 'ASC', 'extraction_format');
+ INSERT INTO s_vitis.vm_tab (tab_id, event, index, mode_id, label_id, ressource_id, edit_column, show_column, sorted_by, sorted_dir, name) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)),'loadList()', 2, 'extraction_ref', 'extraction_18', 'extraction/layers', 'editSectionForm', 'showSectionForm', 'layer_id', 'ASC', 'extraction_layer');
+ INSERT INTO s_vitis.vm_table_button (button_class, table_button_id, event, label_id, ressource_id, tab_id) VALUES ('deleteFlexigrid',(SELECT nextval('s_vitis.seq_vm'::regclass)), 'DeleteSelection', 'extraction_2', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'), (SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'));
+ INSERT INTO s_vitis.vm_table_button (button_class, table_button_id, event, label_id, ressource_id, tab_id) VALUES ('add_smallFlexigrid',(SELECT nextval('s_vitis.seq_vm'::regclass)), 'AddSectionForm', 'extraction_3', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'), (SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'));
+ INSERT INTO s_vitis.vm_table_button (button_class, table_button_id, event, label_id, ressource_id, tab_id) VALUES ('deleteFlexigrid',(SELECT nextval('s_vitis.seq_vm'::regclass)), 'DeleteSelection', 'extraction_12', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_coordsys'), (SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_coordsys'));
+ INSERT INTO s_vitis.vm_table_button (button_class, table_button_id, event, label_id, ressource_id, tab_id) VALUES ('add_smallFlexigrid',(SELECT nextval('s_vitis.seq_vm'::regclass)), 'AddSectionForm', 'extraction_13', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_coordsys'), (SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_coordsys'));
+ INSERT INTO s_vitis.vm_table_button (button_class, table_button_id, event, label_id, ressource_id, tab_id) VALUES ('deleteFlexigrid',(SELECT nextval('s_vitis.seq_vm'::regclass)), 'DeleteSelection', 'extraction_16', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_format'), (SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_format'));
+ INSERT INTO s_vitis.vm_table_button (button_class, table_button_id, event, label_id, ressource_id, tab_id) VALUES ('add_smallFlexigrid',(SELECT nextval('s_vitis.seq_vm'::regclass)), 'AddSectionForm', 'extraction_17', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_format'), (SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_format'));
+ INSERT INTO s_vitis.vm_table_button (button_class, table_button_id, event, label_id, ressource_id, tab_id) VALUES ('deleteFlexigrid',(SELECT nextval('s_vitis.seq_vm'::regclass)), 'DeleteSelection', 'extraction_20', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'), (SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'));
+ INSERT INTO s_vitis.vm_table_button (button_class, table_button_id, event, label_id, ressource_id, tab_id) VALUES ('add_smallFlexigrid',(SELECT nextval('s_vitis.seq_vm'::regclass)), 'AddSectionForm', 'extraction_21', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'), (SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'bo_id', '1', '1', 1, 50, 'right', 'extraction_4', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'), NULL,(SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'requestor', '1', '1', 2, 200, 'left', 'extraction_5', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'), NULL,(SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'status', '1', '1', 3, 150, 'left', 'extraction_6', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'), NULL,(SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'company', '1', '1', 5, 200, 'left', 'extraction_8', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'), NULL,(SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'layers', '1', '1', 6, 60, 'center', 'extraction_9', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'), '<div data-app-extraction-layers-column="{{row.entity[col.field]}}"></div>',(SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'progress_level', '1', '1', 4, 150, 'center', 'extraction_7', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'), '<div data-app-navbar data-mode="info" data-hidevalue data-striped data-active></div>',(SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'coordsys_id', '1', '1', 0, 200, 'left', 'extraction_22', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_coordsys'), NULL,(SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_coordsys'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'coordsys', '1', '1', 1, 200, 'left', 'extraction_23', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_coordsys'), NULL,(SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_coordsys'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'format_id', '1', '1', 0, 100, 'left', 'extraction_24', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_format'), NULL,(SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_format'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'format', '1', '1', 1, 200, 'left', 'extraction_25', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_format'), NULL,(SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_format'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'use_for_raster', '1', '1', 2, 100, 'left', 'extraction_26', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_format'), '<div data-app-set-boolean-icon-column="{{row.entity[col.field]}}"></div>', (SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_format'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'use_for_vector', '1', '1', 3, 100, 'left', 'extraction_27', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_format'), '<div data-app-set-boolean-icon-column="{{row.entity[col.field]}}"></div>', (SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_format'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'layer_id', '1', '1', 0, 150, 'left', 'extraction_28', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'), NULL,(SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'layer', '1', '1', 1, 150, 'left', 'extraction_29', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'), NULL,(SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'category', '1', '1', 2, 150, 'left', 'extraction_30', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'), NULL,(SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'restriction', '1', '1', 3, 100, 'left', 'extraction_31', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'), NULL,(SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'));
+ INSERT INTO s_vitis.vm_table_field (table_field_id, name, sortable, resizeable, index, width, align, label_id, ressource_id, template, tab_id) VALUES ((SELECT nextval('s_vitis.seq_vm'::regclass)), 'unused_attributes', '1', '1', 4, 110, 'left', 'extraction_32', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'), '<div data-app-extraction-ref-unused-attributes-column="{{row.entity[col.field]}}"></div>',(SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'));
+ INSERT INTO s_vitis.vm_section (label_id, name, index, event, tab_id, template, ressource_id, module) VALUES ('extraction_1', 'general', 1, 'Javascript:loadSectionForm', (SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'), 'workspaceListTpl.html', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_extraction'), 'extraction');
+ INSERT INTO s_vitis.vm_section (label_id, name, index, event, tab_id, template, ressource_id, module) VALUES ('extraction_11', 'general', 1, 'Javascript:loadSectionForm', (SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_coordsys'), 'workspaceListTpl.html', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_coordsys'), 'extraction');
+ INSERT INTO s_vitis.vm_section (label_id, name, index, event, tab_id, template, ressource_id, module) VALUES ('extraction_15', 'general', 1, 'Javascript:loadSectionForm', (SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_format'), 'workspaceListTpl.html', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_format'), 'extraction');
+ INSERT INTO s_vitis.vm_section (label_id, name, index, event, tab_id, template, ressource_id, module) VALUES ('extraction_19', 'general', 1, 'Javascript:loadSectionForm', (SELECT tab_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'), 'workspaceListTpl.html', (SELECT ressource_id FROM s_vitis.vm_tab WHERE vm_tab.name = 'extraction_layer'), 'extraction');
+ SELECT s_vitis.wabInsertState('s_extraction', 'rt_extraction_status','START', 0);
+ SELECT s_vitis.wabInsertState('s_extraction', 'rt_extraction_status','Nouveau', 10);
+ SELECT s_vitis.wabInsertState('s_extraction', 'rt_extraction_status','AE Demandé', 20);
+ SELECT s_vitis.wabInsertState('s_extraction', 'rt_extraction_status','AE Généré', 30);
+ SELECT s_vitis.wabInsertState('s_extraction', 'rt_extraction_status','AE Soumis', 40);
+ SELECT s_vitis.wabInsertState('s_extraction', 'rt_extraction_status','Autorisée', 70);
+ SELECT s_vitis.wabInsertState('s_extraction', 'rt_extraction_status','Refusée', 100);
+ SELECT s_vitis.wabInsertState('s_extraction', 'rt_extraction_status','Terminée', 100);
CREATE TABLE s_extraction.rt_extraction_status_group( status_id integer NOT NULL, group_id integer NOT NULL, extraction_status_group_id integer NOT NULL, CONSTRAINT pk_workspace_group PRIMARY KEY (extraction_status_group_id), CONSTRAINT fk_group_id_workspace FOREIGN KEY (group_id) REFERENCES s_vitis."group" (group_id) MATCH SIMPLE ON UPDATE RESTRICT ON DELETE CASCADE, CONSTRAINT fk_status_id FOREIGN KEY (status_id) REFERENCES s_extraction.rt_extraction_status (status_id) MATCH SIMPLE ON UPDATE RESTRICT ON DELETE CASCADE)WITH ( OIDS=FALSE);
ALTER TABLE s_extraction.rt_extraction_status_group OWNER TO u_vitis;
GRANT ALL ON TABLE s_extraction.rt_extraction_status_group TO u_vitis;
GRANT SELECT ON TABLE s_extraction.rt_extraction_status_group TO extraction_user;
GRANT SELECT ON TABLE s_extraction.rt_extraction_status_group TO extraction_admin;
- CREATE VIEW s_extraction.v_extraction AS SELECT DISTINCT extraction.bo_id, extraction.status_id, extraction.history, extraction.creation_date, extraction.requestor, extraction.ae, extraction.extent, extraction.company, extraction.layers, extraction.vector_format_id, extraction.vector_format_id AS format_id, extraction.coordsys_id, extraction.raster_format_id, extraction.extent_method, extraction.signed, extraction.accepted_by_cpa, extraction.identification_complete, extraction.definition_complete, extraction.priority_id, extraction.id_com, extraction.id_conseil, extraction.note, rt_extraction_status.progress AS progress_level, rt_extraction_status.name AS status_name, rt_extraction_status.name AS status FROM ((((s_extraction.extraction LEFT JOIN s_extraction.rt_extraction_status ON ((extraction.status_id = rt_extraction_status.status_id))) LEFT JOIN s_extraction.rt_extraction_status_group ON ((rt_extraction_status.status_id = rt_extraction_status_group.status_id))) LEFT JOIN s_vitis.user_group ON ((rt_extraction_status_group.group_id = user_group.group_id))) LEFT JOIN s_vitis."user" ON ((user_group.user_id = "user".user_id))) WHERE ((("user".login)::name = "current_user"()) AND (((extraction.requestor)::name = "current_user"()) OR (rt_extraction_status_group.group_id = 12)));
+ CREATE OR REPLACE VIEW s_extraction.v_extraction AS SELECT extraction.bo_id,extraction.status,extraction.history,extraction.creation_date,extraction.requestor,extraction.ae,extraction.extent,extraction.company,extraction.layers,extraction.vector_format_id,extraction.vector_format_id AS format_id,extraction.coordsys_id,extraction.raster_format_id,extraction.extent_method,extraction.signed,extraction.accepted_by_cpa,extraction.identification_complete,extraction.definition_complete,extraction.priority_id,extraction.id_com,extraction.id_conseil,extraction.note,rt_extraction_status.progress AS progress_level,extraction.status AS status_name FROM s_extraction.extraction LEFT JOIN s_extraction.rt_extraction_status ON extraction.status::text = rt_extraction_status.name::text LEFT JOIN s_extraction.rt_extraction_status_group on rt_extraction_status.status_id = rt_extraction_status_group.status_id LEFT JOIN s_vitis.user_group ON "rt_extraction_status_group".group_id = user_group.group_id LEFT JOIN s_vitis."user" ON "user_group".user_id = "user".user_id WHERE "user".login::name = "current_user"();
ALTER TABLE s_extraction.v_extraction OWNER TO u_vitis;
GRANT ALL ON TABLE s_extraction.v_extraction TO u_vitis;
GRANT ALL ON TABLE s_extraction.v_extraction TO extraction_admin;
diff --git a/src/module_extraction/web_service/ws/Coordsys.class.inc b/src/module_extraction/web_service/ws/Coordsys.class.inc
index 0f7552e3a60d24cd303b397d6e221b0d45e12afd..5b03fbd7320755ee7bf0e441f72ad3eefaac9f60 100755
--- a/src/module_extraction/web_service/ws/Coordsys.class.inc
+++ b/src/module_extraction/web_service/ws/Coordsys.class.inc
@@ -23,15 +23,14 @@ class Coordsys extends ExtractionExtraction {
* @param type $aPath url of the request
* @param type $aValues parameters of the request
* @param type $properties properties
- * @param type $bShortcut false to reinit variables
* @param type $oConnection connection object
*/
- function __construct($aPath, $aValues, $properties, $bShortcut = false, $oConnection = false){
- parent::__construct($aPath, $aValues, $properties, $bShortcut, $oConnection);
+ function __construct($aPath, $aValues, $properties, $bShortcut = false) {
+ parent::__construct($aPath, $aValues, $properties, $bShortcut);
}
-/**
- * @SWG\Get(path="/coordsyss/{id_coordsys}",
+ /**
+ * @SWG\Get(path="/coordsyss/{id_coordsys}",
* tags={"Coordsyss"},
* summary="Get Coordsys",
* description="Request to get Coordsys by id",
@@ -74,7 +73,7 @@ class Coordsys extends ExtractionExtraction {
$this->aFields = $this->getFields($this->aProperties['schema_extraction'], "rt_coordsys", "coordsys_id");
}
-/**
+ /**
* delete a Point_situation
*/
function DELETE() {
diff --git a/src/module_extraction/web_service/ws/Coordsyss.class.inc b/src/module_extraction/web_service/ws/Coordsyss.class.inc
index 7dbced69f03350c8ce785571bc5211f28ba76e38..848539189da12b83dba01a72cc9a167fa84a5ec5 100755
--- a/src/module_extraction/web_service/ws/Coordsyss.class.inc
+++ b/src/module_extraction/web_service/ws/Coordsyss.class.inc
@@ -34,14 +34,12 @@ class Coordsyss extends ExtractionExtraction {
* @param type $aPath url of the request
* @param type $aValues parameters of the request
* @param type $properties properties
- * @param type $bShortcut false to reinit variables
- * @param type $oConnection connection object
*/
- function __construct($aPath, $aValues, $properties, $bShortcut = false, $oConnection = false){
- parent::__construct($aPath, $aValues, $properties, $bShortcut, $oConnection);
+ function __construct($aPath, $aValues, $properties, $bShortcut = false) {
+ parent::__construct($aPath, $aValues, $properties, $bShortcut);
}
-/**
+ /**
* @SWG\Get(path="/coordsyss",
* tags={"Coordsyss"},
* summary="Get Coordsyss",
@@ -124,7 +122,7 @@ class Coordsyss extends ExtractionExtraction {
return $sMessage;
}
-/**
+ /**
* @SWG\Post(path="/coordsyss",
* tags={"Coordsyss"},
* summary="Add coordsys",
@@ -155,7 +153,7 @@ class Coordsyss extends ExtractionExtraction {
return $aReturn['sMessage'];
}
-/**
+ /**
* @SWG\Put(path="/coordsyss/{id_coordsys}",
* tags={"Coordsyss"},
* summary="update Coordsyss",
@@ -195,7 +193,7 @@ class Coordsyss extends ExtractionExtraction {
return $aReturn['sMessage'];
}
-/**
+ /**
* @SWG\Delete(path="/coordsyss",
* tags={"Coordsyss"},
* summary="delete Coordsyss",
diff --git a/src/module_extraction/web_service/ws/Extraction.class.inc b/src/module_extraction/web_service/ws/Extraction.class.inc
index 8798bd3b7836fd2d7da3d280e92edc0df6267585..a4eef6a4400d4809b3d9ea7c89e2e4558c3b628c 100755
--- a/src/module_extraction/web_service/ws/Extraction.class.inc
+++ b/src/module_extraction/web_service/ws/Extraction.class.inc
@@ -23,7 +23,6 @@ class Extraction extends ExtractionExtraction {
* @param type $aPath url of the request
* @param type $aValues parameters of the request
* @param type $properties properties
- * @param type $bShortcut false to reinit variables
* @param type $oConnection connection object
*/
public function __construct($aPath, $aValues, $properties, $bShortcut = false, $oConnection = false)
@@ -74,7 +73,7 @@ class Extraction extends ExtractionExtraction {
public function GET()
{
require $this->sRessourcesFile;
- $this->aFields = $this->getFields($this->aProperties['schema_extraction'], "v_extraction", "bo_id");
+ $this->aFields = $this->getFields($this->aProperties['schema_extraction'], "extraction", "bo_id");
// Url vers l'acte d'engagement.
if (!empty($this->aFields['ae'])) {
$this->aFields['ae'] = $this->aProperties['web_server_name'] . '/' . $this->aProperties['ws_data_alias'] . '/extraction/extraction_extraction_extraction/documents/' . $this->aValues["my_vitis_id"] . '/ae/' . $this->aFields['ae'];
@@ -130,11 +129,10 @@ class Extraction extends ExtractionExtraction {
$this->aFields['status_name'] = $this->aFields['status'];
}
-/**
- * delete a Point_situation
- */
- public function DELETE()
- {
+ /**
+ * delete a Point_situation
+ */
+ function DELETE() {
$this->oConnection->oBd->delete($this->aProperties['schema_extraction'], 'extraction', 'bo_id', $this->aValues["my_vitis_id"], 'integer');
if ($this->oConnection->oBd->enErreur()) {
$this->oError = new Error(1, $this->oConnection->oBd->getBDMessage());
diff --git a/src/module_extraction/web_service/ws/ExtractionExtraction.class.sql.inc b/src/module_extraction/web_service/ws/ExtractionExtraction.class.sql.inc
index 642c933e42ad0bf44acc0083aa4e49e817bb8453..6edd56aa67d8308105e2ba9079059d21a9b939c2 100755
--- a/src/module_extraction/web_service/ws/ExtractionExtraction.class.sql.inc
+++ b/src/module_extraction/web_service/ws/ExtractionExtraction.class.sql.inc
@@ -8,14 +8,11 @@ $aSql['getTableColumn'] = 'SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS WH
$aSql['getUserPrivileges'] = 'SELECT groname FROM pg_user s LEFT OUTER JOIN pg_group g on (s.usesysid = any(g.grolist) )inner join [sSchemaFramework].user on "user".login = usename WHERE user_id = [user_id]';
$aSql['listDomain'] = 'SELECT distinct domain, alias FROM [sSchemaFramework].domain WHERE "type" = \'AD\'';
$aSql['createRolname'] = 'CREATE ROLE "vitis_[sDomain]" NOSUPERUSER INHERIT NOCREATEDB CREATEROLE;';
-$aSql['getInfoRolname'] = 'SELECT * FROM pg_catalog.pg_roles WHERE rolname = \'vitis_[sDomain]\'';
+$aSql['getInfoRolname'] = 'SELECT * FROM pg_authid WHERE rolname = \'vitis_[sDomain]\'';
// Extraction
$aSql['getCommuneLabel'] = 'SELECT nom_com FROM public.ref_cpa_limadm_commune WHERE id_com IN([id_com])';
$aSql['getConseilLabel'] = 'SELECT nom_epci FROM public.ref_amp_lim_ct WHERE objectid IN([id_conseil])';
-$aSql['getCtId'] = 'SELECT distinct ct_id from [schema_extraction].commune';
-$aSql['getRtLayerWithCtId'] = 'SELECT distinct layer_id, layer, category, mutualized, statistique FROM [schema_extraction].rt_layer INNER JOIN s_extraction.commune ON rt_layer.ct_id = commune.ct_id WHERE (rt_layer."ct_id" IN ([aCtId]))';
-$aSql['getRtLayer'] = 'SELECT distinct layer_id, layer, category, mutualized, statistique FROM [schema_extraction].rt_layer INNER JOIN s_extraction.commune ON rt_layer.ct_id = commune.ct_id';
-
+$aSql['getRtLayer'] = 'SELECT layer_id, layer, category FROM [schema_extraction].rt_layer [sql_params] ORDER BY category, layer';
$aSql['getUserGroups'] = 'SELECT name FROM [schema_framework]."group",[schema_framework].user_group WHERE "group".group_id = user_group.group_id AND user_group.user_id = [user_id]';
$aSql['getFormat'] = 'SELECT id_format FROM q_control."format" WHERE "format".extensions like [extension]';
diff --git a/src/module_extraction/web_service/ws/Extraction_depot.class.inc b/src/module_extraction/web_service/ws/Extraction_depot.class.inc
deleted file mode 100755
index 51e0c62ee46e290f1026da56738a1836a440961a..0000000000000000000000000000000000000000
--- a/src/module_extraction/web_service/ws/Extraction_depot.class.inc
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-require_once __DIR__ . '/ExtractionExtraction.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-
-/**
- * \file Extraction_depot.class.inc
- * \class Extraction_depot
- *
- * \author WAB <support.wab@veremes.com>.
- *
- * \brief This file contains the Extraction_depot php class
- *
- * This class defines operation for one Extraction_depot
- *
- */
-class Extraction_depot extends ExtractionExtraction {
-
- public $oError;
-
- /**
- * construct
- * @param type $aPath url of the request
- * @param type $aValues parameters of the request
- * @param type $properties properties
- * @param type $bShortcut false to reinit variables
- * @param type $oConnection connection object
- */
- function __construct($aPath, $aValues, $properties, $bShortcut = false, $oConnection = false){
- parent::__construct($aPath, $aValues, $properties, $bShortcut, $oConnection);
- }
-
- /**
- * @SWG\Get(path="/extraction_depots/{id_extraction_depot}",
- * tags={"Extraction_depots"},
- * summary="Get Extraction_depot",
- * description="Request to get Extraction_depot by id",
- * operationId="GET",
- * produces={"application/xml", "application/json"},
- * @SWG\Parameter(
- * name="token",
- * in="query",
- * description="user token",
- * required=true,
- * type="string"
- * ),
- * @SWG\Parameter(
- * name="id_extraction_depot",
- * in="path",
- * description="id_extraction_depot",
- * required=true,
- * type="integer",
- * format="int32"
- * ),
- * @SWG\Parameter(
- * name="attributs",
- * in="query",
- * description="list of attributs",
- * required=false,
- * type="string"
- * ),
- * @SWG\Response(
- * response=200,
- * description="Extraction_depot Response",
- * @SWG\Schema(ref="#/definitions/extraction_depots")
- * )
- * )
- */
-
- /**
- * get informations about mode
- */
- function GET() {
- $this->aFields = $this->getFields($this->aProperties['schema_extraction'], "", "");
- }
-
-
-
-}
-
-?>
\ No newline at end of file
diff --git a/src/module_extraction/web_service/ws/Extractions.class.inc b/src/module_extraction/web_service/ws/Extractions.class.inc
index 3a590917be635ef17031eb28854294845989e607..010fefce2439a952b017ace4c43ef113c654de47 100755
--- a/src/module_extraction/web_service/ws/Extractions.class.inc
+++ b/src/module_extraction/web_service/ws/Extractions.class.inc
@@ -37,8 +37,6 @@ class Extractions extends ExtractionExtraction
* @param type $aPath url of the request
* @param type $aValues parameters of the request
* @param type $properties properties
- * @param type $bShortcut false to reinit variables
- * @param type $oConnection connection object
*/
public function __construct($aPath, $aValues, $properties, $bShortcut = false, $oConnection = false)
{
@@ -641,8 +639,7 @@ class Extractions extends ExtractionExtraction
// Check si la table existe si oui change l'état
$this->oBO->wabSetStatus($this->aProperties["schema_extraction"], "extraction", "bo_id", $this->aValues["bo_id"], "Refusée");
-//$this->sendmail(9902);
- $this->oBO->sendmail(175);
+ //$this->sendmail(9902);
}
}
diff --git a/src/module_extraction/web_service/ws/Format.class.inc b/src/module_extraction/web_service/ws/Format.class.inc
index 6bcb455fb7006f40cc38c40c77319653caa509db..385d4329c156277a0c02029b8fef483d2d5976cd 100755
--- a/src/module_extraction/web_service/ws/Format.class.inc
+++ b/src/module_extraction/web_service/ws/Format.class.inc
@@ -23,15 +23,14 @@ class Format extends ExtractionExtraction {
* @param type $aPath url of the request
* @param type $aValues parameters of the request
* @param type $properties properties
- * @param type $bShortcut false to reinit variables
* @param type $oConnection connection object
*/
- function __construct($aPath, $aValues, $properties, $bShortcut = false, $oConnection = false){
- parent::__construct($aPath, $aValues, $properties, $bShortcut, $oConnection);
+ function __construct($aPath, $aValues, $properties, $bShortcut = false) {
+ parent::__construct($aPath, $aValues, $properties, $bShortcut);
}
-/**
- * @SWG\Get(path="/formats/{id_format}",
+ /**
+ * @SWG\Get(path="/formats/{id_format}",
* tags={"Formats"},
* summary="Get Format",
* description="Request to get Format by id",
@@ -74,7 +73,7 @@ class Format extends ExtractionExtraction {
$this->aFields = $this->getFields($this->aProperties['schema_extraction'], "rt_format", "format_id");
}
-/**
+ /**
* delete a Point_situation
*/
function DELETE() {
diff --git a/src/module_extraction/web_service/ws/Formats.class.inc b/src/module_extraction/web_service/ws/Formats.class.inc
index 4a662f060c0b780776dcd25625d8e21530a396b3..15d7aecc746aa1288dea1c826a942b7a47c3e51a 100755
--- a/src/module_extraction/web_service/ws/Formats.class.inc
+++ b/src/module_extraction/web_service/ws/Formats.class.inc
@@ -34,14 +34,12 @@ class Formats extends ExtractionExtraction {
* @param type $aPath url of the request
* @param type $aValues parameters of the request
* @param type $properties properties
- * @param type $bShortcut false to reinit variables
- * @param type $oConnection connection object
*/
- function __construct($aPath, $aValues, $properties, $bShortcut = false, $oConnection = false){
- parent::__construct($aPath, $aValues, $properties, $bShortcut, $oConnection);
+ function __construct($aPath, $aValues, $properties, $bShortcut = false) {
+ parent::__construct($aPath, $aValues, $properties, $bShortcut);
}
-/**
+ /**
* @SWG\Get(path="/formats",
* tags={"Formats"},
* summary="Get Formats",
diff --git a/src/module_extraction/web_service/ws/Layer.class.inc b/src/module_extraction/web_service/ws/Layer.class.inc
index 93afab103abfbac077cc6b82513424b1f6ee5cb9..1d5a36e90a214d425a185f3160102bee30bd6894 100755
--- a/src/module_extraction/web_service/ws/Layer.class.inc
+++ b/src/module_extraction/web_service/ws/Layer.class.inc
@@ -23,15 +23,14 @@ class Layer extends ExtractionExtraction {
* @param type $aPath url of the request
* @param type $aValues parameters of the request
* @param type $properties properties
- * @param type $bShortcut false to reinit variables
* @param type $oConnection connection object
*/
- function __construct($aPath, $aValues, $properties, $bShortcut = false, $oConnection = false){
- parent::__construct($aPath, $aValues, $properties, $bShortcut, $oConnection);
+ function __construct($aPath, $aValues, $properties, $bShortcut = false) {
+ parent::__construct($aPath, $aValues, $properties, $bShortcut);
}
-/**
- * @SWG\Get(path="/layers/{id_layer}",
+ /**
+ * @SWG\Get(path="/layers/{id_layer}",
* tags={"Layers"},
* summary="Get Layer",
* description="Request to get Layer by id",
diff --git a/src/module_extraction/web_service/ws/Layers.class.inc b/src/module_extraction/web_service/ws/Layers.class.inc
index a1b0d5be81ae791b8f11bb005c40b12353f19074..8b11cd56f9b6b0a14a06ea1e689573570839ee09 100755
--- a/src/module_extraction/web_service/ws/Layers.class.inc
+++ b/src/module_extraction/web_service/ws/Layers.class.inc
@@ -34,14 +34,12 @@ class Layers extends ExtractionExtraction {
* @param type $aPath url of the request
* @param type $aValues parameters of the request
* @param type $properties properties
- * @param type $bShortcut false to reinit variables
- * @param type $oConnection connection object
*/
- function __construct($aPath, $aValues, $properties, $bShortcut = false, $oConnection = false){
- parent::__construct($aPath, $aValues, $properties, $bShortcut, $oConnection);
+ function __construct($aPath, $aValues, $properties, $bShortcut = false) {
+ parent::__construct($aPath, $aValues, $properties, $bShortcut);
}
-/**
+ /**
* @SWG\Get(path="/layers",
* tags={"Layers"},
* summary="Get Layers",
@@ -119,7 +117,7 @@ class Layers extends ExtractionExtraction {
* @return Layers
*/
function GET() {
- $aReturn = $this->genericGet($this->aProperties['schema_extraction'], $this->aValues["table"], $this->aValues["filter"]["column"]);
+ $aReturn = $this->genericGet($this->aProperties['schema_extraction'], "rt_layer", "layer_id");
$sMessage = $aReturn['sMessage'];
return $sMessage;
}
diff --git a/src/vitis/.gitignore b/src/vitis/.gitignore
index 1c5c881225047b4f255524bd541279ac7bfef9f7..665b11f9bb947d04a4ca0f4a25a39f66c47ab94a 100644
--- a/src/vitis/.gitignore
+++ b/src/vitis/.gitignore
@@ -1,8 +1,8 @@
-vas/
-client/
-conf/closure
-conf/node_modules/
-conf/properties.json
-src/closure/
+vas/rest/class/*
+vas/rest/class/!*/
+vas/rest/class/!*.*
+vas/sql/*
+vas/sql/!*/
+vas/sql/!*.*
utils - Copie/
diff --git a/src/vitis/_install/client/fileToDelete.txt b/src/vitis/_install/client/fileToDelete.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ca3a9114882b45d4b55b25a40380235fc553ceb9
--- /dev/null
+++ b/src/vitis/_install/client/fileToDelete.txt
@@ -0,0 +1,4 @@
+javascript/externs/formreader/formreader.js
+javascript/externs/formreader/formreaderCtrl.js
+javascript/externs/formreader/formreaderDrtv.js
+javascript/externs/formreader/formreaderSrvc.js
\ No newline at end of file
diff --git a/src/vitis/_install/client/folderToDelete.txt b/src/vitis/_install/client/folderToDelete.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a0e7984dc0bc0ee6987ebffa481549c126c7ef9b
--- /dev/null
+++ b/src/vitis/_install/client/folderToDelete.txt
@@ -0,0 +1,8 @@
+javascript/app
+javascript/require
+javascript/test
+javascript/externs/openLayers/ol
+javascript/externs/openLayers/ol.ext
+javascript/externs/studio/properties
+javascript/externs/studio/javascript
+modules/vitis/javascript
\ No newline at end of file
diff --git a/src/vitis/_install/client/listModuleApache.txt b/src/vitis/_install/client/listModuleApache.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2c0309e320b509b2ba74dc5f3ddd6a211245e922
--- /dev/null
+++ b/src/vitis/_install/client/listModuleApache.txt
@@ -0,0 +1,5 @@
+alias
+deflate
+headers
+rewrite
+ssl
\ No newline at end of file
diff --git a/src/vitis/_install/vas/apache.conf b/src/vitis/_install/vas/apache.conf
new file mode 100644
index 0000000000000000000000000000000000000000..2281b2e2673c513df20924e94a224bfa45673fad
--- /dev/null
+++ b/src/vitis/_install/vas/apache.conf
@@ -0,0 +1,70 @@
+PassEnv TEMP
+Alias /rest[ENV] "[VASDIRECTORY]/rest"
+ <Directory "[VASDIRECTORY]/rest">
+ <FilesMatch ".+\.ph(p[345]?|t|tml)$">
+ SetHandler application/x-httpd-php_vitis[ENV]
+ </FilesMatch>
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ </Directory>
+
+Alias /doc[ENV] "[VASDIRECTORY]/doc"
+ <Directory "[VASDIRECTORY]/doc">
+ <FilesMatch ".+\.ph(p[345]?|t|tml)$">
+ SetHandler application/x-httpd-php_vitis[ENV]
+ </FilesMatch>
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ </Directory>
+
+Alias /public[ENV] "[VASDIRECTORY]/public"
+ <Directory "[VASDIRECTORY]/public">
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ SetHandler application/x-download
+ </Directory>
+Alias /ws_data[ENV] "[VASDIRECTORY]/ws_data"
+ <Directory "[VASDIRECTORY]/ws_data">
+ AllowOverride All
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ SetHandler application/x-download
+ </Directory>
+Alias /proxy[ENV] "[VASDIRECTORY]/util/proxy"
+ <Directory "[VASDIRECTORY]/util/proxy">
+ <FilesMatch ".+\.ph(p[345]?|t|tml)$">
+ SetHandler application/x-httpd-php_vitis[ENV]
+ </FilesMatch>
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ </Directory>
+Alias /printserver[ENV] "[VASDIRECTORY]/util/printserver"
+ <Directory "[VASDIRECTORY]/util/printserver">
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ </Directory>
\ No newline at end of file
diff --git a/src/vitis/_install/vas/listModuleApache.txt b/src/vitis/_install/vas/listModuleApache.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c2626d946f4a9bbaad4d7ca16423af23007c0ca3
--- /dev/null
+++ b/src/vitis/_install/vas/listModuleApache.txt
@@ -0,0 +1,16 @@
+actions
+alias
+cgi
+deflate
+headers
+ldap
+rewrite
+ssl
+proxy
+proxy_ajp
+proxy_connect
+proxy_fcgi
+proxy_ftp
+proxy_http
+proxy_scgi
+proxy_wstunnel
\ No newline at end of file
diff --git a/src/vitis/src/vitis/_install/dependencies/pycron/crontab.txt b/src/vitis/src/vitis/_install/dependencies/pycron/crontab.txt
index 7f7bab4c2d5abb81514f8bd78cbcc20bc4e07a69..dff3a49547d3ea450da0bedeb251288175241e05 100755
--- a/src/vitis/src/vitis/_install/dependencies/pycron/crontab.txt
+++ b/src/vitis/src/vitis/_install/dependencies/pycron/crontab.txt
@@ -1,6 +1,9 @@
-#<gtf_subscription [ServerName] [vasDir]>
-0 23 * * * "[engineDir]/php/php" "[engineDir]/subscription.php" 1
-0 23 * * mon "[engineDir]/php/php" "[engineDir]/subscription.php" 2
-0 23 1 * * "[engineDir]/php/php" "[engineDir]/subscription.php" 3
-*/5 * * * * "[engineDir]/php/php" "[engineDir]/subscription.php" 4
-#</gtf_subscription [ServerName] [vasDir]>
\ No newline at end of file
+#<gtf_subscription [SERVER_NAME] [ENGINE_DIR]>
+0 23 * * * "[PHP_PATH]" "[ENGINE_DIR]/subscription.php" 1
+0 23 * * mon "[PHP_PATH]" "[ENGINE_DIR]/subscription.php" 2
+0 23 1 * * "[PHP_PATH]" "[ENGINE_DIR]/subscription.php" 3
+*/5 * * * * "[PHP_PATH]" "[ENGINE_DIR]/subscription.php" 4
+#</gtf_subscription [ServerName] [ENGINE_DIR]>
+#<gtf_message [SERVER_NAME] [MESSAGE_DIR]>
+*/1 * * * * "[PHP_PATH]" "[MESSAGE_DIR]/processMessages.php" 4
+#</gtf_message [SERVER_NAME] [MESSAGE_DIR]>
\ No newline at end of file
diff --git a/src/vitis/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js b/src/vitis/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js
index 283bbc430a4b12761af760ab9563956ee0ac3e1e..48e7a37a22b78e1f1154bcaec9471d51e4a1c3a5 100644
--- a/src/vitis/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js
+++ b/src/vitis/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js
@@ -176,6 +176,8 @@ formReader.formReaderDirective = function ($q, formReaderService, propertiesSrvc
}
});
});
+ } else {
+ console.error('Error: form not valid');
}
};
@@ -711,6 +713,9 @@ formReader.appFormFieldSpecificParamsDrtv = function ($timeout, $translate, prop
$(element)["datetimepicker"](oOptions);
// Si sélection d'une date : mise à jour du modèle (NE PAS SUPPRIMER!).
+ $(element).on("dp.hide", function (e) {
+ scope["oFormValues"][scope["sFormDefinitionName"]][element[0].name] = element[0].value;
+ });
$(element).on("dp.change", function (e) {
scope["oFormValues"][scope["sFormDefinitionName"]][element[0].name] = element[0].value;
});
@@ -2151,8 +2156,8 @@ formReader.appSubformGridDrtv = function ($timeout, $translate, propertiesSrvc,
// Récupère lélément en sélectionné
formReaderService['getWebServiceData'](oFormWebService).then(function (aResult) {
-
var oSubformDefinition = aResult[0]['bo_json_form'];
+ var sSubformJSDefinition = aResult[0]['bo_json_form_js'];
var oSubformValues = {};
var sModalId = 'formreader_' + scope['sFormUniqueName'] + '_grid_subform_modal';
@@ -2219,7 +2224,7 @@ formReader.appSubformGridDrtv = function ($timeout, $translate, propertiesSrvc,
}
});
- formReaderService['showModalSubform'](sModalId, oSubformScope, oSubformDefinition, sSubformDefinitionName, oSubformValues);
+ formReaderService['showModalSubform'](sModalId, oSubformScope, oSubformDefinition, sSubformDefinitionName, oSubformValues, sSubformJSDefinition);
});
};
@@ -2247,6 +2252,7 @@ formReader.appSubformGridDrtv = function ($timeout, $translate, propertiesSrvc,
};
var sModalId = 'formreader_' + scope['sFormUniqueName'] + '_grid_subform_modal';
var oSubformDefinition = oBusinessObject['json_form'][0];
+ var sSubformJSDefinition = oBusinessObject['json_form_js'];
var sSubformDefinitionName = 'insert';
// Grise le champ contenant la valeur du parent
@@ -2288,7 +2294,7 @@ formReader.appSubformGridDrtv = function ($timeout, $translate, propertiesSrvc,
});
});
};
- formReaderService['showModalSubform'](sModalId, oSubformScope, oSubformDefinition, sSubformDefinitionName, oSubformValues);
+ formReaderService['showModalSubform'](sModalId, oSubformScope, oSubformDefinition, sSubformDefinitionName, oSubformValues, sSubformJSDefinition);
};
/**
diff --git a/src/vitis/src/vitis/client/javascript/externs/formReader/formReaderSrvc.js b/src/vitis/src/vitis/client/javascript/externs/formReader/formReaderSrvc.js
index 6ca6ef291e6a45bdf3b6298b998729bd7abddef5..613652f9c35ccf385e3b72c1c26432d8e0e8a09f 100644
--- a/src/vitis/src/vitis/client/javascript/externs/formReader/formReaderSrvc.js
+++ b/src/vitis/src/vitis/client/javascript/externs/formReader/formReaderSrvc.js
@@ -1230,15 +1230,15 @@ formReader.formReaderService = function ($translate, $rootScope, $q, $log, $time
* @param {object} oSubformDefinition
* @param {object} oSubformDefinitionName
* @param {object} oSubformValues
+ * @param {string|null} sSubformJSDefinition
*/
- "showModalSubform": function (sModalId, oSubformScope, oSubformDefinition, oSubformDefinitionName, oSubformValues) {
+ "showModalSubform": function (sModalId, oSubformScope, oSubformDefinition, oSubformDefinitionName, oSubformValues, sSubformJSDefinition) {
$log.log("showModalSubform");
var sToken = this['sToken'];
var oProperties = this['oProperties'];
- if (goog.isDefAndNotNull(oSubformScope['loadSubForm'])) {
-
+ var loadForm = function(){
oSubformScope['loadSubForm']({
'sFormDefinitionName': oSubformDefinitionName,
'oFormDefinition': oSubformDefinition,
@@ -1246,6 +1246,30 @@ formReader.formReaderService = function ($translate, $rootScope, $q, $log, $time
'oProperties': oProperties,
'sToken': sToken
});
+ }
+
+ if (goog.isDefAndNotNull(oSubformScope['loadSubForm'])) {
+
+ if (goog.isDefAndNotNull(sSubformJSDefinition)) {
+ var sUrl = sSubformJSDefinition;
+ oVmap.log("initHtmlForm : javascript assoc. to : " + sUrl);
+ loadExternalJs([sUrl], {
+ "callback": function () {
+ loadForm();
+ try {
+ if (goog.isDef(constructor_form)) {
+ constructor_form(oSubformScope, sUrl);
+ }
+ } catch (e) {
+ oVmap.log("constructor_form does not exist");
+ }
+ },
+ "async": true,
+ "scriptInBody": true
+ });
+ } else {
+ loadForm();
+ }
$('#' + sModalId).modal('show');
}
diff --git a/src/vitis/src/vitis/vas/doc/index.phtml b/src/vitis/src/vitis/vas/doc/index.phtml
index 086cb768856aca4ecc21b4767186d05547388f71..d4fedf02fc3fd79b18c6da0ffab7f8110a02c8e3 100755
--- a/src/vitis/src/vitis/vas/doc/index.phtml
+++ b/src/vitis/src/vitis/vas/doc/index.phtml
@@ -1,6 +1,9 @@
<?php
session_start();
-require_once '../rest/conf/properties.inc';
+
+$_SERVER['VAS_PATH'] = pathinfo(dirname($_SERVER['SCRIPT_FILENAME']))['dirname'];
+
+require_once $_SERVER['VAS_PATH'] . '/rest/conf/properties.inc';
function returnOverview($sFolder, $parent) {
$aModules = array();
@@ -17,10 +20,12 @@ function returnOverview($sFolder, $parent) {
}
}
}
+
return $aModules;
}
-$aOverview = returnOverview(__DIR__ . "/../rest/ws", "");
+$aOverview = returnOverview($_SERVER['VAS_PATH'] . "/rest/ws", "");
+error_log('$aOverview: '. print_r($aOverview, true));
?>
<!DOCTYPE html>
@@ -59,7 +64,7 @@ $aOverview = returnOverview(__DIR__ . "/../rest/ws", "");
sToken = json.PrivateToken.token;
} else {
sToken = code[0].outerText.split('<token>')[1].split('</token>')[0];
- }
+ }
if (sToken != "") {
$("input[name='token']").each(function () {
$(this).attr("value", sToken);
@@ -154,4 +159,3 @@ foreach ($aOverview as $key => $value) {
</div>
</body>
</html>
-
diff --git a/src/vitis/src/vitis/vas/doc/swagger.php b/src/vitis/src/vitis/vas/doc/swagger.php
index 3437171a291a5f277b6518b72ff0afdd04f8dab5..aca8acffc87a164aedf500bb1f31effd57cf8e5c 100755
--- a/src/vitis/src/vitis/vas/doc/swagger.php
+++ b/src/vitis/src/vitis/vas/doc/swagger.php
@@ -1,8 +1,9 @@
<?php
+$_SERVER['VAS_PATH'] = pathinfo(dirname($_SERVER['SCRIPT_FILENAME']))['dirname'];
header('Content-Type: application/json');
-require_once "../rest/conf/properties.inc";
+require_once $_SERVER['VAS_PATH'] . "/rest/conf/properties.inc";
require("vendor/autoload.php");
-$swagger = \Swagger\scan('../rest/ws/'.$_REQUEST['service']);
+$swagger = \Swagger\scan($_SERVER['VAS_PATH'] . '/rest/ws/'.$_REQUEST['service']);
$aServer = explode("://", $properties["web_server_name"]);
$swagger = str_replace("[service_alias]", $properties["services_alias"], $swagger);
$swagger = str_replace("[protocol]", $aServer[0], $swagger);
diff --git a/src/vitis/src/vitis/vas/rest/index.phtml b/src/vitis/src/vitis/vas/rest/index.phtml
index 86af3b21c85db3857e6e5be0ffccaae43e8a50f7..d4b4cffa2cb95cad6d52b949c6476345429ae154 100755
--- a/src/vitis/src/vitis/vas/rest/index.phtml
+++ b/src/vitis/src/vitis/vas/rest/index.phtml
@@ -1,5 +1,7 @@
<?php
+$_SERVER['VAS_PATH'] = pathinfo(dirname($_SERVER['SCRIPT_FILENAME']))['dirname'];
+
require_once("class/vitis_lib/VitisError.class.inc");
require_once("class/vmlib/cryptUtil.inc");
require_once("conf/properties.inc");
@@ -199,4 +201,4 @@ function customErrorHandler ($errno, $errstr, $errfile, $errline, $context){
}
include ("index.vhtml");
-?>
\ No newline at end of file
+?>
diff --git a/src/vitis/src/vitis/vas/rest/ws/vitis/Properties.class.inc b/src/vitis/src/vitis/vas/rest/ws/vitis/Properties.class.inc
index d363c98601beb319ee43bce3dd2da87b4d247c80..c7f65b413b16534d0349e47a7b9a0a420d1ba76a 100755
--- a/src/vitis/src/vitis/vas/rest/ws/vitis/Properties.class.inc
+++ b/src/vitis/src/vitis/vas/rest/ws/vitis/Properties.class.inc
@@ -14,7 +14,7 @@ require_once(__DIR__ . '/../../class/vmlib/BdDataAccess.inc');
* \brief This file contains the Properties php class
*
* This class defines the rest api for properties
- *
+ *
*/
class Properties extends Vitis {
/**
@@ -53,7 +53,7 @@ class Properties extends Vitis {
}
/**
- * @SWG\Get(path="/properties",
+ * @SWG\Get(path="/properties",
* tags={"Properties"},
* summary="Get properties",
* description="Request to get properties",
@@ -75,7 +75,7 @@ class Properties extends Vitis {
*/
/**
- *
+ *
* @return properties
*/
function GET() {
@@ -85,19 +85,19 @@ class Properties extends Vitis {
} else {
$this->aFields = $this->aProperties;
}
- require_once __DIR__ . "/../../conf/version.inc";
+ require_once dirname($_SERVER['SCRIPT_FILENAME']) . "/conf/version.inc";
if (VM_STATUS != "STABLE") {
$this->aFields['VM_STATUS'] = "UNSTABLE";
} else {
$this->aFields['VM_STATUS'] = "STABLE";
- if ($pointeur = opendir(__DIR__ . "/../../conf/")) {
+ if ($pointeur = opendir(dirname($_SERVER['SCRIPT_FILENAME']) . "/conf/")) {
while (($fichier = readdir($pointeur)) !== false) {
if (($fichier != '.') && ($fichier != '..')) {
- if (is_dir(__DIR__ . "/../../conf/" . $fichier)) {
- $sTexte = file_get_contents(__DIR__ . "/../../conf/" . $fichier . "/version.inc");
+ if (is_dir(dirname($_SERVER['SCRIPT_FILENAME']) . "/conf/" . $fichier)) {
+ $sTexte = file_get_contents(dirname($_SERVER['SCRIPT_FILENAME']) . "/conf/" . $fichier . "/version.inc");
if (strpos($sTexte, "define (\"VM_STATUS\", \"STABLE\");") == false) {
$this->aFields['VM_STATUS'] = "UNSTABLE";
@@ -216,7 +216,7 @@ class Properties extends Vitis {
* description="Poprerties Response",
* @SWG\Schema(ref="#/definitions/properties")
* ),
- *
+ *
* )
*/
@@ -299,7 +299,7 @@ class Properties extends Vitis {
// Message de retour
$aMessage = array('status' => REQUEST_SUCCESS);
- // Ouverture de php
+ // Ouverture de php
$sPropertiesFile = PHP_START . PHP_EOL;
// Texte à ajouter avant le tableau des properties
@@ -343,14 +343,14 @@ class Properties extends Vitis {
$sPropertiesFile .= PROPERTIES_FOOTER . PHP_EOL;
}
- // Fermeture de php
+ // Fermeture de php
$sPropertiesFile .= PHP_END;
// Sauve le fichier (LOCK_EX = accés exclusif au fichier)
if ($this->aValues['module_name'] == 'vitis')
- $sPathProperties = __DIR__ . '/../../conf/properties.inc';
+ $sPathProperties = dirname($_SERVER['SCRIPT_FILENAME']) . '/conf/properties.inc';
else
- $sPathProperties = __DIR__ . '/../../conf/' . $this->aValues['module_name'] . '/properties.inc';
+ $sPathProperties = dirname($_SERVER['SCRIPT_FILENAME']) . '/conf/' . $this->aValues['module_name'] . '/properties.inc';
//
if (file_put_contents($sPathProperties, $sPropertiesFile, LOCK_EX) === false)
$aReturn = array('status' => 0, 'message' => "FORM_ERROR_FILE_WRITING_CONFIGURATION");
@@ -424,4 +424,4 @@ class Properties extends Vitis {
}
-?>
\ No newline at end of file
+?>
diff --git a/src/vitis/src/vitis/vas/rest/ws/vitis/Versions.class.inc b/src/vitis/src/vitis/vas/rest/ws/vitis/Versions.class.inc
index 62b9cfcc9ef13f02c3b310d0543c4d4228ee40e3..3a20a659f09122d360298d4fcc72dc131f54231b 100755
--- a/src/vitis/src/vitis/vas/rest/ws/vitis/Versions.class.inc
+++ b/src/vitis/src/vitis/vas/rest/ws/vitis/Versions.class.inc
@@ -1,204 +1,202 @@
-<?php
-
-require_once 'Vitis.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
-
-/**
- * \file versions.class.inc
- * \class Versions
- *
- * \author Yoann Perollet <yoann.perollet@veremes.com>.
- *
- * \brief This file contains the Versions php class
- *
- * This class defines the rest api for versions
- *
- */
-class Versions extends Vitis {
- /**
- * @SWG\Definition(
- * definition="/versions",
- * allOf={
- * @SWG\Schema(ref="#/definitions/versions")
- * }
- * )
- * @SWG\Tag(
- * name="Versions",
- * description="Operations about versions"
- * )
- */
-
- /**
- * construct
- * @param type $aPath url of the request
- * @param type $aValues parameters of the request
- * @param type $versions ptroperties
- */
- function __construct($aPath, $aValues, $properties) {
- $this->aValues = $aValues;
- $this->aPath = $aPath;
- $this->aProperties = $properties;
- if (!empty($this->aValues['token'])) {
- $this->oConnection = new Connection($this->aValues, $this->aProperties);
- }
- }
-
- /**
- * @SWG\Get(path="/versions",
- * tags={"Versions"},
- * summary="Get versions",
- * description="Request to get versions",
- * operationId="GET",
- * produces={"application/xml", "application/json", "application/x-vm-json"},
- * @SWG\Parameter(
- * name="token",
- * in="query",
- * description="user token",
- * required=false,
- * type="string"
- * ),
- * @SWG\Response(
- * response=200,
- * description="Poprerties Response",
- * @SWG\Schema(ref="#/definitions/versions")
- * )
- * )
- */
-
- /**
- *
- * @return versions
- */
- function GET() {
- if ($this->oConnection->oError == null) {
- $this->getVersion();
- if (!empty($this->aValues['token']) && in_array("vitis_admin", $this->oConnection->aPrivileges)) {
-
- //$this->aFields = $this->aVersions;
- $this->aFields['php_version'] = phpversion();
-
- //*** PDO
- $bPdo = false;
- if (extension_loaded('pdo'))
- $bPdo = true;
- else
- $bVeremap = false;
- $this->aFields['pdo_extension_loaded'] = $bPdo;
-
- //*** PDO Postgresql
- $bPdoPgsql = false;
- if (extension_loaded('pdo_pgsql'))
- $bPdoPgsql = true;
- else
- $bVeremap = false;
- $this->aFields['pdo_pgsql_extension_loaded'] = $bPdoPgsql;
-
- //*** Curl
- $bCurl = false;
- if (extension_loaded('curl'))
- $bCurl = true;
- else
- $bVeremap = false;
- $this->aFields['curl_extension_loaded'] = $bCurl;
-
- //*** Xsl
- $bXsl = false;
- if (extension_loaded('xsl'))
- $bXsl = true;
- $this->aFields['xsl_extension_loaded'] = $bXsl;
-
- //*** Ldap
- $bLdap = false;
- if (extension_loaded('ldap'))
- $bLdap = true;
- $this->aFields['ldap_extension_loaded'] = $bLdap;
-
- // OS.
- $this->aFields['os_version'] = php_uname();
-
- // Info disque.
- $this->aFields['disk_free_space'] = round(disk_free_space("/") / 1073741824) . ' Go';
- $this->aFields['disk_total_space'] = round(disk_total_space("/") / 1073741824) . ' Go';
-
- //
- $this->aFields['server_software'] = $_SERVER['SERVER_SOFTWARE'];
- $this->aFields['server_addr'] = $_SERVER['SERVER_ADDR'];
- $this->aFields['server_name'] = $_SERVER['SERVER_NAME'];
- $this->aFields['server_port'] = $_SERVER['SERVER_PORT'];
-
- //** Postgresql et Postgis
- $bPostgresql = false;
- $bPostgis = false;
- if (!$this->oConnection->oBd->erreurRencontree) {
- $bPostgresql = true;
- $sSql = "SHOW server_version";
- $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, array());
- $oPgVersion = $this->oConnection->oBd->objetSuivant($oPDOresult);
- $sPostgresql = $oPgVersion->server_version;
- $this->aFields['postgresql_version'] = $sPostgresql;
- $this->oConnection->oBd->fermeResultat();
-
- $aVersion = explode(".", $sPostgresql);
- $bExtension = false;
- if ($aVersion[0] >= 9) {
- if ($aVersion[1] >= 1) {
- $bExtension = true;
- }
- }
- if ($bExtension == true) {
- $sSql = "SELECT default_version FROM pg_catalog.pg_available_extensions where name = 'postgis';";
- $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, array());
- if ($aPostgis = $this->oConnection->oBd->ligneSuivante($oPDOresult)) {
- $bPostgis = true;
- $sPostgis = $aPostgis['default_version'];
- } else {
- $bPostgis = false;
- }
- } else {
- $sSql = "SELECT datname FROM pg_catalog.pg_database where datname = 'template_postgis_20';";
- $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, array());
- if ($aPostgis = $this->oConnection->oBd->ligneSuivante($oPDOresult)) {
- $bPostgis = true;
- $sPostgis = '2.0';
- } else {
- $bPostgis = false;
- }
- }
- $this->aFields['postgis_version'] = $sPostgis;
- $this->oConnection->oBd->fermeResultat();
- $sSql = 'SELECT distinct module_id from [sSchemaFramework].vm_mode';
- $aParams['sSchemaFramework'] = array('value' => $this->aProperties['schema_framework'], 'type' => 'schema_name');
- $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, $aParams);
- while ($aLigne = $this->oConnection->oBd->ligneSuivante($oPDOresult)) {
- $aModules[] = $aLigne['module_id'];
- }
- $iRecordset = $this->oConnection->oBd->fermeResultat();
- }
- $this->aFields['postgresql'] = $bPostgresql;
- $this->aFields['postgis'] = $bPostgis;
-
- // Recherche de mise à jour
- //
- if (!empty($this->aValues['app'])) {
- $sUrl = "http://update.veremes.net/vai/" . $this->aValues['app'] . ".json";
- $json = file_get_contents($sUrl);
- $data = json_decode($json, TRUE);
- $this->aFields['appVersion'] = $data['version'];
- }
- }
- $aXmlRacineAttribute['status'] = 1;
- $sMessage = $this->asDocument('', 'vitis', $this->aValues['sEncoding'], True, $aXmlRacineAttribute, $this->aValues['sSourceEncoding'], $this->aValues['output']);
- } else {
- http_response_code(403);
- $aXmlRacineAttribute['status'] = 0;
- $this->aFields['errorMessage'] = "ERROR : invalid token";
- $sMessage = $this->asDocument('', 'vitis', $this->aValues['sEncoding'], True, $aXmlRacineAttribute, $this->aValues['sSourceEncoding'], $this->aValues['output']);
- }
-
- return $sMessage;
- }
-
-}
-
+<?php
+
+require_once 'Vitis.class.inc';
+require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+
+/**
+ * \file versions.class.inc
+ * \class Versions
+ *
+ * \author Yoann Perollet <yoann.perollet@veremes.com>.
+ *
+ * \brief This file contains the Versions php class
+ *
+ * This class defines the rest api for versions
+ *
+ */
+class Versions extends Vitis {
+ /**
+ * @SWG\Definition(
+ * definition="/versions",
+ * allOf={
+ * @SWG\Schema(ref="#/definitions/versions")
+ * }
+ * )
+ * @SWG\Tag(
+ * name="Versions",
+ * description="Operations about versions"
+ * )
+ */
+
+ /**
+ * construct
+ * @param type $aPath url of the request
+ * @param type $aValues parameters of the request
+ * @param type $versions ptroperties
+ */
+ function __construct($aPath, $aValues, $properties) {
+ $this->aValues = $aValues;
+ $this->aPath = $aPath;
+ $this->aProperties = $properties;
+ if (!empty($this->aValues['token'])) {
+ $this->oConnection = new Connection($this->aValues, $this->aProperties);
+ }
+ }
+
+ /**
+ * @SWG\Get(path="/versions",
+ * tags={"Versions"},
+ * summary="Get versions",
+ * description="Request to get versions",
+ * operationId="GET",
+ * produces={"application/xml", "application/json", "application/x-vm-json"},
+ * @SWG\Parameter(
+ * name="token",
+ * in="query",
+ * description="user token",
+ * required=false,
+ * type="string"
+ * ),
+ * @SWG\Response(
+ * response=200,
+ * description="Poprerties Response",
+ * @SWG\Schema(ref="#/definitions/versions")
+ * )
+ * )
+ */
+
+ /**
+ *
+ * @return versions
+ */
+ function GET() {
+ if ($this->oConnection->oError == null) {
+ $this->getVersion();
+ if (!empty($this->aValues['token']) && in_array("vitis_admin", $this->oConnection->aPrivileges)) {
+
+ //$this->aFields = $this->aVersions;
+ $this->aFields['php_version'] = phpversion();
+
+ //*** PDO
+ $bPdo = false;
+ if (extension_loaded('pdo'))
+ $bPdo = true;
+ else
+ $bVeremap = false;
+ $this->aFields['pdo_extension_loaded'] = $bPdo;
+
+ //*** PDO Postgresql
+ $bPdoPgsql = false;
+ if (extension_loaded('pdo_pgsql'))
+ $bPdoPgsql = true;
+ else
+ $bVeremap = false;
+ $this->aFields['pdo_pgsql_extension_loaded'] = $bPdoPgsql;
+
+ //*** Curl
+ $bCurl = false;
+ if (extension_loaded('curl'))
+ $bCurl = true;
+ else
+ $bVeremap = false;
+ $this->aFields['curl_extension_loaded'] = $bCurl;
+
+ //*** Xsl
+ $bXsl = false;
+ if (extension_loaded('xsl'))
+ $bXsl = true;
+ $this->aFields['xsl_extension_loaded'] = $bXsl;
+
+ //*** Ldap
+ $bLdap = false;
+ if (extension_loaded('ldap'))
+ $bLdap = true;
+ $this->aFields['ldap_extension_loaded'] = $bLdap;
+
+ // OS.
+ $this->aFields['os_version'] = php_uname();
+
+ // Info disque.
+ $this->aFields['disk_free_space'] = round(disk_free_space("/") / 1073741824) . ' Go';
+ $this->aFields['disk_total_space'] = round(disk_total_space("/") / 1073741824) . ' Go';
+
+ //
+ $this->aFields['server_software'] = $_SERVER['SERVER_SOFTWARE'];
+ $this->aFields['server_addr'] = $_SERVER['SERVER_ADDR'];
+ $this->aFields['server_name'] = $_SERVER['SERVER_NAME'];
+ $this->aFields['server_port'] = $_SERVER['SERVER_PORT'];
+
+ //** Postgresql et Postgis
+ $bPostgresql = false;
+ $bPostgis = false;
+ if (!$this->oConnection->oBd->erreurRencontree) {
+ $bPostgresql = true;
+ $sSql = "SHOW server_version";
+ $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, array());
+ $oPgVersion = $this->oConnection->oBd->objetSuivant($oPDOresult);
+ $sPostgresql = $oPgVersion->server_version;
+ $this->aFields['postgresql_version'] = $sPostgresql;
+ $this->oConnection->oBd->fermeResultat();
+
+ $aVersion = explode(".", $sPostgresql);
+ $bExtension = false;
+ if ($aVersion[0] . $aVersion[1] >= 91) {
+ $bExtension = true;
+ }
+ if ($bExtension == true) {
+ $sSql = "SELECT default_version FROM pg_catalog.pg_available_extensions where name = 'postgis';";
+ $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, array());
+ if ($aPostgis = $this->oConnection->oBd->ligneSuivante($oPDOresult)) {
+ $bPostgis = true;
+ $sPostgis = $aPostgis['default_version'];
+ } else {
+ $bPostgis = false;
+ }
+ } else {
+ $sSql = "SELECT datname FROM pg_catalog.pg_database where datname = 'template_postgis_20';";
+ $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, array());
+ if ($aPostgis = $this->oConnection->oBd->ligneSuivante($oPDOresult)) {
+ $bPostgis = true;
+ $sPostgis = '2.0';
+ } else {
+ $bPostgis = false;
+ }
+ }
+ $this->aFields['postgis_version'] = $sPostgis;
+ $this->oConnection->oBd->fermeResultat();
+ $sSql = 'SELECT distinct module_id from [sSchemaFramework].vm_mode';
+ $aParams['sSchemaFramework'] = array('value' => $this->aProperties['schema_framework'], 'type' => 'schema_name');
+ $oPDOresult = $this->oConnection->oBd->executeWithParams($sSql, $aParams);
+ while ($aLigne = $this->oConnection->oBd->ligneSuivante($oPDOresult)) {
+ $aModules[] = $aLigne['module_id'];
+ }
+ $iRecordset = $this->oConnection->oBd->fermeResultat();
+ }
+ $this->aFields['postgresql'] = $bPostgresql;
+ $this->aFields['postgis'] = $bPostgis;
+
+ // Recherche de mise à jour
+ //
+ if (!empty($this->aValues['app'])) {
+ $sUrl = "http://update.veremes.net/vai/" . $this->aValues['app'] . ".json";
+ $json = file_get_contents($sUrl);
+ $data = json_decode($json, TRUE);
+ $this->aFields['appVersion'] = $data['version'];
+ }
+ }
+ $aXmlRacineAttribute['status'] = 1;
+ $sMessage = $this->asDocument('', 'vitis', $this->aValues['sEncoding'], True, $aXmlRacineAttribute, $this->aValues['sSourceEncoding'], $this->aValues['output']);
+ } else {
+ http_response_code(403);
+ $aXmlRacineAttribute['status'] = 0;
+ $this->aFields['errorMessage'] = "ERROR : invalid token";
+ $sMessage = $this->asDocument('', 'vitis', $this->aValues['sEncoding'], True, $aXmlRacineAttribute, $this->aValues['sSourceEncoding'], $this->aValues['output']);
+ }
+
+ return $sMessage;
+ }
+
+}
+
?>
\ No newline at end of file
diff --git a/src/vitis/src/vitis/vas/util/printserver/client/map/map.js b/src/vitis/src/vitis/vas/util/printserver/client/map/map.js
index 2a870d9a00d0935c5b31cc776ac42210b8d84ed9..d6dcd882b6e15b31919e02a1799a6bb2b0212263 100755
--- a/src/vitis/src/vitis/vas/util/printserver/client/map/map.js
+++ b/src/vitis/src/vitis/vas/util/printserver/client/map/map.js
@@ -7,7 +7,7 @@
PrintMap = function (opt_options) {
var this_ = this;
-
+
this.mapSize = [document.getElementById('map').offsetWidth, document.getElementById('map').offsetHeight];
this.tileSize = (isDef(window.oProperties.print.tile_size) && window.oProperties.print.features_zoom >= 0) ? window.oProperties.print.tile_size : 2048;
@@ -29,7 +29,7 @@ PrintMap = function (opt_options) {
this.mapJsonParser = new MapJSON({
'properties': window.oProperties
});
-
+
this.view = this.mapJsonParser.getViewFromDef(this.mapDefinition, {
'size': this.mapSize,
'tileSize': [this.tileSize, this.tileSize]
@@ -39,13 +39,13 @@ PrintMap = function (opt_options) {
this.extent = this.getExtent(opt_options);
- this.tileGrid = this.getTileGridFromDefinition(this.tileSize);
-
+ this.tileGrid = this.getTileGridFromDefinition(this.tileSize);
+
this.layers = this.mapJsonParser.getLayersFromDef(this.mapDefinition, {
'size': this.mapSize,
'tileSize': [this.tileSize, this.tileSize]
});
-
+
this.map = this.setMap(this.layers, this.view);
this.featuresOverlay = this.setFeaturesOverlay(this.map);
@@ -63,6 +63,9 @@ PrintMap = function (opt_options) {
// Supprime tous les controls par défaut
this.removeMapControls();
+ // Taille des icones en fonction de la résolution demandée
+ this.setMapSymbolsResolution(this.map, this.resolutionCoeff)
+
// Si aucune étendue a été donnée et que seul un point a été donné, alors zoom sur this.defaultScale
if (!isDef(opt_options.extent) && !isDef(this.features)) {
if (this.features.length === 1 && this.features[0].getGeometry().getType() === 'Point') {
@@ -310,7 +313,7 @@ PrintMap.prototype.getFeaturesFromEWKT = function (aEWKTFeatures) {
};
/**
- * Return true if EWKTGeom is an EWKT geometry
+ * Return true if EWKTGeom is an EWKT geometry
* @param {string} EWKTGeom
* @returns {boolean}
*/
@@ -367,4 +370,21 @@ PrintMap.prototype.getGeomFromEWKT = function (EWKTGeom, proj) {
return null;
}
-};
\ No newline at end of file
+};
+
+/**
+ * For WMS layers set MAP.RESOLUTION and MAP.DEFRESOLUTION to rise the symbols size
+ *
+ * @param {object} olMap
+ * @param {integer} resolutionCoeff
+ */
+PrintMap.prototype.setMapSymbolsResolution = function (olMap, resolutionCoeff) {
+
+ var newRes = resolutionCoeff * 72;
+ var aLayers = olMap.getLayers().getArray();
+ for (var i = 0; i < aLayers.length; i++) {
+ if (aLayers[i].get('type') === 'imagewms' || aLayers[i].get('type') === 'tilewms') {
+ aLayers[i].getSource().updateParams({'MAP.RESOLUTION': newRes, 'MAP.DEFRESOLUTION': 72});
+ }
+ }
+}