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

* commit '606a1444':
  temp serializer approver

app/applicationlayer/cms/template/approver/serializers.py

@@ -10,35 +10,6 @@ class ChangeRequestTemplateApproversSerializer(
         try:
             ret = super().to_representation(instance)
 
-            if instance.user:
-                user_object = {
-                    "id": instance.user.id,
-                    "name": instance.user.name,
-                    "username": instance.user.username,
-                    "code": instance.user.code,
-                    "email": instance.user.email,
-                    "contact_no": instance.user.contact_no
-                }
-
-                ret['company'] = {
-                    "id": instance.user.department.company.id,
-                    "code": instance.user.department.company.code,
-                    "name": instance.user.department.company.name
-                }
-                ret['department'] = {
-                    "id": instance.user.department.id,
-                    "code": instance.user.department.code,
-                    "name": instance.user.department.name
-                }
-                ret['user'] = user_object
-                ret['editable_user'] = False
-                ret['editable_comp'] = False
-                ret['editable_dept'] = False
-            else:
-                ret['editable_user'] = True
-                ret['editable_comp'] = True
-                ret['editable_dept'] = True
-
             if instance.company:
                 
                 ret['company'] = {
@@ -61,6 +32,22 @@ class ChangeRequestTemplateApproversSerializer(
             else:
                 ret['editable_dept'] = True
 
+            if instance.user:
+
+                user_object = {
+                    "id": instance.user.id,
+                    "name": instance.user.name,
+                    "username": instance.user.username,
+                    "code": instance.user.code,
+                    "email": instance.user.email,
+                    "contact_no": instance.user.contact_no
+                }
+
+                ret['user'] = user_object
+                ret['editable_user'] = False
+            else:
+                ret['editable_user'] = True
+
             if instance.delegation.lower() == 'requestor':
 
                 ret['editable_user'] = False

app/entities/models.py

@@ -1092,3 +1092,10 @@ class OverdueTrigger(models.Model):
     
     class Meta:
         db_table = 'overdue_trigger'
+
+
+"""
+**********************
+*** AMS TABLES ***
+**********************
+"""
\ No newline at end of file