nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-04 00:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: UI tests for org chart mobile

Browse Source 
fix(mobile): detach node before emptying hierarchy

fix(mobile): sibling group not rendering for first level
This commit is contained in:
Rucha Mahabal
2021-07-15 19:19:09 +05:30
parent 3cc85e166f
commit a1d379d5d4
3 changed files with 195 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/public/js/hierarchy_chart/hierarchy_chart_mobile.js
View File

@@ -128,6 +128,9 @@ erpnext.HierarchyChartMobile = class {
if (this.$hierarchy)
this.$hierarchy.remove();
if (this.$sibling_group)
this.$sibling_group.empty();
this.$hierarchy = $(
`<ul class="hierarchy-mobile">
<li class="root-level level"></li>
@@ -173,7 +176,7 @@ erpnext.HierarchyChartMobile = class {
if (this.$sibling_group) {
const sibling_parent = this.$sibling_group.find('.node-group').attr('data-parent');
if (node.parent_id !== sibling_parent)
if (node.parent_id !== undefined && node.parent_id != sibling_parent)
this.$sibling_group.empty();
}
@@ -376,9 +379,10 @@ erpnext.HierarchyChartMobile = class {
let node_element = $(`#${node.id}`);
node_element.click(function() {
let el = $(this).detach();
let el = undefined;
if (node.is_root) {
el = $(this).detach();
me.$hierarchy.empty();
$(`#connectors`).empty();
me.add_node_to_hierarchy(el, node);
@@ -386,6 +390,7 @@ erpnext.HierarchyChartMobile = class {
me.remove_levels_after_node(node);
me.remove_orphaned_connectors();
} else {
el = $(this).detach();
me.add_node_to_hierarchy(el, node);
me.collapse_node();
}
@@ -514,10 +519,10 @@ erpnext.HierarchyChartMobile = class {
level = $('.hierarchy-mobile > li:eq('+ level + ')');
level.nextAll('li').remove();
let current_node = level.find(`#${node.id}`);
let node_object = this.nodes[node.id];
let current_node = level.find(`#${node.id}`).detach();
current_node.removeClass('active-child active-path');
node_object.expanded = 0;
node_object.$children = undefined;

7
erpnext/tests/ui_test_helpers.py
View File

@@ -11,10 +11,11 @@ def create_employee_records():
emp2 = create_employee('Test Employee 2', 'CTO')
emp3 = create_employee('Test Employee 3', 'Head of Marketing and Sales', emp1)
emp4 = create_employee('Test Employee 4', 'Project Manager', emp2)
emp5 = create_employee('Test Employee 5', 'Analyst', emp3)
emp6 = create_employee('Test Employee 6', 'Software Developer', emp4)
emp5 = create_employee('Test Employee 5', 'Engineer', emp2)
emp6 = create_employee('Test Employee 6', 'Analyst', emp3)
emp7 = create_employee('Test Employee 7', 'Software Developer', emp4)
employees = [emp1, emp2, emp3, emp4, emp5, emp6]
employees = [emp1, emp2, emp3, emp4, emp5, emp6, emp7]
return employees
def create_company():