Merge pull request #2574 from IFRCGo/feat/add-fields-on-health-data-model

Add fields on health data model in local units

Author: susilnem

local_units/admin.py

@@ -21,6 +21,7 @@
     LocalUnitChangeRequest,
     LocalUnitLevel,
     LocalUnitType,
+    OtherProfile,
     PrimaryHCC,
     ProfessionalTrainingFacility,
     SpecializedMedicalService,
@@ -206,6 +207,11 @@ class ProfessionalTrainingFacilityAdmin(admin.ModelAdmin):
     search_fields = ("name",)
 
 
+@admin.register(OtherProfile)
+class OtherProfileAdmin(admin.ModelAdmin):
+    search_fields = ("position",)
+
+
 @admin.register(HealthData)
 class HealthDataAdmin(CompareVersionAdmin, admin.ModelAdmin):
     autocomplete_fields = [

local_units/migrations/0024_otherprofile_healthdata_other_training_facilities_and_more.py

@@ -0,0 +1,44 @@
+# Generated by Django 4.2.19 on 2025-10-16 09:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('local_units', '0023_remove_localunit_is_locked_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OtherProfile',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('position', models.CharField(verbose_name='Position')),
+                ('number', models.PositiveIntegerField(verbose_name='Number')),
+            ],
+            options={
+                'verbose_name': 'Other Profile',
+                'verbose_name_plural': 'Other Profiles',
+            },
+        ),
+        migrations.AddField(
+            model_name='healthdata',
+            name='other_training_facilities',
+            field=models.TextField(blank=True, null=True, verbose_name='Other Training Facilities'),
+        ),
+        migrations.AddField(
+            model_name='healthdata',
+            name='pharmacists',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Pharmacists'),
+        ),
+        migrations.RemoveField(
+            model_name='healthdata',
+            name='other_profiles',
+        ),
+        migrations.AddField(
+            model_name='healthdata',
+            name='other_profiles',
+            field=models.ManyToManyField(blank=True, related_name='health_data_other_profile', to='local_units.otherprofile', verbose_name='Other Profiles'),
+        ),
+    ]

local_units/models.py

@@ -113,6 +113,18 @@ class Meta:
         verbose_name_plural = "Professional Training Facilities"
 
 
+class OtherProfile(models.Model):
+    position = models.CharField(verbose_name=_("Position"))
+    number = models.PositiveIntegerField(verbose_name=_("Number"))
+
+    def __str__(self):
+        return f"{self.position}"
+
+    class Meta:
+        verbose_name = "Other Profile"
+        verbose_name_plural = "Other Profiles"
+
+
 @reversion.register()
 class HealthData(models.Model):
     created_at = models.DateTimeField(verbose_name=_("Created at"), auto_now=True)
@@ -178,6 +190,7 @@ class HealthData(models.Model):
         null=True,
         blank=True,
     )
