fixing conflict on cms

app/applicationlayer/cms/form/serializers.py

+<<<<<<< HEAD:app/applicationlayer/cms/form/serializers.py
 from app.entities import models
 from rest_framework import serializers
 from django.db.models import Q
@@ -119,3 +120,126 @@ class ChangeRequestFormHeaderSerializer(
                   'frm_attachments', 'frm_details')
 
         read_only_fields = ['created', 'archived_at', 'form_code']
+=======
+from app.entities import models
+from rest_framework import serializers
+from django.db.models import Q
+from app.applicationlayer.cms.utils_cr import logged_user
+from drf_writable_nested import WritableNestedModelSerializer
+
+
+class ChangeRequestFormApproversSerializer(
+    serializers.ModelSerializer
+):
+    # def to_representation(self, instance):
+    #     ret = super().to_representation(instance)
+    #     try:
+    #         user = instance.user
+            
+    #         user_details = get_account_details(user)
+    #         name = user_details['name']
+    #         group = user_details['groups'][0]['name']
+    #         company = user_details['groups'][0]['company__name']
+
+    #         ret['name'] = name
+    #         ret['department'] = group
+    #         ret['company'] = company
+    #         return ret
+
+    #     except Exception as e:
+    #         ret['name'] = "none"
+    #         ret['department'] = "none"
+    #         ret['company'] = "none"
+    #         return ret
+
+    class Meta:
+        model = models.ChangeRequestFormApprovers
+        fields = '__all__'
+        read_only_fields = ['created', 'archived_at', 'code']
+
+
+class ChangeRequestFormStakeHoldersSerializer(
+    serializers.ModelSerializer
+):
+    class Meta:
+        model = models.ChangeRequestFormStakeHolders
+        fields = '__all__'
+        read_only_fields = ['created', 'archived_at', 'code']
+
+
+class ChangeRequestFormAttachmentsSerializer(
+    serializers.ModelSerializer
+):
+    class Meta:
+        model = models.ChangeRequestFormAttachments
+        fields = '__all__'
+        read_only_fields = ['created', 'archived_at', 'code']
+
+
+class ChangeRequestFormDetailsSerializer(
+    serializers.ModelSerializer
+):
+    class Meta:
+        model = models.ChangeRequestFormDetails
+        fields = '__all__'
+        read_only_fields = ['created', 'archived_at', 'code']
+
+
+class ChangeRequestFormHeaderSerializer(
+    WritableNestedModelSerializer
+):
+    frm_approvers = ChangeRequestFormApproversSerializer(
+        many=True, required=False)
+    frm_stakes = ChangeRequestFormStakeHoldersSerializer(
+        many=True, required=False)
+    frm_attachments = ChangeRequestFormAttachmentsSerializer(
+        many=True, required=False)
+    frm_details = ChangeRequestFormDetailsSerializer(
+        many=True, required=False)
+    
+    def to_representation(self, instance):
+        ret = super().to_representation(instance)
+        try:
+            # id_number = self.context.get('request').META.get('user')
+            user = self.context['request'].user
+            print(user)
+
+            # id_number = "USER-20190909-0000005"
+            current_level = models.ChangeRequestFormApprovers.objects.filter(
+                Q(form_code=ret['form_code']) &
+                Q(archived_at=None) &
+                (Q(action='') | Q(action=None))
+            ).order_by('level')
+
+            if current_level.first()['user'] == id_number:
+                if instance.status.lower() == 'rejected':
+                    approver = 'No'
+                elif instance.status.lower() == 'cancelled':
+                    approver = 'No'
+                elif instance.status.lower() == 'closed':
+                    approver = 'No'
+                else:
+                    approver = 'Yes'
+            else:
+                approver = 'No'
+            ret['action'] = approver
+            return ret
+        except Exception as e:
+            ret['action'] = "No"
+            return ret
+
+    class Meta:
+        model = models.ChangeRequestFormHeader
+        # fields = '__all__'
+        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',
+                  'template_no', 'frm_approvers', 'frm_stakes',
+                  'frm_attachments', 'frm_details')
+
+        read_only_fields = ['created', 'archived_at', 'form_code']
+>>>>>>> d48679c96ca8ba780357ca8f9fa91b68cfa3778b:app/applicationlayer/cms/form/serializers.py

app/applicationlayer/cms/template/serializers.py

+<<<<<<< HEAD
 from app.entities import models
 from rest_framework import serializers
 from django.db.models import Q
@@ -63,4 +64,71 @@ class ChangeRequestTemplatesSerializer(
                   'created_by_user', 'created_by_department', 'tmp_approvers',
                   'tmp_stakes', 'tmp_attachments', 'tmp_details')
 
