From 54be3a103733158bf8eb9cce9d1a2202c04898e0 Mon Sep 17 00:00:00 2001 From: chandrashekhar reddy Date: Tue, 31 Dec 2024 15:10:53 +0530 Subject: [PATCH] app version 130.1, without borderline classification and buffer limit --- app/build.gradle | 4 +-- .../presentation/KitScanActivity.kt | 25 +++++++++++-------- .../presentation/hemocube/HemoCubeFragment.kt | 4 +-- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b880c43..480a3a7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ android { applicationId "in.sminnovations.hpostesting.server" minSdk 21 targetSdk 34 - versionCode 130 - versionName "2.1.130" + versionCode 131 + versionName "2.1.130.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt index c4f32c8..a5fa3c4 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt @@ -145,19 +145,22 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate { val time = timeDifference(sharedPreference.getString(Constants.KIT_TIME, "").toString()) val kitNum = sharedPreference.getString(Constants.KIT_NUMBER, "").toString() // Toast.makeText(this@KitScanActivity,"Test MAx time"+ time+"-Test count-"+kitNum,Toast.LENGTH_SHORT).show() - - if (DataHolder.sampleReadCounter <= maxTest && kitNum != "" && time < Constants.MAX_KIT_TIME) { + if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") { moveToNext() - } else { - Toast.makeText(this@KitScanActivity, "Limit Reached, Use New KIT for testing", Toast.LENGTH_SHORT).show() - DataHolder.sampleReadCounter = 0 - DataHolder.kitSerial = "" + }else{ + if (DataHolder.sampleReadCounter <= maxTest && kitNum != "" && time < Constants.MAX_KIT_TIME) { + moveToNext() + } else { + Toast.makeText(this@KitScanActivity, "Limit Reached, Use New KIT for testing", Toast.LENGTH_SHORT).show() + DataHolder.sampleReadCounter = 0 + DataHolder.kitSerial = "" - with(sharedPreference.edit()) { - putString(Constants.KIT_NUMBER, "") - putString(Constants.BUFFER_VALUE_1, "") - putString(Constants.BUFFER_VALUE_2, "") - apply() + with(sharedPreference.edit()) { + putString(Constants.KIT_NUMBER, "") + putString(Constants.BUFFER_VALUE_1, "") + putString(Constants.BUFFER_VALUE_2, "") + apply() + } } } 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 6cc20de..97183f6 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 @@ -1468,7 +1468,7 @@ class HemoCubeFragment : Fragment() { if (deviceRatio != null && borderlineMetric != null) { if(cuvetteSize == "10mm"){ if (deviceRatioClass == "Negative Borderline") { - if (borderlineMetric < negativeBoderLine10mm1){//1.34 + if (borderlineMetric < negativeBoderLine10mm1){//2.0 return "Sickle Cell Trait" }else if(borderlineMetric > negativeBoderLine10mm1){ return "Normal" @@ -1477,7 +1477,7 @@ class HemoCubeFragment : Fragment() { } } if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") { - if (borderlineMetric < positiveBoderLine10mm1){//1.34 + if (borderlineMetric < positiveBoderLine10mm1){//1.3 return "Sickle Cell Disease" }else if(borderlineMetric > positiveBoderLine10mm1){ return "Sickle Cell Trait"