servala/website
1
0
Fork 0
Code Issues 10 Pull requests Projects 1 Packages 1 Activity Actions

remove service level and country

Browse source
This commit is contained in:
Tobias Brunner 2025-01-28 10:06:56 +01:00
parent 9993844057
commit f69f7fb755
No known key found for this signature in database
12 changed files with 32 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

19
hub/services/admin.py
View file

@ -3,8 +3,6 @@ from django.utils.html import format_html
from .models import (
CloudProvider,
ConsultingPartner,
Country,
ServiceLevel,
Service,
Category,
)
@ -33,24 +31,11 @@ class CloudProviderAdmin(admin.ModelAdmin):
return "No logo"
@admin.register(Country)
class CountryAdmin(admin.ModelAdmin):
list_display = ("name", "code")
search_fields = ("name", "code")
@admin.register(ServiceLevel)
class ServiceLevelAdmin(admin.ModelAdmin):
list_display = ("name", "response_time")
search_fields = ("name",)
@admin.register(Service)
class ServiceAdmin(admin.ModelAdmin):
list_display = (
"name",
"cloud_provider",
"service_level",
"price",
"logo_preview",
"category_list",
@ -58,12 +43,10 @@ class ServiceAdmin(admin.ModelAdmin):
)
list_filter = (
"cloud_provider",
"service_level",
"countries",
"categories",
"consulting_partners",
)
filter_horizontal = ("countries", "categories", "consulting_partners")
filter_horizontal = ("categories", "consulting_partners")
search_fields = ("name", "description", "slug")
prepopulated_fields = {"slug": ("name",)}

27
hub/services/migrations/0008_remove_service_countries_and_more.py Normal file
View file

@ -0,0 +1,27 @@
# Generated by Django 5.1.5 on 2025-01-28 09:03
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("services", "0007_consultingpartner_service_consulting_partners"),
]
operations = [
migrations.RemoveField(
model_name="service",
name="countries",
),
migrations.RemoveField(
model_name="service",
name="service_level",
),
migrations.DeleteModel(
name="Country",
),
migrations.DeleteModel(
name="ServiceLevel",
),
]

22
hub/services/models.py
View file

