From 3c4a3d6f8b5ce83a20bd13ea480f699f84d5ad34 Mon Sep 17 00:00:00 2001 From: Horilla Date: Thu, 8 Feb 2024 16:43:52 +0530 Subject: [PATCH] [UPDT] BASE: Multiple values for key in savedFilters js method --- base/methods.py | 5 ++--- employee/templates/tabs/shift-tab.html | 14 +++++++------- employee/views.py | 5 +++-- static/images/ui/no-results.png | Bin 19233 -> 31130 bytes static/index/saveFilters.js | 9 ++++++++- templates/index.html | 7 +++++-- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/base/methods.py b/base/methods.py index c475b96ac..1fcecc6ad 100644 --- a/base/methods.py +++ b/base/methods.py @@ -453,9 +453,8 @@ def export_data(request, model, form_class, filter_class, file_name): employee_company = data.company_id company_name = Company.objects.filter(id=employee_company.id) emp_company = company_name.first() - # Access the date_format attribute directly - time_format = emp_company.time_format + time_format = emp_company.time_format if emp_company else "hh:mm A" else: time_format = "hh:mm A" @@ -486,7 +485,7 @@ def export_data(request, model, form_class, filter_class, file_name): emp_company = company_name.first() # Access the date_format attribute directly - date_format = emp_company.date_format + date_format = emp_company.date_format if emp_company else "MMM. D, YYYY" else: date_format = "MMM. D, YYYY" # Define date formats diff --git a/employee/templates/tabs/shift-tab.html b/employee/templates/tabs/shift-tab.html index 0fb3ffa8f..9519746b3 100644 --- a/employee/templates/tabs/shift-tab.html +++ b/employee/templates/tabs/shift-tab.html @@ -4,8 +4,8 @@
- {% trans "Current Shift" %}   :   {{shift_data.0.employee_id.employee_work_info.shift_id}}. - + {% if employee.employee_work_info.shift_id or shift_data%} + {% if employee.employee_work_info.shift_id %} {% trans "Current Shift" %}   :   {{employee.employee_work_info.shift_id}} {% endif %} - + {% endif %}