diff --git a/employee/templates/tabs/personal-tab.html b/employee/templates/tabs/personal_tab.html similarity index 52% rename from employee/templates/tabs/personal-tab.html rename to employee/templates/tabs/personal_tab.html index 18e66fc39..bae48e5a4 100644 --- a/employee/templates/tabs/personal-tab.html +++ b/employee/templates/tabs/personal_tab.html @@ -1,5 +1,4 @@ {% load i18n %} {% load static %} {% load horillafilters %} -
@@ -15,12 +14,10 @@ {% trans "Date of Birth" %} - {% if employee.dob %} - {{employee.dob}} - {% else %} - {% trans "None" %} - {% endif %} + {{employee.dob|default:_("None")}} +
  • @@ -28,72 +25,55 @@ {% trans employee.get_gender_display %}
    • +
  • {% trans "Address" %} - {% if employee.address %} - {{employee.address}} - {% else %} - {% trans "None" %} - {% endif %} + {{employee.address|default:_("None")}}
    • +
  • {% trans "Country" %} - {% if employee.country %} - {{employee.country}} - {% else %} - {% trans "None" %} - {% endif %} + {{employee.country|default:_("None")}}
    • +
  • {% trans "State" %} - {% if employee.state %} - {{employee.state}} - {% else %} - {% trans "None" %} - {% endif %} + {{employee.state|default:_("None")}}
    • +
  • {% trans "City" %} - {% if employee.city %} - {{employee.city}} - {% else %} - {% trans "None" %} - {% endif %} + {{employee.city|default:_("None")}}
    • +
  • {% trans "Qualification" %} - {% if employee.qualification %} - {{employee.qualification}} - {% else %} - {% trans "None" %} - {% endif %} + {{employee.qualification|default:_("None")}}
    • +
  • {% trans "Experience" %} - {% if employee.experience %} - {{employee.experience}} - {% else %} - {% trans "None" %} - {% endif %} + {{employee.experience|default:_("None")}}
    • +
  • @@ -101,53 +81,39 @@ {{employee.get_marital_status_display}}
    • +
  • {% trans "Children" %} - {% if employee.children %} - {{employee.children}} - {% else %} - {% trans "None" %} - {% endif %} + {{employee.children|default:_("None")}}
    • +
  • {% trans "Emergency Contact" %} - {% if employee.emergency_contact %} - {{employee.emergency_contact}} - {% else %} - {% trans "None" %} - {% endif %} + {{employee.emergency_contact|default:_("None")}}
    • +
  • {% trans "Emergency Contact Name" %} - {% if employee.emergency_contact_name %} - - {{employee.emergency_contact_name}} - - {% else %} - {% trans "None" %} - {% endif %} + {{employee.emergency_contact_name|default:_("None")}}
    • +
  • {% trans "Emergency Contact Relation" %} - {% if employee.emergency_contact_relation %} - - {{employee.emergency_contact_relation}} - - {% else %} - {% trans "None" %} - {% endif %} + {{employee.emergency_contact_relation|default:_("None")}}
    • @@ -191,24 +157,17 @@ {% trans "Department" %} - {% if employee.employee_work_info.department_id %} {{employee.employee_work_info.department_id}} - {% else %} - {% trans "None" %} - {% endif %} + class="oh-profile__info-value">{{employee.employee_work_info.department_id|default:_("None")}} +
  • {% trans "Shift Information" %} - {% if employee.employee_work_info.shift_id %} {{employee.employee_work_info.shift_id}} - {% else %} - {% trans "None" %} - {% endif %} + class="oh-profile__info-value">{{employee.employee_work_info.shift_id|default:_("None")}}
  • @@ -216,12 +175,8 @@ {% trans "Employee Type" %} - {% if employee.employee_work_info.employee_type_id %} {{employee.employee_work_info.employee_type_id}} - {% else %} - {% trans "None" %} - {% endif %} + class="oh-profile__info-value">{{employee.employee_work_info.employee_type_id|default:_("None")}}
  • @@ -229,12 +184,8 @@ {% trans "Reporting Manager" %} - {% if employee.employee_work_info.reporting_manager_id %} {{employee.employee_work_info.reporting_manager_id}} - {% else %} - {% trans "None" %} - {% endif %} + class="oh-profile__info-value">{{employee.employee_work_info.reporting_manager_id|default:_("None")}}
  • @@ -242,24 +193,17 @@ {% trans "Work Location" %} - {% if employee.employee_work_info.location %} {{employee.employee_work_info.location}} - {% else %} - {% trans "None" %} - {% endif %} + class="oh-profile__info-value">{{employee.employee_work_info.location|default:_("None")}}
    • +
  • {% trans "End Date" %} - {% if employee.employee_work_info.contract_end_date %} {{employee.employee_work_info.contract_end_date}} - {% else %} - {% trans "None" %} - {% endif %} + class="oh-profile__info-value dateformat_changer">{{employee.employee_work_info.contract_end_date|default:_("None")}}
    • @@ -271,53 +215,44 @@ {% trans "Job Position" %} - {% if employee.employee_work_info.job_position_id %} {{employee.employee_work_info.job_position_id}} - {% else %} - {% trans "None" %} - {% endif %} + class="oh-profile__info-value">{{employee.employee_work_info.job_position_id|default:_("None")}} +
  • {% trans "Work Type" %} - {% if employee.employee_work_info.work_type_id %} {{employee.employee_work_info.work_type_id}} - {% else %} - {% trans "None" %} - {% endif %} + class="oh-profile__info-value">{{employee.employee_work_info.work_type_id|default:_("None")}}
    • +
  • {% trans "Salary" %} {% if employee.employee_work_info.basic_salary %} - - {% if perms.employee.view_employee or request.user == employee.employee_user_id %} - {{employee.employee_work_info.basic_salary}} - {% else %} - ********** - {% endif %} - + + {% if perms.employee.view_employee or request.user == employee.employee_user_id %} + {{employee.employee_work_info.basic_salary}} + {% else %} + ********** + {% endif %} + {% else %} - {% trans "None" %} + {% trans "None" %} {% endif %}
    • +
  • {% trans "Company" %} - {% if employee.employee_work_info.company_id %} {{employee.employee_work_info.company_id}} - {% else %} - {% trans "None" %} - {% endif %} + class="oh-profile__info-value">{{employee.employee_work_info.company_id|default:_("None")}}
  • @@ -325,13 +260,8 @@ {% trans "Joining Date" %} - {% if employee.employee_work_info.date_joining %} {{employee.employee_work_info.date_joining}} - {% else %} - {% trans "None" %} - {% endif %} - + class="oh-profile__info-value dateformat_changer">{{employee.employee_work_info.date_joining|default:_("None")}}
  • @@ -341,13 +271,13 @@
    {% if employee.employee_work_info.tags.all %} - {% for i in employee.employee_work_info.tags.all %} - {% with tag_width=i.title|length %} - {{ i.title }} - {% endwith %} - {% endfor %} + {% for i in employee.employee_work_info.tags.all %} + {% with tag_width=i.title|length %} + {{ i.title }} + {% endwith %} + {% endfor %} {% else %} {% trans "None" %} {% endif %} @@ -370,119 +300,88 @@
    • {% if perms.employee.view_employeebankdetails or request.user == employee.employee_user_id %} -
    -
    - {% trans "Bank Information" %} -
    -
    -
    -
    -
      -
    • - - - {% trans "Bank Name" %} - - {% if employee.employee_bank_details.bank_name %} - - {{employee.employee_bank_details.bank_name}} - - {% else %} - {% trans "None" %} - {% endif %} -
      • -
    • - - - {% trans "Branch" %} - - {% if employee.employee_bank_details.branch %} - - {{employee.employee_bank_details.branch}} - - {% else %} - {% trans "None" %} - {% endif %} -
      • -
    • - - - {% trans "Bank Address" %} - - {% if employee.employee_bank_details.address %} - - {{employee.employee_bank_details.address}} - - {% else %} - {% trans "None" %} - {% endif %} -
      • -
    • - - - {% trans "Bank Code" %} #1 - - {% if employee.employee_bank_details.any_other_code1 %} - - {{employee.employee_bank_details.any_other_code1}} - - {% else %} - {% trans "None" %} - {% endif %} -
      • -
    -
    -
    -
      -
    • - - - {% trans "Account Number" %} - - {% if employee.employee_bank_details.account_number %} - - {{employee.employee_bank_details.account_number}} - - {% else %} - {% trans "None" %} - {% endif %} -
      • -
    • - - - {% trans "Bank Code" %} #2 - - {% if employee.employee_bank_details.any_other_code2 %} - - {{employee.employee_bank_details.any_other_code2}} - - {% else %} - {% trans "None" %} - {% endif %} -
      • -
    • - - - {% trans "Country" %} - - {% if employee.employee_bank_details.country %} - - {{employee.employee_bank_details.country}} - - {% else %} - {% trans "None" %} - {% endif %} -
      • -
    +
    +
    + {% trans "Bank Information" %} +
    +
    +
    +
    +
      +
    • + + + {% trans "Bank Name" %} + + {{employee.employee_bank_details.bank_name|default:_("None")}} +
      • + +
    • + + + {% trans "Branch" %} + + {{employee.employee_bank_details.branch|default:_("None")}} +
      • + +
    • + + + {% trans "Bank Address" %} + + {{employee.employee_bank_details.address|default:_("None")}} +
      • + +
    • + + + {% trans "Bank Code" %} #2 + + {{employee.employee_bank_details.any_other_code2|default:_("None")}} +
      • + +
    +
    +
    +
      +
    • + + + {% trans "Account Number" %} + + {{employee.employee_bank_details.account_number|default:_("None")}} +
      • + +
    • + + + {% trans "Bank Code" %} #1 + + {{employee.employee_bank_details.any_other_code1|default:_("None")}} +
      • + +
    • + + + {% trans "Country" %} + + {{employee.employee_bank_details.country|default:_("None")}} +
      • +
    +
    -
    {% endif %} -
    - + \ No newline at end of file diff --git a/employee/views.py b/employee/views.py index 7f7008168..cb355aa49 100755 --- a/employee/views.py +++ b/employee/views.py @@ -334,7 +334,7 @@ def about_tab(request, obj_id, **kwargs): ) return render( request, - "tabs/personal-tab.html", + "tabs/personal_tab.html", { "employee": employee, "employee_leaves": employee_leaves,