From 8d69191f3a79fd3dcadb739bf3ccf840b86547e8 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Tue, 12 Mar 2019 17:11:44 +0100
Subject: [PATCH] =?UTF-8?q?Mise=20en=20place=20de=20la=20datasource=20pour?=
=?UTF-8?q?=20r=C3=A9cup=C3=A9rer=20les=20entreprises=20de=20type=20vidang?=
=?UTF-8?q?eur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...saisie_anc_controle_controle_filieres.json | 35 +++++++++++++++++--
.../anc_saisie_anc_filieres_agree.json | 35 +++++++++++++++++--
2 files changed, 66 insertions(+), 4 deletions(-)
diff --git a/module/forms/anc_saisie/anc_saisie_anc_controle_controle_filieres.json b/module/forms/anc_saisie/anc_saisie_anc_controle_controle_filieres.json
index 47254f6b..5bedb462 100755
--- a/module/forms/anc_saisie/anc_saisie_anc_controle_controle_filieres.json
+++ b/module/forms/anc_saisie/anc_saisie_anc_controle_controle_filieres.json
@@ -2467,7 +2467,16 @@
"required":false,
"nb_cols":4,
"id":"fag_en_entr_69_1",
- "id_from":"fag_en_entr_69_1_from"
+ "id_from":"fag_en_entr_69_1_from",
+ "datasource":{
+ "datasource_id":"datasource_64",
+ "sort_order":"ASC",
+ "distinct":"true",
+ "label_key":"nom_entreprise",
+ "order_by":"nom_entreprise",
+ "id_key":"nom_entreprise",
+ "attributs":"nom_entreprise|nom_entreprise"
+ }
}
]
},
@@ -4093,7 +4102,16 @@
"required":false,
"nb_cols":4,
"id":"fag_en_entr_69_1",
- "id_from":"fag_en_entr_69_1_from"
+ "id_from":"fag_en_entr_69_1_from",
+ "datasource":{
+ "datasource_id":"datasource_64",
+ "sort_order":"ASC",
+ "distinct":"true",
+ "label_key":"nom_entreprise",
+ "order_by":"nom_entreprise",
+ "id_key":"nom_entreprise",
+ "attributs":"nom_entreprise|nom_entreprise"
+ }
}
]
},
@@ -5286,6 +5304,19 @@
},
"ressource_id":"vitis/genericquerys",
"id":"datasource_63"
+ },
+ "datasource_64":{
+ "type":"web_service",
+ "dataType":"tableValue",
+ "name":"ptr_vi_entr",
+ "description":"",
+ "parameters":{
+ "filter":{"vidangeur": true},
+ "schema":"s_anc",
+ "table":"param_entreprise"
+ },
+ "ressource_id":"vitis/genericquerys",
+ "id":"datasource_64"
}
}
}
diff --git a/module/forms/anc_saisie/anc_saisie_anc_filieres_agree.json b/module/forms/anc_saisie/anc_saisie_anc_filieres_agree.json
index d4d75442..f2dfb823 100755
--- a/module/forms/anc_saisie/anc_saisie_anc_filieres_agree.json
+++ b/module/forms/anc_saisie/anc_saisie_anc_filieres_agree.json
@@ -2591,7 +2591,16 @@
"required":false,
"nb_cols":4,
"id":"fag_en_entr_69_1",
- "id_from":"fag_en_entr_69_1_from"
+ "id_from":"fag_en_entr_69_1_from",
+ "datasource":{
+ "datasource_id":"datasource_64",
+ "sort_order":"ASC",
+ "distinct":"true",
+ "label_key":"nom_entreprise",
+ "order_by":"nom_entreprise",
+ "id_key":"nom_entreprise",
+ "attributs":"nom_entreprise|nom_entreprise"
+ }
}
]
},
@@ -4235,7 +4244,16 @@
"required":false,
"nb_cols":4,
"id":"fag_en_entr_69_1",
- "id_from":"fag_en_entr_69_1_from"
+ "id_from":"fag_en_entr_69_1_from",
+ "datasource":{
+ "datasource_id":"datasource_64",
+ "sort_order":"ASC",
+ "distinct":"true",
+ "label_key":"nom_entreprise",
+ "order_by":"nom_entreprise",
+ "id_key":"nom_entreprise",
+ "attributs":"nom_entreprise|nom_entreprise"
+ }
}
]
},
@@ -5415,6 +5433,19 @@
},
"ressource_id":"vitis/genericquerys",
"id":"datasource_63"
+ },
+ "datasource_64":{
+ "type":"web_service",
+ "dataType":"tableValue",
+ "name":"ptr_vi_entr",
+ "description":"",
+ "parameters":{
+ "filter":{"vidangeur": true},
+ "schema":"s_anc",
+ "table":"param_entreprise"
+ },
+ "ressource_id":"vitis/genericquerys",
+ "id":"datasource_64"
}
}
}
--
GitLab