Merge branch 'red-develop' into 'product-dev'

Red develop

See merge request rms/Backend/api-main-service!910

app/applicationlayer/cms/form/onbehalf/views.py

@@ -7,8 +7,7 @@ from rest_framework import status, views
 
 from django.db.models import Q
 from app.applicationlayer.utils import (QuerySetHelper,
-                                        status_message_response,
-                                        send_broadcast_message)
+                                        status_message_response)
 from app.businesslayer.changerequest import change_request
 
 from app.entities import enums

app/applicationlayer/download/accounts/views.py

@@ -22,7 +22,6 @@ class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
     permission_classes = (AllowAny,)
     
     def list(self, request, *args, **kwargs):
-
         user_type = self.request.user.user_type
         company = self.request.user.department.company.code
         department = self.request.user.department.code

app/applicationlayer/management/account/serializer.py

@@ -34,13 +34,13 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
     department = serializers.SerializerMethodField()
     company = serializers.SerializerMethodField()
     cms_privilege = serializers.SerializerMethodField()
-
+    my_successions = serializers.SerializerMethodField()
 
     class Meta:
         model = User
         fields = (
             'id',
-            "cms_privilege",
+            'cms_privilege',
             'code', 'name',
             'username', 'contact_no',
             'image', 'company',
@@ -96,11 +96,6 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
 
         if test.count() >= 1:
             return {**test.values("create_form","create_template")[0]}
-        else:
-            return {
-                "create_form": False,
-                "create_template": False
-            }
 
     def get_image(self, user):
         request = self.context.get('request')

app/applicationlayer/utils.py

@@ -4,12 +4,10 @@ from rest_framework.response import Response
 from functools import wraps
 from app.entities import enums
 from app.entities.models import EntityLog, Notification
-
 from django.conf import settings
 from websocket import create_connection
 import json
 from rest_framework import status
-
 from rest_framework import serializers
 import copy
 import json
@@ -28,6 +26,10 @@ app_id = config['SETTINGS']['app_id'],
 key = config['SETTINGS']['key']
 secret = config['SETTINGS']['secret']
 cluster = config['SETTINGS']['cluster']
+<<<<<<< HEAD
+# ssl = if config['SETTINGS']['ssl'] == 1 True else
+=======
+>>>>>>> e6304df2e1235506235d9d1491084d7aefb02e8d
 ssl = True if config['SETTINGS']['ssl'] == 1 else False
 cms_notification = config['SETTINGS']['cms_notification']
 
@@ -239,12 +241,6 @@ def notification_create(form_code, message, account_no,
         ROOM = account_no
         # SENDER = sender_account_no
 
-        # send_broadcast_message(
-        #     ROOM,
-        #     SENDER,
-        #     'NEW NOTIFICATIONS'
-        # )
-
         if ssl != 1:
             send_broadcast_message(
                 ROOM,