xoliqberdiyev/MeridynPharma-Backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
behruz-dev
2025-12-05 15:06:15 +05:00
parent 78746e6071
commit ae8a14b83c
3 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/apps/dashboard/views/doctor.py
View File

@@ -75,6 +75,13 @@ class DoctorViewSet(viewsets.GenericViewSet, ResponseMixin):
required=False,
type=openapi.TYPE_STRING,
),
openapi.Parameter(
in_=openapi.IN_QUERY,
type=openapi.TYPE_INTEGER,
name='user_id',
description="user id bo'yicha filter",
required=False,
)
],
operation_description="Shifokorlar ro'yxatini olish",
operation_summary="Shifokolar ro'yxati",
@@ -147,6 +154,8 @@ class DoctorViewSet(viewsets.GenericViewSet, ResponseMixin):
work_place = request.query_params.get('work_place', None)
sphere = request.query_params.get('sphere', None)
user_full_name = request.query_params.get('user', None)
user_id = request.query_params.get('user_id', None)
queryset = self.queryset.all()
@@ -177,6 +186,8 @@ class DoctorViewSet(viewsets.GenericViewSet, ResponseMixin):
Q(user__first_name__istartswith=user_full_name) |
Q(user__last_name__istartswith=user_full_name)
)
if not user_id is None:
queryset = queryset.filter(user__id=user_id)
page = self.paginate_queryset(queryset)
if page is not None:

11
core/apps/dashboard/views/pharmacy.py
View File

@@ -60,6 +60,13 @@ class PharmacyViewSet(viewsets.GenericViewSet, ResponseMixin):
required=False,
type=openapi.TYPE_STRING,
),
openapi.Parameter(
in_=openapi.IN_QUERY,
type=openapi.TYPE_INTEGER,
name='user_id',
description="user id bo'yicha filter",
required=False,
)
],
)
@action(detail=False, methods=['get'], url_path="list")
@@ -70,6 +77,7 @@ class PharmacyViewSet(viewsets.GenericViewSet, ResponseMixin):
place_name = request.query_params.get('place', None)
district_name = request.query_params.get('district', None)
user_full_name = request.query_params.get('user', None)
user_id = request.query_params.get('user_id', None)
queryset = self.queryset.all()
@@ -88,6 +96,9 @@ class PharmacyViewSet(viewsets.GenericViewSet, ResponseMixin):
Q(user__first_name__istartswith=user_full_name) |
Q(user__last_name__istartswith=user_full_name)
)
if not user_id is None:
queryset = queryset.filter(user__id=user_id)
page = self.paginate_queryset(queryset)
if page is not None:

11
core/apps/dashboard/views/place.py
View File

@@ -53,6 +53,13 @@ class PlaceViewSet(viewsets.GenericViewSet, ResponseMixin):
required=False,
type=openapi.TYPE_STRING,
),
openapi.Parameter(
in_=openapi.IN_QUERY,
type=openapi.TYPE_INTEGER,
name='user_id',
description="user id bo'yicha filter",
required=False,
)
],
)
@action(detail=False, methods=['get'], url_path="list")
@@ -62,6 +69,7 @@ class PlaceViewSet(viewsets.GenericViewSet, ResponseMixin):
name = request.query_params.get('name', None)
district_name = request.query_params.get('district', None)
user_full_name = request.query_params.get('user', None)
user_id = request.query_params.get('user_id', None)
queryset = self.queryset.all()
@@ -77,6 +85,9 @@ class PlaceViewSet(viewsets.GenericViewSet, ResponseMixin):
Q(user__first_name__istartswith=user_full_name) |
Q(user__last_name__istartswith=user_full_name)
)
if not user_id is None:
queryset = queryset.filter(user__id=user_id)
page = self.paginate_queryset(queryset)
if page is not None: