Compare commits
2 Commits
dev-2.1.12
...
2.1.128
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
63891fdade | ||
|
|
1400f71d61 |
@@ -134,7 +134,7 @@ class PrefsFragment: PreferenceFragmentCompat(){
|
|||||||
|
|
||||||
// App Version Preference
|
// App Version Preference
|
||||||
val appVersionPreference = Preference(requireContext())
|
val appVersionPreference = Preference(requireContext())
|
||||||
appVersionPreference.title = "App Version"
|
appVersionPreference.title = "App Version SMI"
|
||||||
appVersionPreference.summary =
|
appVersionPreference.summary =
|
||||||
getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + " ]"
|
getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + " ]"
|
||||||
|
|
||||||
|
|||||||
@@ -1458,21 +1458,39 @@ class HemoCubeFragment : Fragment() {
|
|||||||
if (deviceRatioClass == "Negative Borderline") {
|
if (deviceRatioClass == "Negative Borderline") {
|
||||||
if (borderlineMetric < negativeBoderLine10mm1){//1.34
|
if (borderlineMetric < negativeBoderLine10mm1){//1.34
|
||||||
return "Sickle Cell Trait"
|
return "Sickle Cell Trait"
|
||||||
}else if(borderlineMetric > negativeBoderLine10mm1){
|
}else if(borderlineMetric > negativeBoderLine10mm2){
|
||||||
return "Normal"
|
return "Normal"
|
||||||
}else if(borderlineMetric == negativeBoderLine10mm1){
|
}else if(borderlineMetric > negativeBoderLine10mm1 && borderlineMetric < negativeBoderLine10mm2){
|
||||||
return "Sickle Cell Trait"
|
return "Negative borderline. Confirm with HPLC"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") {
|
if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") {
|
||||||
if (borderlineMetric < positiveBoderLine10mm1){//1.34
|
if (borderlineMetric < positiveBoderLine10mm1){//1.34
|
||||||
return "Sickle Cell Disease"
|
return "Sickle Cell Disease"
|
||||||
}else if(borderlineMetric > positiveBoderLine10mm1){
|
}else if(borderlineMetric > positiveBoderLine10mm2){
|
||||||
return "Sickle Cell Trait"
|
return "Sickle Cell Trait"
|
||||||
}else if(borderlineMetric == positiveBoderLine10mm1){
|
}else if(borderlineMetric > positiveBoderLine10mm1 && borderlineMetric < positiveBoderLine10mm2){
|
||||||
return "Sickle Cell Disease"
|
return "Positive for Sickle Cell. Confirm with HPLC"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// 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"){
|
}else if(cuvetteSize == "2mm"){
|
||||||
if (deviceRatioClass == "Negative Borderline") {
|
if (deviceRatioClass == "Negative Borderline") {
|
||||||
if (borderlineMetric < negativeBoderLine2mm1){//1.34
|
if (borderlineMetric < negativeBoderLine2mm1){//1.34
|
||||||
|
|||||||
@@ -390,7 +390,7 @@ class HemoCubeFragmentTest {
|
|||||||
fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineSickleCellTrait1() {
|
fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineSickleCellTrait1() {
|
||||||
val result =
|
val result =
|
||||||
hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline", 2.2)
|
hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline", 2.2)
|
||||||
assertEquals("Normal", result)
|
assertEquals("Negative borderline. Confirm with HPLC", result)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -400,7 +400,7 @@ class HemoCubeFragmentTest {
|
|||||||
"Positive for Sickle Cell. HPLC for Confirmation",
|
"Positive for Sickle Cell. HPLC for Confirmation",
|
||||||
1.4
|
1.4
|
||||||
)
|
)
|
||||||
assertEquals("Sickle Cell Trait", result)
|
assertEquals("Positive for Sickle Cell. Confirm with HPLC", result)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -410,7 +410,7 @@ class HemoCubeFragmentTest {
|
|||||||
"Positive for Sickle Cell. HPLC for Confirmation",
|
"Positive for Sickle Cell. HPLC for Confirmation",
|
||||||
1.33
|
1.33
|
||||||
)
|
)
|
||||||
assertEquals("Sickle Cell Trait", result)
|
assertEquals("Positive for Sickle Cell. Confirm with HPLC", result)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
3768
hs_err_pid3592.log
Normal file
3768
hs_err_pid3592.log
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user