diff --git a/asset/templates/category/asset_category_form.html b/asset/templates/category/asset_category_form.html index 58acae3fb..94071f745 100644 --- a/asset/templates/category/asset_category_form.html +++ b/asset/templates/category/asset_category_form.html @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/base/static/base/toggleColumn.js b/base/static/base/toggleColumn.js index f812e149a..429d96e8d 100644 --- a/base/static/base/toggleColumn.js +++ b/base/static/base/toggleColumn.js @@ -32,8 +32,8 @@ function toggleColumns(tableId, fieldContainer) { } let selectButtons = $(`
- - + +
`) $(`#${fieldContainer}`).parent().prepend(selectButtons) diff --git a/base/templates/base/rotating_shift/rotating_shift_assign_view.html b/base/templates/base/rotating_shift/rotating_shift_assign_view.html index d9d64435f..f2a2c3c09 100644 --- a/base/templates/base/rotating_shift/rotating_shift_assign_view.html +++ b/base/templates/base/rotating_shift/rotating_shift_assign_view.html @@ -398,4 +398,5 @@ if (!localStorageroratingShiftCells) { $("#roratingShiftCells").find("[type=checkbox]").prop("checked", true); } + $("[type=checkbox]").change(); diff --git a/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html b/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html index 1a93cea06..092afbca7 100644 --- a/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html +++ b/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html @@ -399,4 +399,5 @@ if (!localStorageroratingWorkTypeCells) { $("#roratingWorkTypeCells").find("[type=checkbox]").prop("checked", true); } + $("[type=checkbox]").change(); diff --git a/base/templates/work_type_request/htmx/requests.html b/base/templates/work_type_request/htmx/requests.html index 9a66a750c..762497161 100755 --- a/base/templates/work_type_request/htmx/requests.html +++ b/base/templates/work_type_request/htmx/requests.html @@ -427,4 +427,5 @@ if (!localStorageWorkTypeReqCells) { $("#workTypeRequestCells").find("[type=checkbox]").prop("checked", true); } - + $("[type=checkbox]").change(); + diff --git a/base/views.py b/base/views.py index c873739e7..855d1a8bb 100644 --- a/base/views.py +++ b/base/views.py @@ -250,9 +250,7 @@ def load_demo_database(request): # Add data files for installed apps data_files += [ - file - for app, file in optional_apps - if apps.is_installed(app) + file for app, file in optional_apps if apps.is_installed(app) ] # Load all data files diff --git a/biometric/anviz.py b/biometric/anviz.py index 8001c4ba1..82159b985 100644 --- a/biometric/anviz.py +++ b/biometric/anviz.py @@ -2,7 +2,7 @@ CrossChexCloudAPI module for Anviz Biometric Integration This module provides a wrapper for interacting with the CrossChex Cloud API to manage -authentication, attendance data retrieval, and token handling. It allows for secure +authentication, attendance data retrieval, and token handling. It allows for secure communication with the API, including fetching and validating tokens, and retrieving attendance records . """ diff --git a/biometric/dahua.py b/biometric/dahua.py index b336138b1..063a93175 100644 --- a/biometric/dahua.py +++ b/biometric/dahua.py @@ -1,21 +1,20 @@ """ DahuaAPI module for interacting with Dahua biometric and access control devices. -This module provides a set of methods for managing and configuring Dahua devices, -including retrieving system information, managing users, setting up network configurations, -and interacting with attendance logs. It communicates with Dahua devices via HTTP requests +This module provides a set of methods for managing and configuring Dahua devices, +including retrieving system information, managing users, setting up network configurations, +and interacting with attendance logs. It communicates with Dahua devices via HTTP requests and supports basic operations such as system reboot, setting time, and language configuration. """ import re -from typing import Any, Dict -from datetime import datetime, timezone from collections import defaultdict +from datetime import datetime, timezone +from typing import Any, Dict import requests from requests.auth import HTTPDigestAuth - key_map = { "AttendanceState": "attendance_state", "CardID": "card_id", diff --git a/biometric/templates/biometric_users/dahua/add_dahua_user.html b/biometric/templates/biometric_users/dahua/add_dahua_user.html index 5b0be1fc3..7d741defc 100644 --- a/biometric/templates/biometric_users/dahua/add_dahua_user.html +++ b/biometric/templates/biometric_users/dahua/add_dahua_user.html @@ -30,4 +30,4 @@ $(this).closest("select")[0].dispatchEvent(new Event("change")); }); }); - \ No newline at end of file + diff --git a/biometric/templates/biometric_users/dahua/list_dahua_employees.html b/biometric/templates/biometric_users/dahua/list_dahua_employees.html index 706cbef5d..47daba0d2 100644 --- a/biometric/templates/biometric_users/dahua/list_dahua_employees.html +++ b/biometric/templates/biometric_users/dahua/list_dahua_employees.html @@ -60,4 +60,4 @@ {% endfor %} - \ No newline at end of file + diff --git a/biometric/templates/biometric_users/dahua/map_dahua_users.html b/biometric/templates/biometric_users/dahua/map_dahua_users.html index 3bff8865e..eb68055bc 100644 --- a/biometric/templates/biometric_users/dahua/map_dahua_users.html +++ b/biometric/templates/biometric_users/dahua/map_dahua_users.html @@ -22,4 +22,4 @@ - \ No newline at end of file + diff --git a/biometric/templates/biometric_users/dahua/nav_dahua_employees.html b/biometric/templates/biometric_users/dahua/nav_dahua_employees.html index 0eb4e472a..effecb406 100644 --- a/biometric/templates/biometric_users/dahua/nav_dahua_employees.html +++ b/biometric/templates/biometric_users/dahua/nav_dahua_employees.html @@ -57,4 +57,4 @@ - \ No newline at end of file + diff --git a/biometric/templates/biometric_users/dahua/view_dahua_employees.html b/biometric/templates/biometric_users/dahua/view_dahua_employees.html index 6dae111b3..97e6e80a1 100644 --- a/biometric/templates/biometric_users/dahua/view_dahua_employees.html +++ b/biometric/templates/biometric_users/dahua/view_dahua_employees.html @@ -20,4 +20,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/employee/models.py b/employee/models.py index 7fd31e6a2..83fd48a10 100644 --- a/employee/models.py +++ b/employee/models.py @@ -406,12 +406,6 @@ class Employee(models.Model): badge_id = (f"({self.badge_id})") if self.badge_id is not None else "" return f"{self.employee_first_name} {last_name} {badge_id}" - def get_employee_dob(self) -> any: - if self.dob: - return self.dob.strftime("%d %b") - return None - - def check_online(self): """ This method is used to check if the user is in the list of online users. diff --git a/employee/templates/tabs/personal_tab.html b/employee/templates/tabs/personal_tab.html index 30fab7553..9d46ddca8 100644 --- a/employee/templates/tabs/personal_tab.html +++ b/employee/templates/tabs/personal_tab.html @@ -15,7 +15,7 @@ {% trans "Date of Birth" %} {{employee.get_employee_dob|default:_("None")}} + class="oh-profile__info-value dateformat_changer">{{employee.dob|default:_("None")}}
  • diff --git a/payroll/signals.py b/payroll/signals.py index a645c8740..492104dca 100644 --- a/payroll/signals.py +++ b/payroll/signals.py @@ -50,6 +50,7 @@ def create_installments(sender, instance, created, **kwargs): loan.amount = instance.loan_amount loan.only_show_under_employee = True loan.is_fixed = True + loan.is_fixed = True loan.one_time_date = instance.provided_date loan.is_loan = True loan.include_active_employees = False diff --git a/payroll/templates/payroll/payslip/payslip_table.html b/payroll/templates/payroll/payslip/payslip_table.html index 88aa0fa13..e9484d4af 100644 --- a/payroll/templates/payroll/payslip/payslip_table.html +++ b/payroll/templates/payroll/payslip/payslip_table.html @@ -246,9 +246,10 @@ }); }); // toggle columns // - toggleColumns("payslip-column-table", "payslipCells") + toggleColumns("payslip_column_tab", "payslipCells") localStoragepayslipCells = localStorage.getItem("payslip_column_tab") if (!localStoragepayslipCells) { $("#payslipCells").find("[type=checkbox]").prop("checked", true) } + $("[type=checkbox]").change()