Skip to content

Commit

Permalink
refactor: flattened sidebar
Browse files Browse the repository at this point in the history
refactor: refactored payroll and HR workspace
refactor: rerouted hr app to new workspace name
  • Loading branch information
asmitahase committed Jan 15, 2025
1 parent 6309bf8 commit 3da1fdb
Show file tree
Hide file tree
Showing 11 changed files with 127 additions and 216 deletions.
4 changes: 2 additions & 2 deletions hrms/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
required_apps = ["frappe/erpnext"]
source_link = "http://github.com/frappe/hrms"
app_logo_url = "/assets/hrms/images/frappe-hr-logo.svg"
app_home = "/app/hr"
app_home = "/app/hr-overview"

add_to_apps_screen = [
{
"name": "hrms",
"logo": "/assets/hrms/images/frappe-hr-logo.svg",
"title": "Frappe HR",
"route": "/app/hr",
"route": "/app/hr-overview",
"has_permission": "hrms.hr.utils.check_app_permission",
}
]
Expand Down
15 changes: 10 additions & 5 deletions hrms/hr/workspace/employee_lifecycle/employee_lifecycle.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
{
"app": "hrms",
"charts": [],
"content": "[{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Employee Onboarding\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Employee Separation\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Employee Grievance\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"quick_list\",\"data\":{\"quick_list_name\":\"New Hires (This Month)\",\"col\":4}},{\"type\":\"quick_list\",\"data\":{\"quick_list_name\":\"Exits (This Month)\",\"col\":4}},{\"type\":\"quick_list\",\"data\":{\"quick_list_name\":\"Trainings (This Week)\",\"col\":4}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Masters &amp; Reports</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Onboarding\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Journey\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Grievance\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Training\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Exit\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Daily Work Summary\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}}]",
"creation": "2022-08-20 14:06:34.309347",
"custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "assign",
"idx": 0,
"is_hidden": 0,
"label": "Employee Lifecycle",
"links": [
{
Expand Down Expand Up @@ -287,12 +290,13 @@
"type": "Link"
}
],
"modified": "2024-08-11 11:35:33.462001",
"modified": "2025-01-15 16:43:44.214148",
"modified_by": "Administrator",
"module": "HR",
"name": "Employee Lifecycle",
"number_cards": [],
"owner": "Administrator",
"parent_page": "HR",
"parent_page": "",
"public": 1,
"quick_lists": [
{
Expand All @@ -312,7 +316,7 @@
}
],
"roles": [],
"sequence_id": 6.0,
"sequence_id": 2.0,
"shortcuts": [
{
"color": "Grey",
Expand Down Expand Up @@ -349,5 +353,6 @@
"type": "DocType"
}
],
"title": "Employee Lifecycle"
}
"title": "Employee Lifecycle",
"type": "Workspace"
}
12 changes: 7 additions & 5 deletions hrms/hr/workspace/expense_claims/expense_claims.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"app": "hrms",
"charts": [
{
"chart_name": "Expense Claims",
Expand Down Expand Up @@ -256,17 +257,17 @@
"type": "Link"
}
],
"modified": "2024-08-11 11:40:45.636550",
"modified": "2025-01-15 16:41:35.604928",
"modified_by": "Administrator",
"module": "HR",
"name": "Expense Claims",
"number_cards": [],
"owner": "Administrator",
"parent_page": "HR",
"parent_page": "",
"public": 1,
"quick_lists": [],
"roles": [],
"sequence_id": 8.0,
"sequence_id": 6.0,
"shortcuts": [
{
"color": "Grey",
Expand Down Expand Up @@ -294,5 +295,6 @@
"type": "DocType"
}
],
"title": "Expense Claims"
}
"title": "Expense Claims",
"type": "Workspace"
}
Original file line number Diff line number Diff line change
@@ -1,61 +1,18 @@
{
"charts": [
{
"chart_name": "Hiring vs Attrition Count",
"label": "Hiring vs Attrition Count"
}
],
"content": "[{\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Human Resource\",\"col\":12}},{\"type\":\"chart\",\"data\":{\"chart_name\":\"Hiring vs Attrition Count\",\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Employee\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Leave Application\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"HR Dashboard\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Recruitment Dashboard\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Employee Lifecycle Dashboard\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Attendance Dashboard\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Expense Claims Dashboard\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports &amp; Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Setup\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Employee\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Leaves\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Attendance\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Expense Claim\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Key Reports\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Other Reports\",\"col\":4}}]",
"app": "hrms",
"charts": [],
"content": "[{\"id\":\"pu9Ft3mUeT\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"id\":\"-xxN9AyGlK\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Employee\",\"col\":3}},{\"id\":\"mYg4h6H7aX\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"HR Dashboard\",\"col\":3}},{\"id\":\"OBOPP0dnjY\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Payroll Dashboard\",\"col\":3}},{\"id\":\"zyVHu4rF3u\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"HSmKHOvqMN\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports &amp; Masters</b></span>\",\"col\":12}},{\"id\":\"lKeffKf1va\",\"type\":\"card\",\"data\":{\"card_name\":\"Setup\",\"col\":4}},{\"id\":\"UnVtsnxLo_\",\"type\":\"card\",\"data\":{\"card_name\":\"Employee\",\"col\":4}},{\"id\":\"YXISc0V2sT\",\"type\":\"card\",\"data\":{\"card_name\":\"Leaves\",\"col\":4}},{\"id\":\"TH5ZW37wDA\",\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}},{\"id\":\"vx8pBTHNsf\",\"type\":\"card\",\"data\":{\"card_name\":\"Attendance\",\"col\":4}},{\"id\":\"wv3Sy37NgW\",\"type\":\"card\",\"data\":{\"card_name\":\"Expense Claim\",\"col\":4}},{\"id\":\"v82YqH3rek\",\"type\":\"card\",\"data\":{\"card_name\":\"Key Reports\",\"col\":4}},{\"id\":\"60GScqYEk0\",\"type\":\"card\",\"data\":{\"card_name\":\"Other Reports\",\"col\":4}}]",
"creation": "2020-03-02 15:48:58.322521",
"custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "hr",
"idx": 0,
"label": "HR",
"is_hidden": 0,
"label": "HR Overview",
"links": [
{
"hidden": 0,
"is_query_report": 0,
"label": "Settings",
"link_count": 3,
"onboard": 0,
"type": "Card Break"
},
{
"dependencies": "",
"hidden": 0,
"is_query_report": 0,
"label": "HR Settings",
"link_count": 0,
"link_to": "HR Settings",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "",
"hidden": 0,
"is_query_report": 0,
"label": "Daily Work Summary Group",
"link_count": 0,
"link_to": "Daily Work Summary Group",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "",
"hidden": 0,
"is_query_report": 0,
"label": "Team Updates",
"link_count": 0,
"link_to": "team-updates",
"link_type": "Page",
"onboard": 0,
"type": "Link"
},
{
"hidden": 0,
"is_query_report": 0,
Expand Down Expand Up @@ -383,70 +340,86 @@
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"hidden": 0,
"is_query_report": 0,
"label": "Settings",
"link_count": 3,
"link_type": "DocType",
"onboard": 0,
"type": "Card Break"
},
{
"dependencies": "",
"hidden": 0,
"is_query_report": 0,
"label": "HR Settings",
"link_count": 0,
"link_to": "HR Settings",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "",
"hidden": 0,
"is_query_report": 0,
"label": "Payroll Settings",
"link_count": 0,
"link_to": "Payroll Settings",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "",
"hidden": 0,
"is_query_report": 0,
"label": "Daily Work Summary Group",
"link_count": 0,
"link_to": "Daily Work Summary Group",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
}
],
"modified": "2024-10-10 16:55:59.080694",
"modified": "2025-01-15 16:36:29.588779",
"modified_by": "Administrator",
"module": "HR",
"name": "HR",
"name": "HR Overview",
"number_cards": [],
"owner": "Administrator",
"parent_page": "",
"public": 1,
"quick_lists": [],
"restrict_to_domain": "",
"roles": [],
"sequence_id": 8.0,
"sequence_id": 1.0,
"shortcuts": [
{
"color": "Grey",
"doc_view": "List",
"label": "Payroll Dashboard",
"link_to": "Payroll",
"type": "Dashboard"
},
{
"format": "{} Open",
"label": "HR Dashboard",
"link_to": "Human Resource",
"stats_filter": "{\n \"status\": \"Open\"\n}",
"type": "Dashboard"
},
{
"color": "Grey",
"doc_view": "List",
"label": "Leave Application",
"link_to": "Leave Application",
"type": "DocType"
},
{
"color": "Green",
"format": "{} Active",
"label": "Employee",
"link_to": "Employee",
"stats_filter": "{\"status\":\"Active\"}",
"type": "DocType"
},
{
"color": "Grey",
"doc_view": "List",
"label": "Expense Claims Dashboard",
"link_to": "Expense Claims",
"type": "Dashboard"
},
{
"color": "Grey",
"doc_view": "List",
"label": "Recruitment Dashboard",
"link_to": "Recruitment",
"type": "Dashboard"
},
{
"color": "Grey",
"doc_view": "List",
"label": "Employee Lifecycle Dashboard",
"link_to": "Employee Lifecycle",
"type": "Dashboard"
},
{
"color": "Grey",
"doc_view": "List",
"label": "Attendance Dashboard",
"link_to": "Attendance",
"type": "Dashboard"
}
],
"title": "HR"
}
"title": "HR Overview",
"type": "Workspace"
}
10 changes: 6 additions & 4 deletions hrms/hr/workspace/leaves/leaves.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"app": "hrms",
"charts": [],
"content": "[{\"id\":\"GryoRrWdb3\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"id\":\"_vT0S80v7-\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Leave Application\",\"col\":3}},{\"id\":\"4lGs1glop_\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Leave Allocation\",\"col\":3}},{\"id\":\"kP95qI0Kx_\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"IzQ_B9PEiJ\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Masters &amp; Reports</b></span>\",\"col\":12}},{\"id\":\"UZU5aC1En3\",\"type\":\"card\",\"data\":{\"card_name\":\"Setup\",\"col\":4}},{\"id\":\"gBEhmJgb_7\",\"type\":\"card\",\"data\":{\"card_name\":\"Allocation\",\"col\":4}},{\"id\":\"rtrjT9ZnNs\",\"type\":\"card\",\"data\":{\"card_name\":\"Application\",\"col\":4}},{\"id\":\"xHXxbkgNg3\",\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}}]",
"creation": "2022-08-20 16:06:26.672497",
Expand Down Expand Up @@ -185,17 +186,17 @@
"type": "Link"
}
],
"modified": "2023-09-29 16:55:20.281587",
"modified": "2025-01-15 16:43:06.698449",
"modified_by": "Administrator",
"module": "HR",
"name": "Leaves",
"number_cards": [],
"owner": "Administrator",
"parent_page": "HR",
"parent_page": "",
"public": 1,
"quick_lists": [],
"roles": [],
"sequence_id": 12.0,
"sequence_id": 5.0,
"shortcuts": [
{
"color": "Orange",
Expand All @@ -214,5 +215,6 @@
"type": "DocType"
}
],
"title": "Leaves"
"title": "Leaves",
"type": "Workspace"
}
9 changes: 6 additions & 3 deletions hrms/hr/workspace/performance/performance.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"app": "hrms",
"charts": [],
"content": "[{\"id\":\"nZ9MUieUjy\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"id\":\"ETYoHfg2k0\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Appraisal\",\"col\":3}},{\"id\":\"VRnsImMEoD\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Employee Performance Feedback\",\"col\":5}},{\"id\":\"vXBMJGJ98C\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Goal\",\"col\":3}},{\"id\":\"Vtre-LDhRc\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"NmUDJB28UL\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Masters &amp; Transactions</b></span>\",\"col\":12}},{\"id\":\"vNnUr6yHsH\",\"type\":\"card\",\"data\":{\"card_name\":\"Masters\",\"col\":4}},{\"id\":\"v8mC6C_9V-\",\"type\":\"card\",\"data\":{\"card_name\":\"Appraisal\",\"col\":4}},{\"id\":\"8X_kx16fax\",\"type\":\"card\",\"data\":{\"card_name\":\"Energy Points\",\"col\":4}},{\"id\":\"x_fx5yusAz\",\"type\":\"card\",\"data\":{\"card_name\":\"Promotion\",\"col\":4}},{\"id\":\"ofPrShxelC\",\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}}]",
"creation": "2022-08-20 16:17:20.159886",
"custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
Expand Down Expand Up @@ -172,13 +174,13 @@
"type": "Link"
}
],
"modified": "2023-03-30 22:51:21.593682",
"modified": "2025-01-15 16:42:54.629038",
"modified_by": "Administrator",
"module": "HR",
"name": "Performance",
"number_cards": [],
"owner": "Administrator",
"parent_page": "HR",
"parent_page": "",
"public": 1,
"quick_lists": [],
"roles": [],
Expand Down Expand Up @@ -208,5 +210,6 @@
"type": "DocType"
}
],
"title": "Performance"
"title": "Performance",
"type": "Workspace"
}
Loading

0 comments on commit 3da1fdb

Please sign in to comment.