smiuser/hpos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

release 2.1.99

Browse Source
This commit is contained in:
Pritimay Sarkar
2024-02-02 16:23:28 +05:30
parent 9f2b53c7f7
commit 985c484b8f
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@@ -162,5 +162,4 @@ dependencies {
implementation 'com.google.android.play:core:1.10.3'
implementation fileTree(dir: 'libs', include: ['*.aar'])
// implementation fileTree(dir: '/Users/apple/Downloads/work/hpos/app/libs', include: ['*.aar', '*.jar'])
}

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

@@ -235,6 +235,10 @@ class HemoCubeFragment : Fragment() {
private fun handleReadingFinish() {
if (allReadingsComplete(repeatReadingCount, readingsPerSample) && uploadedToCloud) {
if (validationError) {
hemoCubeViewModel.messages.postValue("Error")
return
}
activity?.runOnUiThread {
binding.btnSubmit.visibility = View.GONE
val i = Intent(
@@ -693,7 +697,7 @@ class HemoCubeFragment : Fragment() {
3
)?.get(0)!!
) {
validationError = true
// validationError = true
testState.allErrorMessages += "Error: Invalid Test. Improper buffer reading (low)"
activity?.runOnUiThread {
binding.errorMessage.text = getString(R.string.error_improper_buffer_low)
@@ -713,7 +717,7 @@ class HemoCubeFragment : Fragment() {
3
)?.get(1)!!
) {
validationError = true
// validationError = true
testState.allErrorMessages += "Error: Invalid Test. Improper buffer reading (high)" + "\n"
activity?.runOnUiThread {
binding.errorMessage.text =
@@ -761,7 +765,7 @@ class HemoCubeFragment : Fragment() {
val slopeClass = slopeRatioClassification(calculatedSlopeRatio)
if (fittedAbs1 <= fittedAbs2) {
validationError = true
// validationError = true
testState.allErrorMessages += "Error: Invalid Test. Problem with de-oxygenation" + "\n"
activity?.runOnUiThread {
binding.errorMessage.text = getString(R.string.error_invalid_test)
@@ -770,14 +774,14 @@ class HemoCubeFragment : Fragment() {
}
if (fittedAbs1 < 0 || fittedAbs2 < 0 || fittedAbs3 < 0 || fittedAbs4 < 0) {
validationError = true
// validationError = true
activity?.runOnUiThread {
binding.errorMessage.text = getString(R.string.error_negative_abs)
// binding.errorMessage.visibility = View.VISIBLE
}
}
if ((led1Average < 0.7 || led2Average < 0.7 || led3Average < 0.7 || led4Average < 0.7) && calculatedSlopeRatio > 35.0) {
if (led1Average < 0.0 || led2Average < 0.0 || led3Average < 0.0 || led4Average < 0.0) {
validationError = true
activity?.runOnUiThread {
binding.errorMessage.text = "Severely Low Hb. Repeat test with 12 ul in 2 ml Buffer"
@@ -786,7 +790,7 @@ class HemoCubeFragment : Fragment() {
}
if (fittedAbs3 < 0.1) {
validationError = true
// validationError = true
testState.allErrorMessages += "Error: Low Hb. Repeat test" + "\n"
activity?.runOnUiThread {
binding.errorMessage.text = "Error: Low Hb. Repeat test"