From 109063dffadf64ad5ecab822fa8388beb3595a44 Mon Sep 17 00:00:00 2001 From: Horilla Date: Tue, 26 Mar 2024 14:10:37 +0530 Subject: [PATCH] [UPDT] DASHBOARD: Changed on leave method in dashboard and added empty page html --- leave/static/dashboard/onLeave.js | 57 +++++++----- leave/templates/leave/on_leave.html | 37 ++++++++ leave/views.py | 15 ++-- templates/dashboard.html | 129 +--------------------------- 4 files changed, 80 insertions(+), 158 deletions(-) create mode 100644 leave/templates/leave/on_leave.html diff --git a/leave/static/dashboard/onLeave.js b/leave/static/dashboard/onLeave.js index 096c1b5a4..3de2da792 100644 --- a/leave/static/dashboard/onLeave.js +++ b/leave/static/dashboard/onLeave.js @@ -1,23 +1,34 @@ -$(document).ready(function () { - $.ajax({ - type: "GET", - url: "/leave/employee-leave", - dataType: "json", - success: function (response) { - $.each(response.employees, function (index, value) { - $("#leaveEmployee").append( - `
  • -
    -
    - Beth Gibbons -
    - ${value} -
    -
    • - ` - ); - }); - }, - }); -}); +// $(document).ready(function () { +// $.ajax({ +// type: "GET", +// url: "/leave/employee-leave", +// dataType: "json", +// success: function (response) { +// if (response.employees.length) { +// $.each(response.employees, function (index, value) { +// $("#leaveEmployee").append( +// `
  • +//
    +//
    +// Beth Gibbons +//
    +// ${value} +//
    +//
    • ` +// ); +// }); +// } +// else{ +// $("#leaveEmployee").append( +// `
    +//
    +// Page not found. 404. +//
    No Announcements to show.
    +//
    +//
    ` +// ) +// } +// }, +// }); +// }); diff --git a/leave/templates/leave/on_leave.html b/leave/templates/leave/on_leave.html new file mode 100644 index 000000000..9c7775d96 --- /dev/null +++ b/leave/templates/leave/on_leave.html @@ -0,0 +1,37 @@ +{% load static i18n %} +{% if employees %} +
    + +
    +{% else %} +
    +
    + Page not found. 404. +
    + {% trans "No Leave request for today." %} +
    +
    +
    +{% endif %} diff --git a/leave/views.py b/leave/views.py index 54b76b4dd..405842d6c 100644 --- a/leave/views.py +++ b/leave/views.py @@ -2198,16 +2198,13 @@ def employee_leave(request): """ today = date.today() employees = [] - leave_requests = LeaveRequest.objects.filter( - Q(start_date__lte=today) - & Q(end_date__gte=today) - & Q(status="approved") - & Q(employee_id__is_active=True) - ) + leave_requests = LeaveRequest.objects.filter(status="approved") + for leave_request in leave_requests: - if leave_request.employee_id.__str__() not in employees: - employees.append(leave_request.employee_id.__str__()) - return JsonResponse({"employees": employees}) + if today in leave_request.requested_dates(): + employees.append(leave_request.employee_id) + return render(request,"leave/on_leave.html",{'employees':employees}) + @login_required diff --git a/templates/dashboard.html b/templates/dashboard.html index 0aded4475..b1bd46693 100755 --- a/templates/dashboard.html +++ b/templates/dashboard.html @@ -734,135 +734,12 @@ > {% trans "On Leave" %} -
    - +
    - {% comment %}
    -
    {% trans "Quick Actions" %}
    - -
    -
    -
    -
    - -
    -
    - -
    - -
    - - {% trans "Attendance Request" %} - -     -
    -
    - -
    -
    - -
    - -
    - - {% trans "Leave Request" %} - -     -
    -
    - -
    -
    - -
    - -
    - - {% trans "Shift Request" %} - -     -
    -
    - -
    -
    - -
    - -
    - - {% trans "Worktype Request" %} - -     -
    -
    - -
    -
    - -
    - -
    - - {% trans "Reimbursement Request" %} - -     -
    -
    - -
    -
    - -
    - -
    - - {% trans "Asset Request" %} - -     -
    -
    - -
    -
    - -
    - -
    - - {% trans "Ticket Creation" %} - -     -
    -
    - -
    -
    -
    -
    -
    {% endcomment %} - {% if perms.leave.view_leaverequest or request.user|is_reportingmanager%}