Parcourir la source

Display usage shares on a service

Jocelyn Delande il y a 9 ans
Parent
commit
8cbbd4ceca
2 fichiers modifiés avec 34 ajouts et 2 suppressions
  1. 14 0
      costs/models.py
  2. 20 2
      costs/templates/costs/service_detail.html

+ 14 - 0
costs/models.py

@@ -148,6 +148,20 @@ class AbstractUse(models.Model):
             (self.share/self.resource.used())*self.resource.unused()
         )
 
+    def unit_share(self):
+        if self.service.subscriptions_count == 0:
+            return 0
+        else:
+            return self.share/self.service.subscriptions_count
+
+        return
+
+    def unit_real_share(self):
+        if self.service.subscriptions_count == 0:
+            return 0
+        else:
+            return self.real_share()/self.service.subscriptions_count
+
     def value_share(self):
         return (
             self.resource.price

+ 20 - 2
costs/templates/costs/service_detail.html

@@ -8,14 +8,32 @@
   {% for usage in goods_uses %}
   <tr>
     <td>amortissement</td>
-    <td>{{ usage.resource.name }}</td>
+    <td>
+       {{ usage.resource.name }}
+      <span class="bare-info">
+       {% if usage.resource.capacity_unit %}
+           ({{ usage.unit_share }} {{ usage.resource.get_capacity_unit_display }})
+         {% else %}
+           ({{ usage.unit_real_share|percent }})
+         {% endif %}
+      </span>
+    </td>
     <td>{{ usage.unit_monthly_provision_share|price }}</td>
   </tr>
   {% endfor %}
   {% for usage in costs_uses %}
   <tr>
     <td>récurent</td>
-    <td>{{ usage.resource }}</td>
+    <td>
+      {{ usage.resource.name }}
+      <span class="bare-info">
+               {% if usage.resource.capacity_unit %}
+           ({{ usage.unit_share }} {{ usage.resource.get_capacity_unit_display }})
+         {% else %}
+           ({{ usage.unit_real_share|percent }})
+         {% endif %}
+      </span>
+    </td>
     <td>{{ usage.unit_cost_share|price }}</td>
   </tr>
   {% endfor %}