+=======
+from app.entities import models
+from rest_framework import serializers
+from django.db.models import Q
+from drf_writable_nested import WritableNestedModelSerializer
+
+
+class ChangeRequestTemplateApproversSerializer(
+    serializers.ModelSerializer
+):
+    class Meta:
+        model = models.ChangeRequestTemplateApprovers
+        fields = '__all__'
+        read_only_fields = ['created', 'archived_at', 'code']
+
+
+class ChangeRequestTemplateStakeHoldersSerializer(
+    serializers.ModelSerializer
+):
+    class Meta:
+        model = models.ChangeRequestTemplateStakeHolders
+        fields = '__all__'
+        read_only_fields = ['created', 'archived_at', 'code']
+    
+
+class ChangeRequestTemplateAttachmentsSerializer(
+    serializers.ModelSerializer
+):
+    class Meta:
+        model = models.ChangeRequestTemplateAttachments
+        fields = '__all__'
+        read_only_fields = ['created', 'archived_at', 'code']
+
+
+class ChangeRequestTemplateDetailsSerializer(
+    serializers.ModelSerializer
+):
+    class Meta:
+        model = models.ChangeRequestTemplateDetails
+        fields = '__all__'
+        read_only_fields = ['created', 'archived_at', 'code']
+
+# comment
+class ChangeRequestTemplatesSerializer(
+    WritableNestedModelSerializer
+):
+    tmp_approvers = ChangeRequestTemplateApproversSerializer(
+        many=True, required=False)
+    tmp_stakes = ChangeRequestTemplateStakeHoldersSerializer(
+        many=True, required=False)
+    tmp_attachments = ChangeRequestTemplateAttachmentsSerializer(
+        many=True, required=False)
+    tmp_details = ChangeRequestTemplateDetailsSerializer(
+        many=True, required=False)
+
+    class Meta:
+        model = models.ChangeRequestTemplateHeader
+        # fields = '__all__'
+        fields = ('template_no', 'requested_to_template_name',
+                  'requested_to_objective', 'requested_to_target_date',
+                  'requested_to_priority', 'description', 'created',
+                  'requested_to_template_id', 'requested_to_company',
+                  'requested_to_department', 'requested_to_user',
+                  'created_by_user', 'created_by_department', 'tmp_approvers',
+                  'tmp_stakes', 'tmp_attachments', 'tmp_details')
+
+>>>>>>> d48679c96ca8ba780357ca8f9fa91b68cfa3778b
         read_only_fields = ['created', 'archived_at', 'template_no']
\ No newline at end of file

app/entities/migrations/0007_auto_20190911_1102.py

+<<<<<<< HEAD
 # Generated by Django 2.2 on 2019-09-11 11:02
 
 from django.db import migrations, models
@@ -16,3 +17,23 @@ class Migration(migrations.Migration):
             field=models.CharField(max_length=255),
         ),
     ]
+=======
+# Generated by Django 2.2 on 2019-09-11 11:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0006_emaillogs_is_sent'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='changerequestformheader',
+            name='requested_to_template_id',
+            field=models.CharField(max_length=255),
+        ),
+    ]
+>>>>>>> d48679c96ca8ba780357ca8f9fa91b68cfa3778b

app/entities/migrations/0008_auto_20190911_1715.py

+<<<<<<< HEAD
 # Generated by Django 2.2 on 2019-09-11 17:15
 
 from django.db import migrations, models
@@ -16,3 +17,23 @@ class Migration(migrations.Migration):
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
     ]
+=======
+# Generated by Django 2.2 on 2019-09-11 17:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0007_auto_20190911_1102'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='changerequesthistory',
+            name='form_code',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]
+>>>>>>> d48679c96ca8ba780357ca8f9fa91b68cfa3778b

app/entities/migrations/0009_auto_20190911_1845.py

+<<<<<<< HEAD
 # Generated by Django 2.2 on 2019-09-11 18:45
 
 from django.db import migrations
@@ -61,3 +62,68 @@ class Migration(migrations.Migration):
             new_name='archived_at',
         ),
     ]
+=======
+# Generated by Django 2.2 on 2019-09-11 18:45
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0008_auto_20190911_1715'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='changerequestformapprovers',
+            old_name='deleted_at',
+            new_name='archived_at',
+        ),
+        migrations.RenameField(
+            model_name='changerequestformattachments',
+            old_name='deleted_at',
+            new_name='archived_at',
+        ),
+        migrations.RenameField(
+            model_name='changerequestformdetails',
+            old_name='deleted_at',
+            new_name='archived_at',
+        ),
+        migrations.RenameField(
+            model_name='changerequestformheader',
+            old_name='deleted_at',
+            new_name='archived_at',
+        ),
+        migrations.RenameField(
+            model_name='changerequestformstakeholders',
+            old_name='deleted_at',
+            new_name='archived_at',
+        ),
+        migrations.RenameField(
+            model_name='changerequesttemplateapprovers',
+            old_name='deleted_at',
+            new_name='archived_at',
+        ),
+        migrations.RenameField(
+            model_name='changerequesttemplateattachments',
+            old_name='deleted_at',
+            new_name='archived_at',
+        ),
+        migrations.RenameField(
+            model_name='changerequesttemplatedetails',
+            old_name='deleted_at',
+            new_name='archived_at',
+        ),
+        migrations.RenameField(
+            model_name='changerequesttemplateheader',
+            old_name='deleted_at',
+            new_name='archived_at',
+        ),
+        migrations.RenameField(
+            model_name='changerequesttemplatestakeholders',
+            old_name='deleted_at',
+            new_name='archived_at',
+        ),
+    ]
+>>>>>>> d48679c96ca8ba780357ca8f9fa91b68cfa3778b

app/entities/migrations/0010_auto_20190913_1143.py

+<<<<<<< HEAD
 # Generated by Django 2.2 on 2019-09-13 11:43
 
 from django.db import migrations
@@ -31,3 +32,38 @@ class Migration(migrations.Migration):
             name='archived_at',
         ),
     ]
+=======
+# Generated by Django 2.2 on 2019-09-13 11:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0009_auto_20190911_1845'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='changerequestformapprovers',
+            name='archived_at',
+        ),
+        migrations.RemoveField(
+            model_name='changerequestformattachments',
+            name='archived_at',
+        ),
+        migrations.RemoveField(
+            model_name='changerequestformdetails',
+            name='archived_at',
+        ),
+        migrations.RemoveField(
+            model_name='changerequestformheader',
+            name='archived_at',
+        ),
+        migrations.RemoveField(
+            model_name='changerequestformstakeholders',
+            name='archived_at',
+        ),
+    ]
+>>>>>>> d48679c96ca8ba780357ca8f9fa91b68cfa3778b