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 3ff6c84..56c0639 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 @@ -18,7 +18,7 @@ data class HemoCubeTestData( var testType: String? = "HEMOCUBE", var testTime: String? = "", var testStatus: Boolean? = false, - var gender: UserData.Gender, + var gender: String = "", var localFlag: Boolean = false, var deviceId: String? = "", var appVersion:String? = "", diff --git a/app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt b/app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt index d9a91e8..8fe5e29 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt @@ -13,6 +13,7 @@ data class UserData( var birthYear: String = "", var abhaId: String = "", var userImageURL: String = "", + var gender: String ="", var location: Location? = null, var createdBy: String? = "", var reportUploadTime: String? = "", @@ -20,7 +21,6 @@ data class UserData( var testStatus: Boolean? = false, var mobileId: String = "", var deviceId: String = "", - var gender: Gender, var state: String = "", var deviceSerialNumber: String = "", var kitSerial: String = "", @@ -49,5 +49,4 @@ fun UserData.toHemoCubeTestData() = HemoCubeTestData( testStatus = testStatus, location = location, gender = gender - ) diff --git a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt index 53f8fd3..6aa46be 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt @@ -11,7 +11,6 @@ import androidx.appcompat.app.AppCompatActivity import com.example.hpostesting.data.DataHolder import com.example.hpostesting.data.constant.Constants import com.example.hpostesting.presentation.dashboard.DashboardActivity -import com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity import com.example.hpostesting.presentation.hemocube.HemocubeActivity import com.example.hpostesting.presentation.testRight.TestRightActivity import com.google.android.material.snackbar.Snackbar diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt index 636f8b3..baf2b05 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt @@ -2,7 +2,6 @@ package com.example.hpostesting.presentation.testRight import android.content.Context import android.net.Uri -import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel