Skip to content

Commit

Permalink
Merge pull request #597 from ruchamahabal/hierarchy-chart
Browse files Browse the repository at this point in the history
  • Loading branch information
ruchamahabal authored Jun 15, 2023
2 parents d5c3545 + a25f171 commit 77464cb
Show file tree
Hide file tree
Showing 12 changed files with 1,606 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
*.egg-info
*.swp
tags
hrms/public/dist
hrms/public/node_modules
hrms/docs/current
node_modules/
dist/
Expand Down
4 changes: 2 additions & 2 deletions hrms/hr/page/organizational_chart/organizational_chart.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ frappe.pages['organizational-chart'].on_page_load = function(wrapper) {
let method = 'hrms.hr.page.organizational_chart.organizational_chart.get_children';

if (frappe.is_mobile()) {
organizational_chart = new erpnext.HierarchyChartMobile('Employee', wrapper, method);
organizational_chart = new hrms.HierarchyChartMobile('Employee', wrapper, method);
} else {
organizational_chart = new erpnext.HierarchyChart('Employee', wrapper, method);
organizational_chart = new hrms.HierarchyChart('Employee', wrapper, method);
}

frappe.breadcrumbs.add('HR');
Expand Down
4 changes: 4 additions & 0 deletions hrms/public/build.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"js/hrms.min.js": [
"public/js/utils.js"
],
"js/hierarchy-chart.min.js": [
"public/js/hierarchy_chart/hierarchy_chart_desktop.js",
"public/js/hierarchy_chart/hierarchy_chart_mobile.js"
]
}
3 changes: 3 additions & 0 deletions hrms/public/js/hierarchy-chart.bundle.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import "./hierarchy_chart/hierarchy_chart_desktop.js";
import "./hierarchy_chart/hierarchy_chart_mobile.js";
import "./templates/node_card.html";
Loading

0 comments on commit 77464cb

Please sign in to comment.