Merge "Rewrite Notification subsystem"

4 files changed, 15 insertions, 15 deletions

diff --git a/dashboard/src/api/models.py b/dashboard/src/api/models.py
index 9afc89a..4237559 100644
--- a/dashboard/src/api/models.py
+++ b/dashboard/src/api/models.py
@@ -217,6 +217,18 @@ class Job(models.Model):
                 tasklist += list(cls.objects.filter(job=self).filter(status=status))
         return tasklist
 
+    def is_fulfilled(self):
+        """
+        This method should return true if all of the job's tasks are done,
+        and false otherwise
+        """
+        my_tasks = self.get_tasklist()
+        for task in my_tasks:
+            if task.status != JobStatus.DONE:
+                return False
+        return True
+
+
     def get_delta(self, status):
         d = {}
         j = {}
diff --git a/dashboard/src/api/serializers/old_serializers.py b/dashboard/src/api/serializers/old_serializers.py
index f50b90b..0944881 100644
--- a/dashboard/src/api/serializers/old_serializers.py
+++ b/dashboard/src/api/serializers/old_serializers.py
@@ -11,13 +11,6 @@
 from rest_framework import serializers
 
 from account.models import UserProfile
-from notifier.models import Notifier
-
-
-class NotifierSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Notifier
-        fields = ('id', 'title', 'content', 'user', 'sender', 'message_type', 'msg_sent')
 
 
 class UserSerializer(serializers.ModelSerializer):
diff --git a/dashboard/src/api/urls.py b/dashboard/src/api/urls.py
index 94f8279..4b1fe40 100644
--- a/dashboard/src/api/urls.py
+++ b/dashboard/src/api/urls.py
@@ -32,7 +32,6 @@ from api.views import *
 
 router = routers.DefaultRouter()
 router.register(r'bookings', BookingViewSet)
-router.register(r'notifier', NotifierViewSet)
 router.register(r'user', UserViewSet)
 
 urlpatterns = [
diff --git a/dashboard/src/api/views.py b/dashboard/src/api/views.py
index 072354f..cc3a668 100644
--- a/dashboard/src/api/views.py
+++ b/dashboard/src/api/views.py
@@ -21,11 +21,11 @@ from django.views.decorators.csrf import csrf_exempt
 import json
 
 from api.serializers.booking_serializer import *
-from api.serializers.old_serializers import NotifierSerializer, UserSerializer
+from api.serializers.old_serializers import UserSerializer
 from account.models import UserProfile
 from booking.models import Booking
-from notifier.models import Notifier
 from api.models import *
+from notifier.manager import NotificationHandler
 
 
 class BookingViewSet(viewsets.ModelViewSet):
@@ -34,11 +34,6 @@ class BookingViewSet(viewsets.ModelViewSet):
     filter_fields = ('resource', 'id')
 
 
-class NotifierViewSet(viewsets.ModelViewSet):
-    queryset = Notifier.objects.none()
-    serializer_class = NotifierSerializer
-
-
 class UserViewSet(viewsets.ModelViewSet):
     queryset = UserProfile.objects.all()
     serializer_class = UserSerializer
@@ -87,6 +82,7 @@ def specific_task(request, lab_name="", job_id="", task_id=""):
         if 'message' in request.POST:
             task.message = request.POST.get('message')
         task.save()
+        NotificationHandler.task_updated(task)
         d = {}
         d['task'] = task.config.get_delta()
         m = {}