From 628b84bfefc048e9a9af89202b3a00a612553d95 Mon Sep 17 00:00:00 2001 From: Mariya Date: Fri, 5 Apr 2024 14:23:51 +0530 Subject: [PATCH] changed the time zone for result upload for molbio --- .../presentation/dashboard/HomeFragment.kt | 10 +++++----- .../presentation/hemocube/HemoCubeViewModel.kt | 13 ++++++++----- 2 files changed, 13 insertions(+), 10 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 f2e3019..91c4404 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 @@ -377,11 +377,11 @@ class HomeFragment : Fragment() { val encryptedString = file.readText() val encryptionKey = Settings.Secure.getString(context?.contentResolver, Settings.Secure.ANDROID_ID) - // val decryptedMessage: String = Encryption.decrypt(encryptedString, encryptionKey) - // val credentials = decryptedMessage.split("\n") - // userID = credentials[0] - // password = credentials[1] - // Toast.makeText(context, "DECRYPTED: $credentials", Toast.LENGTH_SHORT).show() + val decryptedMessage: String = Encryption.decrypt(encryptedString, encryptionKey) + val credentials = decryptedMessage.split("\n") + userID = credentials[0] + password = credentials[1] + Toast.makeText(context, "DECRYPTED: $credentials", Toast.LENGTH_SHORT).show() if (!isTokenAvailable) { hemoCubeViewModel.login(createLoginRequestData(userID, password)) } 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 dfab186..4604171 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 @@ -423,7 +423,10 @@ class HemoCubeViewModel @Inject constructor( testDetails!!.reportUploadTime = SimpleDateFormat( "yyyy-MM-dd HH:mm:ss", Locale.getDefault() ).format(Calendar.getInstance().time) - + val currentTimeFormatted = SimpleDateFormat( + "yyyy-MM-dd'T'HH:mm:ssZZZZZ", + Locale.getDefault() + ).format(Calendar.getInstance().time) when (val response = repository.addTestToDatabase(testDetails)) { is Response.Success -> { val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0) @@ -445,14 +448,14 @@ class HemoCubeViewModel @Inject constructor( MolbioV2Result( rawData = sanitizedTestDetails, analysisId = sanitizedTestDetails._id, - analysisDate = sanitizedTestDetails.testTime, + analysisDate = currentTimeFormatted, analysisStatus = sanitizedTestDetails.classificationResult, thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[sanitizedTestDetails.deviceId]?.toString(), interpretation = sanitizedTestDetails.classificationResult, testId = sanitizedTestDetails._id, - testTime = sanitizedTestDetails.testTime, - collectionTime = sanitizedTestDetails.testTime, - expiryTime = sanitizedTestDetails.testTime, + testTime = currentTimeFormatted, + collectionTime = currentTimeFormatted, + expiryTime = currentTimeFormatted, ) ) )