Add services using services in cost calculation view

costs/admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 
-from .models import Cost, Good, Service, CostUse, GoodUse, Document
+from .models import (
+    Document, Cost, Good, CostUse, GoodUse, Service, ServiceUse)
 
 
 @admin.register(Document)
@@ -18,6 +19,12 @@ class CostUseInline(admin.TabularInline):
     extra = 1
 
 
+class ServiceUseInline(admin.TabularInline):
+    model = ServiceUse
+    extra = 1
+    fk_name = 'service'
+
+
 class DirectDocumentFilter(admin.SimpleListFilter):
     title = 'Document'
 
@@ -53,5 +60,15 @@ class GoodAdmin(admin.ModelAdmin):
 @admin.register(Service)
 class ServiceAdmin(admin.ModelAdmin):
     list_display = ('name', 'subscriptions_count', 'document')
-    inlines = (CostUseInline, GoodUseInline)
+    inlines = (CostUseInline, GoodUseInline, ServiceUseInline)
     list_filter = [DirectDocumentFilter]
+
+    fieldsets = (
+        (None, {
+            'fields': (
+                ('name', 'document'), 'description', 'subscriptions_count'),
+        }),
+        ('Ré-utilisabilité', {
+            'fields': ('reusable',)
+        })
+    )

costs/models.py

@@ -56,7 +56,7 @@ class AbstractResource(AbstractItem):
             (UNIT_U, 'U'),
             (UNIT_IPV4, 'IPv4'),
             (UNIT_ETHERNET_PORT, 'ports'),
-            (UNIT_SERVICE, 'services'),
+            (UNIT_SERVICE, 'abonnement'),
         ),
         blank=True,
     )
@@ -232,7 +232,7 @@ class Service(AbstractResource):
 
     subscriptions_count = models.PositiveIntegerField(default=0)
     reusable = models.BooleanField(
-        "Ré-utilisable", default=False,
+        default=False,
         help_text="Peut-être utilisé par d'autres services")
 
     @property
@@ -254,10 +254,12 @@ class Service(AbstractResource):
     def get_prices(self):
         costs_uses = CostUse.objects.filter(service=self)
         goods_uses = GoodUse.objects.filter(service=self)
+        services_uses = ServiceUse.objects.filter(service=self)
 
         total_costs_price = sum(chain(
             (i.monthly_provision_share() for i in goods_uses),
             (i.cost_share() for i in costs_uses),
+            (i.cost_share() for i in services_uses)
         ))
 
         total_goods_value_share = sum(i.value_share() for i in goods_uses)
@@ -288,6 +290,19 @@ class ServiceUse(AbstractUse):
         limit_choices_to={'reusable': True},
         validators=[validate_reusable_service])
 
+    def cost_share(self):
+        return (
+            self.share / self.resource.total_capacity
+            * self.resource.price
+        )
+
+    def unit_cost_share(self):
+        subscriptions_count = self.service.subscriptions_count
+        if subscriptions_count == 0:
+            return 0
+        else:
+            return self.cost_share()/self.service.subscriptions_count
+
     def clean(self):
         """ Checks for cycles in service using services
         """

costs/templates/costs/service_detail.html

@@ -109,6 +109,25 @@ matériel et des investissements à l'échéance de leur durée de vie.
         <td class="right aligned">{{ usage.unit_cost_share|price }}</td>
       </tr>
   {% endfor %}
+  {% for usage in services_uses %}
+      <tr>
+      {% if forloop.first %}
+        <td rowspan="{{ costs_uses|length }}">Récurent (service)</td>
+      {% endif %}
+        <td>
+          <a href="{{ usage.resource.get_absolute_url }}">service {{ usage.resource.name }}</a>
+          <span class="bare-info">
+         {% if usage.resource.capacity_unit %}
+           ({{ usage.unit_share|human_round }} {{ usage.resource.get_capacity_unit_display }})
+         {% else %}
+           ({{ usage.unit_real_share|percent }})
+         {% endif %}
+          </span>
+        </td>
+        <td class="right aligned">{{ usage.unit_cost_share|price }}</td>
+      </tr>
+  {% endfor %}
+
     </tbody>
     <tfoot>
       <tr>

costs/views.py

@@ -1,7 +1,7 @@
 from django.core.urlresolvers import reverse
 from django.shortcuts import render, get_object_or_404
 
-from .models import Document, Service, CostUse, GoodUse
+from .models import Document, Service, ServiceUse, CostUse, GoodUse
 
 
 def index(request):
@@ -46,6 +46,7 @@ def detail_service(request, pk):
     )
     costs_uses = CostUse.objects.filter(service=service)
     goods_uses = GoodUse.objects.filter(service=service)
+    services_uses = ServiceUse.objects.filter(service=service)
 
     context = {}
     context.update(service.get_prices())
@@ -55,6 +56,7 @@ def detail_service(request, pk):
         'service': service,
         'costs_uses': costs_uses,
         'goods_uses': goods_uses,
+        'services_uses': services_uses,
         'monthly_fas': context['unit_goods_value_share']/12,
     })