diff --git a/app/build.gradle b/app/build.gradle index c881eb0..677ac7f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { applicationId "in.sminnovations.hpostesting.quality" minSdk 21 targetSdk 34 - versionCode 101 - versionName "2.1.101" + versionCode 102 + versionName "2.1.102" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt index 4043938..85e5026 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt @@ -12,6 +12,7 @@ import android.view.ViewGroup import android.widget.AdapterView import android.widget.ArrayAdapter import android.widget.Spinner +import android.widget.Toast import androidx.fragment.app.Fragment import com.example.hpostesting.data.DataHolder import com.example.hpostesting.data.constant.Constants @@ -42,7 +43,7 @@ class AssuranceControlsFragment: Fragment() { // binding.btnSubmit.visibility = View.GONE val solutionSpinner: Spinner = binding.spinnerSolutions - val solutionOptions = arrayOf("Select solution", "Tartrazine", "AR") + val solutionOptions = arrayOf("Select solution", "Tartrazine", "Acid Red") val solutionAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, solutionOptions) solutionAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) solutionSpinner.adapter = solutionAdapter @@ -121,6 +122,13 @@ class AssuranceControlsFragment: Fragment() { volumeSpinner.setSelection(volumePosition) binding.btnSubmit.setOnClickListener { + val selectedSolution = DataHolder.hemoCubeTestData!!.solution + val selectedVolume = DataHolder.hemoCubeTestData!!.volume + if (selectedSolution == "Select solution" || selectedVolume == "Select volume") { + Toast.makeText(requireContext(), "Please select both solution and volume", Toast.LENGTH_SHORT).show() + return@setOnClickListener + } + DataHolder.hemoCubeTestData!!.quickCapture = true val currentUnixTime = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { Instant.now().epochSecond @@ -141,6 +149,7 @@ class AssuranceControlsFragment: Fragment() { apply() } + val i = Intent(requireContext(), HemocubeActivity::class.java) startActivity(i) } 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 70bb256..52e9c9d 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 @@ -875,7 +875,7 @@ class HemoCubeFragment : Fragment() { this.deviceRatioClass = deviceRatioClassification(deviceRatio) this.slopeRatioClass = slopeClass this.classificationResult = findResultWithAdditionalMethods(deviceRatio, deviceRatioClass, slopeRatio) - hemoCubeViewModel.messages.postValue("${this.classificationResult} ") + hemoCubeViewModel.messages.postValue("${this.classificationResult} \n Device Ratio: ${"%.3f".format(this.deviceRatio)} \n Slope Ratio: ${"%.3f".format(this.slopeRatio)}") if (DataHolder.hemoCubeTestData?.testType == "HB") hemoCubeViewModel.messages.postValue("Hb: $calculatedHb4") this.errorMessages = testState.allErrorMessages