From 9b2b64f2486f0ab1fff5219696439a516f273335 Mon Sep 17 00:00:00 2001 From: Mariya Date: Tue, 13 Feb 2024 12:47:57 +0530 Subject: [PATCH 1/5] Added Scroll view for the panel screen --- app/src/main/res/layout/fragment_gallery.xml | 42 +++++++++++--------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/app/src/main/res/layout/fragment_gallery.xml b/app/src/main/res/layout/fragment_gallery.xml index 2f2075f..ae5ad7d 100644 --- a/app/src/main/res/layout/fragment_gallery.xml +++ b/app/src/main/res/layout/fragment_gallery.xml @@ -1,10 +1,15 @@ - + android:fillViewport="true"> + + - - + + - \ No newline at end of file + + \ No newline at end of file From fd5fb6db22bc220999d127822b64f2f3b30ee5e0 Mon Sep 17 00:00:00 2001 From: Mariya Date: Tue, 13 Feb 2024 12:57:41 +0530 Subject: [PATCH 2/5] text view removed of "all registers are tested" for offline, its its only display if the internet is available --- .../example/hpostesting/presentation/dashboard/HomeFragment.kt | 2 ++ 1 file changed, 2 insertions(+) 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 8815933..f368b93 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 @@ -136,6 +136,7 @@ class HomeFragment : Fragment() { if (isConnected) { binding.internetAvailableCL.visibility = View.VISIBLE binding.internetNotAvailableCL.visibility = View.GONE + binding.pendingTest.visibility = View.VISIBLE loadUserData() setSearch() checkForLocalDBData() @@ -176,6 +177,7 @@ class HomeFragment : Fragment() { } else { binding.internetAvailableCL.visibility = View.GONE + binding.pendingTest.visibility = View.GONE binding.internetNotAvailableCL.visibility = View.VISIBLE setUserId() } From 547cf714a4a51fab8d8f72487ebf6c53adc27b0c Mon Sep 17 00:00:00 2001 From: Mariya Date: Tue, 13 Feb 2024 13:02:21 +0530 Subject: [PATCH 3/5] Toast message changed in KitScanActivity if the Scanner is not available --- .../com/example/hpostesting/presentation/KitScanActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4aafcc7..2e31fc0 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt @@ -227,7 +227,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate { if (mScannerInfoList.isNotEmpty()) { sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID) } else { - Toast.makeText(this,"Error", Toast.LENGTH_LONG).show() + Toast.makeText(this,"Scanner Is not available In this device", Toast.LENGTH_LONG).show() } } From 8e5294f564d7daee56d56cc8a6735de6031b3138 Mon Sep 17 00:00:00 2001 From: Mariya Date: Tue, 13 Feb 2024 18:54:04 +0530 Subject: [PATCH 4/5] 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) { From 4ba3b98d2db46383623aefe3465679a54c47bc00 Mon Sep 17 00:00:00 2001 From: Mariya Date: Thu, 15 Feb 2024 20:55:34 +0530 Subject: [PATCH 5/5] updated date format, to check is getting null values --- .../model/molbioresult/MolbioV2ResultData.kt | 8 ++++---- .../presentation/dashboard/HomeFragment.kt | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt index c6168b4..6ec1eb8 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt @@ -4,20 +4,20 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData data class MolbioV2ResultData( val age: Int? = 0, - val analysisDate: String? = "", + val analysisDate: String? = "2024-02-08 16:33:56", val analysisStatus: String? = "", val analysisType: String? = "", val analysisTypeMethod: String? = "", val bloodGroup: String? = "", val coefficients: List? = listOf(), val collectionLocation: List? = listOf(), - val collectionTime: String? = "", + val collectionTime: String? = "2024-02-08 16:33:56", val collector: String? = "", val createdAt: String? = "", val createdBy: Int? = 0, val curveFitting: String? = "", val deviceId: Int? = 0, - val expiryTime: String? = "", + val expiryTime: String? = "2024-02-08 16:33:56", val gender: String? = "", val id: Int? = 0, val interpretation: String? = "", @@ -32,7 +32,7 @@ data class MolbioV2ResultData( val testId: String? = "", val testResult: String? = "", val testStatus: String? = "", - val testTime: String? = "", + val testTime: String? = "2024-02-08 16:33:56", val testType: String? = "", val thresholds: String? = "", val underMedication: Boolean? = false, 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 fab093b..19f8cc6 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,14 +150,14 @@ class HomeFragment : Fragment() { MolbioV2Result( rawData = userData, analysisId = userData._id, - analysisDate = userData.testTime, + analysisDate = "2024-02-08 16:33:56",//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, + testTime = "2024-02-08 16:33:56",//userData.testTime, + collectionTime = "2024-02-08 16:33:56",//userData.testTime, + expiryTime = "2024-02-08 16:33:56"//userData.testTime, ) ) userData.molbioFlag = true @@ -821,14 +821,14 @@ class HomeFragment : Fragment() { MolbioV2Result( rawData = userData, analysisId = userData._id, - analysisDate = userData.testTime, + analysisDate = "2024-02-08 16:33:56",//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, + testTime = "2024-02-08 16:33:56",//userData.testTime, + collectionTime = "2024-02-08 16:33:56",//userData.testTime, + expiryTime = "2024-02-08 16:33:56"//userData.testTime, ) ) userData.molbioFlag = true