BufferCheckData uploaded to database code pending

2023-10-13 18:50:57 +05:30
parent 497a61c16b
commit 9db8e962d7
5 changed files with 126 additions and 52 deletions
--- a/app/src/main/java/com/example/hpostesting/data/model/patient/BufferCheckData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/patient/BufferCheckData.kt
@@ -0,0 +1,19 @@
+package com.example.hpostesting.data.model.patient
+
+data class BufferCheckData(
+    var kitno: String = "",
+    var deviceId: String? = "",
+    var appVersion:String? = "",
+    var deviceSerialNumber: String = "",
+    var deviceType: String = "HEMOCUBE",
+    var resultData: String = "",
+    var led1Buffer: Double? = null,
+    var led2Buffer: Double? = null,
+    var led1Sample: Double? = null,
+    var led2Sample: Double? = null,
+    var led1Average: Double? = null,
+    var led2Average: Double? = null,
+    var deviceRatio: Double? = null,
+    var calculatedRatio: Double? = null,
+    var classificationResult: String = ""
+)
--- a/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt
+++ b/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt
@@ -3,6 +3,7 @@ package com.example.hpostesting.data.repository
 import android.net.Uri
 import com.example.hpostesting.data.model.PendingUploads
 import com.example.hpostesting.data.model.Response
+import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
@@ -50,16 +51,10 @@ class DatabaseRepository : Repository {
        }
    }

