diff --git a/updates/36/36012/ws/dml.sql b/updates/36/36012/ws/dml.sql index 4e4dde98c5..bd51dfa321 100644 --- a/updates/36/36012/ws/dml.sql +++ b/updates/36/36012/ws/dml.sql @@ -7,7 +7,7 @@ This version of Giswater is provided by Giswater Association SET search_path = SCHEMA_NAME, public, pg_catalog; -INSERT INTO sys_function VALUES (3310, 'gw_fct_setpsectorcostremovedpipes', 'ws', 'function', 'json', 'json', +INSERT INTO sys_function VALUES (3322, 'gw_fct_setpsectorcostremovedpipes', 'ws', 'function', 'json', 'json', 'Function to set cost for removed material on specific psectors', 'role_master', null, 'core') ON CONFLICT (id) DO NOTHING; @@ -16,10 +16,10 @@ ON CONFLICT (fid) DO NOTHING; DELETE from sys_fprocess WHERE fid = 522; -INSERT INTO config_toolbox VALUES (3310, 'Set cost for removed material on psectors', '{"featureType":[]}', +INSERT INTO config_toolbox VALUES (3322, 'Set cost for removed material on psectors', '{"featureType":[]}', '[ {"widgetname":"expl", "label":"Exploitation:", "widgettype":"combo", "datatype":"text", "dvQueryText":"SELECT expl_id as id, name as idval FROM v_edit_exploitation", "layoutname":"grl_option_parameters","layoutorder":1, "selectedId":""}, -{"widgetname":"material", "label":"Material:", "widgettype":"combo", "datatype":"text", "dvQueryText":"SELECT id, descript as idval FROM cat_mat_node", "layoutname":"grl_option_parameters","layoutorder":2, "selectedId":""}, +{"widgetname":"material", "label":"Material:", "widgettype":"combo", "datatype":"text", "dvQueryText":"SELECT id, descript as idval FROM cat_mat_arc", "layoutname":"grl_option_parameters","layoutorder":2, "selectedId":""}, {"widgetname":"price", "label":"Price:","widgettype":"linetext","datatype":"text", "isMandatory":true, "tooltip":"Code of removal material price", "placeholder":"", "layoutname":"grl_option_parameters","layoutorder":3, "value":""}, {"widgetname":"observ", "label":"Observ:","widgettype":"linetext","datatype":"text", "isMandatory":true, "tooltip":"Descriptive text for removal (it apears on psector_x_other observ)", "placeholder":"", "layoutname":"grl_option_parameters","layoutorder":4, "value":""} ]', diff --git a/ws/fct/ws_gw_fct_setpsectorcostremovedpipes.sql b/ws/fct/ws_gw_fct_setpsectorcostremovedpipes.sql index e393121bc6..87987c3e89 100644 --- a/ws/fct/ws_gw_fct_setpsectorcostremovedpipes.sql +++ b/ws/fct/ws_gw_fct_setpsectorcostremovedpipes.sql @@ -4,7 +4,7 @@ The program is free software: you can redistribute it and/or modify it under the This version of Giswater is provided by Giswater Association */ ---FUNCTION CODE: 3310 +--FUNCTION CODE: 3322 DROP FUNCTION IF EXISTS SCHEMA_NAME.gw_fct_setpsectorcostremovedpipes(json); CREATE OR REPLACE FUNCTION SCHEMA_NAME.gw_fct_setpsectorcostremovedpipes(p_data json) @@ -97,7 +97,7 @@ BEGIN ',"data":{ "info":'||v_result_info||','|| '"line":'||v_result_line|| '}}'|| - '}')::json, 3310, null, null, null); + '}')::json, 3322, null, null, null); -- Exception handling EXCEPTION WHEN OTHERS THEN