this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

fix: added status to CreateDispenseOrder spec (#3427)

* fix: added status to dispense order and validation

* fix:updated status filter

* fix:made some validation changes

* fix:review changes

* fix status default value

---------

Co-authored-by: Prafful Sharma <115104695+praffq@users.noreply.github.com>

authored by

Nandkishor R
Prafful Sharma
and committed by
GitHub
01ec20df c31558c4

+9 -2
+2 -1
care/emr/api/viewsets/inventory/dispense_order.py
··· 22 22 from care.facility.models.facility import Facility 23 23 from care.security.authorization.base import AuthorizationController 24 24 from care.utils.filters.dummy_filter import DummyBooleanFilter, DummyUUIDFilter 25 + from care.utils.filters.multiselect import MultiSelectFilter 25 26 26 27 27 28 class DispenseOrderFilters(filters.FilterSet): 28 - status = filters.CharFilter(lookup_expr="iexact") 29 + status = MultiSelectFilter(field_name="status") 29 30 created_date = filters.DateRangeFilter() 30 31 patient = filters.UUIDFilter(field_name="patient__external_id") 31 32 location = DummyUUIDFilter()
+7 -1
care/emr/resources/medication/dispense/spec.py
··· 106 106 substitution: MedicationDispenseSubstitution | None = None 107 107 108 108 109 + class CreateDispenseOrderStatusOptions(str, Enum): 110 + draft = "draft" 111 + in_progress = "in_progress" 112 + 113 + 109 114 class CreateDispenseOrder(BaseModel): 110 115 name: str | None = None 111 116 note: str | None = None 112 117 alternate_identifier: str 118 + status: CreateDispenseOrderStatusOptions = CreateDispenseOrderStatusOptions.draft 113 119 114 120 115 121 class MedicationDispenseWriteSpec(BaseMedicationDispenseSpec): ··· 171 177 raise ValidationError("Prescription is not active") 172 178 if not dispense_order_obj: 173 179 dispense_order_obj = DispenseOrder.objects.create( 174 - status=MedicationDispenseOrderStatusOptions.draft.value, 180 + status=self.create_dispense_order.status, 175 181 alternate_identifier=self.create_dispense_order.alternate_identifier, 176 182 patient=obj.patient, 177 183 location=obj.location,