this repo has no description
refact:updated the date filters in delivery and request order (#3534)
refact:updated the date filters
authored by
Nandkishor R
and committed by
GitHub
28451821
52b798b3
+4
-4
+3
-3
care/emr/api/viewsets/inventory/delivery_order.py
+3
-3
care/emr/api/viewsets/inventory/delivery_order.py
···
2
2
from django.db.models import Q
3
3
from django.shortcuts import get_object_or_404
4
4
from django_filters import rest_framework as filters
5
-
from pydantic import ValidationError
6
-
from rest_framework.exceptions import PermissionDenied
5
+
from rest_framework.exceptions import PermissionDenied, ValidationError
7
6
from rest_framework.filters import OrderingFilter
8
7
9
8
from care.emr.api.viewsets.base import (
···
37
36
38
37
class DeliveryOrderFilters(filters.FilterSet):
39
38
status = MultiSelectFilter(field_name="status")
40
-
created_date = filters.DateRangeFilter()
39
+
created_date = filters.DateTimeFromToRangeFilter(field_name="created_date")
41
40
supplier = filters.UUIDFilter(field_name="supplier__external_id")
42
41
created_by = filters.UUIDFilter(field_name="created_by__external_id")
43
42
origin = DummyUUIDFilter()
···
123
122
SupplyDeliveryOrderStatusOptions.entered_in_error.value,
124
123
]:
125
124
cancel_return_invoice(instance)
125
+
126
126
return super().perform_update(instance)
127
127
128
128
def authorize_create(self, instance):
+1
-1
care/emr/api/viewsets/inventory/request_order.py
+1
-1
care/emr/api/viewsets/inventory/request_order.py
···
30
30
31
31
class RequestOrderFilters(filters.FilterSet):
32
32
status = MultiSelectFilter(field_name="status")
33
-
date = filters.DateFilter(field_name="created_date")
33
+
date = filters.DateTimeFromToRangeFilter(field_name="created_date")
34
34
priority = filters.CharFilter(lookup_expr="iexact")
35
35
supplier = filters.UUIDFilter(field_name="supplier__external_id")
36
36
intent = filters.CharFilter(lookup_expr="iexact")