From 547f4a048ecf2584cce49ad4d50481b89c56a652 Mon Sep 17 00:00:00 2001 From: Gregory Trullemans Date: Sun, 9 Jan 2022 21:48:37 +0100 Subject: [PATCH] Update Admin ForeignKey --- templates/ultron/dashboard/dashboard.html | 2 +- ultron/followup/admin.py | 22 ++++++++++++---------- ultron/location/admin.py | 2 +- ultron/objective/admin.py | 5 +++-- ultron/planning/admin.py | 6 +++--- ultron/profiles/admin.py | 1 + 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/templates/ultron/dashboard/dashboard.html b/templates/ultron/dashboard/dashboard.html index 98e0664493..e4bacfede7 100644 --- a/templates/ultron/dashboard/dashboard.html +++ b/templates/ultron/dashboard/dashboard.html @@ -11,7 +11,7 @@

Hi {{ user.username }} !

- Welcome to Ultron v0.41 (last update : 8-1-2022)
+ Welcome to Ultron v0.42 (last update : 9-1-2022)
This application is there to help us manage the gymnasts (evolution, evaluation, routine, scores, ...). It is not perfect so feel free to make improvement proposals, bug reports, … by sending me an email.

Gelukkig nieuwjaar 2022 en mijn beste wensen! diff --git a/ultron/followup/admin.py b/ultron/followup/admin.py index a772b17690..d25ad2cf77 100644 --- a/ultron/followup/admin.py +++ b/ultron/followup/admin.py @@ -1,7 +1,5 @@ from django.contrib import admin -from django_extensions.admin import ForeignKeyAutocompleteAdmin - from .models import ( Chrono, LearnedSkill, @@ -15,13 +13,12 @@ from .models import ( ) -class ChronoAdmin(ForeignKeyAutocompleteAdmin): +class ChronoAdmin(admin.ModelAdmin): model = Chrono list_display = ("date", "gymnast", "tof", "chrono_type") list_filter = ("chrono_type",) - # search_fields = ('gymnast', 'routine') - autocomplete_fields = ["gymnast"] + autocomplete_fields = ("gymnast",) date_hierarchy = "date" related_search_fields = {"gymnast": ("last_name", "first_name")} @@ -32,7 +29,7 @@ class LearnedSkillAdmin(admin.ModelAdmin): list_display = ("gymnast", "skill", "cando", "date") list_filter = ("gymnast", "skill", "cando") search_fields = ("gymnast", "skill") - autocomplete_fields = ["gymnast", "skill"] + autocomplete_fields = ("gymnast", "skill") date_hierarchy = "date" @@ -48,6 +45,7 @@ class PointAdmin(admin.ModelAdmin): ) ordering = ("gymnast",) list_filter = ("gymnast", "event", "routine_type") + autocomplete_fields = ("gymnast", "event") class AccidentAdmin(admin.ModelAdmin): @@ -58,7 +56,7 @@ class AccidentAdmin(admin.ModelAdmin): list_filter = ("date",) date_hierarchy = "date" search_fields = ("date", "gymnast") # educative - autocomplete_fields = ["gymnast"] # educative + autocomplete_fields = ("gymnast", "skill") class MindStateAdmin(admin.ModelAdmin): @@ -67,10 +65,11 @@ class MindStateAdmin(admin.ModelAdmin): fields = ("gymnast", "date", "score", "informations") list_display = ("date", "gymnast", "score") list_filter = ("date", "gymnast") + autocomplete_fields = ("gymnast", ) date_hierarchy = "date" -class GymnastHasRoutineAdmin(ForeignKeyAutocompleteAdmin): +class GymnastHasRoutineAdmin(admin.ModelAdmin): model = GymnastHasRoutine list_display = ("gymnast", "routine", "routine_type", "datebegin", "dateend") @@ -79,7 +78,7 @@ class GymnastHasRoutineAdmin(ForeignKeyAutocompleteAdmin): autocomplete_fields = ("gymnast", "routine") -class NumberOfRoutineDoneAdmin(ForeignKeyAutocompleteAdmin): +class NumberOfRoutineDoneAdmin(admin.ModelAdmin): model = NumberOfRoutineDone list_display = ( @@ -90,15 +89,17 @@ class NumberOfRoutineDoneAdmin(ForeignKeyAutocompleteAdmin): "number_of_try", ) list_filter = ("gymnast", "routine_type") + autocomplete_fields = ("gymnast", "routine") date_hierarchy = "date" -class HeightWeightAdmin(ForeignKeyAutocompleteAdmin): +class HeightWeightAdmin(admin.ModelAdmin): model = HeightWeight list_display = ("gymnast", "height", "hips_height", "weight", "date") list_filter = ("gymnast",) date_hierarchy = "date" + autocomplete_fields = ("gymnast",) class PlanAdmin(admin.ModelAdmin): @@ -113,6 +114,7 @@ class PlanAdmin(admin.ModelAdmin): "educative__short_label", ) date_hierarchy = "date" + autocomplete_fields = ("gymnast",) admin.site.register(Plan, PlanAdmin) diff --git a/ultron/location/admin.py b/ultron/location/admin.py index 6b24e05af6..85e78bfe49 100644 --- a/ultron/location/admin.py +++ b/ultron/location/admin.py @@ -27,7 +27,7 @@ class PlaceAdmin(admin.ModelAdmin): ordering = ("name",) list_filter = ("is_active",) search_fields = ("name", "address", "postal", "city") - autocomplete_fields = ("country",) + autocomplete_fields = ("country",) # , "place" admin.site.register(Place, PlaceAdmin) diff --git a/ultron/objective/admin.py b/ultron/objective/admin.py index eea614846f..edc3a37298 100644 --- a/ultron/objective/admin.py +++ b/ultron/objective/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from django_extensions.admin import ForeignKeyAutocompleteAdmin +# from django_extensions.admin import ForeignKeyAutocompleteAdmin from django_admin_listfilter_dropdown.filters import ( DropdownFilter, @@ -26,7 +26,7 @@ def duplicate_skill(modeladmin, request, queryset): # pylint: disable=unused-ar obj.save() -class SkillAdmin(ForeignKeyAutocompleteAdmin): +class SkillAdmin(admin.ModelAdmin): model = Skill fields = ( @@ -156,6 +156,7 @@ class RoutineSkillAdmin(admin.ModelAdmin): "routine__short_label", ) ordering = ("routine",) + autocomplete_fields = ("routine", "skill") admin.site.register(TouchPosition, TouchPositionAdmin) diff --git a/ultron/planning/admin.py b/ultron/planning/admin.py index 6928a6f102..58ea2b01cf 100644 --- a/ultron/planning/admin.py +++ b/ultron/planning/admin.py @@ -1,5 +1,4 @@ from django.contrib import admin -from django_extensions.admin import ForeignKeyAutocompleteAdmin from .models import ( EventType, @@ -27,7 +26,7 @@ class EventTypeAdmin(admin.ModelAdmin): search_fields = ("name", "acronym") -class EventAdmin(ForeignKeyAutocompleteAdmin): +class EventAdmin(admin.ModelAdmin): model = Event fields = ("name", "eventtype", "place", "datebegin", "dateend", "informations") @@ -35,7 +34,7 @@ class EventAdmin(ForeignKeyAutocompleteAdmin): ordering = ("name",) list_filter = ("eventtype",) search_fields = ("name",) - autocomplete_fields = ("eventtype",) + autocomplete_fields = ("eventtype", "place") date_hierarchy = "datebegin" # related_search_fields = { @@ -51,6 +50,7 @@ class EventParticipationAdmin(admin.ModelAdmin): fields = ("event", "gymnast", "rank") list_display = ("event", "gymnast", "rank") + autocomplete_fields = ("event", "gymnast") admin.site.register(EventType, EventTypeAdmin) diff --git a/ultron/profiles/admin.py b/ultron/profiles/admin.py index fa3a761db8..f56abe9a17 100644 --- a/ultron/profiles/admin.py +++ b/ultron/profiles/admin.py @@ -5,6 +5,7 @@ from .models import Profile class ProfileAdmin(admin.ModelAdmin): model = Profile list_display = ("user", "template_color", "sidebar_color") + autocomplete_fields = ("user",) admin.site.register(Profile, ProfileAdmin)