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

* commit '44f2c685':
  change ordering

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

@@ -4,6 +4,14 @@ from app.entities.models import ChangeRequestFormHeader
 
 class HeaderFilterSet(filters.FilterSet):
 
+    # action_required = filters.CharFilter(method='action_required_bar')
+    # def action_required_bar(self, queryset, name, value):
+    #     return queryset.filter(
+    #         Q(title__icontains=value) |
+    #         Q(name__icontains=value) |
+    #         Q(description__icontains=value)
+    #     )
+
     class Meta:
         model = ChangeRequestFormHeader
         fields = '__all__'

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

@@ -73,7 +73,19 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
     lookup_field = 'form_code'
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     filterset_class = HeaderFilterSet
-    ordering_fields = '__all__'
+    ordering_fields = (
+        'form_code',
+        'requested_to_template_id',
+        'requested_to_user__name',
+        'requested_to_department__company__name',
+        'requested_to_department__name',
+        'requested_by_user__name',
+        'status',
+        'requested_to_priority',
+        'created',
+        'requested_to_target_date'
+    )
+
     search_fields = (
         "form_code", "status", "requested_to_template_id", "requested_by_user__name",
         "requested_by_user__code", "requested_by_department__name",

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

@@ -52,7 +52,16 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
     lookup_field = 'template_no'
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     filterset_class = HeaderFilterSet
-    ordering_fields = '__all__'
+    ordering_fields = (
+        'template_no',
+        'requested_to_template_name',
+        'requested_to_department__company__name',
+        'requested_to_department__name',
+        'requested_to_user__name',
+        'created',
+        'created_by_user__name'
+    )
+
     search_fields = (
         "template_no", "requested_to_template_id", "created_by_user__name",
         "created_by_user__code", "created_by_department__name",

app/entities/migrations/0011_auto_20191001_1556.py

+# Generated by Django 2.2 on 2019-10-01 15:56
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0010_auto_20191001_1200'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='changerequestformheader',
+            options={'ordering': ['-created']},
+        ),
+    ]

app/entities/models.py

@@ -708,6 +708,7 @@ class ChangeRequestFormHeader(BaseHeader):
 
     class Meta:
         db_table = 'change_request_form_headers'
+        ordering = ['-created']
     
     def __str__(self):
         return f'{self.form_code}'