+    other_training_facilities = models.TextField(verbose_name="Other Training Facilities", blank=True, null=True)
     maximum_capacity = models.IntegerField(verbose_name=_("Maximum Capacity"), blank=True, null=True)
     number_of_isolation_rooms = models.IntegerField(verbose_name=_("Number of isolation rooms"), blank=True, null=True)
     is_warehousing = models.BooleanField(
@@ -226,12 +239,18 @@ class HealthData(models.Model):
     dentist = models.IntegerField(verbose_name=_("Dentist"), blank=True, null=True)
     nursing_aid = models.IntegerField(verbose_name=_("Nursing Aid"), blank=True, null=True)
     midwife = models.IntegerField(verbose_name=_("Midwife"), blank=True, null=True)
+    pharmacists = models.IntegerField(verbose_name=_("Pharmacists"), blank=True, null=True)
     other_medical_heal = models.BooleanField(
         verbose_name=_("Other medical heal"),
         null=True,
         blank=True,
     )
-    other_profiles = models.CharField(max_length=200, verbose_name=_("Other Profiles"), blank=True, null=True)
+    other_profiles = models.ManyToManyField(
+        OtherProfile,
+        related_name="health_data_other_profile",
+        verbose_name=_("Other Profiles"),
+        blank=True,
+    )
     feedback = models.TextField(verbose_name=_("Feedback"), blank=True, null=True)
 
     def __str__(self):

local_units/serializers.py

@@ -32,6 +32,7 @@
     LocalUnitChangeRequest,
     LocalUnitLevel,
     LocalUnitType,
+    OtherProfile,
     PrimaryHCC,
     ProfessionalTrainingFacility,
     SpecializedMedicalService,
@@ -106,6 +107,14 @@ class Meta:
         fields = "__all__"
 
 
+class OtherProfileSerializer(NestedCreateMixin, NestedUpdateMixin, serializers.ModelSerializer):
+    id = serializers.IntegerField(required=False)
+
+    class Meta:
+        model = OtherProfile
+        fields = "__all__"
+
+
 class MiniHealthDataSerializer(serializers.ModelSerializer):
     health_facility_type_details = FacilityTypeSerializer(source="health_facility_type", read_only=True)
 
@@ -147,6 +156,10 @@ class HealthDataSerializer(
     professional_training_facilities_details = ProfessionalTrainingFacilitySerializer(
         source="professional_training_facilities", many=True, read_only=True
     )
+    other_profiles = OtherProfileSerializer(
+        many=True,
+        required=False,
+    )
     modified_by_details = LocalUnitMiniUserSerializer(source="modified_by", read_only=True)
     created_by_details = LocalUnitMiniUserSerializer(source="created_by", read_only=True)
 
@@ -840,7 +853,6 @@ def parse_m2m(field_name, mapping):
         parse_m2m("specialized_medical_beyond_primary_level", self.specializedmedicalservice_map)
         parse_m2m("blood_services", self.bloodservice_map)
         parse_m2m("professional_training_facilities", self.professionaltrainingfacility_map)
-
         return super().to_internal_value(data)
 
     def create(self, validated_data):

local_units/test_views.py

@@ -576,7 +576,10 @@ def test_create_update_local_unit_health(self):
                 "nursing_aid": 0,
                 "midwife": 9,
                 "other_medical_heal": True,
-                "other_profiles": None,
+                "other_profiles": [
+                    {"number": 2, "position": "Nurse"},
+                    {"number": 3, "position": "Doctor"},
+                ],
                 "feedback": "first question of initial question did not provide for the option to write the name of the NS. It is written LRC yet it should allow Baphalali Eswatini Red Cross Society (BERCS) to be inscribed in the box.",  # noqa: E501
                 "affiliation": affiliation.id,
                 "functionality": functionality.id,

main/test_files/local_unit/test-health.csv

@@ -1,4 +1,4 @@
-focal_point_email,focal_point_phone_number,focal_point_position,health_facility_type,other_facility_type,affiliation,functionality,primary_health_care_centre,speciality,hospital_type,is_teaching_hospital,is_in_patient_capacity,maximum_capacity,is_isolation_rooms_wards,number_of_isolation_rooms,is_warehousing,is_cold_chain,general_medical_services,specialized_medical_beyond_primary_level,other_services,blood_services,total_number_of_human_resource,general_practitioner,specialist,residents_doctor,nurse,dentist,nursing_aid,midwife,other_medical_heal,other_profiles,feedback,professional_training_facilities,ambulance_type_a,ambulance_type_b,ambulance_type_c,residential_long_term_care_facilities,primary_health_care_center,other_affiliation,local_branch_name,english_branch_name,subtype,level,postcode,address_loc,address_en,city_loc,city_en,focal_person_loc,focal_person_en,phone,email,link,source_en,source_loc,date_of_data,visibility,longitude,latitude
-[email protected],26876088546,Programmes Manager,Ambulance Station,tet,Public Government Facility,Fully Functional,Medical Practices,"Initiate TB treatment, Cervical Cancer Screening and testing and diagnostic and treatment for people living with HIV and follow up care through the ART programme which the government supports very well",Mental Health Hospital,yes,No,2,yes,2,Yes,Yes,Minor Trauma,Anaesthesiology,test,Blood Collection,32,0,0,0,3,0,0,9,Yes,test,first question of initial question did not provide for the option to write the name of the NS. It is written LRC yet it should allow Baphalali Eswatini Red Cross Society (BERCS) to be inscribed in the box.,Nurses,2,1,1,1,Dental Practices,test,Cruz Vermelha - Órgão Central HQ - Brasília,,Office,National,70300-910,"Setor Comercial Sul (SCS), quadra 6, bloco A, nº 157, salas 502 e 503 - Edifício Bandeirantes, Asa Sul, Brasília-DF  ",,Brasília - DF,,Lourenço Braga,,55 (61) 99909-0761,[email protected],http://www.cruzvermelha.org.br/,Brazilian Red Cross,Brazilian Red Cross Local,2024-02-07,Public,-47.88972222,-15.79638889
-[email protected],26876088546,Programmes Manager,Ambulance Station,tet,Public Government Facility,Fully Functional,"Medical Practices,Dental Practices","Initiate TB treatment, Cervical Cancer Screening and testing and diagnostic and treatment for people living with HIV and follow up care through the ART programme which the government supports very well",Mental Health Hospital,No ,No,2,yes,2,Yes,Yes,Minor Trauma,Anaesthesiology,test,Blood Collection,32,0,0,0,3,0,0,9,Yes,test,first question of initial question did not provide for the option to write the name of the NS. It is written LRC yet it should allow Baphalali Eswatini Red Cross Society (BERCS) to be inscribed in the box.,Nurses,1,2,3,1,Dental Practices,test,Filial Alagoas,,Office,National,57035-530,"Av. Com. Gustavo de Paiva, 2889 - Mangabeiras, Maceió - AL",,Alagoas - AL,,Agarina Mendonça,,55 (82) 3325-2430,[email protected],https://www.cruzvermelha.org.br/pb/filiais/alagoas/,Brazilian Red Cross,Brazilian Red Cross Local,2024-02-07,Public,-35.71611111,-9.64777778
-[email protected],26876088546,Programmes Manager,Ambulance Station,tet,Public Government Facility,Fully Functional,Medical Practices,"Initiate TB treatment, Cervical Cancer Screening and testing and diagnostic and treatment for people living with HIV and follow up care through the ART programme which the government supports very well",Mental Health Hospital,No ,No,2,no,2,Yes,Yes,Minor Trauma,Anaesthesiology,test,Blood Collection,32,0,0,0,3,0,0,9,Yes,test,first question of initial question did not provide for the option to write the name of the NS. It is written LRC yet it should allow Baphalali Eswatini Red Cross Society (BERCS) to be inscribed in the box.,Nurses,1,2,2,1,Dental Practices,test,Cruz Vermelha - Órgão Central HQ,,Office,National,20230-130,"Praça Cruz Vermelha N° 10-12, Centro, Rio de Janeiro - RJ",,Rio de Janeiro - RJ,,Thiago Quintaneiro,,55 (21) 2507-3577 / 2507-3392,[email protected],http://www.cruzvermelha.org.br/,Brazilian Red Cross,Brazilian Red Cross Local,2024-02-07,Public,-43.1875,-22.91111111
+focal_point_email,focal_point_phone_number,focal_point_position,health_facility_type,other_facility_type,affiliation,functionality,primary_health_care_centre,speciality,hospital_type,is_teaching_hospital,is_in_patient_capacity,maximum_capacity,is_isolation_rooms_wards,number_of_isolation_rooms,is_warehousing,is_cold_chain,general_medical_services,specialized_medical_beyond_primary_level,other_services,blood_services,total_number_of_human_resource,general_practitioner,specialist,residents_doctor,nurse,dentist,nursing_aid,midwife,other_medical_heal,feedback,professional_training_facilities,ambulance_type_a,ambulance_type_b,ambulance_type_c,residential_long_term_care_facilities,primary_health_care_center,other_affiliation,local_branch_name,english_branch_name,subtype,level,postcode,address_loc,address_en,city_loc,city_en,focal_person_loc,focal_person_en,phone,email,link,source_en,source_loc,date_of_data,visibility,longitude,latitude
+[email protected],26876088546,Programmes Manager,Ambulance Station,tet,Public Government Facility,Fully Functional,Medical Practices,"Initiate TB treatment, Cervical Cancer Screening and testing and diagnostic and treatment for people living with HIV and follow up care through the ART programme which the government supports very well",Mental Health Hospital,yes,No,2,yes,2,Yes,Yes,Minor Trauma,Anaesthesiology,test,Blood Collection,32,0,0,0,3,0,0,9,Yes,first question of initial question did not provide for the option to write the name of the NS. It is written LRC yet it should allow Baphalali Eswatini Red Cross Society (BERCS) to be inscribed in the box.,Nurses,2,1,1,1,Dental Practices,test,Cruz Vermelha - Órgão Central HQ - Brasília,,Office,National,70300-910,"Setor Comercial Sul (SCS), quadra 6, bloco A, nº 157, salas 502 e 503 - Edifício Bandeirantes, Asa Sul, Brasília-DF  ",,Brasília - DF,,Lourenço Braga,,55 (61) 99909-0761,[email protected],http://www.cruzvermelha.org.br/,Brazilian Red Cross,Brazilian Red Cross Local,2024-02-07,Public,-47.88972222,-15.79638889
+[email protected],26876088546,Programmes Manager,Ambulance Station,tet,Public Government Facility,Fully Functional,"Medical Practices,Dental Practices","Initiate TB treatment, Cervical Cancer Screening and testing and diagnostic and treatment for people living with HIV and follow up care through the ART programme which the government supports very well",Mental Health Hospital,No ,No,2,yes,2,Yes,Yes,Minor Trauma,Anaesthesiology,test,Blood Collection,32,0,0,0,3,0,0,9,Yes,first question of initial question did not provide for the option to write the name of the NS. It is written LRC yet it should allow Baphalali Eswatini Red Cross Society (BERCS) to be inscribed in the box.,Nurses,1,2,3,1,Dental Practices,test,Filial Alagoas,,Office,National,57035-530,"Av. Com. Gustavo de Paiva, 2889 - Mangabeiras, Maceió - AL",,Alagoas - AL,,Agarina Mendonça,,55 (82) 3325-2430,[email protected],https://www.cruzvermelha.org.br/pb/filiais/alagoas/,Brazilian Red Cross,Brazilian Red Cross Local,2024-02-07,Public,-35.71611111,-9.64777778
+[email protected],26876088546,Programmes Manager,Ambulance Station,tet,Public Government Facility,Fully Functional,Medical Practices,"Initiate TB treatment, Cervical Cancer Screening and testing and diagnostic and treatment for people living with HIV and follow up care through the ART programme which the government supports very well",Mental Health Hospital,No ,No,2,no,2,Yes,Yes,Minor Trauma,Anaesthesiology,test,Blood Collection,32,0,0,0,3,0,0,9,Yes,first question of initial question did not provide for the option to write the name of the NS. It is written LRC yet it should allow Baphalali Eswatini Red Cross Society (BERCS) to be inscribed in the box.,Nurses,1,2,2,1,Dental Practices,test,Cruz Vermelha - Órgão Central HQ,,Office,National,20230-130,"Praça Cruz Vermelha N° 10-12, Centro, Rio de Janeiro - RJ",,Rio de Janeiro - RJ,,Thiago Quintaneiro,,55 (21) 2507-3577 / 2507-3392,[email protected],http://www.cruzvermelha.org.br/,Brazilian Red Cross,Brazilian Red Cross Local,2024-02-07,Public,-43.1875,-22.91111111