Merge remote-tracking branch 'origin/dev-without-firebase-integration' into dev-without-firebase-integration

app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt

@@ -52,5 +52,6 @@ interface HemoCubeDao {
 
     @Query("SELECT * from hemo_cube_test_table WHERE localFlag = 0")
     fun getPendingUser(): LiveData<List<HemoCubeTestData>>
-
+    @Update
+    suspend fun updateTest(hemoCubeTestData: HemoCubeTestData)
 }

app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt

@@ -43,6 +43,7 @@ data class UserData(
     var result: TestRightResultType? = null,
     var resultRatio: Double? = null,
     var prdClassification: String = "",
+    var sampleid: Int = 0
 ) {
     enum class Gender {
         MALE,
@@ -60,6 +61,8 @@ fun UserData.toHemoCubeTestData() = HemoCubeTestData(
     _id = _id,
     name = name,
     bloodGroup = bloodGroup,
+    sampleid = sampleid,
+    incubationTime = incubationTime,
     birthYear = birthYear,
     gender = gender,
     state = state,

app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt

@@ -122,6 +122,7 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
                                     ).show()
                                 } else {
                                     DataHolder.selectedTest = UserData(
+                                        sampleid = userList.sampleid,
                                         _id = userList._id,
                                         bloodGroup = userList.bloodGroup,
                                         incubationTime = userList.incubationTime

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt

@@ -136,7 +136,7 @@ class HemoCubeViewModel @Inject constructor(
                 testDetails?.testTime = SimpleDateFormat(
                     "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                 ).format(Calendar.getInstance().time)
-                hemoCubeDao.insertAll(testDetails!!)
+                hemoCubeDao.updateTest(testDetails!!)
                 fireBaseUpload.postValue("Local")
             }
         } catch (e: Exception) {
@@ -423,7 +423,6 @@ class HemoCubeViewModel @Inject constructor(
                 testDetails!!.reportUploadTime = SimpleDateFormat(
                     "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                 ).format(Calendar.getInstance().time)
-                hemoCubeDao.insertAll(testDetails)
 //                when (val response = repository.addTestToDatabase(testDetails)) {
 //                    is Response.Success -> {
 //                        val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
@@ -474,7 +473,7 @@ class HemoCubeViewModel @Inject constructor(
                             )
                         )
                     )
-                    hemoCubeDao.insertAll(testDetails)
+                    hemoCubeDao.updateTest(testDetails)
                 }
             } catch (e: Exception) {
                 Log.e("Testdb", "Exception during data upload: ${e.message}")