diff --git a/app/build.gradle b/app/build.gradle index 581a71f..be6dbd6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,12 +15,13 @@ android { namespace 'in.sminnovations.hpostesting' // dev -> development, quality -> qc, uat -> User Acceptance Testing, preprod -> preproduction, prod -> production, iocl -> iocl-iisc production + //for testing in iisc->in.sminnovations.hpostesting.test / prod -> in.sminnovations.hpostesting.iocl defaultConfig { applicationId "in.sminnovations.hpostesting.iocl" minSdk 21 targetSdk 34 - versionCode 127 - versionName "2.1.127" + versionCode 129 + versionName "2.1.129" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/google-services.json b/app/google-services.json deleted file mode 100644 index 1ddf40e..0000000 --- a/app/google-services.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "project_info": { - "project_number": "243503501547", - "project_id": "iocl-iisc-hpos", - "storage_bucket": "iocl-iisc-hpos.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:243503501547:android:f17de652a3524d047feeae", - "android_client_info": { - "package_name": "com.iocl_iisc.hposqc" - } - }, - "oauth_client": [], - "api_key": [ - { - "current_key": "AIzaSyBPxgcDkZfZMr8cFrkMWkVf1a-MstzWC1k" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:243503501547:android:e1bb0f338c8448dd7feeae", - "android_client_info": { - "package_name": "in.sminnovations.hposregistration.iocl" - } - }, - "oauth_client": [], - "api_key": [ - { - "current_key": "AIzaSyBPxgcDkZfZMr8cFrkMWkVf1a-MstzWC1k" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:243503501547:android:18b8b33b2dc3776d7feeae", - "android_client_info": { - "package_name": "in.sminnovations.hpostesting.iocl" - } - }, - "oauth_client": [], - "api_key": [ - { - "current_key": "AIzaSyBPxgcDkZfZMr8cFrkMWkVf1a-MstzWC1k" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [] - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index e027849..43969a2 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 128, - "versionName": "2.1.128", + "versionCode": 129, + "versionName": "2.1.129", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt index caec6ec..96096ad 100644 --- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt +++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt @@ -29,6 +29,7 @@ object Constants { const val ABHA_APP_PACKAGE = "in.ndhm.phr" const val MOLBIO_INTEGRATION = true + const val FIREBASE_INTEGRATION = false const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in" const val deviceProvisionPassword = "f2ab0e7f9d69" const val DEVICE_ID_API = "deviceIDAPI" @@ -44,8 +45,8 @@ object Constants { const val TEST_RIGHT_TOTAL_PIXEL = 3694 - const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE = 35 - const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM = 10 + const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE = 34 + const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM = 9 const val RANGE_IN_RESULT_CALCULATIONS = 10 diff --git a/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt b/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt index 8b8b67a..35a69ac 100644 --- a/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt +++ b/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt @@ -41,6 +41,9 @@ interface HemoCubeDao { @Query("DELETE FROM hemo_cube_test_table WHERE _id = :id") suspend fun deleteById(id: String) + @Query("DELETE FROM hemo_cube_test_table WHERE testStatus = 0") + suspend fun deleteByStatus() + @Query("UPDATE hemo_cube_test_table SET localFlag = :newValue WHERE _id = :id") suspend fun updateFieldById(id: String, newValue: Boolean) 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 e6f1903..ee1c284 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 @@ -23,7 +23,7 @@ import com.example.hpostesting.data.model.patient.UserData @Database( entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class], - version = 36, + version = 38, exportSchema = false ) @TypeConverters(Converters::class) diff --git a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt b/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt index ba3c994..d0b4365 100644 --- a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt +++ b/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt @@ -110,7 +110,7 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource { data.name, data.incubationTime, data.bloodGroup, - data.birthYear, // Include other fields similarly + data.age, // Include other fields similarly data.state, data.abhaId, data.userImageURL, @@ -233,7 +233,7 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource { data.name, data.incubationTime, data.bloodGroup, - data.birthYear, // Include other fields similarly + data.age, // Include other fields similarly data.state, data.abhaId, data.userImageURL, 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 0fa0885..f97a08c 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,7 +24,7 @@ data class HemoCubeTestData( var name: String = "", var incubationTime: String = "", var bloodGroup: String = "", - var birthYear: String = "", + var age: String = "", var state: String = "", var abhaId: String = "", var userImageURL: 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 ef25223..98137db 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 @@ -24,7 +24,7 @@ data class UserData( var name: String = "", var incubationTime: String = "", var gender: String = "", - var birthYear: String = "", + var age: String = "", var abhaId: String = "", var bloodGroup: String = "", var userImageURL: String = "", @@ -63,7 +63,7 @@ fun UserData.toHemoCubeTestData() = HemoCubeTestData( sampleid = sampleid, bloodGroup = bloodGroup, incubationTime = incubationTime, - birthYear = birthYear, + age = age, gender = gender, state = state, abhaId = abhaId, diff --git a/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt index 6349d1a..6faec8a 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt @@ -111,10 +111,10 @@ class MainActivity : AppCompatActivity() { } } - if (DataHolder.selectedTest == null) { - startActivity(Intent(this, DashboardActivity::class.java)) - finish() - } +// if (DataHolder.selectedTest == null) { +// startActivity(Intent(this, DashboardActivity::class.java)) +// finish() +// } } private fun checkAndUpdateUsbConnection() { diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ActivitiesFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ActivitiesFragment.kt index a36dd52..b3ba44e 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ActivitiesFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ActivitiesFragment.kt @@ -33,6 +33,10 @@ import com.example.hpostesting.presentation.testRight.TestRightViewModel import `in`.sminnovations.hpostesting.R import `in`.sminnovations.hpostesting.databinding.FragmentActivitiesBinding import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding +import java.text.SimpleDateFormat +import java.util.Calendar +import java.util.Date +import java.util.Locale class ActivitiesFragment : Fragment() { private lateinit var binding: FragmentActivitiesBinding @@ -53,6 +57,11 @@ class ActivitiesFragment : Fragment() { hemoCubeViewModel.allPendingUserToUpload.observe(viewLifecycleOwner) { userData -> if (userData.isNotEmpty()) { + userData.forEach { user -> + if(isBetween15And30Minutes(user.incubationTime) > 30 && user.testStatus == false){ + hemoCubeViewModel.deleteByStatus() + } + } binding.rvOrderOffline.visibility = View.VISIBLE binding.noDataText.visibility = View.GONE val bm = @@ -68,5 +77,15 @@ class ActivitiesFragment : Fragment() { } } } + private fun isBetween15And30Minutes(createdAt: String): Long { + val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()) + val createdAtDate: Date = formatter.parse(createdAt)!! + + val currentTime = Calendar.getInstance().time + + val diffMillis = currentTime.time - createdAtDate.time + + return diffMillis / (60 * 1000) + } } \ No newline at end of file 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 bfe35c8..b5c25a5 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 @@ -37,6 +37,7 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ArrayAdapter import android.widget.Toast import androidx.annotation.RequiresApi import androidx.appcompat.content.res.AppCompatResources @@ -133,7 +134,6 @@ class HomeFragment : Fragment() { binding.labelQuickCapture.visibility = View.VISIBLE binding.btnQuickCapture.visibility = View.VISIBLE } - getDeviceId() checkUnprocessedCSVData() //checkForUpdate() @@ -177,6 +177,7 @@ class HomeFragment : Fragment() { Toast.makeText( requireContext(), R.string.test_upload, Toast.LENGTH_SHORT ).show() + hemoCubeViewModel.fireBaseBulkUpload.postValue("Done") } if (result == "Error") { Toast.makeText(requireContext(), R.string.test_upload_failed, Toast.LENGTH_SHORT) @@ -200,8 +201,7 @@ class HomeFragment : Fragment() { // }else{ // binding.downloadCSV.visibility = View.GONE // } - val btnSaveLocalVisibility = - if (userData.any { it.testStatus == true }) View.VISIBLE else View.GONE + val btnSaveLocalVisibility = if (userData.any { it.testStatus == true }) View.VISIBLE else View.GONE binding.downloadCSV.visibility = btnSaveLocalVisibility binding.downloadCSV.setOnClickListener { if (btnSaveLocalVisibility == View.VISIBLE) { @@ -291,15 +291,24 @@ class HomeFragment : Fragment() { private fun checkNetworkStatus() { hemoCubeViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isConnected -> // Toast.makeText(requireContext(),"connected"+isConnected+wasConnected, Toast.LENGTH_SHORT).show() + if(isConnected){ + binding.tvTitleNoInternet.text = "Please enter the user id and select blood group to start the test." + binding.internetIcon.setImageDrawable(AppCompatResources.getDrawable(requireContext(),R.drawable.internet)) + binding.internetNotAvailableCL.visibility = View.VISIBLE + }else{ + binding.internetIcon.setImageDrawable(AppCompatResources.getDrawable(requireContext(),R.drawable.off)) + binding.tvTitleNoInternet.text = getString(R.string.internet_not_available_please_enter_the_user_id_manually) + binding.internetNotAvailableCL.visibility = View.VISIBLE + } if (isConnected != wasConnected) { if (isConnected) { - binding.tvTitleNoInternet.text = "Please enter the user id and select blood group to start the test." //binding.internetAvailableCL.visibility = View.VISIBLE - binding.internetIcon.setImageDrawable(AppCompatResources.getDrawable(requireContext(),R.drawable.internet)) - binding.internetNotAvailableCL.visibility = View.VISIBLE binding.pendingTest.visibility = View.GONE setUserId() // loadUserData() + binding.tvTitleNoInternet.text = "Please enter the user id and select blood group to start the test." + binding.internetIcon.setImageDrawable(AppCompatResources.getDrawable(requireContext(),R.drawable.internet)) + binding.internetNotAvailableCL.visibility = View.VISIBLE // setSearch() //checkForLocalDBData() if (Constants.MOLBIO_INTEGRATION) { @@ -372,7 +381,9 @@ class HomeFragment : Fragment() { if(Constants.MOLBIO_INTEGRATION){ hemoCubeViewModel.sendDataToMolbio() } - hemoCubeViewModel.sendDataToFirebase() + if(Constants.FIREBASE_INTEGRATION) { + hemoCubeViewModel.sendDataToFirebase() + } } else { binding.tvTitleNoInternet.text = getString(R.string.internet_not_available_please_enter_the_user_id_manually) @@ -403,7 +414,8 @@ class HomeFragment : Fragment() { var userID = sharedPreference.getString(Constants.DEVICE_ID_API, "").toString() deviceId = sharedPreference.getString(Constants.DEVICE_ID, "").toString() - val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + // val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + val target = File(requireContext().getExternalFilesDir(null), "HPOSDocuments") val file = File(target, "credentials.txt") //this file contains userID and password to communicate with API. if (userID.isNotEmpty() && password.isNotEmpty()) { @@ -785,27 +797,75 @@ class HomeFragment : Fragment() { private fun setUserId() { binding.btnSubmit.setOnClickListener { val userId = binding.userId.text.toString() + val age = binding.age.text.toString() val bloodGroup = binding.etBloodGroup.text.toString() - if (userId.length >= 5 && bloodGroup != "Select Blood Group") { - DataHolder.selectedTest = UserData( - _id = userId, - bloodGroup = bloodGroup, - incubationTime = SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss", Locale.getDefault() - ).format(Calendar.getInstance().time).toString() - ) - findNavController().navigate(R.id.action_nav_home_to_mainActivity) + if (userId.length >= 5 && bloodGroup.isNotEmpty() && age.isNotEmpty()) { + lifecycleScope.launch { + // Add user first, ensuring it's done before fetching the user + withContext(Dispatchers.IO) { + hemoCubeViewModel.addUser( + HemoCubeTestData( + _id = userId, + age = age, + bloodGroup = bloodGroup, + incubationTime = SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss", Locale.getDefault() + ).format(Calendar.getInstance().time).toString() + ) + ) + } + + // Now fetch the user after the addUser operation is complete + val user = withContext(Dispatchers.IO) { + hemoCubeViewModel.hemoCubeDao.getUserByID(userId) + } + + user?.let { + DataHolder.selectedTest = UserData( + sampleid = it.sampleid, + _id = it._id, + age = it.age, + bloodGroup = it.bloodGroup, + incubationTime = SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss", Locale.getDefault() + ).format(Calendar.getInstance().time).toString() + ) + findNavController().navigate(R.id.action_nav_home_to_mainActivity) + } ?: run { + Log.e("Error", "User not found") + } + } + // hemoCubeViewModel.addUser( // HemoCubeTestData( // _id = userId, -// bloodGroup = bloodGroup.toString(), +// age = age, +// bloodGroup = bloodGroup, // incubationTime = SimpleDateFormat( // "yyyy-MM-dd HH:mm:ss", Locale.getDefault() // ).format(Calendar.getInstance().time).toString() // ) // ) +// +// lifecycleScope.launch { +// val user = hemoCubeViewModel.hemoCubeDao.getUserByID(userId) +// user.let { +// DataHolder.selectedTest = UserData( +// sampleid = it.sampleid, +// _id = it._id, +// age = it.age, +// bloodGroup = it.bloodGroup, +// incubationTime = SimpleDateFormat( +// "yyyy-MM-dd HH:mm:ss", Locale.getDefault() +// ).format(Calendar.getInstance().time).toString() +// ) +// findNavController().navigate(R.id.action_nav_home_to_mainActivity) +// } +// } Toast.makeText(requireContext(), "Successfully added- $userId", Toast.LENGTH_SHORT).show() binding.userId.setText("") + binding.etBloodGroup.clearListSelection() + // val userData = UserData(_id = userId) // DataHolder.selectedTest = userData // findNavController().navigate(R.id.action_nav_home_to_mainActivity) diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt index f49a4f5..fced288 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt @@ -134,7 +134,7 @@ class PrefsFragment: PreferenceFragmentCompat(){ // App Version Preference val appVersionPreference = Preference(requireContext()) - appVersionPreference.title = "App Version" + appVersionPreference.title = "App Version SMI" appVersionPreference.summary = getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + " ]" diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt index 8a4b10a..7b1fae8 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt @@ -91,7 +91,7 @@ class LoginFragment : Fragment() { setupAutoCompleteTextView() } private fun setupAutoCompleteTextView() { - val districts = resources.getStringArray(R.array.district) + val districts = resources.getStringArray(R.array.districtN) val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, districts) binding.etDistrict.setAdapter(adapter) diff --git a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt index f728ebb..3fbd445 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt @@ -249,10 +249,14 @@ class DeviceProvisionFragment : Fragment() { private fun encryptAndSaveToFile(username: String, password: String) { val messageToEncrypt = "$username\n$password" val encryptionKey = - Settings.Secure.getString(context?.contentResolver, Settings.Secure.ANDROID_ID) + Settings.Secure.getString(requireContext().contentResolver, Settings.Secure.ANDROID_ID) val encryptedString = Encryption.encrypt(messageToEncrypt, encryptionKey) Log.d("DEVICE ID/encryptionKey", encryptionKey) - val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + // val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS) + val target = File(requireContext().getExternalFilesDir(null), "HPOSDocuments") + if (!target.exists()) { + target.mkdirs() // Create the directory if it doesn't exist + } val file = File(target, "credentials.txt") if (!file.exists()) { diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/DigitalCardFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/DigitalCardFragment.kt index 9d8c00b..0a0dacd 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/DigitalCardFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/DigitalCardFragment.kt @@ -57,7 +57,7 @@ class DigitalCardFragment : Fragment() { binding.progressBar.visibility = View.VISIBLE } Log.d("DigitalCardFragment", "Name: ${DataHolder.hemoCubeTestData?.name}") - Log.d("DigitalCardFragment", "DOB: ${testDetails?.birthYear}") + Log.d("DigitalCardFragment", "DOB: ${testDetails?.age}") Log.d("DigitalCardFragment", "Gender: ${testDetails?.gender}") Log.d("DigitalCardFragment", "State: ${testDetails?.state}") Log.d("DigitalCardFragment", "ABHA ID: ${testDetails?.abhaId}") @@ -67,7 +67,7 @@ class DigitalCardFragment : Fragment() { activity?.runOnUiThread { binding.progressBar.visibility = View.GONE binding.name.text = "Name: ${DataHolder.hemoCubeTestData?.name}" - binding.dob.text = "DOB: ${testDetails?.birthYear}" + binding.dob.text = "DOB: ${testDetails?.age}" binding.gender.text = "Gender: ${testDetails?.gender}" binding.State.text = "State: ${testDetails?.state}" binding.abhaid.text = "ABHA ID: ${testDetails?.abhaId}" 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 99d437e..8dbbc08 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 @@ -67,7 +67,7 @@ import javax.inject.Inject @Suppress("MemberVisibilityCanBePrivate") @HiltViewModel class HemoCubeViewModel @Inject constructor( - private val hemoCubeDao: HemoCubeDao, + val hemoCubeDao: HemoCubeDao, private val hemoCubeBufferDao: HemoCubeBufferDao, private val repository: Repository, private val logFileManager: LogFileManager, @@ -132,13 +132,23 @@ class HemoCubeViewModel @Inject constructor( try { if (isOnline) { parseData() - addResultTestToDb(quickCapture) + if(Constants.FIREBASE_INTEGRATION){ + addResultTestToDb(quickCapture) + }else{ + uploadToMolbio() + } } else { parseData() - addResultTestToDb(quickCapture) + val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0) + with(sharedPreference.edit()) { + putInt(Constants.KIT_COUNT, kitCount.plus(1)) + apply() + } + // addResultTestToDb(quickCapture,isOnline) testDetails?.testTime = SimpleDateFormat( "yyyy-MM-dd HH:mm:ss", Locale.getDefault() ).format(Calendar.getInstance().time) + testDetails?.localFlag = false hemoCubeDao.updateTest(testDetails!!) fireBaseUpload.postValue("Local") } @@ -146,6 +156,50 @@ class HemoCubeViewModel @Inject constructor( Log.e("Testdb", "Upload failed: ${e.message}") } } + fun uploadToMolbio(){ + if (Constants.MOLBIO_INTEGRATION) { + testDetails!!.testStatus = true + testDetails.localFlag = true + val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0) + with(sharedPreference.edit()) { + putInt(Constants.KIT_COUNT, kitCount.plus(1)) + apply() + } + fireBaseUpload.postValue("Success") + 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) + // Sanitize testDetails before using it in the API call + val sanitizedTestDetails = sanitizeDoubleValues(testDetails) + + // Now, use sanitizedTestDetails for the API call + uploadResult( + MolbioV2ResultRequest( + mutableListOf( + MolbioV2Result( + rawData = sanitizedTestDetails, + analysisId = sanitizedTestDetails._id, + analysisDate = currentTimeFormatted, + analysisStatus = sanitizedTestDetails.classificationResult, + thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[sanitizedTestDetails.deviceId]?.toString(), + interpretation = sanitizedTestDetails.classificationResult, + testId = sanitizedTestDetails._id, + testTime = currentTimeFormatted, + collectionTime = currentTimeFormatted, + expiryTime = currentTimeFormatted, + ) + ) + ) + ) + viewModelScope.launch { + hemoCubeDao.updateTest(testDetails) + } + } + } fun login(loginRequest: LoginRequest) = viewModelScope.launch { loginResponse.postValue(Result.Loading()) @@ -221,16 +275,20 @@ class HemoCubeViewModel @Inject constructor( is Result.Success -> { it.data.data?.forEach { id -> id.rawData?.let { it1 -> + updateLocalFlag(it1._id) updateMolbioFlag( it1._id ) } } + fireBaseBulkUpload.postValue("Success") } is Result.Error -> { + fireBaseBulkUpload.postValue("Error") Log.d("result","result upload error") } else -> { + fireBaseBulkUpload.postValue("Error") Log.d("result","result upload else") } } @@ -248,7 +306,6 @@ class HemoCubeViewModel @Inject constructor( } } } - } @@ -399,7 +456,7 @@ class HemoCubeViewModel @Inject constructor( testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients testDetails?.incubationTime = DataHolder.hemoCubeTestData?.incubationTime.toString() testDetails?.name = DataHolder.hemoCubeTestData?.name.toString() - testDetails?.birthYear = DataHolder.hemoCubeTestData?.birthYear.toString() + testDetails?.age = DataHolder.hemoCubeTestData?.age.toString() testDetails?.userImageURL = DataHolder.hemoCubeTestData?.userImageURL.toString() testDetails?.classificationResult = DataHolder.hemoCubeTestData?.classificationResult!! testDetails?.prdClassification = DataHolder.hemoCubeTestData?.prdClassification.toString() @@ -429,6 +486,7 @@ class HemoCubeViewModel @Inject constructor( viewModelScope.launch { try { testDetails!!.quickCapture = quickCapture + testDetails.testStatus = true testDetails.reportUploadTime = SimpleDateFormat( "yyyy-MM-dd HH:mm:ss", Locale.getDefault() ).format(Calendar.getInstance().time) @@ -461,6 +519,7 @@ class HemoCubeViewModel @Inject constructor( }else{ when (val response = repository.addTestToDatabase(testDetails)) { is Response.Success -> { + testDetails.localFlag = true val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0) with(sharedPreference.edit()) { putInt(Constants.KIT_COUNT, kitCount.plus(1)) @@ -468,7 +527,6 @@ class HemoCubeViewModel @Inject constructor( } Log.i("Testdb", "Data uploaded to Firestore successfully") fireBaseUpload.postValue("Success") - testDetails.localFlag = true if (Constants.MOLBIO_INTEGRATION) { // Sanitize testDetails before using it in the API call val sanitizedTestDetails = sanitizeDoubleValues(testDetails) @@ -560,7 +618,9 @@ class HemoCubeViewModel @Inject constructor( fun deleteById(userId: String) = viewModelScope.launch { hemoCubeDao.deleteById(id = userId) } - + fun deleteByStatus() = viewModelScope.launch { + hemoCubeDao.deleteByStatus() + } private fun addResultTestToDbforbuffercheck(bufferCheckData: BufferCheckData) { viewModelScope.launch { @@ -606,7 +666,7 @@ class HemoCubeViewModel @Inject constructor( userData._id, userData.name, userData.bloodGroup, - userData.birthYear, + userData.age, userData.classificationResult, userData.testTime.toString(), userData.userImageURL diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt index 5ca746b..c151881 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt @@ -112,14 +112,14 @@ class TestRightResults : Fragment() { } private fun updateResults() { - if (viewModel.testDetails?.name == "" && viewModel.testDetails?.birthYear == "") { + if (viewModel.testDetails?.name == "" && viewModel.testDetails?.age == "") { binding.tvName.visibility = View.GONE binding.tvAge.visibility = View.GONE } else { binding.tvName.text = getString(R.string.name_in_textview, viewModel.testDetails?.name) binding.tvAge.text = getString( R.string.age_in_textview, - viewModel.testDetails?.birthYear?.toInt()?.calculateAgeFromYOB().toString() + viewModel.testDetails?.age?.toInt()?.calculateAgeFromYOB().toString() ) } diff --git a/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt index 27b0535..90e924e 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt @@ -287,7 +287,7 @@ class TrueHemeViewModel @Inject constructor( testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients testDetails?.incubationTime = DataHolder.hemoCubeTestData?.incubationTime.toString() testDetails?.name = DataHolder.hemoCubeTestData?.name.toString() - testDetails?.birthYear = DataHolder.hemoCubeTestData?.birthYear.toString() + testDetails?.age = DataHolder.hemoCubeTestData?.age.toString() testDetails?.userImageURL = DataHolder.hemoCubeTestData?.userImageURL.toString() testDetails?.classificationResult = DataHolder.hemoCubeTestData?.classificationResult!! testDetails?.prdClassification = DataHolder.hemoCubeTestData?.prdClassification.toString() @@ -434,7 +434,7 @@ class TrueHemeViewModel @Inject constructor( userData._id, userData.name, userData.bloodGroup, - userData.birthYear, + userData.age, userData.classificationResult, userData.testTime.toString(), userData.userImageURL diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e6308aa..0a395e8 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -102,7 +102,26 @@ android:hint="@string/sample_id" /> + + + + + app:layout_constraintTop_toBottomOf="@+id/til_age"> diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 4f00558..66e3fc8 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -31,5 +31,9 @@ Chamarajanagar Other + + Nagpur + Other + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ddc2065..e0b11a0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -87,7 +87,7 @@ Acquire Enter Patient Details Patient Name - Age in years + Age Gender Name can\'t be empty Age can\'t be empty