Merge pull request #244 in RMS/api-main-service from red-develop to RMSv2

* commit 'fc506ac5':
  clean code at current user and fixed the list of user on CRs drop down

app/applicationlayer/cms/master/account/views.py

@@ -20,7 +20,8 @@ class UserList(APIView):
             company = self.request.query_params['company_code']
             user_list = models.AllowedCompany.objects.filter(
                 Q(company_pivot=company) &
-                Q(group_pivots=dept)
+                Q(group_pivots=dept) &
+                Q(id_number=request.user.code)
             )
             user_list = user_list.exclude(id=1).values('id_number')
             queryset = models.User.objects.filter(code__in=user_list).order_by('name')

app/applicationlayer/management/user/serializers.py

@@ -96,23 +96,6 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
         rms = models.Application.objects.filter(id=1).values().first()
 
         for data in app:
-            # if data.id == 1:
-            #     if user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
-            #         rms_module = models.Module.objects.filter(
-            #             Q(application=rms['code']) &
-            #             Q(parent=0)
-            #         )
-            #     elif user.user_type.upper() != enums.UserTypeEnum.USER.value:
-            #         rms_module = models.Module.objects.filter(
-            #             code="MODULE-20190919-0000006"
-            #         )
-            # else:
-            #     rms_module = data.modules.all()
-            # if user.user_type.upper() != enums.UserTypeEnum.USER.value:
-            #     rms_module2 = models.Module.objects.filter(code="MODULE-20190919-0000006")
-            #     datas = rms_module.union(rms_module, rms_module2)
-            # else:
-                # datas = rms_module
             mod = data.modules.filter(~Q(name__icontains='header'))
             if user.user_type.upper() != enums.UserTypeEnum.USER.value:
                 if user.user_type.upper() != enums.UserTypeEnum.USER.value:
@@ -120,12 +103,6 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
                         name__icontains="user"
                     )
                     mod = mod.union(mod, user_module)
-                # else:
-                #     mod = user_module = models.Module.objects.filter(
-                #         name__icontains="user"
-                #     )
-
-            # mod = mod.exclude(parent=0)
             mod = mod.order_by("parent", "sort_id")
 
             mod = ModuleSerializer(data=mod, many=True)

app/entities/models.py

@@ -741,7 +741,7 @@ class ChangeRequestFormApprovers(BaseApprover):
         null=True)
     action_date = models.DateTimeField(
         blank=True,
-        null=True) 
+        null=True)
     date_sent = models.DateTimeField(
         blank=True,
         null=True)