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

* commit 'eb36fc53':
  migrations
  serializers template

app/applicationlayer/cms/form/views.py

@@ -1002,10 +1002,10 @@ class ChangeRequestFormPost(APIView):
             
             template_no = serializer.data['template_no']
             CR_Prefix = serializer.data['requested_to_template_id']
-            form_code = serializer.data['form_code']
+            frm_id = serializer.data['form_code']
 
             # generate requested template id
-            generate_template_id(CR_Prefix, form_code, template_no)
+            generate_template_id(CR_Prefix, frm_id, template_no)
             
             # create template approvers
             frm_approvers = form_header['frm_approvers']

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

@@ -20,7 +20,7 @@ class ChangeRequestTemplateApproversSerializer(
             ret['company'] = model_to_dict(instance.user.department.company)
             ret['department'] = model_to_dict(instance.user.department)
             ret['user'] = user_object
-
+            
             return ret
         except Exception as e:
             ret['company'] = "none"

app/applicationlayer/cms/template/serializers.py

@@ -7,7 +7,6 @@ from app.applicationlayer.cms.utils_cr import (get_account_details,
                                                get_dept_details,
                                                get_companies_details)
 
-
 from app.applicationlayer.cms.template.approver.serializers import ChangeRequestTemplateApproversSerializer
 from app.applicationlayer.cms.template.stakeholder.serializers import ChangeRequestTemplateStakeHoldersSerializer
 
@@ -45,15 +44,14 @@ class ChangeRequestTemplatesSerializer(
     def to_representation(self, instance):
         ret = super().to_representation(instance)
         try:
-
-            ret['company'] = model_to_dict(instance.user.department.company)
-            ret['department'] = model_to_dict(instance.user.department)
-            ret['point_of_contact'] = model_to_dict(instance.requested_to_user)
-            ret['created_by'] = instance.created_by_user.code
+        
+            ret['company'] = instance.requested_to_company.name
+            ret['department'] = instance.requested_to_department.name
+            ret['point_of_contact'] = instance.requested_to_user.name
+            ret['created_by'] = instance.created_by_user.name
 
             return ret
         except Exception as e:
-
             ret['company'] = "none"
             ret['department'] = "none"
             ret['point_of_contact'] = "none"

app/applicationlayer/cms/template/views.py

@@ -219,7 +219,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
     @transaction.atomic
     def partial_update(self, request, *args, **kwargs):
         
-        partial = kwargs.pop('partial', False)
+        partial = kwargs.pop('partial', True)
         instance = self.get_object()
 
         template_no = kwargs['template_no']
@@ -256,39 +256,36 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
                 self,
                 template_no
             )
+            
+            tmp_add_edit_delete(
+                body_data['tmp_stakes'],
+                models.ChangeRequestTemplateStakeHolders,
+                enums.LogEntitiesEnum.ChangeRequestTemplateStakeHolders.value,
+                serializers.ChangeRequestTemplateStakeHoldersSerializer,
+                partial,
+                self,
+                template_no
+            )
 
-            if body_data['tmp_stakes']:
-                tmp_add_edit_delete(
-                    body_data['tmp_stakes'],
-                    models.ChangeRequestTemplateStakeHolders,
-                    enums.LogEntitiesEnum.ChangeRequestTemplateStakeHolders.value,
-                    serializers.ChangeRequestTemplateStakeHoldersSerializer,
-                    partial,
-                    self,
-                    template_no
-                )
-
-            if body_data['tmp_attachments']:
-                tmp_add_edit_delete(
-                    body_data['tmp_attachments'],
-                    models.ChangeRequestTemplateAttachments,
-                    enums.LogEntitiesEnum.ChangeRequestTemplateAttachments.value,
-                    serializers.ChangeRequestTemplateAttachmentsSerializer,
-                    partial,
-                    self,
-                    template_no
-                )
+            tmp_add_edit_delete(
+                body_data['tmp_attachments'],
+                models.ChangeRequestTemplateAttachments,
+                enums.LogEntitiesEnum.ChangeRequestTemplateAttachments.value,
+                serializers.ChangeRequestTemplateAttachmentsSerializer,
+                partial,
+                self,
+                template_no
+            )
 
-            if body_data['tmp_details']:
-                tmp_add_edit_delete(
-                    body_data['tmp_details'],
-                    models.ChangeRequestTemplateDetails,
-                    enums.LogEntitiesEnum.ChangeRequestTemplateDetails.value,
-                    serializers.ChangeRequestTemplateDetailsSerializer,
-                    partial,
-                    self,
-                    template_no
-                )
+            tmp_add_edit_delete(
+                body_data['tmp_details'],
+                models.ChangeRequestTemplateDetails,
+                enums.LogEntitiesEnum.ChangeRequestTemplateDetails.value,
+                serializers.ChangeRequestTemplateDetailsSerializer,
+                partial,
+                self,
+                template_no
+            )
 
             serializer = self.get_serializer(instance)
 
@@ -304,7 +301,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
             "Unable to edit due to existing transaction",
                 status=status.HTTP_400_BAD_REQUEST
         )
-#try
+
 
 class ChangeRequestTemplatePost(APIView):
 

app/entities/migrations/0009_auto_20190926_1837.py

+# Generated by Django 2.2 on 2019-09-26 18:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0008_auto_20190926_1040'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='changerequestformdetails',
+            name='field_idx',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='changerequestformdetails',
+            name='field_props',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='changerequestformdetails',
+            name='field_ref',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='changerequestformdetails',
+            name='field_val',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='changerequesttemplatedetails',
+            name='field_idx',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='changerequesttemplatedetails',
+            name='field_props',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='changerequesttemplatedetails',
+            name='field_ref',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='changerequesttemplatedetails',
+            name='field_val',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

app/entities/models.py

@@ -440,7 +440,7 @@ class MasterAttachment(models.Model):
         upload_to='uploads/',
         blank=True,
         null=True)
-    
+
     class Meta:
         db_table = 'master_attachments'
 
@@ -470,10 +470,21 @@ class BaseAttachment(models.Model):
 
 
 class BaseDetails(models.Model):
-    field_idx = models.TextField(max_length=255)
-    field_ref = models.TextField(max_length=255)
-    field_val = models.TextField(max_length=255)
-    field_props = models.TextField(max_length=255)
+    field_idx = models.TextField(
+        blank=True,
+        null=True)
+    field_ref = models.TextField(
+        blank=True,
+        null=True
+    )
+    field_val = models.TextField(
+        blank=True,
+        null=True
+    )
+    field_props = models.TextField(
+        blank=True,
+        null=True
+    )
 
     created = models.DateTimeField(
         blank=True,