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

* commit 'abd189da':
  comments
  requested template id

app/applicationlayer/cms/form/serializers.py

@@ -74,19 +74,20 @@ class ChangeRequestFormHeaderSerializer(
         many=True, read_only=True)
     frm_details = ChangeRequestFormDetailsSerializer(
         many=True, read_only=True)
-
+    
     def to_representation(self, instance):
         ret = super().to_representation(instance)
         try:
             user = self.context['request'].user
             
             id_number = user.code
+            
             current_level = models.ChangeRequestFormApprovers.objects.filter(
-                Q(form_code=ret['form_code'])
+                Q(form_code=ret['form_code']) &
                 (Q(action='') | Q(action=None))
             ).order_by('level')
-
-            if current_level.first()['user'] == id_number:
+            
+            if current_level[0].user.code == id_number:
                 if instance.status.lower() == 'rejected':
                     approver = 'No'
                 elif instance.status.lower() == 'cancelled':
@@ -98,9 +99,17 @@ class ChangeRequestFormHeaderSerializer(
             else:
                 approver = 'No'
             ret['action'] = approver
+            ret['company'] = instance.requested_to_company.name
+            ret['department'] = instance.requested_to_department.name
+            ret['requested_by'] = instance.requested_by_user.name
+            
             return ret
         except Exception as e:
             ret['action'] = "No"
+            ret['company'] = "None"
+            ret['department'] = "None"
+            ret['requested_by'] = "None"
+
             return ret
 
     class Meta:

app/applicationlayer/cms/form/views.py

@@ -856,10 +856,10 @@ class ChangeRequestFormApproversViewset(meviewsets.ModelViewSet):
         self.queryset = QuerySetHelper.Sort(self)
         return super(ChangeRequestFormApproversViewset, self).list(request)
 
-    def retrieve(self, request, *args, **kwargs):
-        instance = self.queryset.filter(archived_at=None).first()
-        serializer = self.get_serializer(instance)
-        return Response(serializer.data)
+    # def retrieve(self, request, *args, **kwargs):
+    #     instance = self.queryset.filter(archived_at=None).first()
+    #     serializer = self.get_serializer(instance)
+    #     return Response(serializer.data)
 
 
 class ChangeRequestFormAttachmentsViewset(meviewsets.ModelViewSet):
@@ -868,7 +868,7 @@ class ChangeRequestFormAttachmentsViewset(meviewsets.ModelViewSet):
     pagination_class = paginators.SimplePageNumberPagination
 
     def list(self, request, *args, **kwargs):
-        self.queryset = self.queryset.filter(archived_at=None)
+        # self.queryset = self.queryset.filter(archived_at=None)
         self.queryset = QuerySetHelper.Sort(self)
         self.queryset = QuerySetHelper.Filter(self)
         return super(
@@ -908,10 +908,10 @@ class ChangeRequestFormAttachmentsViewset(meviewsets.ModelViewSet):
     #         headers=headers
     #     )
 
-    def retrieve(self, request, *args, **kwargs):
-        instance = self.queryset.filter(archived_at=None).first()
-        serializer = self.get_serializer(instance)
-        return Response(serializer.data)
+    # def retrieve(self, request, *args, **kwargs):
+    #     instance = self.queryset.filter(archived_at=None).first()
+    #     serializer = self.get_serializer(instance)
+    #     return Response(serializer.data)
 
 
 class ChangeRequestFormStakeHoldersViewset(meviewsets.ModelViewSet):
@@ -921,7 +921,7 @@ class ChangeRequestFormStakeHoldersViewset(meviewsets.ModelViewSet):
     pagination_class = paginators.SimplePageNumberPagination
 
     def list(self, request, *args, **kwargs):
-        self.queryset = self.queryset.filter(archived_at=None)
+        # self.queryset = self.queryset.filter(archived_at=None)
         self.queryset = QuerySetHelper.Sort(self)
         self.queryset = QuerySetHelper.Filter(self)
         return super(ChangeRequestFormStakeHoldersViewset, self).list(request)
@@ -947,10 +947,10 @@ class ChangeRequestFormStakeHoldersViewset(meviewsets.ModelViewSet):
     #         headers=headers
     #     )
 
-    def retrieve(self, request, *args, **kwargs):
-        instance = self.queryset.filter(archived_at=None).first()
-        serializer = self.get_serializer(instance)
-        return Response(serializer.data)
+    # def retrieve(self, request, *args, **kwargs):
+    #     instance = self.queryset.filter(archived_at=None).first()
+    #     serializer = self.get_serializer(instance)
+    #     return Response(serializer.data)
 
 
 class ChangeRequestFormDetailsViewset(meviewsets.ModelViewSet):
@@ -960,7 +960,7 @@ class ChangeRequestFormDetailsViewset(meviewsets.ModelViewSet):
     pagination_class = paginators.SimplePageNumberPagination
 
     def list(self, request, *args, **kwargs):
-        self.queryset = self.queryset.filter(archived_at=None)
+        # self.queryset = self.queryset.filter(archived_at=None)
         self.queryset = QuerySetHelper.Sort(self)
         self.queryset = QuerySetHelper.Filter(self)
         return super(ChangeRequestFormDetailsViewset, self).list(request)
@@ -986,10 +986,10 @@ class ChangeRequestFormDetailsViewset(meviewsets.ModelViewSet):
     #         headers=headers
     #     )
 
-    def retrieve(self, request, *args, **kwargs):
-        instance = self.queryset.filter(archived_at=None).first()
-        serializer = self.get_serializer(instance)
-        return Response(serializer.data)
+    # def retrieve(self, request, *args, **kwargs):
+    #     instance = self.queryset.filter(archived_at=None).first()
+    #     serializer = self.get_serializer(instance)
+    #     return Response(serializer.data)
 
 
 class ChangeRequestFormPost(APIView):

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

@@ -245,7 +245,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
             "Unable to edit due to existing transaction",
                 status=status.HTTP_400_BAD_REQUEST
         )
-#try
+#try 1
 
 class ChangeRequestTemplatePost(APIView):
 

app/entities/migrations/0002_changerequesthistory_requested_to_template_id.py

+# Generated by Django 2.2 on 2019-09-27 14:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='changerequesthistory',
+            name='requested_to_template_id',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]

app/entities/models.py

@@ -900,6 +900,10 @@ class ChangeRequestHistory(AuditClass):
         null=True)
     fromValue = models.TextField(blank=True, null=True)
     toValue = models.TextField(blank=True, null=True)
+    requested_to_template_id = models.CharField(
+        max_length=255,
+        blank=True,
+        null=True)
     
     def __str__(self):
         return self.entity