From faf5c473d8fe97c43f95e3f0c42539fda2ed20f3 Mon Sep 17 00:00:00 2001
From: orbitroom <orbitroom13@gmail.com>
Date: Wed, 23 Mar 2016 01:40:46 -0400
Subject: [PATCH] Added Automatic Ship and ISK Fields

---
 services/managers/srp_manager.py             | 3 +++
 srp/models.py                                | 2 +-
 srp/views.py                                 | 6 +++---
 stock/templates/registered/srpfleetdata.html | 4 ++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/services/managers/srp_manager.py b/services/managers/srp_manager.py
index c0517268..874bd0da 100644
--- a/services/managers/srp_manager.py
+++ b/services/managers/srp_manager.py
@@ -14,6 +14,7 @@ class srpManager():
         str = (killboard_link)
         set = '0123456789'
         kill_id = ''.join([c for c in str if c in set])
+        return kill_id
 
     @staticmethod
     def get_kill_data (kill_id):
@@ -28,6 +29,7 @@ class srpManager():
             logger.debug("Ship type for kill ID %s is determined to be %s" % (kill_id, ship_type))
             ship_value = result['zkb']['totalValue']
             logger.debug("total loss value for kill id %s is %s" %(kill_id, ship_value))
+            return (ship_type, ship_value)
         else:
             raise ValueError("Invalid Kill ID")
 
@@ -42,6 +44,7 @@ class srpManager():
         if result:
             ship_name = result['typeName']
             logger.debug("ship type %s determined to be %s" % (ship_type, ship_name))
+            return ship_name
         else:
             logger.info("ship type %s is invalid please try again" % ship_type)
 
diff --git a/srp/models.py b/srp/models.py
index 0c3d75ec..58e096e6 100755
--- a/srp/models.py
+++ b/srp/models.py
@@ -24,7 +24,7 @@ class SrpUserRequest(models.Model):
     srp_total_amount = models.BigIntegerField(default=0)
     character = models.ForeignKey(EveCharacter)
     srp_fleet_main = models.ForeignKey(SrpFleetMain)
-
+    kb_total_loss = models.BigIntegerField(default=0)
     srp_ship_name = models.CharField(max_length=254, default="") 
 
 
diff --git a/srp/views.py b/srp/views.py
index 2e98f91a..1f9d8684 100755
--- a/srp/views.py
+++ b/srp/views.py
@@ -193,16 +193,16 @@ def srp_request_view(request, fleet_srp):
             srp_request.character = character
             srp_request.srp_fleet_main = srp_fleet_main
             srp_kill_link = srpManager.get_kill_id(srp_request.killboard_link)
-            srp_kill_data = srpManager.get_kill_data(srp_kill_link)
+            (srp_kill_data, ship_value) = srpManager.get_kill_data(srp_kill_link)
             srp_ship_name = srpManager.get_ship_name(srp_kill_data)
             srp_request.srp_ship_name = srp_ship_name
+            kb_total_loss = ship_value
+            srp_request.kb_total_loss = kb_total_loss
             srp_request.save()
 
             completed = True
             logger.info("Created SRP Request on behalf of user %s for fleet name %s" % (request.user, srp_fleet_main.fleet_name))
 
-
-            srp_request.append()
     else:
         logger.debug("Returning blank SrpFleetUserRequestForm")
         form = SrpFleetUserRequestForm()
diff --git a/stock/templates/registered/srpfleetdata.html b/stock/templates/registered/srpfleetdata.html
index 596bc457..395fce17 100755
--- a/stock/templates/registered/srpfleetdata.html
+++ b/stock/templates/registered/srpfleetdata.html
@@ -37,6 +37,8 @@
                     <th class="text-center">Pilot Name</th>
                     <th class="text-center">Killboard Link</th>
                     <th class="text-center">Additional Info</th>
+		    <th class="text-center">Ship Type</th>
+                    <th class="text-center">Killboard Loss Amt</th>
                     <th class="text-center">SRP ISK Cost</th>
                     <th class="text-center">Status</th>
                     {% if perms.auth.srp_management %}
@@ -55,6 +57,8 @@
                                target="_blank">{{ srpfleetrequest.killboard_link }}</a>
                         </td>
                         <td class="text-center">{{ srpfleetrequest.additional_info }}</td>
+			<td class="text-center">{{ srpfleetrequest.srp_ship_name }}</td>
+			<td class="text-center">ISK: {{ srpfleetrequest.kb_total_loss | intcomma }}</td>
                         <td class="text-center">ISK: {{ srpfleetrequest.srp_total_amount | intcomma }}</td>
                         <td class="text-center">
                             {% if srpfleetrequest.srp_status == "Approved" %}