2.1.128 version

app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt

@@ -134,7 +134,7 @@ class PrefsFragment: PreferenceFragmentCompat(){
 
         // App Version Preference
         val appVersionPreference = Preference(requireContext())
-        appVersionPreference.title = "App Version SMI"
+        appVersionPreference.title = "App Version"
         appVersionPreference.summary =
             getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + " ]"
 

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt

@@ -1458,39 +1458,21 @@ class HemoCubeFragment : Fragment() {
                     if (deviceRatioClass == "Negative Borderline") {
                         if (borderlineMetric < negativeBoderLine10mm1){//1.34
                             return "Sickle Cell Trait"
-                        }else if(borderlineMetric > negativeBoderLine10mm2){
+                        }else if(borderlineMetric > negativeBoderLine10mm1){
                             return "Normal"
-                        }else if(borderlineMetric > negativeBoderLine10mm1 && borderlineMetric < negativeBoderLine10mm2){
-                            return "Negative borderline. Confirm with HPLC"
+                        }else if(borderlineMetric == negativeBoderLine10mm1){
+                            return "Sickle Cell Trait"
                         }
                     }
                     if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") {
                         if (borderlineMetric < positiveBoderLine10mm1){//1.34
                             return "Sickle Cell Disease"
-                        }else if(borderlineMetric > positiveBoderLine10mm2){
+                        }else if(borderlineMetric > positiveBoderLine10mm1){
                             return "Sickle Cell Trait"
-                        }else if(borderlineMetric > positiveBoderLine10mm1 && borderlineMetric < positiveBoderLine10mm2){
-                            return "Positive for Sickle Cell. Confirm with HPLC"
+                        }else if(borderlineMetric == positiveBoderLine10mm1){
+                            return "Sickle Cell Disease"
                         }
                     }
-//                    if (deviceRatioClass == "Negative Borderline") {
-//                        if (borderlineMetric < negativeBoderLine10mm1){//1.34
-//                            return "Sickle Cell Trait"
-//                        }else if(borderlineMetric > negativeBoderLine10mm1){
-//                            return "Normal"
-//                        }else if(borderlineMetric == negativeBoderLine10mm1){
-//                            return "Sickle Cell Trait"
-//                        }
-//                    }
-//                    if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") {
-//                        if (borderlineMetric < positiveBoderLine10mm1){//1.34
-//                            return "Sickle Cell Disease"
-//                        }else if(borderlineMetric > positiveBoderLine10mm1){
-//                            return "Sickle Cell Trait"
-//                        }else if(borderlineMetric == positiveBoderLine10mm1){
-//                            return "Sickle Cell Disease"
-//                        }
-//                    }
                 }else if(cuvetteSize == "2mm"){
                     if (deviceRatioClass == "Negative Borderline") {
                         if (borderlineMetric < negativeBoderLine2mm1){//1.34

app/src/test/java/com/example/hpostesting/HemoCubeFragmentTest.kt

@@ -390,7 +390,7 @@ class HemoCubeFragmentTest {
     fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineSickleCellTrait1() {
         val result =
             hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline", 2.2)
-        assertEquals("Negative borderline. Confirm with HPLC", result)
+        assertEquals("Normal", result)
     }
 
     @Test
@@ -400,7 +400,7 @@ class HemoCubeFragmentTest {
             "Positive for Sickle Cell. HPLC for Confirmation",
             1.4
         )
-        assertEquals("Positive for Sickle Cell. Confirm with HPLC", result)
+        assertEquals("Sickle Cell Trait", result)
     }
 
     @Test
@@ -410,7 +410,7 @@ class HemoCubeFragmentTest {
             "Positive for Sickle Cell. HPLC for Confirmation",
             1.33
         )
-        assertEquals("Positive for Sickle Cell. Confirm with HPLC", result)
+        assertEquals("Sickle Cell Trait", result)
     }
 
     @Test