Removed the stale app — manual_class_logging, which was used during t…

…he dashboard launch for manualy accounting teachers
e-coeur · Jan 3, 2017 · 501678c · 501678c
1 parent a3cd27a
commit 501678c
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 173 deletions.
diff --git a/elk/settings.py b/elk/settings.py
@@ -78,7 +78,6 @@ def get_git_revision():
     'history',  # an app for future data mining — all significant user actions are recorded here
     'mailer',
     'extevents',  # integrations with external calendars, like Google's one
-    'manual_class_logging',  # temporary app to log classes completed outside the system. Should be deleted in 2016
     'accounting',  # teacher accounting — passed classes, customer inspired cancellation etc
     'payments',  # students payment processing
 

diff --git a/manual_class_logging/__init__.py b/manual_class_logging/__init__.py
diff --git a/manual_class_logging/admin.py b/manual_class_logging/admin.py
diff --git a/manual_class_logging/apps.py b/manual_class_logging/apps.py
diff --git a/manual_class_logging/migrations/0001_initial.py b/manual_class_logging/migrations/0001_initial.py
diff --git a/manual_class_logging/migrations/0002_auto_20160822_1646.py b/manual_class_logging/migrations/0002_auto_20160822_1646.py
diff --git a/manual_class_logging/migrations/__init__.py b/manual_class_logging/migrations/__init__.py
diff --git a/manual_class_logging/models.py b/manual_class_logging/models.py
diff --git a/manual_class_logging/signals.py b/manual_class_logging/signals.py
diff --git a/market/admin/actions.py b/market/admin/actions.py
@@ -1,10 +1,9 @@
 from django import forms
 from django.contrib import admin
-from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import redirect
 
 from elk.admin.forms import ActionFormWithParams
 from elk.logging import write_admin_log_entry
-from manual_class_logging.signals import class_marked_as_used, class_renewed
 from teachers.models import Teacher
 
 
@@ -30,8 +29,6 @@ def mark_as_used(modeladmin, request, queryset):
     if pk == -1:  # when no teacher is specified
         pk = request.user.teacher_data.pk
 
-    teacher = get_object_or_404(Teacher, pk=pk)
-
     for c in queryset.all():
         if not c.is_fully_used:
             c.mark_as_fully_used()
@@ -40,7 +37,6 @@ def mark_as_used(modeladmin, request, queryset):
                 object=c,
                 msg='Marked as used',
             )
-            class_marked_as_used.send(sender=mark_as_used, instance=c, teacher=teacher)
 
 
 def renew(modeladmin, request, queryset):
@@ -53,8 +49,6 @@ def renew(modeladmin, request, queryset):
     if pk == -1:  # when no teacher is specified
         pk = request.user.teacher_data.pk
 
-    teacher = get_object_or_404(Teacher, pk=pk)
-
     for c in queryset.all():
         if c.is_fully_used:
             c.renew()
@@ -63,7 +57,6 @@ def renew(modeladmin, request, queryset):
                 object=c,
                 msg='Renewed',
             )
-            class_renewed.send(sender=renew, instance=c, teacher=teacher)
 
 
 def export_emails(modeladmin, request, queryset):

diff --git a/market/migrations/0003_auto_20160929_0355.py b/market/migrations/0003_auto_20160929_0355.py
@@ -12,7 +12,7 @@ def mark_double_scheduled_classes(apps, schema_editor):
     For details of the fix, see the rest of the commit
     """
     Class = apps.get_model('market.Class')
-    for c in Class.objects.filter(manualy_completed_classes__isnull=False, timeline__isnull=False):
+    for c in Class.objects.filter(timeline__isnull=False):
         print("Got double-marked class for", c.customer.user.first_name, c.customer.user.last_name)
         print(" → Double marked class id", c.pk)
         print(" → Findind the actual class to mark as used")