From 985c484b8f4ab7a48056e810ad02650071ce1860 Mon Sep 17 00:00:00 2001
From: Pritimay Sarkar <pritimay@sminnovations.in>
Date: Fri, 2 Feb 2024 16:23:28 +0530
Subject: [PATCH] release 2.1.99

---
 app/build.gradle                                 |  1 -
 .../presentation/hemocube/HemoCubeFragment.kt    | 16 ++++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 785faa6..03cae80 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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'])
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
index 6250418..3a3b452 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
@@ -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"