diff --git a/plugins/polio/js/src/domains/VaccineModule/SupplyChain/hooks/api/vrf.tsx b/plugins/polio/js/src/domains/VaccineModule/SupplyChain/hooks/api/vrf.tsx index 7801c4efb4..8684c50f6e 100644 --- a/plugins/polio/js/src/domains/VaccineModule/SupplyChain/hooks/api/vrf.tsx +++ b/plugins/polio/js/src/domains/VaccineModule/SupplyChain/hooks/api/vrf.tsx @@ -135,8 +135,8 @@ export const useCampaignDropDowns = ( })); const vaccines = selectedCampaign?.single_vaccines ? selectedCampaign.single_vaccines.split(',').map(vaccineName => ({ - label: vaccineName, - value: vaccineName, + label: vaccineName.trim(), + value: vaccineName.trim(), })) : singleVaccinesList; const rounds = vaccine diff --git a/plugins/polio/models/base.py b/plugins/polio/models/base.py index 0cfacfb375..1a8738fa6f 100644 --- a/plugins/polio/models/base.py +++ b/plugins/polio/models/base.py @@ -53,6 +53,12 @@ ("nOPV2 & bOPV", _("nOPV2 & bOPV")), ] +INDIVIDUAL_VACCINES = [ + ("mOPV2", _("mOPV2")), + ("nOPV2", _("nOPV2")), + ("bOPV", _("bOPV")), +] + DOSES_PER_VIAL = { "mOPV2": 20, "nOPV2": 50, @@ -1099,7 +1105,7 @@ class Meta: ] campaign = models.ForeignKey(Campaign, on_delete=models.CASCADE, db_index=True) - vaccine_type = models.CharField(max_length=30, choices=VACCINES) + vaccine_type = models.CharField(max_length=30, choices=INDIVIDUAL_VACCINES) rounds = models.ManyToManyField(Round, db_index=True) date_vrf_signature = models.DateField(null=True, blank=True) date_vrf_reception = models.DateField(null=True, blank=True)