Merge pull request #193 from PROCOLLAB-github/feature/trajectories

Оптимизация административной панели

Author: Toksi86

apps/courses/admin.py

@@ -17,6 +17,7 @@ class SkillAdmin(admin.ModelAdmin):
         "status",
         "free_access",
     )
+    search_fields = ("name",)
 
 
 @admin.register(Task)
@@ -75,6 +76,7 @@ def question_type(self, obj):
 
     def has_popups(self, obj):
         return obj.popup.exists()
+
     has_popups.boolean = True
 
 

apps/trajectories/admin.py

@@ -11,13 +11,15 @@ class TrajectoryAdmin(admin.ModelAdmin):
         "company",
         "start_date",
         "duration_months",
-        "background_color",
-        "button_color",
-        "select_button_color",
-        "text_color",
     )
-    list_filter = ["company", "start_date"]
-    search_fields = ["name", "company"]
+    list_filter = ("company", "start_date",)
+    search_fields = ("name", "company",)
+    autocomplete_fields = ("mentors",)
+
+    def get_mentors(self, obj):
+        return ", ".join([mentor.email for mentor in obj.mentors.all()])
+
+    get_mentors.short_description = "Наставники"
 
 
 @admin.register(Month)
@@ -27,7 +29,9 @@ class MonthAdmin(admin.ModelAdmin):
         "trajectory",
         "skills_list",
     )
-    search_fields = ["trajectory__name"]
+    list_filter = ("trajectory",)
+    search_fields = ("trajectory__name",)
+    autocomplete_fields = ("skills",)
 
     def skills_list(self, obj):
         return ", ".join(skill.name for skill in obj.skills.all())
@@ -45,8 +49,9 @@ class UserTrajectoryAdmin(admin.ModelAdmin):
         "is_active",
         "mentor",
     )
-    list_filter = ["is_active", "trajectory"]
-    search_fields = ["user__email", "trajectory__name"]
+    list_filter = ("is_active", "trajectory",)
+    search_fields = ("user__email", "trajectory__name",)
+    autocomplete_fields = ("mentor",)
 
     def trajectory_name(self, obj):
         return obj.trajectory.name
@@ -62,8 +67,9 @@ class MeetingAdmin(admin.ModelAdmin):
         "initial_meeting",
         "final_meeting",
     )
-    list_filter = ["initial_meeting", "final_meeting"]
-    search_fields = ["user_trajectory__user__email"]
+    readonly_fields = ("user_trajectory",)
+    list_filter = ("initial_meeting", "final_meeting",)
+    search_fields = ("user_trajectory__user__email",)
 
     def user_trajectory_user_email(self, obj):
         return obj.user_trajectory.user.email

apps/trajectories/apps.py

@@ -5,3 +5,6 @@ class TrajectoriesConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name = "trajectories"
     verbose_name = "Траектории"
+
+    def ready(self):
+        import trajectories.signals  # noqa

apps/trajectories/serializers.py

@@ -12,7 +12,12 @@
 
 
 class TrajectoryIdSerializer(serializers.Serializer):
-    user_trajectory_id = serializers.IntegerField(source="id")
+    trajectory_id = serializers.IntegerField(source="trajectory.id", write_only=True)
+    user_trajectory_id = serializers.IntegerField(source="id", read_only=True)
+
+    class Meta:
+        model = Trajectory
+        fields = ["user_trajectory_id", "trajectory_id"]
 
 
 class TrajectoryStudentSerializer(serializers.ModelSerializer):

apps/trajectories/signals.py

@@ -0,0 +1,10 @@
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+
+from trajectories.models import Meeting, UserTrajectory
+
+
+@receiver(post_save, sender=UserTrajectory)
+def create_meeting_for_new_trajectory(sender, instance, created, **kwargs):
+    if created:
+        Meeting.objects.create(user_trajectory=instance)