Approve/Reject Overhead/Rebate integrated

source/web/hostel_mess/templates/apprebate.html

@@ -171,8 +171,8 @@
                       <td>{{ rebate.name }}</td>
                       <td>{{ rebate.duration }}</td>
                       <td>
-                        <input id={{rebate.id}} name="approve"  type="submit" class="btn btn-outline-success" formaction="/user/rebate/approve/{{rebate.id}}" formmethod="GET" value="APPROVE"/>
-                        <input id={{rebate.id}} name="reject" type="submit" class="btn btn-outline-danger" formaction="/user/rebate/reject/{{rebate.id}}" formmethod="GET" value="REJECT"/></td>
+                        <input id="{{rebate.id}}" name="approve"  type="submit" class="btn btn-outline-success" formaction="/user/rebate/approve/{{rebate.id}}/" formmethod="GET" value="APPROVE"/>
+                        <input id="{{rebate.id}}" name="reject" type="submit" class="btn btn-outline-danger" formaction="/user/rebate/reject/{{rebate.id}}/" formmethod="GET" value="REJECT"/></td>
                     </tr>
                     {% endfor %}
                   </tbody>

source/web/hostel_mess/templates/appreq.html

@@ -156,8 +156,9 @@
                       <td>{{ overhead.mealType }}</td>
                       <td>{{ overhead.count }}</td>
                       <td>
-                      <input id={{overhead.id}} name="approve" type="submit" class="btn btn-outline-success" value='APPROVE'formaction="/user/overhead/approve/{{overhead.id}}" formmethod="GET"/>
-                      <input id={{overhead.id}} name="reject" type="submit" class="btn btn-outline-danger" value='REJECT' formaction="/user/overhead/reject/{{overhead.id}}" formmethod="GET"\></td> 
+                      <input id="{{overhead.id}}" name="approve" type="submit" class="btn btn-outline-success" value='APPROVE'formaction="/user/overhead/approve/{{overhead.id}}/" formmethod="GET"/>
+                      <input id="{{overhead.id}}" name="reject" type="submit" class="btn btn-outline-danger" value='REJECT' formaction="/user/overhead/reject/{{overhead.id}}/" formmethod="GET" />
+                      </td> 
                     </tr>
                     {% endfor %}
                   </tbody>

source/web/hostel_mess/usermgmt/views.py

@@ -105,7 +105,7 @@ def rebate(request):
 @login_required
 @user_passes_test(is_manager)
 def approve_rebate(request,id):
-	reb = RebateReq.objects.filter(id=id)[0]
+	reb = RebateReq.objects.get(id=id)
 	reb.status='Y'
 	reb.save()
 	return redirect('manager-homepage')
@@ -114,24 +114,24 @@ def approve_rebate(request,id):
 @login_required
 @user_passes_test(is_manager)
 def reject_rebate(request,id):
-	reb = RebateReq.objects.filter(id=id)[0]
+	reb = RebateReq.objects.get(id=id)
 	reb.status='N'
 	reb.save()
 	return redirect('manager-homepage')
 
 @login_required
-@user_passes_test(is_manager)
+@user_passes_test(is_worker)
 def approve_overhead(request,id):
-	reb = OverheadReq.objects.filter(id=id)[0]
+	reb = OverheadReq.objects.get(id=id)
 	reb.status='Y'
 	reb.save()
 	return redirect('worker-homepage')
 
 
 @login_required
-@user_passes_test(is_manager)
+@user_passes_test(is_worker)
 def reject_overhead(request,id):
-	reb = OverheadReq.objects.filter(id=id)[0]
+	reb = OverheadReq.objects.get(id=id)
 	reb.status='N'
 	reb.save()
 	return redirect('worker-homepage')