From 8f8fa4e30249362b51d8ed942130de844dda715c Mon Sep 17 00:00:00 2001
From: Pritimay Sarkar <pritimay@sminnovations.in>
Date: Sat, 6 Jan 2024 17:48:22 +0530
Subject: [PATCH] fix merge errors

---
 .../presentation/dashboard/HomeFragment.kt    |  1 +
 .../presentation/hemocube/HemoCubeFragment.kt | 47 ++++++++++++++++++-
 .../hemocube/HemoCubeViewModel.kt             | 19 +++++++-
 3 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
index 13a46ab..6ed3ef7 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
@@ -99,6 +99,7 @@ class HomeFragment : Fragment() {
         }
         viewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isConnected ->
             if (isConnected) {
+
                 binding.internetAvailableCL.visibility = View.VISIBLE
                 binding.internetNotAvailableCL.visibility = View.GONE
                 loadUserData()
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 2de40cb..36bbf6c 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
@@ -162,11 +162,37 @@ class HemoCubeFragment : Fragment() {
         hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 showToast(R.string.test_upload)
-                handleReadingFinish()
+                hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
+                    when (it) {
+                        is Result.Success -> {
+                            it.data.data?.get(0)?.rawData?.let { it1 ->
+                                hemoCubeViewModel.updateMolbioFlag(
+                                    it1._id)
+                                activity?.runOnUiThread {
+                                    binding.btnSubmit.visibility = View.GONE
+                                    val i = Intent(
+                                        requireContext().applicationContext,
+                                        DashboardActivity::class.java
+                                    )
+                                    startActivity(i)
+                                }
+                            }
+                        }
+                        is Result.Error -> {
+                            //Remove this line of code while deploying to IOCL
+                            it.exception.let { message ->
+                                Toast.makeText(activity, "An error occurred: $message", Toast.LENGTH_LONG)
+                                    .show()
+                            }
+                        }
+
+                        else -> {}
+                    }
+                }
             }
             if (result == "Local") {
                 showToast(R.string.internt_not_local)
-                handleReadingFinish()
+                startActivity(Intent(requireActivity(), DashboardActivity::class.java))
             }
             if (result == "Error") {
                 showToast(R.string.error_local)
@@ -176,6 +202,23 @@ class HemoCubeFragment : Fragment() {
             binding.progressBar.visibility = View.GONE
         }
 
+//        hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
+//            if (result == "Success") {
+//                showToast(R.string.test_upload)
+//                handleReadingFinish()
+//            }
+//            if (result == "Local") {
+//                showToast(R.string.internt_not_local)
+//                handleReadingFinish()
+//            }
+//            if (result == "Error") {
+//                showToast(R.string.error_local)
+//                startActivity(Intent(requireActivity(), DashboardActivity::class.java))
+//            }
+//
+//            binding.progressBar.visibility = View.GONE
+//        }
+
         hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID, ""))
 
         hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) {
diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
index 8fb3cfb..7061979 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
@@ -286,7 +286,24 @@ class HemoCubeViewModel @Inject constructor(
                         Log.i("Testdb", "Data uploaded to Firestore successfully")
                         fireBaseUpload.postValue("Success")
                         testDetails.localFlag = true
-                        uploadResult(MolbioV2ResultRequest(listOf(MolbioV2Result(rawData = testDetails))))
+                        uploadResult(
+                            MolbioV2ResultRequest(
+                                listOf(
+                                    MolbioV2Result(
+                                        rawData = testDetails,
+                                        analysisId = testDetails._id,
+                                        analysisDate = testDetails.testTime,
+                                        analysisStatus = testDetails.classificationResult,
+                                        thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[testDetails.deviceId].toString(),
+                                        interpretation = testDetails.classificationResult,
+                                        testId = testDetails._id,
+                                        testTime = testDetails.testTime,
+                                        collectionTime = testDetails.testTime,
+                                        expiryTime = testDetails.testTime,
+                                    )
+                                )
+                            )
+                        )
                         hemoCubeDao.insertAll(testDetails)
                     }