Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
ggounot committed Aug 22, 2024
1 parent 0fe50ee commit bdc64fc
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
24 changes: 24 additions & 0 deletions dora/services/admin.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.contrib.admin import RelatedOnlyFieldListFilter
from django.contrib.gis import admin
from django.db.models import Count

from dora.core.admin import EnumAdmin

Expand All @@ -10,6 +11,7 @@
CoachOrientationMode,
ConcernedPublic,
Credential,
FundingLabel,
LocationKind,
Requirement,
SavedSearch,
Expand Down Expand Up @@ -146,6 +148,27 @@ class ServiceModelAdmin(admin.ModelAdmin):
raw_id_fields = ["structure", "model", "creator", "last_editor"]


class FundingLabelAdmin(admin.ModelAdmin):
list_display = [
"department",
"label",
"service_count"
]
search_fields = (
"department",
"label",
)
ordering = ["department"]

def get_queryset(self, request):
queryset = super().get_queryset(request)
queryset = queryset.annotate(service_count=Count("service"))
return queryset

def service_count(self, obj):
return obj.service_count


class CustomizableChoiceAdmin(admin.ModelAdmin):
list_display = ("name", "structure")
list_filter = [
Expand Down Expand Up @@ -192,6 +215,7 @@ class SavedSearchAdmin(admin.ModelAdmin):

admin.site.register(Service, ServiceAdmin)
admin.site.register(ServiceModel, ServiceModelAdmin)
admin.site.register(FundingLabel, FundingLabelAdmin)
admin.site.register(AccessCondition, CustomizableChoiceAdmin)
admin.site.register(ConcernedPublic, CustomizableChoiceAdmin)
admin.site.register(Requirement, CustomizableChoiceAdmin)
Expand Down
1 change: 1 addition & 0 deletions dora/services/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ def _get_di_results(
lat=lat,
lon=lon,
)
print(set([r["service"]["source"] for r in raw_di_results if r]))
except requests.ConnectionError:
return []

Expand Down

0 comments on commit bdc64fc

Please sign in to comment.