Commit 4d2defe4 authored by Gladys Forte's avatar Gladys Forte

on behalf list action_required

parent 88819112
...@@ -125,7 +125,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -125,7 +125,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
self.serializer_class = ChangeRequestFormHeaderSerializerList self.serializer_class = ChangeRequestFormHeaderSerializerList
id_number = self.request.user.code id_number = self.request.user.code
self.queryset = change_request.list_by_user(id_number) self.queryset = change_request.list_by_user(id_number)
self.queryset = change_request.filter_base( self.queryset = change_request.filter_base(
self.queryset, self.queryset,
request.query_params.get('company_requested_to'), request.query_params.get('company_requested_to'),
......
...@@ -121,11 +121,14 @@ class ChangeRequestFormHeaderSerializerList( ...@@ -121,11 +121,14 @@ class ChangeRequestFormHeaderSerializerList(
user = self.context['request'].user user = self.context['request'].user
id_number = user.code id_number = user.code
active_users = models.ChangeRequestSettings.objects.filter(
behalf_user=id_number).values('active_user__code')
current_level = models.ChangeRequestFormApprovers.objects.filter( current_level = models.ChangeRequestFormApprovers.objects.filter(
Q(form_code=ret['form_code']) & Q(form_code=ret['form_code']) &
Q(is_action=True) & Q(is_action=True) &
Q(user=id_number) Q(user__in=active_users)
).order_by('level') ).order_by('level')
if current_level.count() > 0: if current_level.count() > 0:
......
import configparser
import shutil
import os import os
from django.shortcuts import render
from rest_framework import viewsets from rest_framework import viewsets
from rest_framework.views import APIView
from app.entities import models from app.entities import models
from datetime import datetime
from datetime import timedelta
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework import status, views from rest_framework import status, views
from rest_framework.decorators import action
from django.http import Http404
from django.db.models import Q from django.db.models import Q
import requests
from django.conf import settings
from rest_framework.exceptions import ValidationError
from django.db import transaction, IntegrityError, connection
from app.applicationlayer.utils import (QuerySetHelper, from app.applicationlayer.utils import (QuerySetHelper,
status_message_response, status_message_response,
send_broadcast_message) send_broadcast_message)
from app.businesslayer.changerequest import change_request from app.businesslayer.changerequest import change_request
from app.entities import enums from app.entities import enums
from app.applicationlayer.utils import model_to_dict
import json
from django.shortcuts import get_object_or_404
from django.db.models import Min
from app.applicationlayer.utils import (CustomPagination, from app.applicationlayer.utils import (CustomPagination,
status_message_response) status_message_response)
from rest_framework.exceptions import ParseError from app.applicationlayer.cms.form.onbehalf.serializers import (
from app.businesslayer.changerequest.change_request import (
form_add_edit_delete
)
from app.applicationlayer.cms.form.approver.serializers import ChangeRequestFormApproversSerializer
from app.applicationlayer.cms.form.stakeholder.serializers import ChangeRequestFormStakeHoldersSerializer
from app.applicationlayer.cms.form.details.serializers import ChangeRequestFormDetailsSerializer
from app.applicationlayer.cms.form.attachment.serializers import (
ChangeRequestFormAttachmentsFileUploadSerializer,
ChangeRequestFormAttachmentsSerializer)
from app.applicationlayer.cms.form.header.serializers import (
ChangeRequestFormHeaderSerializer, ChangeRequestFormHeaderSerializer,
ChangeRequestFormHeaderSerializerList) ChangeRequestFormHeaderSerializerList)
from app.applicationlayer.cms.form.header.table_filters import HeaderFilterSet from app.applicationlayer.cms.form.onbehalf.table_filters import HeaderFilterSet
from rest_framework.filters import SearchFilter, OrderingFilter from rest_framework.filters import SearchFilter, OrderingFilter
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from django_filters.rest_framework import DjangoFilterBackend from django_filters.rest_framework import DjangoFilterBackend
import json
from app.applicationlayer.utils import main_threading
from django.conf import settings
from io import BytesIO
from django.http import HttpResponse
class ChangeRequestFormsViewset(viewsets.ModelViewSet): class ChangeRequestFormsViewset(viewsets.ModelViewSet):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment