From 8e5294f564d7daee56d56cc8a6735de6031b3138 Mon Sep 17 00:00:00 2001 From: Mariya Date: Tue, 13 Feb 2024 18:54:04 +0530 Subject: [PATCH] Disable Download Csv button --- .../presentation/dashboard/HomeFragment.kt | 79 +++++++++---------- 1 file changed, 37 insertions(+), 42 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 f368b93..fab093b 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 @@ -150,21 +150,20 @@ class HomeFragment : Fragment() { MolbioV2Result( rawData = userData, analysisId = userData._id, - analysisDate = "2024-02-08 16:33:56", + analysisDate = userData.testTime, analysisStatus = userData.classificationResult, thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(), interpretation = userData.classificationResult, testId = userData._id, testTime = userData.testTime, - collectionTime = "2024-02-08 16:33:56",//userData.testTime, - expiryTime = "2024-02-08 16:33:56"//userData.testTime, + collectionTime = userData.testTime, + expiryTime = userData.testTime, ) ) - } - if (!userData.molbioFlag && isTokenAvailable) { userData.molbioFlag = true hemoCubeViewModel.uploadResult(resultList) } + if (!userData.localFlag) { userData.localFlag = true hemoCubeViewModel.bulkAddResultTestToDb(userData) @@ -174,7 +173,6 @@ class HomeFragment : Fragment() { } - } else { binding.internetAvailableCL.visibility = View.GONE binding.pendingTest.visibility = View.GONE @@ -197,14 +195,13 @@ class HomeFragment : Fragment() { logoutUser(requireContext()) } - binding.uploadData.setOnClickListener { showUploadDialog(requireContext()) } hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData -> val btnSaveLocalVisibility = - if (userData.any { it.testStatus == true }) View.VISIBLE else View.GONE + if (userData.any { it.testStatus == true }) View.GONE else View.GONE binding.downloadCSV.visibility = btnSaveLocalVisibility @@ -751,7 +748,7 @@ class HomeFragment : Fragment() { private fun checkUnprocessedCSVData() { hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList -> val downloadDataVisibility = - if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.VISIBLE else View.GONE + if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.GONE else View.GONE binding.downloadCSV.visibility = downloadDataVisibility } } @@ -806,39 +803,6 @@ class HomeFragment : Fragment() { } } - hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList -> - val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result())) - userDataList.forEach { userData -> - if (!userData.molbioFlag && isTokenAvailable) { - resultList.results?.add( - MolbioV2Result( - rawData = userData, - analysisId = userData._id, - analysisDate = "2024-02-08 16:33:56", //userData.reportUploadTime, - analysisStatus = userData.classificationResult, - thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(), - interpretation = userData.classificationResult, - testId = userData._id, - testTime = userData.testTime, - collectionTime = "2024-02-08 16:33:56",//userData.testTime, - expiryTime = "2024-02-08 16:33:56",//userData.testTime, - ) - ) - - } - - if(!userData.localFlag){ - userData.localFlag = true - hemoCubeViewModel.bulkAddResultTestToDb(userData) - } - if (!userData.molbioFlag && isTokenAvailable) { - userData.molbioFlag = true - hemoCubeViewModel.uploadResult(resultList) - } - } - dialog.dismiss() - } - hemoCubeViewModel.allKitTestData.observe(viewLifecycleOwner) { kitDataList -> kitDataList.forEach { userData -> if (!userData.localFlag) { @@ -848,6 +812,37 @@ class HomeFragment : Fragment() { } dialog.dismiss() } + + hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList -> + val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result())) + userDataList.forEach { userData -> + if (!userData.molbioFlag && isTokenAvailable) { + resultList.results?.add( + MolbioV2Result( + rawData = userData, + analysisId = userData._id, + analysisDate = userData.testTime, + analysisStatus = userData.classificationResult, + thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(), + interpretation = userData.classificationResult, + testId = userData._id, + testTime = userData.testTime, + collectionTime = userData.testTime, + expiryTime = userData.testTime, + ) + ) + userData.molbioFlag = true + hemoCubeViewModel.uploadResult(resultList) + } + + if (!userData.localFlag) { + userData.localFlag = true + hemoCubeViewModel.bulkAddResultTestToDb(userData) + } + + } + dialog.dismiss() + } } // private fun downloadLocalDBData(dialog: DialogInterface) {