Added new features to srp app, including the total amounts for everything

srp/form.py

@@ -9,4 +9,8 @@ class SrpFleetMainForm(forms.Form):
 
 class SrpFleetUserRequestForm(forms.Form):
     killboard_link = forms.CharField(required=True, label="Killboard Link")
-    additional_info = forms.CharField(required=False, label="Additional Info")
+    additional_info = forms.CharField(required=False, label="Additional Info")
+
+
+class SrpFleetUpdateCostForm(forms.Form):
+    srp_total_amount = forms.IntegerField(required=True, label="Total SRP Amount")

srp/models.py

@@ -20,6 +20,7 @@ class SrpUserRequest(models.Model):
     after_action_report_link = models.CharField(max_length=254, default="")
     additional_info = models.CharField(max_length=254, default="")
     srp_status = models.CharField(max_length=254, default="")
+    srp_total_amount = models.BigIntegerField(default=0)
     character = models.ForeignKey(EveCharacter)
     srp_fleet_main = models.ForeignKey(SrpFleetMain)
 

srp/views.py

@@ -13,6 +13,7 @@ from models import SrpFleetMain
 from models import SrpUserRequest
 from form import SrpFleetMainForm
 from form import SrpFleetUserRequestForm
+from form import SrpFleetUpdateCostForm
 
 
 def srp_util_test(user):
@@ -22,24 +23,50 @@ def srp_util_test(user):
 @login_required
 @user_passes_test(srp_util_test)
 def srp_management(request):
-    context = {"srpfleets": SrpFleetMain.objects.filter(fleet_srp_status="")}
+    totalcost = 0
+    runningcost = 0
+    price_pair = {}
+    for fleet_main in SrpFleetMain.objects.filter(fleet_srp_status="").iterator():
+        for fleet_data in SrpUserRequest.objects.filter(srp_fleet_main=fleet_main).iterator():
+            totalcost = totalcost + fleet_data.srp_total_amount
+            runningcost = runningcost + fleet_data.srp_total_amount
+        price_pair[fleet_main.id] = runningcost
+        runningcost = 0
+
+    context = {"srpfleets": SrpFleetMain.objects.filter(fleet_srp_status=""), "totalcost": totalcost,
+               "price_pair": price_pair}
     return render_to_response('registered/srpmanagement.html', context, context_instance=RequestContext(request))
 
 
 @login_required
 @user_passes_test(srp_util_test)
 def srp_management_all(request):
-    context = {"srpfleets": SrpFleetMain.objects.all()}
+    totalcost = 0
+    runningcost = 0
+    price_pair = {}
+    for fleet_main in SrpFleetMain.objects.all().iterator():
+        for fleet_data in SrpUserRequest.objects.filter(srp_fleet_main=fleet_main).iterator():
+            totalcost = totalcost + fleet_data.srp_total_amount
+            runningcost = runningcost + fleet_data.srp_total_amount
+        price_pair[fleet_main.id] = runningcost
+        runningcost = 0
+
+    context = {"srpfleets": SrpFleetMain.objects.all(), "totalcost": totalcost, "price_pair": price_pair}
     return render_to_response('registered/srpmanagement.html', context, context_instance=RequestContext(request))
 
 
 @login_required
 @user_passes_test(srp_util_test)
 def srp_fleet_view(request, fleet_id):
-    if SrpFleetMain.objects.filter(id=fleet_id):
+    if SrpFleetMain.objects.filter(id=fleet_id).exists():
         fleet_main = SrpFleetMain.objects.get(id=fleet_id)
+        totalcost = 0
+        for fleet_data in SrpUserRequest.objects.filter(srp_fleet_main=fleet_main):
+            totalcost = totalcost + fleet_data.srp_total_amount
+
         context = {"fleet_id": fleet_id, "fleet_status": fleet_main.fleet_srp_status,
-                   "srpfleetrequests": SrpUserRequest.objects.filter(srp_fleet_main=fleet_main)}
+                   "srpfleetrequests": SrpUserRequest.objects.filter(srp_fleet_main=fleet_main),
+                   "totalcost": totalcost}
 
         return render_to_response('registered/srpfleetdata.html', context, context_instance=RequestContext(request))
 
@@ -194,4 +221,31 @@ def srp_request_reject(request, srp_request_id):
     if stored_fleet_view is None:
         return HttpResponseRedirect("/srp")
     else:
-        return HttpResponseRedirect("/srp_fleet_view/" + str(stored_fleet_view))
+        return HttpResponseRedirect("/srp_fleet_view/" + str(stored_fleet_view))
+
+
+@login_required
+@permission_required('auth.srp_management')
+def srp_request_update_amount_view(request, fleet_srp_request_id):
+    no_srp_code = False
+    srp_code = ""
+
+    if SrpUserRequest.objects.filter(id=fleet_srp_request_id).exists() is False:
+        no_srp_code = True
+
+    if request.method == 'POST':
+        form = SrpFleetUpdateCostForm(request.POST)
+
+        if form.is_valid():
+            srp_request = SrpUserRequest.objects.get(id=fleet_srp_request_id)
+            srp_request.srp_total_amount = form.cleaned_data['srp_total_amount']
+            srp_request.save()
+
+            return HttpResponseRedirect("/srp_fleet_view/" + str(srp_request.srp_fleet_main.id))
+    else:
+        form = SrpFleetUpdateCostForm()
+
+    render_items = {'form': form, "no_srp_code": no_srp_code}
+
+    return render_to_response('registered/srpfleetrequestamount.html', render_items,
+                              context_instance=RequestContext(request))