From fb8adf69dd151326e6b6116ed15585feb09fa145 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Wed, 7 Nov 2018 16:21:12 +0100
Subject: [PATCH] =?UTF-8?q?Ajout=20de=20listes=20d=C3=A9roulantes=20au=20f?=
=?UTF-8?q?ormulaire=20objet=20m=C3=A9tier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...ap_business_object_vmap_business_object.js | 15 +++
..._business_object_vmap_business_object.json | 110 ++++++++++++++----
2 files changed, 105 insertions(+), 20 deletions(-)
diff --git a/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.js b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.js
index ad663b75..80ce2724 100644
--- a/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.js
+++ b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.js
@@ -250,6 +250,21 @@ var oFormScope;
oFormValues['id_field']['options'] = aColumnsOptions;
}
}
+ if (angular.isDefined(oFormValues['geom_column'])) {
+ if (angular.isDefined(oFormValues['geom_column']['options'])) {
+ oFormValues['geom_column']['options'] = aColumnsOptions;
+ }
+ }
+ if (angular.isDefined(oFormValues['search_field'])) {
+ if (angular.isDefined(oFormValues['search_field']['options'])) {
+ oFormValues['search_field']['options'] = aColumnsOptions;
+ }
+ }
+ if (angular.isDefined(oFormValues['result_field'])) {
+ if (angular.isDefined(oFormValues['result_field']['options'])) {
+ oFormValues['result_field']['options'] = aColumnsOptions;
+ }
+ }
});
},
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 b5697404..17dbe046 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
@@ -291,41 +291,76 @@
},
{
"fields": [{
- "type": "text",
+ "type": "editable_select",
"name": "geom_column",
"label": "FORM_GEOM_COLUMN_DEVELOPMENT_0",
"required": true,
- "pattern": "",
- "nb_cols": 6,
- "id": "New_el_10_12_1"
+ "nb_cols": 5
+ }, {
+ "type": "button",
+ "class": "btn-group btn-group-sm margin-top-20",
+ "nb_cols": 1,
+ "buttons": [{
+ "type": "button",
+ "name": "table-datalist",
+ "label": "FORM_GEOM_COLUMN_DEVELOPMENT_0",
+ "class": "btn-primary",
+ "event": "loadVMapBoFormColumns()",
+ "glyphicon": "refresh"
+ }
+ ]
}]
},
{
"fields": [{
- "type": "text",
+ "type": "editable_select",
"name": "search_field",
"label": "FORM_SEARCH_FIELD_0",
- "nb_cols": 6,
- "id": "New_el_11_13_1",
+ "nb_cols": 5,
"tooltip": {
"title": "",
"content": "FORM_SEARCH_FIELD_0_TOOLTIP",
"container": "body"
}
+ }, {
+ "type": "button",
+ "class": "btn-group btn-group-sm margin-top-20",
+ "nb_cols": 1,
+ "buttons": [{
+ "type": "button",
+ "name": "table-datalist",
+ "label": "FORM_SEARCH_FIELD_0",
+ "class": "btn-primary",
+ "event": "loadVMapBoFormColumns()",
+ "glyphicon": "refresh"
+ }
+ ]
}]
},
{
"fields": [{
- "type": "text",
+ "type": "editable_select",
"name": "result_field",
"label": "FORM_RESULT_FIELD_0",
- "nb_cols": 6,
- "id": "New_el_12_14_1",
+ "nb_cols": 5,
"tooltip": {
"title": "",
"content": "FORM_RESULT_FIELD_0_TOOLTIP",
"container": "body"
}
+ }, {
+ "type": "button",
+ "class": "btn-group btn-group-sm margin-top-20",
+ "nb_cols": 1,
+ "buttons": [{
+ "type": "button",
+ "name": "table-datalist",
+ "label": "FORM_RESULT_FIELD_0",
+ "class": "btn-primary",
+ "event": "loadVMapBoFormColumns()",
+ "glyphicon": "refresh"
+ }
+ ]
}]
},
{
@@ -685,41 +720,76 @@
},
{
"fields": [{
- "type": "text",
+ "type": "editable_select",
"name": "geom_column",
"label": "FORM_GEOM_COLUMN_DEVELOPMENT_0",
"required": true,
- "pattern": "",
- "nb_cols": 6,
- "id": "New_el_10_12_1"
+ "nb_cols": 5
+ }, {
+ "type": "button",
+ "class": "btn-group btn-group-sm margin-top-20",
+ "nb_cols": 1,
+ "buttons": [{
+ "type": "button",
+ "name": "table-datalist",
+ "label": "FORM_GEOM_COLUMN_DEVELOPMENT_0",
+ "class": "btn-primary",
+ "event": "loadVMapBoFormColumns()",
+ "glyphicon": "refresh"
+ }
+ ]
}]
},
{
"fields": [{
- "type": "text",
+ "type": "editable_select",
"name": "search_field",
"label": "FORM_SEARCH_FIELD_0",
- "nb_cols": 6,
- "id": "New_el_11_13_1",
+ "nb_cols": 5,
"tooltip": {
"title": "",
"content": "FORM_SEARCH_FIELD_0_TOOLTIP",
"container": "body"
}
+ }, {
+ "type": "button",
+ "class": "btn-group btn-group-sm margin-top-20",
+ "nb_cols": 1,
+ "buttons": [{
+ "type": "button",
+ "name": "table-datalist",
+ "label": "FORM_SEARCH_FIELD_0",
+ "class": "btn-primary",
+ "event": "loadVMapBoFormColumns()",
+ "glyphicon": "refresh"
+ }
+ ]
}]
},
{
"fields": [{
- "type": "text",
+ "type": "editable_select",
"name": "result_field",
"label": "FORM_RESULT_FIELD_0",
- "nb_cols": 6,
- "id": "New_el_12_14_1",
+ "nb_cols": 5,
"tooltip": {
"title": "",
"content": "FORM_RESULT_FIELD_0_TOOLTIP",
"container": "body"
}
+ }, {
+ "type": "button",
+ "class": "btn-group btn-group-sm margin-top-20",
+ "nb_cols": 1,
+ "buttons": [{
+ "type": "button",
+ "name": "table-datalist",
+ "label": "FORM_RESULT_FIELD_0",
+ "class": "btn-primary",
+ "event": "loadVMapBoFormColumns()",
+ "glyphicon": "refresh"
+ }
+ ]
}]
},
{
--
GitLab