Merge pull request #765 in RMS/api-main-service from core-dev-gladys to RMSv2

* commit '6f54cdd6':
  {dev bugfix} remove fields in model (company_desc, requested_desc, department_desc)

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

@@ -98,7 +98,7 @@ class ChangeRequestFormHeaderSerializer(
             ret['template_object'] = "None"
 
             return ret
-    # 'company_desc', 'department_desc', 'requested_desc',
+    
     class Meta:
         model = models.ChangeRequestFormHeader
         # fields = '__all__'

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

@@ -1196,7 +1196,6 @@ class ChangeRequestFormPost(APIView):
     def post(self, request):
         
         form_header = request.data
-        # comment
         try:
             data_list_approver = []
             data_list_stake = []
@@ -1211,9 +1210,6 @@ class ChangeRequestFormPost(APIView):
                 'requested_to_priority': form_header['requested_to_priority'],
                 'description': form_header['description'],
                 'status': form_header['status'],
-                'company_desc': None,
-                'department_desc': None,
-                'requested_desc': None,
                 'requested_by_department': form_header['requested_by_department'],
                 'requested_by_user': form_header['requested_by_user'],
                 'requested_to_company': form_header['requested_to_company'],
@@ -1221,6 +1217,10 @@ class ChangeRequestFormPost(APIView):
                 'requested_to_user': form_header['requested_to_user'],
                 'template_no': form_header['template_no']
             }
+
+            # 'company_desc': None,
+            # 'department_desc': None,
+            # 'requested_desc': None,
             
             sp1 = transaction.savepoint()  # nothing will save to db
 

app/applicationlayer/cms/form/serializers.py

@@ -118,7 +118,6 @@ class ChangeRequestFormHeaderSerializer(
         fields = ('form_code', 'requested_to_template_name', 'requested_to_objective',
                   'requested_to_target_date', 'requested_to_priority',
                   'description', 'created', 'cancel_date', 'status',
-                  'company_desc', 'department_desc', 'requested_desc',
                   'requested_to_template_id', 'requested_to_company',
                   'requested_to_department', 'requested_to_user',
                   'requested_by_user', 'requested_by_department',
@@ -127,7 +126,7 @@ class ChangeRequestFormHeaderSerializer(
 
         read_only_fields = ['created', 'form_code']
 
-
+        # 'company_desc', 'department_desc', 'requested_desc',
 class ChangeRequestFormHeaderSerializerList(
     serializers.ModelSerializer
 ):

app/applicationlayer/cms/form/views.py

@@ -941,9 +941,6 @@ class ChangeRequestFormPost(APIView):
                 'requested_to_priority': form_header['requested_to_priority'],
                 'description': form_header['description'],
                 'status': form_header['status'],
-                'company_desc': form_header['company_desc'],
-                'department_desc': form_header['department_desc'],
-                'requested_desc': form_header['requested_desc'],
                 'requested_by_department': form_header['requested_by_department'],
                 'requested_by_user': form_header['requested_by_user'],
                 'requested_to_company': form_header['requested_to_company'],
@@ -952,6 +949,10 @@ class ChangeRequestFormPost(APIView):
                 'template_no': form_header['template_no']
             }
 
+            # 'company_desc': form_header['company_desc'],
+            # 'department_desc': form_header['department_desc'],
+            # 'requested_desc': form_header['requested_desc'],
+
             sp1 = transaction.savepoint()  # nothing will save to db
 
             serializer = serializers.ChangeRequestFormHeaderSerializer(

app/entities/migrations/0003_auto_20200206_1422.py

+# Generated by Django 2.2 on 2020-02-06 14:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0002_auto_20200205_1707'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='changerequestformheader',
+            name='company_desc',
+        ),
+        migrations.RemoveField(
+            model_name='changerequestformheader',
+            name='department_desc',
+        ),
+        migrations.RemoveField(
+            model_name='changerequestformheader',
+            name='requested_desc',
+        ),
+    ]

app/entities/models.py

@@ -784,18 +784,6 @@ class ChangeRequestFormHeader(BaseHeader):
         on_delete=models.PROTECT,
         to_field='template_no')
     status = models.CharField(max_length=50)
-    company_desc = models.CharField(
-        max_length=255,
-        null=True,
-        blank=True)
-    department_desc = models.CharField(
-        max_length=255,
-        null=True,
-        blank=True)
-    requested_desc = models.CharField(
-        max_length=255,
-        null=True,
-        blank=True)
     requested_to_template_id = models.CharField(
         max_length=255)
     requested_to_target_date = models.DateTimeField(
@@ -817,6 +805,18 @@ class ChangeRequestFormHeader(BaseHeader):
             self.form_code = code
             self.save()
 
+    # company_desc = models.CharField(
+    #     max_length=255,
+    #     null=True,
+    #     blank=True)
+    # department_desc = models.CharField(
+    #     max_length=255,
+    #     null=True,
+    #     blank=True)
+    # requested_desc = models.CharField(
+    #     max_length=255,
+    #     null=True,
+    #     blank=True)
 
 class ChangeRequestFormApprovers(BaseApprover):
     code = models.CharField(