Skip to content

Commit

Permalink
feat: tabbed view for Employee form (#31940) (#32095)
Browse files Browse the repository at this point in the history
  • Loading branch information
ruchamahabal authored Sep 6, 2022
1 parent 8b8d054 commit 3c688df
Showing 1 changed file with 151 additions and 75 deletions.
226 changes: 151 additions & 75 deletions erpnext/setup/doctype/employee/employee.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,79 +10,89 @@
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"basic_details_tab",
"basic_information",
"employee",
"naming_series",
"first_name",
"middle_name",
"last_name",
"salutation",
"employee_name",
"image",
"column_break1",
"company",
"status",
"column_break_9",
"gender",
"date_of_birth",
"salutation",
"column_break1",
"date_of_joining",
"employee_number",
"emergency_contact_details",
"person_to_be_contacted",
"relation",
"column_break_19",
"emergency_phone_number",
"image",
"status",
"erpnext_user",
"user_id",
"create_user",
"create_user_permission",
"company_details_section",
"company",
"department",
"employee_number",
"column_break_25",
"designation",
"reports_to",
"column_break_18",
"branch",
"employment_details",
"scheduled_confirmation_date",
"column_break_32",
"final_confirmation_date",
"col_break_22",
"contract_end_date",
"col_break_22",
"notice_number_of_days",
"date_of_retirement",
"job_profile",
"department",
"designation",
"reports_to",
"column_break_31",
"branch",
"contact_details",
"cell_number",
"column_break_40",
"personal_email",
"company_email",
"column_break4",
"prefered_contact_email",
"prefered_email",
"unsubscribed",
"address_section",
"current_address",
"current_accommodation_type",
"column_break_46",
"permanent_address",
"permanent_accommodation_type",
"emergency_contact_details",
"person_to_be_contacted",
"column_break_55",
"emergency_phone_number",
"column_break_19",
"relation",
"attendance_and_leave_details",
"attendance_device_id",
"column_break_44",
"holiday_list",
"salary_information",
"salary_currency",
"ctc",
"payroll_cost_center",
"column_break_52",
"salary_currency",
"salary_mode",
"bank_details_section",
"bank_name",
"bank_ac_no",
"contact_details",
"cell_number",
"prefered_email",
"personal_email",
"unsubscribed",
"permanent_accommodation_type",
"permanent_address",
"column_break4",
"prefered_contact_email",
"company_email",
"current_accommodation_type",
"current_address",
"sb53",
"bio",
"personal_details",
"passport_number",
"date_of_issue",
"valid_upto",
"place_of_issue",
"marital_status",
"blood_group",
"column_break6",
"family_background",
"column_break6",
"blood_group",
"health_details",
"passport_details_section",
"passport_number",
"valid_upto",
"column_break_73",
"date_of_issue",
"place_of_issue",
"profile_tab",
"bio",
"educational_qualification",
"education",
"previous_work_experience",
Expand All @@ -92,16 +102,20 @@
"exit",
"resignation_letter_date",
"relieving_date",
"reason_for_leaving",
"leave_encashed",
"encashment_date",
"exit_interview_details",
"held_on",
"new_workplace",
"column_break_99",
"leave_encashed",
"encashment_date",
"feedback_section",
"reason_for_leaving",
"column_break_104",
"feedback",
"lft",
"rgt",
"old_parent"
"old_parent",
"connections_tab"
],
"fields": [
{
Expand Down Expand Up @@ -261,7 +275,7 @@
"collapsible": 1,
"fieldname": "erpnext_user",
"fieldtype": "Section Break",
"label": "ERPNext User"
"label": "User Details"
},
{
"description": "System User (login) ID. If set, it will become default for all HR forms.",
Expand Down Expand Up @@ -289,8 +303,8 @@
"allow_in_quick_entry": 1,
"collapsible": 1,
"fieldname": "employment_details",
"fieldtype": "Section Break",
"label": "Joining Details"
"fieldtype": "Tab Break",
"label": "Joining"
},
{
"fieldname": "scheduled_confirmation_date",
Expand Down Expand Up @@ -331,12 +345,6 @@
"oldfieldname": "date_of_retirement",
"oldfieldtype": "Date"
},
{
"collapsible": 1,
"fieldname": "job_profile",
"fieldtype": "Section Break",
"label": "Department"
},
{
"fieldname": "department",
"fieldtype": "Link",
Expand Down Expand Up @@ -366,10 +374,6 @@
"oldfieldtype": "Link",
"options": "Employee"
},
{
"fieldname": "column_break_31",
"fieldtype": "Column Break"
},
{
"fieldname": "branch",
"fieldtype": "Link",
Expand All @@ -391,7 +395,7 @@
{
"collapsible": 1,
"fieldname": "salary_information",
"fieldtype": "Section Break",
"fieldtype": "Tab Break",
"label": "Salary Details",
"oldfieldtype": "Section Break",
"width": "50%"
Expand Down Expand Up @@ -423,8 +427,8 @@
{
"collapsible": 1,
"fieldname": "contact_details",
"fieldtype": "Section Break",
"label": "Contact Details"
"fieldtype": "Tab Break",
"label": "Contact"
},
{
"fieldname": "cell_number",
Expand Down Expand Up @@ -493,12 +497,6 @@
"fieldtype": "Small Text",
"label": "Current Address"
},
{
"collapsible": 1,
"fieldname": "sb53",
"fieldtype": "Section Break",
"label": "Personal Bio"
},
{
"description": "Short biography for website and other publications.",
"fieldname": "bio",
Expand All @@ -508,7 +506,7 @@
{
"collapsible": 1,
"fieldname": "personal_details",
"fieldtype": "Section Break",
"fieldtype": "Tab Break",
"label": "Personal Details"
},
{
Expand Down Expand Up @@ -601,7 +599,7 @@
{
"collapsible": 1,
"fieldname": "exit",
"fieldtype": "Section Break",
"fieldtype": "Tab Break",
"label": "Exit",
"oldfieldtype": "Section Break"
},
Expand Down Expand Up @@ -702,7 +700,7 @@
{
"collapsible": 1,
"fieldname": "attendance_and_leave_details",
"fieldtype": "Section Break",
"fieldtype": "Tab Break",
"label": "Attendance and Leave Details"
},
{
Expand All @@ -713,10 +711,6 @@
"fieldname": "column_break_19",
"fieldtype": "Column Break"
},
{
"fieldname": "column_break_52",
"fieldtype": "Column Break"
},
{
"fieldname": "salary_currency",
"fieldtype": "Link",
Expand All @@ -728,13 +722,95 @@
"fieldtype": "Currency",
"label": "Cost to Company (CTC)",
"options": "salary_currency"
},
{
"fieldname": "basic_details_tab",
"fieldtype": "Tab Break",
"label": "Basic Details"
},
{
"fieldname": "company_details_section",
"fieldtype": "Section Break",
"label": "Company Details"
},
{
"fieldname": "column_break_18",
"fieldtype": "Column Break"
},
{
"collapsible": 1,
"fieldname": "address_section",
"fieldtype": "Section Break",
"label": "Address"
},
{
"fieldname": "column_break_46",
"fieldtype": "Column Break"
},
{
"fieldname": "profile_tab",
"fieldtype": "Tab Break",
"label": "Profile"
},
{
"fieldname": "passport_details_section",
"fieldtype": "Section Break",
"label": "Passport Details"
},
{
"fieldname": "column_break_73",
"fieldtype": "Column Break"
},
{
"fieldname": "bank_details_section",
"fieldtype": "Section Break",
"label": "Bank Details"
},
{
"fieldname": "column_break_9",
"fieldtype": "Column Break"
},
{
"fieldname": "column_break_25",
"fieldtype": "Column Break"
},
{
"fieldname": "connections_tab",
"fieldtype": "Tab Break",
"label": "Connections",
"show_dashboard": 1
},
{
"fieldname": "column_break_32",
"fieldtype": "Column Break"
},
{
"fieldname": "column_break_40",
"fieldtype": "Column Break"
},
{
"fieldname": "column_break_55",
"fieldtype": "Column Break"
},
{
"fieldname": "column_break_99",
"fieldtype": "Column Break"
},
{
"fieldname": "feedback_section",
"fieldtype": "Section Break",
"label": "Feedback"
},
{
"fieldname": "column_break_104",
"fieldtype": "Column Break"
}
],
"icon": "fa fa-user",
"idx": 24,
"image_field": "image",
"links": [],
"modified": "2022-06-27 01:29:32.952091",
"modified": "2022-08-23 13:47:46.944993",
"modified_by": "Administrator",
"module": "Setup",
"name": "Employee",
Expand Down

0 comments on commit 3c688df

Please sign in to comment.