refactor code by applying isort and added left arrow icon

module_cms/api/serializers.py

@@ -1,7 +1,9 @@
 from rest_framework import serializers
 from taggit.models import Tag
+
 from module_cms.models import Faqs, Organization
 
+
 class FaqSerializer(serializers.ModelSerializer):
     class Meta:
         model = Faqs

module_cms/api/urls.py

@@ -1,4 +1,5 @@
 from django.urls import path
+
 from . import views
 
 urlpatterns = [

module_cms/api/views.py

@@ -1,10 +1,12 @@
-from rest_framework.views import APIView
 from rest_framework.permissions import IsAuthenticated
+from rest_framework.views import APIView
 from rest_framework_simplejwt.authentication import JWTAuthentication
+
 from module_project import constants
 from module_project.utils import ApiResponse
-from .serializers import FaqSerializer, OrganizationSerializer
+
 from ..models import Faqs, Organization
+from .serializers import FaqSerializer, OrganizationSerializer
 
 
 class FaqListAPIView(APIView):

module_cms/forms.py

@@ -1,14 +1,11 @@
 from django import forms
-from django.core.exceptions import ValidationError
 from django.core import validators
-from .models import (
-    Organization,
-    FaqCategory,
-    Faqs,
-)
+from django.core.exceptions import ValidationError
 
 from module_project import constants
 
+from .models import FaqCategory, Faqs, Organization
+
 
 class OrganizationForm(forms.ModelForm):
     class Meta:

module_cms/models.py

@@ -1,7 +1,9 @@
 from django.db import models
-from module_iam.models import BaseModel, IAmPrincipal
-from taggit.managers import TaggableManager
 from django_quill.fields import QuillField
+from taggit.managers import TaggableManager
+
+from module_iam.models import BaseModel, IAmPrincipal
+
 
 # Create your models here.
 class Organization(BaseModel):

module_cms/urls.py

@@ -1,4 +1,5 @@
 from django.urls import path
+
 from . import views
 
 app_name = "module_cms"

module_cms/views.py

@@ -3,18 +3,19 @@ import logging
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.db.models import Q
-from django.shortcuts import render, redirect, get_object_or_404
+from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse_lazy
 from django.views import generic
-from module_iam.models import IAmPrincipal
-from module_iam import iam_constant
-from .forms import AboutUsForm, TermsAndConditionForm, FaqsForm, PrivacyPolicyForm
-from .models import Faqs, Organization
-from module_project.mixins import DatatablesMixin
 from django_datatables_view.base_datatable_view import BaseDatatableView
-from module_project.mixins import ActionMixin
 
+from module_iam import iam_constant
+from module_iam.models import IAmPrincipal
 from module_project import constants
+from module_project.mixins import ActionMixin, DatatablesMixin
+
+from .forms import (AboutUsForm, FaqsForm, PrivacyPolicyForm,
+                    TermsAndConditionForm)
+from .models import Faqs, Organization
 
 logger = logging.getLogger(__name__)
 
@@ -35,8 +36,8 @@ class FaqView(LoginRequiredMixin, generic.TemplateView):
 
 class FaqListJson(BaseDatatableView):
     model = Faqs
-    columns = ["id", "question", "answer", "active", "deleted"]
-    order_columns = ["id", "question", "answer", "active", "deleted"]
+    columns = ["id", "question", "answer", "active"]
+    order_columns = ["id", "question", "answer", "active"]
 
     def get_initial_queryset(self):
         deleted_flag = self.request.GET.get('deleted_flag', None)
@@ -55,11 +56,24 @@ class FaqListJson(BaseDatatableView):
             )
 
         for column in self.columns:
-            search_value = self.request.GET.get(f'columns[{self.columns.index(column)}][search][value]', None)
+            search_value = self.request.GET.get(f'columns[{self.columns.index(column)+1}][search][value]', None)
             if search_value:
                 qs = qs.filter(**{f"{column}__icontains": search_value})
 
         return qs
+    
+    def ordering(self, qs):
+        order = self.request.GET.get('order[0][dir]', None)
+        if order:
+            column_index = int(self.request.GET.get('order[0][column]', None)) - 1
+            order_column = self.order_columns[column_index]
+
+            if order == "asc":
+                qs = qs.order_by(order_column)
+            elif order == "desc":
+                qs = qs.order_by("-" + order_column)
+
+        return qs
 
 
 class FaqCreateOrUpdateView(LoginRequiredMixin, generic.View):