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

* commit 'd299a099':
  added company and dep to form approvers

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

@@ -20,39 +20,69 @@ class ChangeRequestFormApproversSerializer(
                 "contact_no": instance.user.contact_no
             }
             ret['user'] = user_object
+            
+            if instance.form_code.status == 'Draft':
+                if instance.tmp_approver:
+                    if instance.tmp_approver.user or instance.tmp_approver.delegation.lower() == 'requestor':
+                        ret['editable_user'] = False
+                    else:
+                        ret['editable_user'] = True
 
-            if instance.tmp_approver:
-                if instance.form_code.status == '' or instance.form_code.status == 'Draft':
-                    if instance.tmp_approver.delegation.lower() == 'requestor':
-                        ret['is_editable'] = False
-                    elif instance.tmp_approver.user:
-                        ret['is_editable'] = False
+                    if instance.tmp_approver.company or instance.tmp_approver.delegation.lower() == 'requestor':
+                        ret['editable_comp'] = False
                     else:
-                        ret['is_editable'] = True
+                        ret['editable_comp'] = True
+
+                    if instance.tmp_approver.department  or instance.tmp_approver.delegation.lower() == 'requestor':
+                        ret['editable_dept'] = False
+                    else:
+                        ret['editable_dept'] = True
+
                 else:
-                    ret['is_editable'] = False    
+                    ret['editable_user'] = False
+                    ret['editable_comp'] = False
+                    ret['editable_dept'] = False
             else:
-                ret['is_editable'] = False
+                ret['editable_user'] = False
+                ret['editable_comp'] = False
+                ret['editable_dept'] = False
 
             return ret
         
         except Exception as e:
-            ret['user'] = "none"
-            ret['department'] = "none"
-            ret['company'] = "none"
             
-            if instance.tmp_approver:
-                if instance.form_code.status == '' or instance.form_code.status == 'Draft':
-                    if instance.tmp_approver.delegation.lower() == 'requestor':
-                        ret['is_editable'] = False
-                    elif instance.tmp_approver.user:
-                        ret['is_editable'] = False
+            if instance.form_code.status == 'Draft':
+                if instance.tmp_approver:
+                    if instance.tmp_approver.user or instance.tmp_approver.delegation.lower() == 'requestor':
+                        ret['editable_user'] = False
                     else:
-                        ret['is_editable'] = True
+                        ret['user'] = None
+                        ret['editable_user'] = True
+
+                    if instance.tmp_approver.company or instance.tmp_approver.delegation.lower() == 'requestor':
+                        ret['company'] = model_to_dict(
+                            instance.tmp_approver.company)
+                        ret['editable_comp'] = False
+                    else:
+                        ret['company'] = None
+                        ret['editable_comp'] = True
+
+                    if instance.tmp_approver.department  or instance.tmp_approver.delegation.lower() == 'requestor':
+                        ret['department'] = model_to_dict(
+                            instance.tmp_approver.department)
+                        ret['editable_dept'] = False
+                    else:
+                        ret['department'] = None
+                        ret['editable_dept'] = True
+
                 else:
-                    ret['is_editable'] = False    
+                    ret['editable_user'] = False
+                    ret['editable_comp'] = False
+                    ret['editable_dept'] = False
             else:
-                ret['is_editable'] = False
+                ret['editable_user'] = False
+                ret['editable_comp'] = False
+                ret['editable_dept'] = False
 
             return ret
 

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

@@ -21,25 +21,45 @@ class ChangeRequestTemplateApproversSerializer(
             ret['department'] = model_to_dict(instance.user.department)
             ret['user'] = user_object
 
-            if instance.delegation.lower() == 'requestor':
-                ret['is_editable'] = False
-            elif instance.user:
-                ret['is_editable'] = False
+            if instance.user or instance.delegation.lower() == 'requestor':
+                ret['editable_user'] = False
             else:
-                ret['is_editable'] = True
+                ret['editable_user'] = True
+
+            if instance.company or instance.delegation.lower() == 'requestor':
+                ret['editable_comp'] = False
+            else:
+                ret['editable_comp'] = True
+
+            if instance.department  or instance.delegation.lower() == 'requestor':
+                ret['editable_dept'] = False
+            else:
+                ret['editable_dept'] = True
 
             return ret
         except Exception as e:
-            ret['company'] = "none"
-            ret['department'] = "none"
-            ret['name'] = "none"
             
-            if instance.delegation.lower() == 'requestor':
-                ret['is_editable'] = False
-            elif instance.user:
-                ret['is_editable'] = False
+            if instance.user or instance.delegation.lower() == 'requestor':
+                ret['editable_user'] = False
+            else:
+                ret['user'] = None
+                ret['editable_user'] = True
+
+            if instance.company or instance.delegation.lower() == 'requestor':
+                ret['company'] = model_to_dict(
+                    instance.company)
+                ret['editable_comp'] = False
+            else:
+                ret['company'] = None
+                ret['editable_comp'] = True
+
+            if instance.department  or instance.delegation.lower() == 'requestor':
+                ret['department'] = model_to_dict(
+                    instance.department)
+                ret['editable_dept'] = False
             else:
-                ret['is_editable'] = True
+                ret['department'] = None
+                ret['editable_dept'] = True
 
             return ret
 

app/entities/migrations/0022_auto_20191021_1107.py

+# Generated by Django 2.2 on 2019-10-21 11:07
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0021_changerequestformapprovers_tmp_approver'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='changerequesttemplateapprovers',
+            name='company',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='entities.Company', to_field='code'),
+        ),
+        migrations.AddField(
+            model_name='changerequesttemplateapprovers',
+            name='department',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='entities.Department', to_field='code'),
+        ),
+    ]

app/entities/models.py

@@ -557,6 +557,18 @@ class ChangeRequestTemplateApprovers(BaseApprover):
         on_delete=models.PROTECT,
         to_field='template_no',
         related_name='tmp_approvers')
+    company = models.ForeignKey(
+        Company,
+        blank=True,
+        null=True,
+        on_delete=models.PROTECT,
+        to_field='code')
+    department = models.ForeignKey(
+        Department,
+        blank=True,
+        null=True,
+        on_delete=models.PROTECT,
+        to_field='code')
     
     class Meta:
         db_table = 'change_request_template_approvers'