Skip to content

Commit

Permalink
fix(fct_setpsectorcostremovedpipes): set new id to this function, 331…
Browse files Browse the repository at this point in the history
…0 was duplicated
  • Loading branch information
albertbofill committed Sep 3, 2024
1 parent 9676850 commit 91dba43
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions updates/36/36012/ws/dml.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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":""}
]',
Expand Down
4 changes: 2 additions & 2 deletions ws/fct/ws_gw_fct_setpsectorcostremovedpipes.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 91dba43

Please sign in to comment.