Commit 82498be1 authored by Gladys Forte's avatar Gladys Forte

Merge pull request #407 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit 'e6a18cf5':
  threading
parents 65591090 e6a18cf5
...@@ -65,7 +65,7 @@ class ReminderTriggerAPIView(views.APIView): ...@@ -65,7 +65,7 @@ class ReminderTriggerAPIView(views.APIView):
requestor_recipient, admin] requestor_recipient, admin]
main_threading(args_requestor, sender.routing_table_reminder_requestor) main_threading(args_requestor, sender.routing_table_reminder_requestor)
today_mail.update(date_to_send=next_day.strftime('%Y-%m-%d 00:00:00.000')) today_mail.update(date_to_send=next_day.strftime('%Y-%m-%d 00:00:00.000'))
return Response( return Response(
......
...@@ -60,6 +60,7 @@ from rest_framework.filters import SearchFilter, OrderingFilter ...@@ -60,6 +60,7 @@ from rest_framework.filters import SearchFilter, OrderingFilter
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from django_filters.rest_framework import DjangoFilterBackend from django_filters.rest_framework import DjangoFilterBackend
import json import json
from app.applicationlayer.utils import main_threading
APPROVER_MESSAGE = settings.APPROVER_MESSAGE APPROVER_MESSAGE = settings.APPROVER_MESSAGE
REQUESTOR_MESSAGE = settings.REQUESTOR_MESSAGE REQUESTOR_MESSAGE = settings.REQUESTOR_MESSAGE
...@@ -376,11 +377,13 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -376,11 +377,13 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
ROOM = id_number ROOM = id_number
SENDER = id_number SENDER = id_number
send_broadcast_message( notif = send_broadcast_message(
ROOM, ROOM,
SENDER, SENDER,
'UPDATE NOTIFICATIONS' 'UPDATE NOTIFICATIONS'
) )
main_threading(1, notif)
instance = self.get_object() instance = self.get_object()
serializer = self.get_serializer(instance) serializer = self.get_serializer(instance)
...@@ -680,7 +683,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -680,7 +683,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
url_path='actions', url_name='actions' url_path='actions', url_name='actions'
) )
def actions(self, request, *args, **kwargs): def actions(self, request, *args, **kwargs):
current_user = self.request.user.code current_user = self.request.user.code
action_body = request.data action_body = request.data
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment