Skip to content

R
red-ci-cd
Commit 7644707d authored by John Red Medrano's avatar John Red Medrano
Browse files
Options

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

* commit '12a93c89':
  added code on current user
parents 69a34b1f 12a93c89
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 17 deletions
app/applicationlayer/management/user/serializers.py
View file @ 7644707d
...@@ -62,6 +62,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer): ...@@ -62,6 +62,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
def get_department(self, user): def get_department(self, user):
data = { data = {
"id": user.department.id, "id": user.department.id,
"code": user.department.code
"name": user.department.name "name": user.department.name
} }
return data return data
...@@ -69,6 +70,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer): ...@@ -69,6 +70,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
def get_company(self, user): def get_company(self, user):
data = { data = {
"id": user.department.company.id, "id": user.department.company.id,
"code": user.department.company.code
"name": user.department.company.name "name": user.department.company.name
} }
return data return data
...@@ -94,25 +96,29 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer): ...@@ -94,25 +96,29 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
rms = models.Application.objects.filter(id=1).values().first() rms = models.Application.objects.filter(id=1).values().first()
for data in app: for data in app:
if data.id == 1: # if data.id == 1:
if user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value: # if user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
rms_module = models.Module.objects.filter( # rms_module = models.Module.objects.filter(
Q(application=rms['code']) & # Q(application=rms['code']) &
Q(parent=0) # Q(parent=0)
) # )
elif user.user_type.upper() != enums.UserTypeEnum.USER.value: # elif user.user_type.upper() != enums.UserTypeEnum.USER.value:
rms_module = models.Module.objects.filter( # rms_module = models.Module.objects.filter(
code="MODULE-20190919-0000006" # code="MODULE-20190919-0000006"
) # )
else: # else:
rms_module = data.modules.all() # 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.all()
if user.user_type.upper() != enums.UserTypeEnum.USER.value: if user.user_type.upper() != enums.UserTypeEnum.USER.value:
rms_module2 = models.Module.objects.filter(code="MODULE-20190919-0000006") user_module = models.Module.objects.filter(code="MODULE-20190919-0000006")
datas = rms_module.union(rms_module, rms_module2) mod = mod.union(mod, user_module)
else:
datas = rms_module
mod = ModuleSerializer(data=datas, many=True) mod = ModuleSerializer(data=mod, many=True)
mod.is_valid() mod.is_valid()
app_body = {} app_body = {}
......
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