Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ce7934e

Browse files
authoredAug 11, 2021
Merge pull request Southpaw-TACTIC#1681 from remkonoteboom/4.8
More fixes on Table
2 parents c71f483 + 1dd909e commit ce7934e

File tree

2 files changed

+48
-31
lines changed

2 files changed

+48
-31
lines changed
 

‎src/tactic/ui/panel/table_layout_wdg.py

+24-20
Original file line numberDiff line numberDiff line change
@@ -2028,6 +2028,22 @@ def handle_table_behaviors(self, table):
20282028

20292029

20302030

2031+
# collapse groups
2032+
from tactic.ui.widget.swap_display_wdg import SwapDisplayWdg
2033+
SwapDisplayWdg.handle_top(table)
2034+
2035+
table.add_relay_behavior( {
2036+
'type': 'click',
2037+
'bvr_match_class': 'spt_group_row_collapse',
2038+
'cbjs_action': '''
2039+
spt.table.set_table(bvr.src_el);
2040+
var row = bvr.src_el.getParent(".spt_group_row");
2041+
spt.table.collapse_group(row);
2042+
'''
2043+
} )
2044+
2045+
2046+
20312047

20322048

20332049
# indicator that a cell is editable
@@ -2079,6 +2095,10 @@ def handle_table_behaviors(self, table):
20792095
} )
20802096

20812097

2098+
2099+
2100+
2101+
20822102
# set styles at the table level to be relayed down
20832103
border_color = table.get_color("table_border", default="border")
20842104

@@ -2150,23 +2170,6 @@ def handle_table_behaviors(self, table):
21502170

21512171

21522172

2153-
2154-
2155-
# collapse groups
2156-
from tactic.ui.widget.swap_display_wdg import SwapDisplayWdg
2157-
SwapDisplayWdg.handle_top(table)
2158-
2159-
table.add_relay_behavior( {
2160-
'type': 'click',
2161-
'bvr_match_class': 'spt_group_row_collapse',
2162-
'cbjs_action': '''
2163-
spt.table.set_table(bvr.src_el);
2164-
var row = bvr.src_el.getParent(".spt_group_row");
2165-
spt.table.collapse_group(row);
2166-
'''
2167-
} )
2168-
2169-
21702173
if self.kwargs.get("show_group_highlight") not in [False, 'false']:
21712174
# group mouse over color
21722175
table.add_relay_behavior( {
@@ -7635,11 +7638,12 @@ def handle_load_behaviors(self, table):
76357638
show = false;
76367639
}
76377640
7638-
var sub_row = last_row.getNext();
76397641
7640-
var group_level = last_row.getAttribute("spt_group_level")
7642+
var sub_row = last_row.getNext();
7643+
7644+
var group_level = last_row.getAttribute("spt_group_level")
76417645
7642-
if (group_level) {
7646+
if (group_level) {
76437647
group_level = parseInt(group_level);
76447648
76457649
}

‎src/tactic/ui/table/task_element_wdg.py

+24-11
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,6 @@ def preprocess(self):
784784

785785
def handle_layout_behaviors(self, layout):
786786

787-
788787
# add a style for this layout
789788
styles = HtmlElement.style()
790789
layout.add(styles)
@@ -942,12 +941,30 @@ def handle_layout_behaviors(self, layout):
942941
"type": "change",
943942
'bvr_match_class': "spt_task_element_assigned",
944943
"cbjs_action": '''
945-
var all_top_el = bvr.src_el.getParent(".spt_all_task_top");
946-
var values = spt.api.Utility.get_input_values(all_top_el,'.spt_task_element_assigned', false);
947-
var value_wdg = all_top_el.getElement(".spt_data");
948-
value_wdg.value = JSON.stringify(values);
949-
spt.dg_table.edit.widget = all_top_el;
950-
spt.dg_table.inline_edit_cell_cbk( value_wdg, {} );
944+
945+
let value = bvr.src_el.value;
946+
//bvr.src_el.style.background = status_colors[value];
947+
let context = bvr.src_el.getAttribute("spt_context");
948+
let layout = bvr.src_el.getParent(".spt_layout");
949+
spt.table.set_layout(layout);
950+
let rows = spt.table.get_selected_rows();
951+
for (let i = 0; i < rows.length; i++) {
952+
let row = rows[i];
953+
let elements = row.getElements(".spt_task_assigned_select");
954+
for (let j = 0; j < elements.length; j++) {
955+
let el = elements[j];
956+
if (el == bvr.src_el) {
957+
continue;
958+
}
959+
960+
let el_context = el.getAttribute("spt_context");
961+
if (el_context == context) {
962+
el.value = value;
963+
spt.task_element.status_change_cbk(evt, {src_el: el});
964+
}
965+
}
966+
}
967+
951968
'''
952969
} )
953970

@@ -971,10 +988,6 @@ def handle_layout_behaviors(self, layout):
971988
status_colors = bvr.colors["task"];
972989
}
973990
974-
975-
//let status_colors = bvr.color;
976-
977-
978991
let value = bvr.src_el.value;
979992
bvr.src_el.style.background = status_colors[value];
980993
let context = bvr.src_el.getAttribute("spt_context");

0 commit comments

Comments
 (0)
Please sign in to comment.