@ -94,26 +94,6 @@ class ConsultingPartner(models.Model):
return reverse("services:partner_detail", kwargs={"slug": self.slug})
class Country(models.Model):
name = models.CharField(max_length=100)
code = models.CharField(max_length=2)
class Meta:
verbose_name_plural = "Countries"
def __str__(self):
return self.name
class ServiceLevel(models.Model):
name = models.CharField(max_length=100)
description = models.TextField()
response_time = models.CharField(max_length=50)
def __str__(self):
return self.name
class Service(models.Model):
name = models.CharField(max_length=200)
slug = models.SlugField(max_length=250, unique=True)
@ -122,9 +102,7 @@ class Service(models.Model):
consulting_partners = models.ManyToManyField(
ConsultingPartner, related_name="services", blank=True
)
service_level = models.ForeignKey(ServiceLevel, on_delete=models.CASCADE)
categories = models.ManyToManyField(Category, related_name="services")
countries = models.ManyToManyField(Country)
price = models.DecimalField(max_digits=10, decimal_places=2)
features = ProseEditorField()
logo = models.ImageField(

1
hub/services/templates/services/lead_form.html
View file

@ -10,7 +10,6 @@
<div class="mb-4">
<h5>Service Details</h5>
<p><strong>Provider:</strong> {{ service.cloud_provider.name }}</p>
<p><strong>Service Level:</strong> {{ service.service_level.name }}</p>
<p><strong>Price:</strong> ${{ service.price }}</p>
</div>

6
hub/services/templates/services/partner_detail.html
View file

@ -54,12 +54,6 @@
<span class="badge bg-secondary me-1">{{ category.full_path }}</span>
{% endfor %}
</div>
<p class="card-text">
<small class="text-muted">
Service Level: {{ service.service_level.name }}<br>
Price: ${{ service.price }}
</small>
</p>
<a href="{{ service.get_absolute_url }}" class="btn btn-primary">View Details</a>
</div>
</div>

6
hub/services/templates/services/provider_detail.html
View file

@ -39,12 +39,6 @@
<span class="badge bg-secondary me-1">{{ category.full_path }}</span>
{% endfor %}
</div>
<p class="card-text">
<small class="text-muted">
Service Level: {{ service.service_level.name }}<br>
Price: ${{ service.price }}
</small>
</p>
<a href="{% url 'services:service_detail' service.slug %}" class="btn btn-primary">View Details</a>
</div>
</div>

11
hub/services/templates/services/service_detail.html
View file

@ -39,21 +39,12 @@
<div class="card-body">
<h5 class="card-title">Service Details</h5>
<p><strong>Price:</strong> ${{ service.price }}</p>
<p><strong>Service Level:</strong> {{ service.service_level.name }}</p>
<p><strong>Response Time:</strong> {{ service.service_level.response_time }}</p>
<h6>Available Countries</h6>
<ul>
{% for country in service.countries.all %}
<li>{{ country.name }}</li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
<a href="{% url 'services:create_lead' service.slug %}" class="btn btn-success">Show Interest</a>
<a href="{% url 'services:create_lead' service.slug %}" class="btn btn-success">Order</a>
<a href="{% url 'services:service_list' %}" class="btn btn-secondary">Back to Services</a>
</div>
</div>

30
hub/services/templates/services/service_list.html
View file

@ -53,30 +53,6 @@
</select>
</div>
<div class="mb-3">
<label for="country" class="form-label">Country</label>
<select class="form-select" id="country" name="country">
<option value="">All Countries</option>
{% for country in countries %}
<option value="{{ country.id }}" {% if request.GET.country == country.id|stringformat:'i' %}selected{% endif %}>
{{ country.name }}
</option>
{% endfor %}
</select>
</div>
<div class="mb-3">
<label for="service_level" class="form-label">Service Level</label>
<select class="form-select" id="service_level" name="service_level">
<option value="">All Levels</option>
{% for level in service_levels %}
<option value="{{ level.id }}" {% if request.GET.service_level == level.id|stringformat:'i' %}selected{% endif %}>
{{ level.name }}
</option>
{% endfor %}
</select>
</div>
<button type="submit" class="btn btn-primary">Apply Filters</button>
<a href="{% url 'services:service_list' %}" class="btn btn-secondary">Clear</a>
</form>
@ -118,12 +94,6 @@
</div>
<p class="card-text">{{ service.description|safe|truncatewords:30 }}</p>
<p class="card-text">
<small class="text-muted">
Service Level: {{ service.service_level.name }}<br>
Price: ${{ service.price }}
</small>
</p>
<a href="{{ service.get_absolute_url }}" class="btn btn-primary">View Details</a>
<a href="{% url 'services:create_lead' service.slug %}" class="btn btn-success">Show Interest</a>
</div>

1
hub/services/templates/services/thank_you.html
View file

@ -15,7 +15,6 @@
<div class="mb-4">
<h5>Service Details</h5>
<p><strong>Provider:</strong> {{ service.cloud_provider.name }}</p>
<p><strong>Service Level:</strong> {{ service.service_level.name }}</p>
</div>
<div class="mb-4">

12
hub/services/views.py
View file

@ -8,8 +8,6 @@ from .models import (
Service,
CloudProvider,
ConsultingPartner,
Country,
ServiceLevel,
Category,
)
@ -22,20 +20,12 @@ logger = logging.getLogger(__name__)
def service_list(request):
services = Service.objects.all()
cloud_providers = CloudProvider.objects.all()
countries = Country.objects.all()
service_levels = ServiceLevel.objects.all()
categories = Category.objects.filter(parent=None)
consulting_partners = ConsultingPartner.objects.all()
if request.GET.get("cloud_provider"):
services = services.filter(cloud_provider_id=request.GET.get("cloud_provider"))
if request.GET.get("country"):
services = services.filter(countries__id=request.GET.get("country"))
if request.GET.get("service_level"):
services = services.filter(service_level_id=request.GET.get("service_level"))
if request.GET.get("category"):
category_id = request.GET.get("category")
category = Category.objects.get(id=category_id)
@ -58,8 +48,6 @@ def service_list(request):
context = {
"services": services,
"cloud_providers": cloud_providers,
"countries": countries,
"service_levels": service_levels,
"categories": categories,
"consulting_partners": consulting_partners,
}