From 63f37177f55c32cb961c9a73a68bae8169a7c17f Mon Sep 17 00:00:00 2001 From: Horilla Date: Wed, 6 Mar 2024 20:53:32 +0530 Subject: [PATCH] [UPDT] EMPLOYEE: Bonus point redeem requested also show in the history and design fix --- employee/templates/tabs/bonus_points.html | 170 +++++++----------- employee/templates/tabs/forms/add_points.html | 86 +++++---- .../tabs/forms/redeem_points_form.html | 60 ++++--- employee/views.py | 13 +- 4 files changed, 163 insertions(+), 166 deletions(-) diff --git a/employee/templates/tabs/bonus_points.html b/employee/templates/tabs/bonus_points.html index 954e10df2..cc99cd2bc 100644 --- a/employee/templates/tabs/bonus_points.html +++ b/employee/templates/tabs/bonus_points.html @@ -1,112 +1,76 @@ {% load i18n %} {% load basefilters %}
-
- -
-
-

{% trans "Bonus Points" %}

- {% if perms.employee.add_bonuspoint or request.user|check_manager:employee %} -
- -
- {% endif %} - +
+
+

{% trans "Bonus Points" %}

+ {% if perms.employee.add_bonuspoint or request.user|check_manager:employee %} +
+
-
-
-
- -
-
- {{employee}} - - {{employee.get_department}} / {{employee.get_job_position}} -
-
-
-
-

{% trans "Balance points to redeem:" %}

-

{{points.points}}

-
- {% trans "Redeem Now" %} + {% endif %} +
+
+
+
+ +
+
+ {{employee}} + + {{employee.get_department}} / {{employee.get_job_position}} +
+
+
+
+

{% trans "Balance points to redeem:" %}

+

{{points.points}}

+
+ {% trans "Redeem Now" %}
- {% for activity in activity_list %} -
- {% if activity.type == 'Bonus point created' %} - --> {% trans "Bonus Account created" %} - {{ activity.date|date:"d N Y"}} - {% else %} - {% if activity.reason == 'bonus points has been redeemed.' %} --> {{activity.points|abs_value}} {% else %}--> {{activity.user}} {% trans "Added " %} - {{activity.points}} {% trans "bonus points for " %}{% endif %} {{activity.reason|truncatechars:40}} - {{ activity.date|date:"d N Y"}} - {% endif %} -
- {% endfor %} -
-
- - diff --git a/employee/templates/tabs/forms/redeem_points_form.html b/employee/templates/tabs/forms/redeem_points_form.html index 229fbd520..2bf849aa7 100644 --- a/employee/templates/tabs/forms/redeem_points_form.html +++ b/employee/templates/tabs/forms/redeem_points_form.html @@ -1,29 +1,39 @@ {% load i18n %} -
+

{% trans "Redeem bonus points" %}

+ +
+
- {% csrf_token %} -
-
- -
- {{form.points}} {{form.points.errors}} + + {% csrf_token %} +
+
+ +
+ {{form.points}} {{form.points.errors}} +
-
-
- -
- +
+ +
+ +
\ No newline at end of file diff --git a/employee/views.py b/employee/views.py index f4a188abe..65ea2461d 100755 --- a/employee/views.py +++ b/employee/views.py @@ -3114,8 +3114,8 @@ def bonus_points_tab(request, emp_id): """ employee_obj = Employee.objects.get(id=emp_id) points = BonusPoint.objects.get(employee_id=emp_id) + requested_bonus_points = Reimbursement.objects.filter(employee_id=emp_id,type = "bonus_encashment", status="requested") trackings = points.tracking() - activity_list = [] for history in trackings: activity_list.append( @@ -3131,6 +3131,17 @@ def bonus_points_tab(request, emp_id): "reason": history["pair"][0].reason, } ) + for requested in requested_bonus_points: + activity_list.append( + { + "type":"requested", + "date": requested.created_at, + "points": requested.bonus_to_encash, + "user": employee_obj.employee_user_id, + "reason":"Redeemed points", + } + ) + activity_list = sorted(activity_list, key=lambda x: x['date'], reverse=True) context = { "employee": employee_obj, "points": points,