diff --git a/hub/services/templates/services/partner_detail.html b/hub/services/templates/services/partner_detail.html index b93ca54..e7fcd4c 100644 --- a/hub/services/templates/services/partner_detail.html +++ b/hub/services/templates/services/partner_detail.html @@ -1,71 +1,77 @@ {% extends 'services/base.html' %} {% block content %} -
-
-
- {% if partner.logo %} - {{ partner.name }} logo - {% endif %} -
-

{{ partner.name }}

- {% if partner.website %} - - Visit Website - - {% endif %} -
- {{ partner.description|safe }} +
+
+
+
+
+

{{ partner.name }}

+
+
+ {{ partner.description|safe }} +
+
+ {% if partner.website %} + + {% endif %} +
+
+
+
+ {% if partner.logo %} + {{ partner.name }} logo + {% endif %}
+
+
-

Available Services

-
- {% for service in services %} -
-
-
-
- {% if service.logo %} +
+

Available Services

+

{{ partner.name }} provides consulting services for the following services

+
+ {% for service in services %} +
+
+
+
+ {% if service.logo %} + {{ service.name }} logo - {% endif %} -
-
{{ service.name }}
-
- {% if service.cloud_provider.logo %} - {{ service.cloud_provider.name }} logo - {% endif %} -
- {{ service.cloud_provider.name }} -
-
+ + {% endif %} +
+
{{ service.name }}
+
+ {% if service.cloud_provider.logo %} + {{ service.cloud_provider.name }} logo + {% endif %} +
+ {{ service.cloud_provider.name }} +
-
- {{ service.description|safe|truncatewords_html:30 }} -
-
- {% for category in service.categories.all %} - {{ category.full_path }} - {% endfor %} -
- View Details +
+
+ {{ service.description|safe|truncatewords_html:30 }}
- {% empty %} -
-
- No services available from this partner yet. -
+
+ {% empty %} +
+
+ No services available from this partner yet.
- {% endfor %} -
+
+ {% endfor %}
{% endblock %} \ No newline at end of file diff --git a/hub/services/templates/services/partner_list.html b/hub/services/templates/services/partner_list.html index ffc74ab..bc5d342 100644 --- a/hub/services/templates/services/partner_list.html +++ b/hub/services/templates/services/partner_list.html @@ -72,6 +72,23 @@
+ +
+
+

Service

+
+
+ +
+
+
diff --git a/hub/services/views/offerings.py b/hub/services/views/offerings.py index 62ef10d..bfe3dbc 100644 --- a/hub/services/views/offerings.py +++ b/hub/services/views/offerings.py @@ -18,7 +18,7 @@ def offering_list(request): cloud_providers = CloudProvider.objects.all() categories = Category.objects.filter(parent=None).prefetch_related("children") - services = Service.objects.all().order_by("name") # Add this line + services = Service.objects.all().order_by("name") # Handle cloud provider filter if request.GET.get("cloud_provider"): @@ -34,7 +34,7 @@ def offering_list(request): Q(service__categories=category) | Q(service__categories__in=subcategories) ).distinct() - # Add service filter handling + # Handle service filter if request.GET.get("service"): service_id = request.GET.get("service") offerings = offerings.filter(service_id=service_id) diff --git a/hub/services/views/partners.py b/hub/services/views/partners.py index d5789f4..ed46f58 100644 --- a/hub/services/views/partners.py +++ b/hub/services/views/partners.py @@ -1,9 +1,6 @@ from django.shortcuts import render, get_object_or_404 from django.db.models import Q -from hub.services.models import ( - ConsultingPartner, - CloudProvider, -) +from hub.services.models import ConsultingPartner, CloudProvider, Service def partner_list(request): @@ -11,11 +8,18 @@ def partner_list(request): "services", "cloud_providers" ) + services = Service.objects.all().order_by("name") + # Handle cloud provider filter if request.GET.get("cloud_provider"): provider_id = request.GET.get("cloud_provider") partners = partners.filter(cloud_providers__id=provider_id) + # Handle service filter + if request.GET.get("service"): + service_id = request.GET.get("service") + partners = partners.filter(services__id=service_id) + # Handle search if request.GET.get("search"): query = request.GET.get("search") @@ -25,6 +29,7 @@ def partner_list(request): context = { "partners": partners, + "services": services, "cloud_providers": CloudProvider.objects.all(), } return render(request, "services/partner_list.html", context)