fixing merge

app/applicationlayer/cms/form/serializers.py

@@ -3,9 +3,6 @@ from rest_framework import serializers
 from django.db.models import Q
 from drf_writable_nested import WritableNestedModelSerializer
 from django.forms.models import model_to_dict
-from app.applicationlayer.cms.utils_cr import (get_account_details,
-                                               get_dept_details,
-                                               get_companies_details)
 
 
 class ChangeRequestFormApproversSerializer(
@@ -14,29 +11,21 @@ class ChangeRequestFormApproversSerializer(
     def to_representation(self, instance):
         ret = super().to_representation(instance)
         try:
-            user = instance.user
-            
-            user_details = get_account_details(user.code)
-            name = user_details.values_list('name', flat=True)[0]
-            dept_code = user_details.values_list('department', flat=True)[0]
-            department_details = get_dept_details(dept_code)
-            department = department_details.values_list('name', flat=True)[0]
-            comp_code = department_details.values_list('company', flat=True)[0]
-            company_details = get_companies_details(comp_code)
-            company = company_details.values_list('name', flat=True)[0]
-            
-            ret['name'] = name
-            ret['department'] = department
-            ret['company'] = company
-            
-            # ret['company'] = model_to_dict(instance.user.department.company)
-            # ret['department'] = model_to_dict(instance.user.department)
-            # ret['name'] = model_to_dict(instance.user)
-            
+            ret['company'] = model_to_dict(instance.user.department.company)
+            ret['department'] = model_to_dict(instance.user.department)
+            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
             return ret
         
         except Exception as e:
-            ret['name'] = "none"
+            ret['user'] = "none"
             ret['department'] = "none"
             ret['company'] = "none"
             return ret

app/applicationlayer/cms/form/views.py

@@ -27,7 +27,8 @@ from app.applicationlayer.cms.utils_cr import (number_generator,
                                                next_approver_email,
                                                crhistory_save,
                                                send_mail_vendor,
-                                               get_max_batchno)
+                                               get_max_batchno,
+                                               generate_template_id)
 from app.entities import enums
 from django.forms.models import model_to_dict
 import json
@@ -718,6 +719,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         batchno = get_max_batchno("batch")
 
         # generate requested_to_template_id
+        generate_template_id(CR_Prefix, form_code, template_no)
 
         data_update = {
             "status": 'Pendsing',
@@ -999,14 +1001,11 @@ class ChangeRequestFormPost(APIView):
                 serializer.save()
             
             template_no = serializer.data['template_no']
-
             CR_Prefix = serializer.data['requested_to_template_id']
-
             frm_id = serializer.data['form_code']
 
             # generate requested template id
-
-            
+            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,9 +7,8 @@ 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
+from app.applicationlayer.cms.template.stakeholder.serializers import ChangeRequestTemplateStakeHoldersSerializer
 
 
 class ChangeRequestTemplateAttachmentsSerializer(
@@ -35,7 +34,7 @@ class ChangeRequestTemplatesSerializer(
 ):
     tmp_approvers = ChangeRequestTemplateApproversSerializer(
         many=True, read_only=True)
-    tmp_stakes = ChangeRequestTemplateStakeholdersSerializer(
+    tmp_stakes = ChangeRequestTemplateStakeHoldersSerializer(
         many=True, read_only=True)
     tmp_attachments = ChangeRequestTemplateAttachmentsSerializer(
         many=True, read_only=True)
@@ -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/stakeholder/serializers.py

@@ -3,7 +3,7 @@ from app.entities import models
 from django.forms.models import model_to_dict
 
 
-class ChangeRequestTemplateStakeholdersSerializer(
+class ChangeRequestTemplateStakeHoldersSerializer(
     serializers.ModelSerializer
 ):
     def to_representation(self, instance):

app/applicationlayer/cms/template/stakeholder/views.py

@@ -14,7 +14,7 @@ from app.applicationlayer.utils import (
 class ChangeRequestTemplateStakeholdersViewset(viewsets.ModelViewSet):
 
     queryset = models.ChangeRequestTemplateStakeHolders.objects.all()
-    serializer_class = serializers.ChangeRequestTemplateStakeholdersSerializer
+    serializer_class = serializers.ChangeRequestTemplateStakeHoldersSerializer
     pagination_class = CustomPagination
     lookup_field = "code"
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)

app/applicationlayer/cms/template/views.py

 from rest_framework import viewsets as meviewsets
 from rest_framework.views import APIView
 from app.applicationlayer.cms.template import serializers
+
 from app.entities import models
 
 from rest_framework.response import Response
@@ -206,8 +207,13 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
 
     @transaction.atomic
     def partial_update(self, request, *args, **kwargs):
+<<<<<<< HEAD
 
         partial = kwargs.pop('partial', False)
+=======
+        
+        partial = kwargs.pop('partial', True)
+>>>>>>> 499b31aed51c5eb9414a0a713597b2951aa6a974
         instance = self.get_object()
 
         template_no = kwargs['template_no']
@@ -244,7 +250,18 @@ 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
+            )
 
+<<<<<<< HEAD
             if body_data['tmp_stakes']:
                 tmp_add_edit_delete(
                     body_data['tmp_stakes'],
@@ -277,6 +294,27 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
                     self,
                     template_no
                 )
+=======
+            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_details'],
+                models.ChangeRequestTemplateDetails,
+                enums.LogEntitiesEnum.ChangeRequestTemplateDetails.value,
+                serializers.ChangeRequestTemplateDetailsSerializer,
+                partial,
+                self,
+                template_no
+            )
+>>>>>>> 499b31aed51c5eb9414a0a713597b2951aa6a974
 
             serializer = self.get_serializer(instance)
 
@@ -292,7 +330,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
             "Unable to edit due to existing transaction",
                 status=status.HTTP_400_BAD_REQUEST
         )
-#try
+
 
 class ChangeRequestTemplatePost(APIView):
 

app/applicationlayer/cms/utils_cr.py

@@ -481,5 +481,5 @@ def generate_template_id(prefix, form_code, template_no):
     generate_tmp = number_generator(prefix, tmp_counter)
 
     models.ChangeRequestFormHeader.objects.filter(
-        form_code=frm_id).update(
+        form_code=form_code).update(
             requested_to_template_id=generate_tmp)
\ No newline at end of file

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,