diff --git a/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.json b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.json
index e0168f15efdbb3674d714c7de0f294e58283bb88..add59599a54d6f9c536bcd598baf4ee1bddbf4c1 100644
--- a/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.json
+++ b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.json
@@ -511,6 +511,51 @@
}
]
},
+ {
+ "fields": [
+ {
+ "type": "radio",
+ "options": {
+ "choices": [
+ {
+ "label": "Oui",
+ "value": true
+ },
+ {
+ "label": "Non",
+ "value": false
+ }
+ ]
+ },
+ "name": "enable_selection",
+ "label": "FORM_SELECTABLE_VMAP_BUSINESS_OBJECT_TOOLTIP",
+ "disabled": false,
+ "required": true,
+ "nb_cols": 12,
+ "default_value": true
+ }, {
+ "type": "radio",
+ "options": {
+ "choices": [
+ {
+ "label": "Oui",
+ "value": true
+ },
+ {
+ "label": "Non",
+ "value": false
+ }
+ ]
+ },
+ "name": "enable_location",
+ "label": "FORM_LOCATABLE_VMAP_BUSINESS_OBJECT_TOOLTIP",
+ "disabled": false,
+ "required": true,
+ "nb_cols": 12,
+ "default_value": true
+ }
+ ]
+ },
{
"fields": [
{
diff --git a/src/module_vmap/module/lang/lang-en.json b/src/module_vmap/module/lang/lang-en.json
index dfca19f973cb24a29baabc9d4d03dbef574b89c8..a8198863966769e1fdcce7fb40b311557fb04439 100644
--- a/src/module_vmap/module/lang/lang-en.json
+++ b/src/module_vmap/module/lang/lang-en.json
@@ -185,6 +185,8 @@
"FORM_MAX_SNAPPING_SCALE_VMAP_BUSINESS_OBJECT_TOOLTIP": "Maximum edition scale",
"FORM_MIN_SNAPPING_SCALE_VMAP_BUSINESS_OBJECT": "Minimum edition scale",
"FORM_MIN_SNAPPING_SCALE_VMAP_BUSINESS_OBJECT_TOOLTIP": "Minimum edition scale",
+ "FORM_SELECTABLE_VMAP_BUSINESS_OBJECT_TOOLTIP": "Object selectable",
+ "FORM_LOCATABLE_VMAP_BUSINESS_OBJECT_TOOLTIP": "Object locatable",
"LIST_DELETE_CONFIRM_VMAP_BUSINESS_OBJECT": "Delete the selected items and associations with layers?",
"": "",
"FORM_TITLE_VMAP_MODULE_MODULE": "Module {{::label}}",
diff --git a/src/module_vmap/module/lang/lang-fr.json b/src/module_vmap/module/lang/lang-fr.json
index a1b1a7bbd94917d3d4b0021295bd5cac3f109774..418acf5fc20d8609eca876b2bddfb55bf069b19f 100644
--- a/src/module_vmap/module/lang/lang-fr.json
+++ b/src/module_vmap/module/lang/lang-fr.json
@@ -185,6 +185,8 @@
"FORM_MAX_SNAPPING_SCALE_VMAP_BUSINESS_OBJECT_TOOLTIP": "Échelle à partir de laquelle la saisie ne sera plus possible : il faudra zoomer pour reprendre la saisie",
"FORM_MIN_SNAPPING_SCALE_VMAP_BUSINESS_OBJECT": "Échelle minimale de saisie",
"FORM_MIN_SNAPPING_SCALE_VMAP_BUSINESS_OBJECT_TOOLTIP": "Échelle à partir de laquelle la saisie sera possible : il faudra dézoomer pour reprendre la saisie",
+ "FORM_SELECTABLE_VMAP_BUSINESS_OBJECT_TOOLTIP": "Objet sélectionnable",
+ "FORM_LOCATABLE_VMAP_BUSINESS_OBJECT_TOOLTIP": "Objet localisable",
"LIST_DELETE_CONFIRM_VMAP_BUSINESS_OBJECT": "Supprimer les objets métiers sélectionnés et les associations avec les calques ?",
"": "",
"FORM_TITLE_VMAP_MODULE_MODULE": "Module {{::label}}",
diff --git a/src/module_vmap/web_service/sql/sqlQueries.xml b/src/module_vmap/web_service/sql/sqlQueries.xml
index a7a4ff6699e62b6fb67a7b5637015655befbf6d5..d90340764077bb24ef1f681ed47ffdbf53e220be 100644
--- a/src/module_vmap/web_service/sql/sqlQueries.xml
+++ b/src/module_vmap/web_service/sql/sqlQueries.xml
@@ -1145,5 +1145,17 @@
]]>
</code>
</query>
+ <query>
+ <type>update</type>
+ <version>2019.01.00</version>
+ <code>
+ <![CDATA[
+ -- Armand 26/04/2018 14:27 Ajout des colonnes enable_selection et enable_location
+ ALTER TABLE s_vmap.business_object ADD COLUMN enable_selection boolean;
+ ALTER TABLE s_vmap.business_object ADD COLUMN enable_location boolean;
+ UPDATE s_vmap.business_object SET enable_selection=true, enable_location=true;
+ ]]>
+ </code>
+ </query>
</queriesCollection>
</sqlQueries>
diff --git a/src/module_vmap/web_service/ws/BusinessObject.class.inc b/src/module_vmap/web_service/ws/BusinessObject.class.inc
index b3da1a450873ab4e1f76bae4ac4d0c60fe9c1f55..ba6c8a045c1f09fc523b786231592909c5fb546f 100644
--- a/src/module_vmap/web_service/ws/BusinessObject.class.inc
+++ b/src/module_vmap/web_service/ws/BusinessObject.class.inc
@@ -31,7 +31,7 @@ class BusinessObject extends Vmap {
*/
function __construct($aPath, $aValues, $properties, $bShortcut = false, $oConnection = false) {
parent::__construct($aPath, $aValues, $properties, $bShortcut, $oConnection);
- $this->aSelectedFields = Array("business_object_id", "title", "formtitle", "summarytitle", "id_field", "database", "schema", "table", "sql_summary", "sql_list", "sorted_by", "geom_column", "search_field", "result_field", "search_use_strict", "event_id", "index", "add_form_size", "edit_form_size", "display_form_size", "selection_buffer", "user_rights", "max_edition_scale", "min_edition_scale");
+ $this->aSelectedFields = Array("business_object_id", "title", "formtitle", "summarytitle", "id_field", "database", "schema", "table", "sql_summary", "sql_list", "sorted_by", "geom_column", "search_field", "result_field", "search_use_strict", "event_id", "index", "add_form_size", "edit_form_size", "display_form_size", "selection_buffer", "user_rights", "max_edition_scale", "min_edition_scale", "enable_selection", "enable_location");
}
/**
diff --git a/src/module_vmap/web_service/ws/BusinessObjects.class.inc b/src/module_vmap/web_service/ws/BusinessObjects.class.inc
index fa7ca58d1eaf4d159d82c3498a6c75caf20b1d79..6479b6aa94a034329e6ad8d56a68076a75fc29f5 100755
--- a/src/module_vmap/web_service/ws/BusinessObjects.class.inc
+++ b/src/module_vmap/web_service/ws/BusinessObjects.class.inc
@@ -42,7 +42,7 @@ class BusinessObjects extends Vmap {
*/
function __construct($aPath, $aValues, $properties, $bShortcut = false, $oConnection = false) {
parent::__construct($aPath, $aValues, $properties, $bShortcut, $oConnection);
- $this->aSelectedFields = Array("business_object_id", "title", "formtitle", "summarytitle", "id_field", "database", "schema", "table", "sql_summary", "sql_list", "sorted_by", "geom_column", "search_field", "result_field", "search_use_strict", "event_id", "index", "add_form_size", "edit_form_size", "display_form_size", "selection_buffer", "user_rights", "max_edition_scale", "min_edition_scale");
+ $this->aSelectedFields = Array("business_object_id", "title", "formtitle", "summarytitle", "id_field", "database", "schema", "table", "sql_summary", "sql_list", "sorted_by", "geom_column", "search_field", "result_field", "search_use_strict", "event_id", "index", "add_form_size", "edit_form_size", "display_form_size", "selection_buffer", "user_rights", "max_edition_scale", "min_edition_scale", "enable_selection", "enable_location");
}
/**