-    suspend fun addTestToDatabaseforBufferCheck(data: HemoCubeTestData?): Response<String> {
+    suspend fun addTestToDatabaseforBufferCheck(data: BufferCheckData?): Response<String> {
        return try {
-            val userdata = db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
-            if (userdata.documents.isNotEmpty()) {
-                userdata.documents.forEach {
-                    db.collection("patientData").document(it.id).update("testStatus", true)
-                }
-            }
            db.collection("buffers").add(data!!).await()
-            Response.Success(data!!._id)
+            Response.Success(data!!.kitno)
        } catch (e: Exception) {
            Firebase.crashlytics.recordException(e)
            Response.Error(e)
--- a/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt
@@ -1,5 +1,6 @@
 package com.example.hpostesting.presentation.buffercheck

+import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -7,14 +8,15 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AutoCompleteTextView
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.lifecycleScope
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
+import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.presentation.UsbServiceListener
@@ -26,7 +28,6 @@ import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
-import kotlinx.coroutines.launch
 import kotlin.math.log10

 class HemoCubeBufferCheckFragment : Fragment() {
@@ -36,6 +37,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
    private lateinit var sharedPreferences: SharedPreferences
    private var currentDeviceData: DeviceData? = null
    private var resultData: String = ""
+    private var kitno: String = ""
    private var isOnline = false
    private val messages = MutableLiveData<String>()
    private var isTestOngoing = false
@@ -56,24 +58,43 @@ class HemoCubeBufferCheckFragment : Fragment() {
    }

    private fun initViews() {
-//        binding.btnKit.visibility = View.GONE
-        binding.btnSubmit.visibility = View.GONE
-//        binding.etBloodGroup.visibility = View.GONE
-        listenToHemoCube()
-        startBufferProcess()

-        binding.btnSubmit.setOnClickListener {
-            activity?.runOnUiThread {
-                binding.progressBar.visibility = View.VISIBLE
+        binding.nameEditText.setText("SMI/SC/")
+
+        binding.btnGo.setOnClickListener {
+            val serialNumber = binding.nameEditText.text.toString().trim()
+            if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
+                kitno = serialNumber
+                listenToHemoCube()
+                startBufferProcess()
+            } else {
+                Toast.makeText(context, "Invalid KIT Number", Toast.LENGTH_LONG).show()
+                return@setOnClickListener
            }
-            hemoCubeViewModel.uploadHemoCubeResultToDatabaseforbuffercheckN(
-                isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, "")
-            )
+            activity?.runOnUiThread {
+                binding.tvSubtitle2.visibility = View.GONE
+                binding.etAbhaId.visibility = View.GONE
+                binding.tvTitle.visibility = View.GONE
+                binding.tvTitle2.visibility = View.GONE
+                binding.btnGo.visibility = View.GONE
+            }
+        }
+
+
+
+        activity?.runOnUiThread {
+            binding.btnSubmit.isEnabled = true
+            binding.btnSubmit.isClickable = true
+        }
+        binding.btnSubmit.setOnClickListener {
+
        }
        binding.btnSubmit.isEnabled = false
        binding.btnSubmit.isClickable = false
    }

+
+
    private fun observeViewModel() {
        hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
            if (result == "Success") {
@@ -239,8 +260,10 @@ class HemoCubeBufferCheckFragment : Fragment() {
                val led2Average = log10(led2BufferForDevice?.div(led2Sample!!) ?: 0.0)
                val deviceRatio = led1Average / led2Average
                val calculatedRatio = calculateRatio(deviceRatio)
-                val classificationResult = findResult(calculatedRatio)
+                val classificationResult = "KIT PASSED"
                messages.postValue(classificationResult)
+                val bufferData = BufferCheckData(kitno = kitno, led1Buffer = led1BufferForDevice, led2Buffer = led2BufferForDevice, led1Average = led1Average, led2Average = led2Average, led1Sample = led1Sample, led2Sample = led2Sample, deviceRatio = deviceRatio , calculatedRatio = calculatedRatio )
+                hemoCubeViewModel.uploadHemoCubeResultToDatabaseforbuffercheckN(bufferData)
            }
        } catch (e: Exception) {
            Toast.makeText(
@@ -332,6 +355,16 @@ class HemoCubeBufferCheckFragment : Fragment() {
        return ""
    }

+    private fun isSerialValid(s: String): Boolean {
+        if (s.length != 17) {
+            binding.nameEditText.error = getString(R.string.invalid_kit)
+            return false
+        }
+        return true
+    }
+
+
+
    private fun isValidResult(line: String): String {
        return if (line.contains("RESULT") && line.split(" ").size == 8) {
            line
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
@@ -12,6 +12,7 @@ import com.example.hpostesting.data.NetworkStatusLiveData
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.model.Response
+import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
@@ -71,28 +72,10 @@ class HemoCubeViewModel @Inject constructor(



-    fun uploadHemoCubeResultToDatabaseforbuffercheckN(isOnline: Boolean, testStatus: Boolean, kitSerial: String?) =
+    fun uploadHemoCubeResultToDatabaseforbuffercheckN(bufferCheckData: BufferCheckData) =
        viewModelScope.launch {
-            if (kitSerial != null) {
-                testDetails?.kitSerial = kitSerial
-            }
-            testDetails?.testStatus = testStatus
+                addResultTestToDbforbuffercheck(bufferCheckData)

-            try {
-                if (isOnline) {
-                    parseData()
-                    addResultTestToDbforbuffercheck()
-                } else {
-                    parseData()
-                    testDetails?.testTime = SimpleDateFormat(
-                        "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                    ).format(Calendar.getInstance().time)
-                    hemoCubeDao.insertAll(testDetails!!)
-                    fireBaseUpload.postValue("Local")
-                }
-            } catch (e: Exception) {
-                Log.e("Testdb", "Upload failed: ${e.message}")
-            }
        }


@@ -157,14 +140,11 @@ class HemoCubeViewModel @Inject constructor(
    }


-    private fun addResultTestToDbforbuffercheck() {
+    private fun addResultTestToDbforbuffercheck(bufferCheckData: BufferCheckData) {
        viewModelScope.launch {
            try {
-                testDetails!!.reportUploadTime = SimpleDateFormat(
-                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                ).format(Calendar.getInstance().time)

-                when (val response = repository.addTestToDatabaseforBufferCheck(testDetails)) {
+                when (val response = repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
                    is Response.Success -> {
                        val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
                        with(sharedPreference.edit()) {
--- a/app/src/main/res/layout/fragment_hemo_cube_reference.xml
+++ b/app/src/main/res/layout/fragment_hemo_cube_reference.xml
@@ -27,7 +27,6 @@
            android:layout_height="wrap_content"
            android:layout_marginHorizontal="24dp"
            android:layout_marginTop="16dp"
-            android:text="@string/step4"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@id/tv_title" />
@@ -45,6 +44,7 @@
 <!--            app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />-->

        <TextView
+            android:visibility="gone"
            android:id="@+id/tv_name"
            style="@style/title2"
            android:layout_width="0dp"
@@ -52,7 +52,7 @@
            android:layout_marginHorizontal="24dp"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btn_submit" />
+            tools:ignore="MissingConstraints" />

        <TextView
            android:id="@+id/tv_subtitle4"
@@ -66,7 +66,7 @@
            android:textSize="18sp"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
+            app:layout_constraintTop_toBottomOf="@id/et_abha_id" />


        <!--        <Button-->
@@ -98,7 +98,55 @@
        <!--            app:layout_constraintTop_toBottomOf="@id/btn_submit" />-->


+        <TextView
+            android:id="@+id/tv_title2"
+            style="@style/title1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="24dp"
+            android:layout_marginTop="48dp"
+            android:text="@string/enter_kit_serial_number_manually"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:ignore="MissingConstraints" />
+
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/et_abha_id"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="20dp"
+            app:layout_constraintEnd_toStartOf="@id/btn_go"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_title2">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/name_edit_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:maxLength="17"
+                android:inputType="text"
+                android:hint="@string/serial_number" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_go"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="24dp"
+            android:text="@string/go"
+            app:cornerRadius="16dp"
+            app:layout_constraintBottom_toBottomOf="@id/et_abha_id"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintStart_toEndOf="@id/et_abha_id"
+            app:layout_constraintTop_toTopOf="@id/et_abha_id" />
+
+
        <Button
+            android:visibility="gone"
            android:id="@+id/btn_submit"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -181,7 +229,6 @@
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

-
    </androidx.constraintlayout.widget.ConstraintLayout>
+    </layout>

-</layout>