Skip to content

Commit

Permalink
allow occupation to null
Browse files Browse the repository at this point in the history
  • Loading branch information
konavivekramakrishna committed Feb 5, 2024
1 parent 4219b95 commit bb013e8
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 13 deletions.
12 changes: 8 additions & 4 deletions care/facility/api/serializers/patient.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@


class PatientMetaInfoSerializer(serializers.ModelSerializer):
occupation = ChoiceField(choices=PatientMetaInfo.OccupationChoices)
occupation = ChoiceField(choices=PatientMetaInfo.OccupationChoices, allow_null=True)

class Meta:
model = PatientMetaInfo
Expand Down Expand Up @@ -311,9 +311,13 @@ def create(self, validated_data):
Disease.objects.bulk_create(diseases, ignore_conflicts=True)

if meta_info:
meta_info_obj = PatientMetaInfo.objects.create(**meta_info)
patient.meta_info = meta_info_obj
patient.save()
if patient.meta_info is None:
meta_info_obj = PatientMetaInfo.objects.create(**meta_info)
patient.meta_info = meta_info_obj
else:
for key, value in meta_info.items():
setattr(patient.meta_info, key, value)
patient.meta_info.save()

if contacted_patients:
contacted_patient_objs = [
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Generated by Django 4.2.8 on 2024-02-05 15:39

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("facility", "0407_alter_dailyround_additional_symptoms_and_more"),
]

operations = [
migrations.AlterField(
model_name="patientmetainfo",
name="head_of_household",
field=models.BooleanField(blank=True, null=True),
),
migrations.AlterField(
model_name="patientmetainfo",
name="occupation",
field=models.IntegerField(
blank=True,
choices=[
(1, "STUDENT"),
(2, "BUSINESSMAN"),
(3, "HEALTH_CARE_WORKER"),
(4, "HEALTH_CARE_LAB_WORKER"),
(5, "ANIMAL_HANDLER"),
(6, "OTHERS"),
],
null=True,
),
),
]
16 changes: 7 additions & 9 deletions care/facility/models/patient.py
Original file line number Diff line number Diff line change
Expand Up @@ -571,17 +571,15 @@ def format_diagnoses(diagnosis_ids):
class PatientMetaInfo(models.Model):
class OccupationEnum(enum.Enum):
STUDENT = 1
MEDICAL_WORKER = 2
GOVT_EMPLOYEE = 3
PRIVATE_EMPLOYEE = 4
HOME_MAKER = 5
WORKING_ABROAD = 6
OTHERS = 7

BUSINESSMAN = 2
HEALTH_CARE_WORKER = 3
HEALTH_CARE_LAB_WORKER =4
ANIMAL_HANDLER = 5
OTHERS = 6
OccupationChoices = [(item.value, item.name) for item in OccupationEnum]

occupation = models.IntegerField(choices=OccupationChoices)
head_of_household = models.BooleanField()
occupation = models.IntegerField(choices=OccupationChoices,blank=True, null=True)
head_of_household = models.BooleanField( blank=True,null=True)


class PatientContactDetails(models.Model):
Expand Down

0 comments on commit bb013e8

Please sign in to comment.