updated date format, to check is getting null values

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<Int>? = listOf(),
     val collectionLocation: List<Any>? = 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,

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()
         }
 
     }

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()
@@ -149,21 +150,20 @@ class HomeFragment : Fragment() {
                                 MolbioV2Result(
                                     rawData = userData,
                                     analysisId = userData._id,
-                                    analysisDate = "2024-02-08 16:33:56",
+                                    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,
+                                    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,
                                 )
                             )
-                        }
-                        if (!userData.molbioFlag && isTokenAvailable) {
                             userData.molbioFlag = true
                             hemoCubeViewModel.uploadResult(resultList)
                         }
+
                         if (!userData.localFlag) {
                             userData.localFlag = true
                             hemoCubeViewModel.bulkAddResultTestToDb(userData)
@@ -173,9 +173,9 @@ class HomeFragment : Fragment() {
 
                 }
 
-
             } else {
                 binding.internetAvailableCL.visibility = View.GONE
+                binding.pendingTest.visibility = View.GONE
                 binding.internetNotAvailableCL.visibility = View.VISIBLE
                 setUserId()
             }
@@ -195,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
 
@@ -749,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
         }
     }
@@ -804,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) {
@@ -846,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 = "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 = "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
+                    hemoCubeViewModel.uploadResult(resultList)
+                }
+
+                if (!userData.localFlag) {
+                    userData.localFlag = true
+                    hemoCubeViewModel.bulkAddResultTestToDb(userData)
+                }
+
+            }
+            dialog.dismiss()
+        }
     }
 
 //    private fun downloadLocalDBData(dialog: DialogInterface) {

app/src/main/res/layout/fragment_gallery.xml

@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.example.hpostesting.presentation.dashboard.GalleryFragment">
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:context="com.example.hpostesting.presentation.dashboard.GalleryFragment">
 
     <TextView
         android:id="@+id/tv_subtitle4"
@@ -77,22 +82,8 @@
         app:cornerRadius="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_deviceProvision" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_deviceProvision"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="visible"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:text="@string/deviceProvision"
-        android:textColor="@color/white"
-        app:cornerRadius="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btn_auto_dac" />
+
         
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_deviceInfo"
@@ -108,6 +99,20 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btn_calibration" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_deviceProvision"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="24dp"
+            android:clickable="false"
+            android:text="@string/deviceProvision"
+            android:textColor="@color/white"
+            app:cornerRadius="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/btn_deviceInfo" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_firefox"
@@ -137,4 +142,5 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btn_firefox" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>