quick improvements

oser_backend/tests/test_tutoring/test_tutoring_session.py

@@ -43,4 +43,4 @@ class TutoringSessionTest(ModelTestCase):
                          self.obj.tutoring_group)
         self.assertIn(self.obj,
                       tutoring.models.TutoringGroup.objects.get()
-                      .tutoring_sessions.all())
+                      .sessions.all())

oser_backend/tutoring/migrations/0004_auto_20180429_1159.py

+# Generated by Django 2.0.4 on 2018-04-29 09:59
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tutoring', '0003_auto_20180429_1053'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tutoringsession',
+            name='tutoring_group',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='sessions', to='tutoring.TutoringGroup', verbose_name='groupe de tutorat'),
+        ),
+    ]

oser_backend/tutoring/models.py

@@ -186,21 +186,7 @@ def default_end_time():
 
 
 class TutoringSession(models.Model):
-    """Represents a tutoring session event.
-
-    Fields
-    ------
-    date : date
-    start_time : time
-    end_time : time
-    tutoring_group : 1-n with tutoring.TutoringGroup
-        Deletion rule: CASCADE
-    report : 1-1 with tutoring.TutoringReport
-
-    Meta
-    ----
-    ordering : by date (upcoming sessions first)
-    """
+    """Represents a tutoring session event."""
 
     date = models.DateField(default=datetime.now)
     start_time = models.TimeField('heure de début',
@@ -210,8 +196,7 @@ class TutoringSession(models.Model):
     tutoring_group = models.ForeignKey('TutoringGroup',
                                        on_delete=models.CASCADE,
                                        verbose_name='groupe de tutorat',
-                                       related_name='tutoring_sessions')
-    # TODO add report 1-1
+                                       related_name='sessions')
 
     class Meta:  # noqa
         verbose_name = 'séance de tutorat'

oser_backend/users/admin.py

@@ -6,7 +6,6 @@ from django.utils.translation import ugettext_lazy as _
 from guardian.admin import GuardedModelAdminMixin
 
 from core.admin import AutocompleteAddressMixin
-from tutoring.admin import TutoringGroupMembershipInline
 from visits.admin import VisitParticipantInline
 
 from .models import Student, Tutor, User
@@ -71,11 +70,21 @@ class ProfileAdminMixin:
     search_fields = ('user__email', 'user__first_name', 'user__last_name',)
 
 
+class TutorTutoringGroupsInline(admin.TabularInline):
+    """Inline for tutor tutoring groups."""
+
+    model = Tutor.tutoring_groups.through
+    extra = 0
+    max_num = 0
+    readonly_fields = ('tutoring_group', 'is_leader')
+    can_delete = False
+
+
 @admin.register(Tutor)
 class TutorAdmin(ProfileAdminMixin, admin.ModelAdmin):
     """Tutor admin panel."""
 
-    inlines = (TutoringGroupMembershipInline,)
+    inlines = (TutorTutoringGroupsInline,)
 
     class Meta:  # noqa
         model = Tutor