From 9f648e419a2924fff6e3c459c39b8f6e99aebaa4 Mon Sep 17 00:00:00 2001 From: Horilla Date: Fri, 23 Feb 2024 12:08:08 +0530 Subject: [PATCH] [UPDT] LEAVE: Updation in leave request updation form by exclude status field from form --- base/views.py | 2 +- employee/templates/tabs/leave-tab.html | 84 ++++---- employee/views.py | 189 +++++++++++++----- .../leave/leave_request/cancel_form.html | 38 ++-- .../leave/leave_request/request_view.html | 2 +- 5 files changed, 210 insertions(+), 105 deletions(-) diff --git a/base/views.py b/base/views.py index d923d9867..5c794f773 100644 --- a/base/views.py +++ b/base/views.py @@ -194,7 +194,7 @@ def login_user(request): ) return redirect("/login") if user.employee_get.is_active == False: - messages.error( + messages.warning( request, _( "This user is archived. Please contact the manager for more information." diff --git a/employee/templates/tabs/leave-tab.html b/employee/templates/tabs/leave-tab.html index 86ae37b17..5191fba7c 100644 --- a/employee/templates/tabs/leave-tab.html +++ b/employee/templates/tabs/leave-tab.html @@ -252,46 +252,50 @@ {% if perms.leave.change_leaverequest %}
-
- {% if leave_request.status != 'approved' %} - - - +
+ {% if leave_request.status == 'cancelled' %} + {% if leave_request.end_date >= current_date %} + + + + {% else %} + + + + {% endif %} {% else %} - - - - {% endif %} - {% if leave_request.status != "rejected" %} - - - - {% else %} - - - + {% if leave_request.is_approved and leave_request.status == 'requested' and leave_request.end_date >= current_date %} + current_date.month %} onclick = "leaveRequestConfirm('This leave request is for the month of {{leave_request.start_date|date:'F'}}. Approval depends on the {{leave_request.employee_id.get_full_name}} having available leave days for this month.',event);" {% else %} onclick = "return confirm('Do You really want to Approve this request?')"; {% endif %}> + + + {% else %} + + + + {% endif %} + {% if leave_request.status != 'rejected' and leave_request.end_date >= current_date %} + + + + + {% else %} + + + + + {% endif %} + {% endif %}
@@ -354,7 +358,7 @@

- {% trans "Reject Leave Allocation Request" %} + {% trans "Request Rejection" %}

- \ No newline at end of file +
+ +
+
+ diff --git a/leave/templates/leave/leave_request/request_view.html b/leave/templates/leave/leave_request/request_view.html index f3e3a0de1..ddf8c79e6 100644 --- a/leave/templates/leave/leave_request/request_view.html +++ b/leave/templates/leave/leave_request/request_view.html @@ -311,7 +311,7 @@

- {% trans "Reason for rejection" %} + {% trans "Rejection" %}