From ed567f65456d73ad5f63b5c5d28ca17f22f55c41 Mon Sep 17 00:00:00 2001 From: mohamedkaif356 Date: Tue, 25 Jul 2023 11:18:23 +0530 Subject: [PATCH] Displaying message when user list is empty and update blood group --- .../presentation/adapter/UserListAdapter.kt | 6 +++++- .../presentation/dashboard/HomeFragment.kt | 8 +++++++- .../presentation/testRight/TestRightResults.kt | 14 ++++++++------ app/src/main/res/layout/fragment_home.xml | 13 +++++++++++++ app/src/main/res/values/strings.xml | 1 + 5 files changed, 34 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt index 653b623..a291d6a 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt @@ -10,12 +10,16 @@ import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.example.hpostesting.data.DataHolder import com.example.hpostesting.data.model.patient.UserData +import com.example.hpostesting.presentation.testRight.TestRightViewModel import com.firebase.ui.firestore.FirestoreRecyclerAdapter import com.firebase.ui.firestore.FirestoreRecyclerOptions import `in`.sminnovations.hpostesting.R import `in`.sminnovations.hpostesting.databinding.UserItemViewBinding -class UserListAdapter(options: FirestoreRecyclerOptions, private val view: View) : +class UserListAdapter( + options: FirestoreRecyclerOptions, + private val view: View +) : FirestoreRecyclerAdapter(options) { class OrderItemViewHolder(val binding: UserItemViewBinding) : 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 e3f59d2..8c98654 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 @@ -5,7 +5,6 @@ import android.content.Context import android.content.DialogInterface import android.content.SharedPreferences import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -83,6 +82,13 @@ class HomeFragment : Fragment() { } private fun loadUserData() { val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false) + query.get().addOnSuccessListener { + if (it.documents.isEmpty()) { + binding.pendingTest.visibility = View.VISIBLE + } else { + binding.pendingTest.visibility = View.GONE + } + } val recyclerViewOptions = FirestoreRecyclerOptions.Builder().setQuery(query, UserData::class.java) .build() 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 b107f97..f29378b 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 @@ -85,15 +85,17 @@ class TestRightResults : Fragment() { db.collection("patientData").whereEqualTo("_id", viewModel.testDetails?._id) .get().await() if (userdata.documents.isNotEmpty()) { - userdata.documents.forEach { - db.collection("patientData").document(it.id).update("bloodGroup", bloodGroup) + db.collection("patientData").document(userdata.documents[0].id) + .update("bloodGroup", bloodGroup) + withContext(Dispatchers.Main) { + val i = Intent( + requireContext().applicationContext, + DashboardActivity::class.java + ) + startActivity(i) } } } - withContext(Dispatchers.Main) { - val i = Intent(requireContext().applicationContext, DashboardActivity::class.java) - startActivity(i) - } } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index db1f4a6..6fac1db 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -5,6 +5,19 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + Upload done successfully Test Completed Select Blood Group + All registered user are tested successfully \ No newline at end of file