[Internal] Minor UI changes

HewlettPackard · Oct 12, 2022 · f8a4025 · f8a4025
1 parent 6ff17ee
commit f8a4025
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/Squest/views.py b/Squest/views.py
@@ -30,7 +30,9 @@ def home(request):
             .annotate(service_name=F('service__name'))\
             .annotate(instance_count=Count('service_name'))\
             .order_by('service_name')
-        submitted_requests = Request.objects.filter(state=RequestState.SUBMITTED).values('instance__service__name')\
+        submitted_and_accepted_requests = Request.objects.filter(state__in=[RequestState.SUBMITTED,
+                                                                            RequestState.ACCEPTED])\
+            .values('instance__service__name')\
             .annotate(service_name=F('instance__service__name'))\
             .annotate(request_count=Count('service_name'))\
             .order_by('service_name')
@@ -54,8 +56,8 @@ def home(request):
             }
             if instances.filter(service=service.id).exists():
                 service_details[service.name]["instances"] = instances.get(service=service.id)["instance_count"]
-            if submitted_requests.filter(instance__service=service.id).exists():
-                service_details[service.name]["submitted_request"] = submitted_requests.get(instance__service=service.id)["request_count"]
+            if submitted_and_accepted_requests.filter(instance__service=service.id).exists():
+                service_details[service.name]["submitted_and_accepted_request"] = submitted_and_accepted_requests.get(instance__service=service.id)["request_count"]
             if failed_requests.filter(instance__service=service.id).exists():
                 service_details[service.name]["failed_requests"] = failed_requests.get(instance__service=service.id)["request_count"]
             if opened_supports.filter(instance__service=service.id).exists():

diff --git a/service_catalog/models/custom_link.py b/service_catalog/models/custom_link.py
@@ -42,4 +42,4 @@ class CustomLink(Model):
     )
 
     def __str__(self):
-        return self.name
+        return f"{self.name} ({','.join(self.services.all().values_list('name', flat=True))})"
diff --git a/service_catalog/tables/custom_link_table.py b/service_catalog/tables/custom_link_table.py
@@ -1,4 +1,4 @@
-from django_tables2 import tables, TemplateColumn, LinkColumn
+from django_tables2 import tables, TemplateColumn, LinkColumn, Column
 from django_tables2.utils import A
 
 from service_catalog.models import CustomLink
@@ -11,3 +11,6 @@ class Meta:
         model = CustomLink
         attrs = {"id": "custom_link_table", "class": "table squest-pagination-tables "}
         fields = ("name", "actions")
+
+    def render_name(self, record):
+        return f"{record}"
diff --git a/templates/home/admin.html b/templates/home/admin.html
@@ -94,11 +94,11 @@ <h3 class="widget-user-desc"><a class="text-dark" title="Instances of {{ service
                     <div class="d-flex justify-content-around">
                         <div class="row">
                             <div class="col-4">
-                                <a class="btn btn-app m-0" href="{% url 'service_catalog:request_list' %}?state=SUBMITTED&instance__service__id={{ service.service.id }}" title="New submitted requests">
-                                    {% if service.submitted_request > 0 %}
-                                        <span class="badge bg-info">{{ service.submitted_request }}</span>
+                                <a class="btn btn-app m-0" href="{% url 'service_catalog:request_list' %}?state=SUBMITTED&state=ACCEPTED&instance__service__id={{ service.service.id }}" title="New requests">
+                                    {% if service.submitted_and_accepted_request > 0 %}
+                                        <span class="badge bg-info">{{ service.submitted_and_accepted_request }}</span>
                                     {%  endif %}
-                                    <i class="{% if service.submitted_request > 0 %}text-info{%  endif %} fas fa-clipboard-check"></i> Requests
+                                    <i class="{% if service.submitted_and_accepted_request > 0 %}text-info{%  endif %} fas fa-clipboard-check"></i> Requests
                                 </a>
                             </div>
                             <div class="col-4">