From 81088ffab5cba193d4ac5fbf857511907218e88c Mon Sep 17 00:00:00 2001 From: Albert Bofill Date: Wed, 28 Aug 2024 12:49:25 +0200 Subject: [PATCH] enhancement: visual order for v_edit_dma, dqa and presszone --- example/user/ws/ws_99_sample_other.sql | 61 ++++++++++++++------------ updates/36/36012/ws/dml.sql | 10 ++--- 2 files changed, 39 insertions(+), 32 deletions(-) diff --git a/example/user/ws/ws_99_sample_other.sql b/example/user/ws/ws_99_sample_other.sql index a7078445a5..07ce8314dd 100644 --- a/example/user/ws/ws_99_sample_other.sql +++ b/example/user/ws/ws_99_sample_other.sql @@ -608,11 +608,11 @@ UPDATE config_form_fields SET layoutorder =2 WHERE formname = 'v_edit_sector' A UPDATE config_form_fields SET layoutorder =3 WHERE formname = 'v_edit_sector' AND columnname = 'macrosector_id'; UPDATE config_form_fields SET layoutorder =4 WHERE formname = 'v_edit_sector' AND columnname = 'descript'; UPDATE config_form_fields SET layoutorder =5 WHERE formname = 'v_edit_sector' AND columnname = 'undelete'; -UPDATE config_form_fields SET layoutorder =6 WHERE formname = 'v_edit_sector' AND columnname = 'graphconfig'; -UPDATE config_form_fields SET layoutorder =7 WHERE formname = 'v_edit_sector' AND columnname = 'stylesheet'; -UPDATE config_form_fields SET layoutorder =8 WHERE formname = 'v_edit_sector' AND columnname = 'active'; -UPDATE config_form_fields SET layoutorder =9 WHERE formname = 'v_edit_sector' AND columnname = 'parent_id'; -UPDATE config_form_fields SET layoutorder =10 WHERE formname = 'v_edit_sector' AND columnname = 'pattern_id'; +UPDATE config_form_fields SET layoutorder =6 WHERE formname = 'v_edit_sector' AND columnname = 'parent_id'; +UPDATE config_form_fields SET layoutorder =7 WHERE formname = 'v_edit_sector' AND columnname = 'pattern_id'; +UPDATE config_form_fields SET layoutorder =8, iseditable=false WHERE formname = 'v_edit_sector' AND columnname = 'graphconfig'; +UPDATE config_form_fields SET layoutorder =9 WHERE formname = 'v_edit_sector' AND columnname = 'stylesheet'; +UPDATE config_form_fields SET layoutorder =10 WHERE formname = 'v_edit_sector' AND columnname = 'active'; UPDATE config_form_fields SET layoutname = 'lyt_data_1' where formname = 'v_edit_dma'; UPDATE config_form_fields SET layoutorder =1 WHERE formname = 'v_edit_dma' AND columnname = 'dma_id'; @@ -621,39 +621,46 @@ UPDATE config_form_fields SET layoutorder =3 WHERE formname = 'v_edit_dma' AND UPDATE config_form_fields SET layoutorder =4 WHERE formname = 'v_edit_dma' AND columnname = 'descript'; UPDATE config_form_fields SET layoutorder =5 WHERE formname = 'v_edit_dma' AND columnname = 'undelete'; UPDATE config_form_fields SET layoutorder =6 WHERE formname = 'v_edit_dma' AND columnname = 'expl_id'; -UPDATE config_form_fields SET layoutorder =7 WHERE formname = 'v_edit_dma' AND columnname = 'pattern_id'; -UPDATE config_form_fields SET layoutorder =8 WHERE formname = 'v_edit_dma' AND columnname = 'link'; -UPDATE config_form_fields SET layoutorder =9 WHERE formname = 'v_edit_dma' AND columnname = 'minc'; -UPDATE config_form_fields SET layoutorder =10 WHERE formname = 'v_edit_dma' AND columnname = 'maxc'; -UPDATE config_form_fields SET layoutorder =12 WHERE formname = 'v_edit_dma' AND columnname = 'effc'; -UPDATE config_form_fields SET layoutorder =13 WHERE formname = 'v_edit_dma' AND columnname = 'graphconfig'; +UPDATE config_form_fields SET layoutorder =7 WHERE formname = 'v_edit_dma' AND columnname = 'sector_id'; +UPDATE config_form_fields SET layoutorder =8 WHERE formname = 'v_edit_dma' AND columnname = 'pattern_id'; +UPDATE config_form_fields SET layoutorder =9 WHERE formname = 'v_edit_dma' AND columnname = 'dma_type'; +UPDATE config_form_fields SET layoutorder =10 WHERE formname = 'v_edit_dma' AND columnname = 'link'; +UPDATE config_form_fields SET layoutorder =11 WHERE formname = 'v_edit_dma' AND columnname = 'effc'; +UPDATE config_form_fields SET layoutorder =12 WHERE formname = 'v_edit_dma' AND columnname = 'avg_press'; +UPDATE config_form_fields SET layoutorder =13, iseditable=false WHERE formname = 'v_edit_dma' AND columnname = 'graphconfig'; UPDATE config_form_fields SET layoutorder =14 WHERE formname = 'v_edit_dma' AND columnname = 'stylesheet'; -UPDATE config_form_fields SET layoutorder =15 WHERE formname = 'v_edit_dma' AND columnname = 'active'; -UPDATE config_form_fields SET layoutorder =16 WHERE formname = 'v_edit_dma' AND columnname = 'avg_press'; +UPDATE config_form_fields SET layoutorder =15 WHERE formname = 'v_edit_dma' AND columnname = 'expl_id2'; +UPDATE config_form_fields SET layoutorder =16 WHERE formname = 'v_edit_dma' AND columnname = 'active'; UPDATE config_form_fields SET layoutname = 'lyt_data_1' where formname = 'v_edit_presszone'; UPDATE config_form_fields SET layoutorder =1 WHERE formname = 'v_edit_presszone' AND columnname = 'presszone_id'; UPDATE config_form_fields SET layoutorder =2 WHERE formname = 'v_edit_presszone' AND columnname = 'name'; UPDATE config_form_fields SET layoutorder =3 WHERE formname = 'v_edit_presszone' AND columnname = 'expl_id'; -UPDATE config_form_fields SET layoutorder =4 WHERE formname = 'v_edit_presszone' AND columnname = 'graphconfig'; -UPDATE config_form_fields SET layoutorder =5 WHERE formname = 'v_edit_presszone' AND columnname = 'head'; -UPDATE config_form_fields SET layoutorder =6 WHERE formname = 'v_edit_presszone' AND columnname = 'stylesheet'; -UPDATE config_form_fields SET layoutorder =7 WHERE formname = 'v_edit_presszone' AND columnname = 'active'; -UPDATE config_form_fields SET layoutorder =8 WHERE formname = 'v_edit_presszone' AND columnname = 'descript'; +UPDATE config_form_fields SET layoutorder =4 WHERE formname = 'v_edit_presszone' AND columnname = 'sector_id'; +UPDATE config_form_fields SET layoutorder =5 WHERE formname = 'v_edit_presszone' AND columnname = 'descript'; +UPDATE config_form_fields SET layoutorder =6 WHERE formname = 'v_edit_presszone' AND columnname = 'head'; +UPDATE config_form_fields SET layoutorder =7 WHERE formname = 'v_edit_presszone' AND columnname = 'presszone_type'; +UPDATE config_form_fields SET layoutorder =8, iseditable=false WHERE formname = 'v_edit_presszone' AND columnname = 'graphconfig'; +UPDATE config_form_fields SET layoutorder =9 WHERE formname = 'v_edit_presszone' AND columnname = 'stylesheet'; +UPDATE config_form_fields SET layoutorder =10 WHERE formname = 'v_edit_presszone' AND columnname = 'expl_id2'; +UPDATE config_form_fields SET layoutorder =11 WHERE formname = 'v_edit_presszone' AND columnname = 'active'; UPDATE config_form_fields SET layoutname = 'lyt_data_1' where formname = 'v_edit_dqa'; UPDATE config_form_fields SET layoutorder =1 WHERE formname = 'v_edit_dqa' AND columnname = 'dqa_id'; UPDATE config_form_fields SET layoutorder =2 WHERE formname = 'v_edit_dqa' AND columnname = 'name'; UPDATE config_form_fields SET layoutorder =3 WHERE formname = 'v_edit_dqa' AND columnname = 'expl_id'; -UPDATE config_form_fields SET layoutorder =4 WHERE formname = 'v_edit_dqa' AND columnname = 'macrodqa_id'; -UPDATE config_form_fields SET layoutorder =5 WHERE formname = 'v_edit_dqa' AND columnname = 'descript'; -UPDATE config_form_fields SET layoutorder =6 WHERE formname = 'v_edit_dqa' AND columnname = 'undelete'; -UPDATE config_form_fields SET layoutorder =7 WHERE formname = 'v_edit_dqa' AND columnname = 'pattern_id'; -UPDATE config_form_fields SET layoutorder =8 WHERE formname = 'v_edit_dqa' AND columnname = 'dqa_type'; -UPDATE config_form_fields SET layoutorder =9 WHERE formname = 'v_edit_dqa' AND columnname = 'link'; -UPDATE config_form_fields SET layoutorder =10 WHERE formname = 'v_edit_dqa' AND columnname = 'graphconfig'; -UPDATE config_form_fields SET layoutorder =11 WHERE formname = 'v_edit_dqa' AND columnname = 'stylesheet'; -UPDATE config_form_fields SET layoutorder =12 WHERE formname = 'v_edit_dqa' AND columnname = 'active'; +UPDATE config_form_fields SET layoutorder =4 WHERE formname = 'v_edit_dqa' AND columnname = 'sector_id'; +UPDATE config_form_fields SET layoutorder =5 WHERE formname = 'v_edit_dqa' AND columnname = 'macrodqa_id'; +UPDATE config_form_fields SET layoutorder =6 WHERE formname = 'v_edit_dqa' AND columnname = 'descript'; +UPDATE config_form_fields SET layoutorder =7 WHERE formname = 'v_edit_dqa' AND columnname = 'undelete'; +UPDATE config_form_fields SET layoutorder =8 WHERE formname = 'v_edit_dqa' AND columnname = 'pattern_id'; +UPDATE config_form_fields SET layoutorder =9 WHERE formname = 'v_edit_dqa' AND columnname = 'dqa_type'; +UPDATE config_form_fields SET layoutorder =10 WHERE formname = 'v_edit_dqa' AND columnname = 'link'; +UPDATE config_form_fields SET layoutorder =11 WHERE formname = 'v_edit_dqa' AND columnname = 'avg_press'; +UPDATE config_form_fields SET layoutorder =12, iseditable=false WHERE formname = 'v_edit_dqa' AND columnname = 'graphconfig'; +UPDATE config_form_fields SET layoutorder =13 WHERE formname = 'v_edit_dqa' AND columnname = 'stylesheet'; +UPDATE config_form_fields SET layoutorder =14 WHERE formname = 'v_edit_dqa' AND columnname = 'expl_id2'; +UPDATE config_form_fields SET layoutorder =15 WHERE formname = 'v_edit_dqa' AND columnname = 'active'; UPDATE config_param_system SET value = (replace(value, 'Disable', 'Random')) WHERE parameter='utils_graphanalytics_style'; diff --git a/updates/36/36012/ws/dml.sql b/updates/36/36012/ws/dml.sql index 4b1c0beba2..088451f8f9 100644 --- a/updates/36/36012/ws/dml.sql +++ b/updates/36/36012/ws/dml.sql @@ -188,13 +188,13 @@ INSERT INTO config_form_fields(formname, formtype, tabname, columnname, layoutna VALUES ('v_edit_dma', 'form_feature', 'tab_none', 'dma_type', 'lyt_data_1', 18, 'string', 'combo', 'dma_type', 'dma_type', false, false, true, false, 'SELECT id, idval FROM edit_typevalue WHERE typevalue=''dma_type''', false); INSERT INTO config_form_fields(formname, formtype, tabname, columnname, layoutname, layoutorder, datatype, widgettype, label, tooltip, ismandatory, isparent, iseditable, isautoupdate, dv_querytext, dv_orderby_id, widgetcontrols, hidden) -VALUES ('v_edit_dma', 'form_feature', 'tab_none', 'sector_id', 'lyt_data_1', 19, 'string', 'combo', 'sector_id', 'sector_id', false, false, true, false, 'SELECT sector_id as id, name as idval FROM sector WHERE sector_id IS NOT NULL', true, '{"setMultiline": false, "valueRelation":{"nullValue":false, "layer": "v_edit_sector", "activated": true, "keyColumn": "sector_id", "valueColumn": "name", "filterExpression": null}}', false); +VALUES ('v_edit_dma', 'form_feature', 'tab_none', 'sector_id', 'lyt_data_1', 19, 'string', 'combo', 'sector_id', 'sector_id', false, false, true, false, 'SELECT sector_id as id, name as idval FROM sector WHERE sector_id>1', true, '{"setMultiline": false, "valueRelation":{"nullValue":false, "layer": "v_edit_sector", "activated": true, "keyColumn": "sector_id", "valueColumn": "name", "filterExpression": null}}', false); INSERT INTO config_form_fields(formname, formtype, tabname, columnname, layoutname, layoutorder, datatype, widgettype, label, tooltip, ismandatory, isparent, iseditable, isautoupdate, dv_querytext, dv_orderby_id, widgetcontrols, hidden) -VALUES ('v_edit_dqa', 'form_feature', 'tab_none', 'sector_id', 'lyt_data_1', 15, 'string', 'combo', 'sector_id', 'sector_id', false, false, true, false, 'SELECT sector_id as id, name as idval FROM sector WHERE sector_id IS NOT NULL', true, '{"setMultiline": false, "valueRelation":{"nullValue":false, "layer": "v_edit_sector", "activated": true, "keyColumn": "sector_id", "valueColumn": "name", "filterExpression": null}}', false); +VALUES ('v_edit_dqa', 'form_feature', 'tab_none', 'sector_id', 'lyt_data_1', 15, 'string', 'combo', 'sector_id', 'sector_id', false, false, true, false, 'SELECT sector_id as id, name as idval FROM sector WHERE sector_id>1', true, '{"setMultiline": false, "valueRelation":{"nullValue":false, "layer": "v_edit_sector", "activated": true, "keyColumn": "sector_id", "valueColumn": "name", "filterExpression": null}}', false); INSERT INTO config_form_fields(formname, formtype, tabname, columnname, layoutname, layoutorder, datatype, widgettype, label, tooltip, ismandatory, isparent, iseditable, isautoupdate, dv_querytext, dv_orderby_id, widgetcontrols, hidden) -VALUES ('v_edit_presszone', 'form_feature', 'tab_none', 'sector_id', 'lyt_data_1', 11, 'string', 'combo', 'sector_id', 'sector_id', false, false, true, false, 'SELECT sector_id as id, name as idval FROM sector WHERE sector_id IS NOT NULL', true, '{"setMultiline": false, "valueRelation":{"nullValue":false, "layer": "v_edit_sector", "activated": true, "keyColumn": "sector_id", "valueColumn": "name", "filterExpression": null}}', false); +VALUES ('v_edit_presszone', 'form_feature', 'tab_none', 'sector_id', 'lyt_data_1', 11, 'string', 'combo', 'sector_id', 'sector_id', false, false, true, false, 'SELECT sector_id as id, name as idval FROM sector WHERE sector_id>1', true, '{"setMultiline": false, "valueRelation":{"nullValue":false, "layer": "v_edit_sector", "activated": true, "keyColumn": "sector_id", "valueColumn": "name", "filterExpression": null}}', false); INSERT INTO config_form_fields(formname, formtype, tabname, columnname, layoutname, layoutorder, datatype, widgettype, label, tooltip, ismandatory, isparent, iseditable, isautoupdate, dv_querytext, hidden) @@ -327,8 +327,8 @@ UPDATE config_form_fields SET layoutorder=6 WHERE formname='v_edit_dma' AND form UPDATE config_form_fields SET layoutorder=7 WHERE formname='v_edit_dma' AND formtype='form_feature' AND columnname='expl_id' AND tabname='tab_none'; UPDATE config_form_fields SET layoutorder=8 WHERE formname='v_edit_dma' AND formtype='form_feature' AND columnname='pattern_id' AND tabname='tab_none'; UPDATE config_form_fields SET layoutorder=9 WHERE formname='v_edit_dma' AND formtype='form_feature' AND columnname='link' AND tabname='tab_none'; -UPDATE config_form_fields SET layoutorder=10 WHERE formname='v_edit_dma' AND formtype='form_feature' AND columnname='minc' AND tabname='tab_none'; -UPDATE config_form_fields SET layoutorder=11 WHERE formname='v_edit_dma' AND formtype='form_feature' AND columnname='maxc' AND tabname='tab_none'; +DELETE FROM config_form_fields WHERE formname='v_edit_dma' AND formtype='form_feature' AND columnname='minc' AND tabname='tab_none'; +DELETE FROM config_form_fields WHERE formname='v_edit_dma' AND formtype='form_feature' AND columnname='maxc' AND tabname='tab_none'; UPDATE config_form_fields SET layoutorder=12 WHERE formname='v_edit_dma' AND formtype='form_feature' AND columnname='effc' AND tabname='tab_none'; UPDATE config_form_fields SET web_layoutorder=1 WHERE formname='mincut' AND formtype='form_mincut' AND columnname='btn_valve_status' AND tabname='tab_mincut';