Merge branch 'main' into develop

TIP-Global-Health · Oct 6, 2024 · 5de4cf4 · 5de4cf4
2 parents eeccbc8 + 2128b2e
commit 5de4cf4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/client/src/elm/Measurement/Utils.elm b/client/src/elm/Measurement/Utils.elm
@@ -6785,12 +6785,18 @@ malariaResultFormWithDefault form saved =
                         resolveRunConfirmedByLabTechFromValue value
 
                     bloodSmearTakenByValue =
-                        value.bloodSmearResult == BloodSmearPendingInput
+                        List.member value.bloodSmearResult
+                            [ BloodSmearNegative
+                            , BloodSmearPlus
+                            , BloodSmearPlusPlus
+                            , BloodSmearPlusPlusPlus
+                            , BloodSmearPendingInput
+                            ]
 
                     -- If we have an indication that Blood Smear test was
                     -- ordered on initail phase, empty it's value.
                     bloodSmearResultByValue =
-                        if bloodSmearTakenByValue then
+                        if value.bloodSmearResult == BloodSmearPendingInput then
                             Nothing
 
                         else
@@ -6813,7 +6819,7 @@ malariaResultFormWithDefault form saved =
                 , bloodSmearResult =
                     maybeValueConsideringIsDirtyField form.bloodSmearResultDirty
                         form.bloodSmearResult
-                        (Just value.bloodSmearResult)
+                        bloodSmearResultByValue
                 , bloodSmearResultDirty = form.bloodSmearResultDirty
                 }
             )

diff --git a/server/elm/src/Pages/Reports/View.elm b/server/elm/src/Pages/Reports/View.elm
@@ -1160,10 +1160,10 @@ backendGeneratedNutritionReportTableDateToMetricsResultsTableData language backe
     , rows =
         [ translate language Translate.StuntingModerate :: backendTableData.stuntingModerate
         , translate language Translate.StuntingSevere :: backendTableData.stuntingSevere
-        , translate language Translate.WastingModerate :: backendTableData.stuntingModerate
-        , translate language Translate.WastingSevere :: backendTableData.stuntingSevere
-        , translate language Translate.UnderweightModerate :: backendTableData.stuntingModerate
-        , translate language Translate.UnderweightSevere :: backendTableData.stuntingSevere
+        , translate language Translate.WastingModerate :: backendTableData.wastingModerate
+        , translate language Translate.WastingSevere :: backendTableData.wastingSevere
+        , translate language Translate.UnderweightModerate :: backendTableData.underweightModerate
+        , translate language Translate.UnderweightSevere :: backendTableData.underweightSevere
         ]
     }
 

diff --git a/server/hedley/modules/custom/hedley_general/js/elm-main.js b/server/hedley/modules/custom/hedley_general/js/elm-main.js
@@ -12890,19 +12890,19 @@ var $author$project$Pages$Reports$View$backendGeneratedNutritionReportTableDateT
 					A2(
 					$elm$core$List$cons,
 					A2($author$project$Translate$translate, language, $author$project$Translate$WastingModerate),
-					backendTableData.stuntingModerate),
+					backendTableData.wastingModerate),
 					A2(
 					$elm$core$List$cons,
 					A2($author$project$Translate$translate, language, $author$project$Translate$WastingSevere),
-					backendTableData.stuntingSevere),
+					backendTableData.wastingSevere),
 					A2(
 					$elm$core$List$cons,
 					A2($author$project$Translate$translate, language, $author$project$Translate$UnderweightModerate),
-					backendTableData.stuntingModerate),
+					backendTableData.underweightModerate),
 					A2(
 					$elm$core$List$cons,
 					A2($author$project$Translate$translate, language, $author$project$Translate$UnderweightSevere),
-					backendTableData.stuntingSevere)
+					backendTableData.underweightSevere)
 				])
 		};
 	});