Merge branch 'core-dev' of...

Merge branch 'core-dev' of http://54.169.104.100:27015/rms/Backend/api-main-service into core-dev-red-develop

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

@@ -203,6 +203,17 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         self.queryset = change_request.list_by_user_without_dept(
             id_number)
         
+        self.queryset = change_request.filter_base(
+            self.queryset,
+            request.query_params.get('company_requested_to'),
+            request.query_params.get('department_requested_to'),
+            request.query_params.get('date_modified_from'),
+            request.query_params.get('date_modified_to'),
+            request.query_params.get('date_required_from'),
+            request.query_params.get('date_required_to'),
+            request.query_params.get('form_type'),
+        )
+
         awaiting_filtered = change_request.filter_awaiting(self.queryset, id_number)
 
         awaiting = awaiting_filtered.count()

app/applicationlayer/download/accounts/views.py

@@ -5,13 +5,13 @@ from drf_renderer_xlsx.renderers import XLSXRenderer
 from app.entities.models import (
     User
 )
-# from app.applicationlayer.form_listing_ import headers
 from app.applicationlayer.download.accounts.serializers import headers
 from django.db.models import CharField, Value
 from django.db.models import Q
 from rest_framework.response import Response
 from rest_framework.permissions import AllowAny
-# from cms.applicationlayer.utilities import logged_user
+from rest_framework.exceptions import ParseError
+from rest_framework import status
 
 
 class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
@@ -22,12 +22,30 @@ class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
     permission_classes = (AllowAny,)
     
     def list(self, request, *args, **kwargs):
+        #comment this line
+        user_type = self.request.user.user_type
+        company = self.request.user.department.company.code
+        department = self.request.user.department.code
         
-        # id_number = request.user.code
-
+        if user_type == 'CUA':
+            data = User.objects.filter(
+                department__company=company).exclude(id=1)
+        elif user_type == 'DUA':
+            data = User.objects.filter(
+                department=department).exclude(id=1)
+        elif user_type == 'SU':
+            data = User.objects.all().exclude(id=1)
+        elif user_type == 'OUA':
             data = User.objects.all().exclude(id=1)
+        else:
+            return Response(
+                        {"message": "Logged user is unauthorize to access this section"},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+        
         serializer = headers(data=data, many=True)
         serializer.is_valid(raise_exception=False)
+        
         return Response(serializer.data)
 
     column_header = {

app/entities/migrations/0001_initial.py

-# Generated by Django 2.2 on 2019-12-10 11:34
+# Generated by Django 2.2 on 2020-02-19 14:59
 
 from django.conf import settings
 from django.db import migrations, models
@@ -115,9 +115,6 @@ class Migration(migrations.Migration):
                 ('form_code', models.CharField(max_length=255, unique=True)),
                 ('cancel_date', models.DateTimeField(blank=True, null=True)),
                 ('status', models.CharField(max_length=50)),
-                ('company_desc', models.CharField(blank=True, max_length=255, null=True)),
-                ('department_desc', models.CharField(blank=True, max_length=255, null=True)),
-                ('requested_desc', models.CharField(blank=True, max_length=255, null=True)),
                 ('requested_to_template_id', models.CharField(max_length=255)),
                 ('requested_to_target_date', models.DateTimeField(blank=True, null=True)),
             ],
@@ -526,7 +523,7 @@ class Migration(migrations.Migration):
                 ('description', models.CharField(blank=True, max_length=255, null=True)),
                 ('created', models.DateTimeField(blank=True, null=True)),
                 ('code', models.CharField(max_length=255, unique=True)),
-                ('file_upload', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='template_attachments', to='entities.MasterAttachment')),
+                ('file_upload', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='template_attachments', to='entities.MasterAttachment')),
                 ('template_no', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='tmp_attachments', to='entities.ChangeRequestTemplateHeader', to_field='template_no')),
                 ('uploaded_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, to_field='code')),
             ],
@@ -624,7 +621,7 @@ class Migration(migrations.Migration):
                 ('description', models.CharField(blank=True, max_length=255, null=True)),
                 ('created', models.DateTimeField(blank=True, null=True)),
                 ('code', models.CharField(max_length=255, unique=True)),
-                ('file_upload', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='form_attachments', to='entities.MasterAttachment')),
+                ('file_upload', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='form_attachments', to='entities.MasterAttachment')),
                 ('form_code', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='frm_attachments', to='entities.ChangeRequestFormHeader', to_field='form_code')),
                 ('uploaded_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, to_field='code')),
             ],

app/entities/migrations/0002_auto_20200205_1707.py

-# Generated by Django 2.2 on 2020-02-05 17:07
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('entities', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='changerequestformattachments',
-            name='file_upload',
-            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.PROTECT, related_name='form_attachments', to='entities.MasterAttachment'),
-            preserve_default=False,
-        ),
-        migrations.AlterField(
-            model_name='changerequesttemplateattachments',
-            name='file_upload',
-            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.PROTECT, related_name='template_attachments', to='entities.MasterAttachment'),
-            preserve_default=False,
-        ),
-    ]

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',
-        ),
-    ]