From edf1d706084cb7c44a2eb0083f801ba9182696e8 Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Fri, 3 Nov 2023 16:35:28 +0530 Subject: [PATCH] add 4 led in data class --- .../java/com/example/hpostesting/data/dao/MyDataBase.kt | 2 +- .../hpostesting/data/model/patient/HemoCubeTestData.kt | 6 ++++++ .../hpostesting/presentation/hemocube/HemoCubeViewModel.kt | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt b/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt index ac14230..339d58d 100644 --- a/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt +++ b/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt @@ -11,7 +11,7 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData import com.google.android.datatransport.runtime.dagger.Provides import javax.inject.Singleton -@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 3, exportSchema = false) +@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 5, exportSchema = false) @TypeConverters(Converters::class) abstract class MyDatabase : RoomDatabase() { abstract fun userDao(): UserDao diff --git a/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt b/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt index 5599862..8f3b663 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt @@ -24,10 +24,16 @@ data class HemoCubeTestData( var resultData: String = "", var led1Buffer: Double? = null, var led2Buffer: Double? = null, + var led3Buffer: Double? = null, + var led4Buffer: Double? = null, var led1Sample: Double? = null, var led2Sample: Double? = null, + var led3Sample: Double? = null, + var led4Sample: Double? = null, var led1Average: Double? = null, var led2Average: Double? = null, + var led3Average: Double? = null, + var led4Average: Double? = null, var deviceRatio: Double? = null, var calculatedRatio: Double? = null, var coefficients: String? = "", 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 73d05fc..4a7dd6b 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 @@ -95,10 +95,16 @@ class HemoCubeViewModel @Inject constructor( testDetails?.kitSerial = sharedPreference.getString(Constants.KIT_NUMBER, "").toString() testDetails?.led1Buffer = DataHolder.hemoCubeTestData?.led1Buffer testDetails?.led2Buffer = DataHolder.hemoCubeTestData?.led2Buffer + testDetails?.led3Buffer = DataHolder.hemoCubeTestData?.led3Buffer + testDetails?.led4Buffer = DataHolder.hemoCubeTestData?.led4Buffer testDetails?.led1Sample = DataHolder.hemoCubeTestData?.led1Sample testDetails?.led2Sample = DataHolder.hemoCubeTestData?.led2Sample + testDetails?.led3Sample = DataHolder.hemoCubeTestData?.led3Sample + testDetails?.led4Sample = DataHolder.hemoCubeTestData?.led4Sample testDetails?.led1Average = DataHolder.hemoCubeTestData?.led1Average testDetails?.led2Average = DataHolder.hemoCubeTestData?.led2Average + testDetails?.led3Average = DataHolder.hemoCubeTestData?.led3Average + testDetails?.led4Average = DataHolder.hemoCubeTestData?.led4Average testDetails?.deviceRatio = DataHolder.hemoCubeTestData?.deviceRatio testDetails?.calculatedRatio = DataHolder.hemoCubeTestData?.calculatedRatio testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients