fix hemocube db save error
- add mapper to hemocube data - save test details correctly on dataholder - add result data from device on test details
This commit is contained in:
@@ -22,7 +22,7 @@ object DataHolder {
|
||||
val wavelengthToPixelArray = ArrayList<Double>()
|
||||
val intensityReferenceArray = ArrayList<Double>()
|
||||
var selectedTest: UserData? = null
|
||||
var HomocubeTestType: HemoCubeTestData? = null
|
||||
var hemoCubeTestData: HemoCubeTestData? = null
|
||||
|
||||
var kitSerial: String = ""
|
||||
|
||||
|
||||
@@ -10,8 +10,10 @@ data class HemoCubeTestData(
|
||||
var name: String = "",
|
||||
var birthYear: String = "",
|
||||
var userImageURL: String = "",
|
||||
var location: UserData.Location? = null,
|
||||
var createdBy: String? = "",
|
||||
var reportUploadTime: String? = "",
|
||||
var testType: String? = "HEMOCUBE",
|
||||
var testTime: String? = "",
|
||||
var testStatus: Boolean? = false,
|
||||
var mobileId: String = "",
|
||||
@@ -19,6 +21,7 @@ data class HemoCubeTestData(
|
||||
var kitSerial: String = "",
|
||||
var reportPath: String = "",
|
||||
var resultRatio: Double? = null,
|
||||
var resultData: String = "",
|
||||
var led1: Double? = null,
|
||||
var led2: Double? = null
|
||||
)
|
||||
@@ -36,3 +36,20 @@ data class UserData(
|
||||
var longitude: Double? = null
|
||||
)
|
||||
}
|
||||
|
||||
fun UserData.toHemoCubeTestData() = HemoCubeTestData(
|
||||
_id = _id,
|
||||
name = name,
|
||||
birthYear = birthYear,
|
||||
userImageURL = userImageURL,
|
||||
location = location,
|
||||
createdBy = createdBy,
|
||||
reportUploadTime = reportUploadTime,
|
||||
testTime = testTime,
|
||||
testStatus = testStatus,
|
||||
mobileId = mobileId,
|
||||
deviceSerialNumber = deviceSerialNumber,
|
||||
kitSerial = kitSerial,
|
||||
reportPath = reportPath,
|
||||
resultRatio = resultRatio,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user