Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Develop To Staging v24.23.0 #2205

Merged
merged 7 commits into from
May 29, 2024
Merged

Merge Develop To Staging v24.23.0 #2205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f051cab
bump docker healthcheck retries (#2192)
sainak May 25, 2024
de22042
Symptoms table (#2186)
sainak May 28, 2024
9edfed0
Adds support to specify and filter ration card category of a patient …
rithviknishad May 28, 2024
0e947b8
fix redis tokenization for icd11 ids (#2193)
sainak May 28, 2024
28bedb1
Fixes state and district admin not able to see users of same user typ…
rithviknishad May 28, 2024
5c88ca1
merge migrations (#2202)
sainak May 28, 2024
51235a9
fix state admin access to daily rounds (#2203)
sainak May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ pyjwt = "==2.8.0"
python-slugify = "==8.0.1"
pywebpush = "==1.14.0"
redis = {extras = ["hiredis"], version = "<5.0.0"} # constraint for redis-om
redis-om = "==0.3.1"
requests = "==2.31.0"
sentry-sdk = "==1.30.0"
whitenoise = "==6.6.0"
redis-om = "==0.2.1"

[dev-packages]
black = "==24.4.2"
Expand Down
110 changes: 55 additions & 55 deletions Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions care/facility/api/serializers/daily_round.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from care.facility.models.bed import Bed
from care.facility.models.daily_round import DailyRound
from care.facility.models.notification import Notification
from care.facility.models.patient_base import SYMPTOM_CHOICES, SuggestionChoices
from care.facility.models.patient_base import SuggestionChoices
from care.facility.models.patient_consultation import PatientConsultation
from care.users.api.serializers.user import UserBaseMinimumSerializer
from care.utils.notification_handler import NotificationGenerator
Expand All @@ -24,9 +24,6 @@

class DailyRoundSerializer(serializers.ModelSerializer):
id = serializers.CharField(source="external_id", read_only=True)
additional_symptoms = serializers.MultipleChoiceField(
choices=SYMPTOM_CHOICES, required=False
)
deprecated_covid_category = ChoiceField(
choices=COVID_CATEGORY_CHOICES, required=False
) # Deprecated
Expand Down
Loading
Loading