-
Notifications
You must be signed in to change notification settings - Fork 7.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: Organizational Chart #26893
Merged
Merged
feat: Organizational Chart #26893
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- remove all connectors while expanding a group node
- method to return the node data - wrapper for showing the hierarchy
- optimise get_children function - use promises instead of callbacks - optimise selectors - use const wherever possible - use pure js instead of jquery for connectors for faster rendering
fix(mobile): detach node before emptying hierarchy fix(mobile): sibling group not rendering for first level
ruchamahabal
requested review from
ankush,
pateljannat and
surajshetty3416
as code owners
August 10, 2021 18:15
@ruchamahabal please add changes in this PR as well. |
fix: Nest `.level` class style under `.hierarchy` class
- added dom freeze while expanding all nodes and exporting
ruchamahabal
force-pushed
the
org-chart-develop
branch
from
August 16, 2021 13:35
79c08cc
to
aea07f4
Compare
ruchamahabal
force-pushed
the
org-chart-develop
branch
from
August 16, 2021 13:57
aea07f4
to
33032ce
Compare
Unrelated POS Invoice test case failing |
asoral
pushed a commit
to asoral/erpnext
that referenced
this pull request
Nov 12, 2021
* feat: Organizational Chart * feat: org chart mobile interactions * feat(mobile): sibling node group expansion and rendering * fix: expanded node group interactions and visibility * feat: connectors for mobile node cards * fix: don't refresh connections for same node - remove all connectors while expanding a group node * chore: create separate files for Desktop and Mobile view and bundle assets * refactor: add options to chart - method to return the node data - wrapper for showing the hierarchy * feat: setup node edit action * fix: revert changes in employee descendants query * refactor: use arcs instead of bezier curves for cleaner connectors * feat: add arc to connectors in mobile view * fix: edit node button overflowing * fix: sider * fix: removing orphaned connectors * fix: unnecessary variables * feat: handle multiple root / orphan nodes * perf: Optimise Rendering - optimise get_children function - use promises instead of callbacks - optimise selectors - use const wherever possible - use pure js instead of jquery for connectors for faster rendering * fix: do not sort by number of connections * feat: use icon for connections on mobile view * fix: exclude active node while fetching sibling group * fix: sibling group expansion not working for root nodes * fix(mobile): collapsed nodes not expanding * fix: sider * test: UI tests for org chart desktop * test: UI tests for org chart mobile fix(mobile): detach node before emptying hierarchy fix(mobile): sibling group not rendering for first level * fix: sider * ci(cypress): use env variable for key documentation ref: https://docs.cypress.io/guides/guides/command-line\#cypress-run * fix(tests): clear filter before typing * fix(tests): apply filters correctly * fix: tests * fix: tests * fix: tests * fix(test): increase timeout for record creation * fix: sider * fix: sider * feat: Expand All nodes option in Desktop view * feat: add html2canvas for easily exporting html to images using canvas * feat: Export chart option in desktop view * fix(style): longer titles overflowing * fix: remove unnecessary imports * fix: test * fix: make bundled assets for hierarchy chart * fix(style): apply svg container margin only in desktop view * fix: Nest `.level` class style under `.hierarchy` class (frappe#26905) fix: Nest `.level` class style under `.hierarchy` class * fix: add z-index to filter to avoid svg wrapper overlapping * fix: expand all nodes not working when there are only 2 levels - added dom freeze while expanding all nodes and exporting * fix: test Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Port of: #26261
Organizational Charts
An organizational chart shows the organizational structure by depicting connections between different employees with their designation, image, and name. In large organizations where it's difficult to remember names, people can interact with the org chart and know the hierarchy through faces and other info. The Edit button navigates to the employee master.
Desktop View
Interactions:
org-chart.mp4
Expand All and Export
org-chart-export.mp4
Mobile View
After clicking on sibling group:
Documentation PR: frappe/erpnext_documentation#364
ToDo