- {% for contract in contracts %}
-
-
-
{{ contract.contract_name }}
-
{{ contract.contract_start_date}}
-
- {% if contract.contract_end_date %}{{ contract.contract_end_date}}{% endif %}
-
-
- {{ contract.get_wage_type_display}}
-
-
{{ contract.wage}}
-
{{ contract.filing_status}}
-
- {{ contract.get_contract_status_display}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
{% trans "Contract" %}
+
{% trans "Start Date" %}
+
{% trans "End Date" %}
+
{% trans "Wage Type" %}
+
{% trans "Basic Salary" %}
+
{% trans "Filing Status" %}
+
{% trans "Status" %}
+
+
+ {% for contract in contracts %}
+
+
+
{{ contract.contract_name }}
+
{{ contract.contract_start_date}}
+
+ {% if contract.contract_end_date %}{{ contract.contract_end_date}}{% endif %}
+
+
+ {{ contract.get_wage_type_display}}
+
+
{{ contract.wage}}
+
{{ contract.filing_status}}
+
+ {{ contract.get_contract_status_display}}
+
+
+
+ {% endfor %}
- {% endfor %}
-
-
{% else %}
-
-
{% trans "There are no contracts at the moment." %}
-
+
+
{% trans "There are no contracts at the moment." %}
+
{% endif %}
diff --git a/employee/templates/tabs/personal-tab.html b/employee/templates/tabs/personal-tab.html
index 7e87a0040..f9739541a 100644
--- a/employee/templates/tabs/personal-tab.html
+++ b/employee/templates/tabs/personal-tab.html
@@ -1,382 +1,387 @@
-{% load i18n %}
+{% load i18n %} {% load static %}
-
-
-
-
-
- -
-
-
- {% trans "Date of Birth" %}
-
- {{employee.dob}}
-
- -
-
-
- {% trans "Gender" %}
-
- {% trans employee.get_gender_display %}
-
- -
-
-
- {% trans "Address" %}
-
-
- {{employee.address}}
-
-
- -
-
-
- {% trans "Country" %}
-
-
- {{employee.country}}
-
-
- -
-
-
- {% trans "State" %}
-
-
- {{employee.state}}
-
-
- -
-
-
- {% trans "City" %}
-
-
- {{employee.city}}
-
-
- -
-
-
- {% trans "Qualification" %}
-
-
- {{employee.qualification}}
-
-
- -
-
-
- {% trans "Experience" %}
-
-
- {{employee.experience}}
-
-
- -
-
-
- {% trans "Maritial Status" %}
-
- {{employee.get_marital_status_display}}
-
- -
-
-
- {% trans "Children" %}
-
-
- {{employee.children}}
-
-
- -
-
-
- {% trans "Emergency Contact" %}
-
-
- {{employee.emergency_contact}}
-
-
- -
-
-
- {% trans "Emergency Contact Name" %}
-
-
- {{employee.emergency_contact_name}}
-
-
- -
-
-
- {% trans "Emergency Contact Relation" %}
-
-
- {{employee.emergency_contact_relation}}
-
-
-
-
-
-
-
-
+
+
+
+
+
+ -
+
+
+ {% trans "Date of Birth" %}
+
+ {{employee.dob}}
+
+ -
+
+
+ {% trans "Gender" %}
+
+ {% trans employee.get_gender_display %}
+
+ -
+
+
+ {% trans "Address" %}
+
+
{{employee.address}}
+
+ -
+
+
+ {% trans "Country" %}
+
+ {{employee.country}}
+
+ -
+
+
+ {% trans "State" %}
+
+ {{employee.state}}
+
+ -
+
+
+ {% trans "City" %}
+
+ {{employee.city}}
+
+ -
+
+
+ {% trans "Qualification" %}
+
+
+ {{employee.qualification}}
+
+
+ -
+
+
+ {% trans "Experience" %}
+
+
+ {{employee.experience}}
+
+
+ -
+
+
+ {% trans "Maritial Status" %}
+
+ {{employee.get_marital_status_display}}
+
+ -
+
+
+ {% trans "Children" %}
+
+ {{employee.children}}
+
+ -
+
+
+ {% trans "Emergency Contact" %}
+
+
+ {{employee.emergency_contact}}
+
+
+ -
+
+
+ {% trans "Emergency Contact Name" %}
+
+
+ {{employee.emergency_contact_name}}
+
+
+ -
+
+
+ {% trans "Emergency Contact Relation" %}
+
+
+ {{employee.emergency_contact_relation}}
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ {% trans "Work Information" %}
+
+ -
+
+
+ {% trans "Contract details" %}
+
+
+
+
+
+
+
+
+
+ -
+
+
+ {% trans "Department" %}
+
+ {{employee.employee_work_info.department_id}}
+
+ -
+
+
+ {% trans "Shift Information" %}
+
+ {{employee.employee_work_info.shift_id}}
+
-
-
- -
- {% trans "Work Information" %}
-
- -
- {% trans "Contract details" %}
-
-
-
-
+
-
+
+
+ {% trans "Employee Type" %}
+
+ {{employee.employee_work_info.employee_type_id}}
+
-
-
-
-
-
- -
-
-
- {% trans "Department" %}
-
- {{employee.employee_work_info.department_id}}
-
- -
-
-
- {% trans "Shift Information" %}
-
- {{employee.employee_work_info.shift_id}}
-
-
- -
-
-
- {% trans "Employee Type" %}
-
- {{employee.employee_work_info.employee_type_id}}
-
-
- -
-
-
- {% trans "Reporting Manager" %}
-
- {{employee.employee_work_info.reporting_manager_id}}
-
-
- -
-
-
- {% trans "Work Location" %}
-
- {{employee.employee_work_info.location}}
-
- -
-
-
- {% trans "End Date" %}
-
- {{employee.employee_work_info.contract_end_date}}
-
-
-
-
-
-
- -
-
-
- {% trans "Job Position" %}
-
- {{employee.employee_work_info.job_position_id}}
-
- -
-
-
- {% trans "Work Type" %}
-
- {{employee.employee_work_info.work_type_id}}
-
- -
-
-
- {% trans "Salary" %}
-
- {{employee.employee_work_info.basic_salary}}
-
- -
-
-
- {% trans "Company" %}
-
- {{employee.employee_work_info.company_id}}
-
-
- -
-
-
- {% trans "Start Date" %}
-
- {{employee.employee_work_info.date_joining}}
-
-
-
-
-
-
-
+
-
+
+
+ {% trans "Reporting Manager" %}
+
+ {{employee.employee_work_info.reporting_manager_id}}
+
- {% include "tabs/contract-tab.html" %}
+ -
+
+
+ {% trans "Work Location" %}
+
+ {{employee.employee_work_info.location}}
+
+ -
+
+
+ {% trans "End Date" %}
+
+ {{employee.employee_work_info.contract_end_date}}
+
+
+
-
+
+
+ -
+
+
+ {% trans "Job Position" %}
+
+ {{employee.employee_work_info.job_position_id}}
+
+ -
+
+
+ {% trans "Work Type" %}
+
+ {{employee.employee_work_info.work_type_id}}
+
+ -
+
+
+ {% trans "Salary" %}
+
+ {{employee.employee_work_info.basic_salary}}
+
+ -
+
+
+ {% trans "Company" %}
+
+ {{employee.employee_work_info.company_id}}
+
-
-
-
-
-
-
-
-
-
- -
-
-
- {% trans "Bank Name" %}
-
- {{employee.employee_bank_details.bank_name}}
-
- -
-
-
- {% trans "Branch" %}
-
- {{employee.employee_bank_details.branch}}
-
- -
-
-
- {% trans "Bank Address" %}
-
- {{employee.employee_bank_details.address}}
-
- -
-
-
- {% trans "Bank Code" %} #1
-
- {{employee.employee_bank_details.any_other_code1}}
-
-
-
-
-
- -
-
-
- {% trans "Account Number" %}
-
- {{employee.employee_bank_details.account_number}}
-
- -
-
-
- {% trans "Bank Code" %} #2
-
- {{employee.employee_bank_details.any_other_code2}}
-
- -
-
-
- {% trans "Country" %}
-
- {{employee.employee_bank_details.country}}
-
-
-
-
-
-
-
-
+
+
+
+ {% trans "Start Date" %}
+
+ {{employee.employee_work_info.date_joining}}
+
+
+
+
+
+
+
+ {% include "tabs/contract-tab.html" %}
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ {% trans "Bank Name" %}
+
+
+ {{employee.employee_bank_details.bank_name}}
+
+
+ -
+
+
+ {% trans "Branch" %}
+
+
+ {{employee.employee_bank_details.branch}}
+
+
+ -
+
+
+ {% trans "Bank Address" %}
+
+
+ {{employee.employee_bank_details.address}}
+
+
+ -
+
+
+ {% trans "Bank Code" %} #1
+
+
+ {{employee.employee_bank_details.any_other_code1}}
+
+
+
+
+
+
+ -
+
+
+ {% trans "Account Number" %}
+
+
+ {{employee.employee_bank_details.account_number}}
+
+
+ -
+
+
+ {% trans "Bank Code" %} #2
+
+
+ {{employee.employee_bank_details.any_other_code2}}
+
+
+ -
+
+
+ {% trans "Country" %}
+
+
+ {{employee.employee_bank_details.country}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+ $(document).ready(function () {
+ $(".oh-tabs__tab[data-target]").click(function (e) {
+ e.preventDefault();
+ var newActiveTab = $(this).attr("data-target");
+ $(".oh-tabs__content--active").toggleClass("oh-tabs__content--active");
+ $(".oh-tabs__tab--active").toggleClass("oh-tabs__tab--active");
+ $(`[data-target="${newActiveTab}"]`).toggleClass("oh-tabs__tab--active");
+ $(newActiveTab).toggleClass("oh-tabs__content--active");
+ });
+ });
+
diff --git a/static/images/ui/attendance-check.png b/static/images/ui/attendance-check.png
new file mode 100644
index 000000000..64d788b62
Binary files /dev/null and b/static/images/ui/attendance-check.png differ
diff --git a/static/images/ui/attendance-request.png b/static/images/ui/attendance-request.png
new file mode 100644
index 000000000..13e813a13
Binary files /dev/null and b/static/images/ui/attendance-request.png differ
diff --git a/static/images/ui/hour-glass.png b/static/images/ui/hour-glass.png
new file mode 100644
index 000000000..70ca2544c
Binary files /dev/null and b/static/images/ui/hour-glass.png differ
diff --git a/static/images/ui/work-info.png b/static/images/ui/work-info.png
new file mode 100644
index 000000000..f9d6c8efb
Binary files /dev/null and b/static/images/ui/work-info.png differ
- 
+ {% trans "Requested Attendances" %}
+ 
+ {% trans "Validate Attendance" %}
+ 
+ {% trans "Hour Account" %}
+