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 53c65c8..19ceb1f 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 @@ -53,7 +53,7 @@ class UserListAdapter( userName.text = "Name: ${model.name}" userId.text = "User ID:${model._id}" if (model.incubationTime == "") { -// btnStartIncubation.visibility = View.VISIBLE + btnBlood.visibility = View.VISIBLE } else { userId.text = "User ID:${model._id} \n Time: ${isBetween15And30Minutes(model.incubationTime)} \n Started at: ${ @@ -63,7 +63,7 @@ class UserListAdapter( ).parse(model.incubationTime)!! ) }" - btnStartIncubation.visibility = View.GONE + btnBlood.visibility = View.GONE } @@ -117,6 +117,7 @@ class UserListAdapter( "Blood group updated successfully", Toast.LENGTH_SHORT ).show() + btnBlood.visibility = View.GONE } .addOnFailureListener { e -> Toast.makeText( diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt index 87ef90d..0a691b0 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt @@ -64,25 +64,31 @@ class HemoCubeFragment : Fragment() { } private fun initViews() { -// binding.btnSubmit.setOnClickListener { + binding.btnSubmit.setOnClickListener { // val bloodGroupText = binding.etBloodGroup.text.toString() // if (bloodGroupText.isEmpty()) { // binding.etBloodGroup.error = "Please enter your blood group" // } else { -// activity?.runOnUiThread { -// binding.progressBar.visibility = View.VISIBLE -// } -// hemoCubeViewModel.uploadHemoCubeResultToDatabase( -// isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, "") -// ) + activity?.runOnUiThread { + binding.progressBar.visibility = View.VISIBLE + } + hemoCubeViewModel.uploadHemoCubeResultToDatabase( + isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, "") + ) + + val i = Intent( + requireContext().applicationContext, DashboardActivity::class.java + ) + startActivity(i) + (activity as HemocubeActivity).finish() // } -// } -// if (isTestOngoing) { + } + if (isTestOngoing) { // binding.btnKit.visibility = View.GONE // binding.btnKit.isEnabled = false // binding.btnKit.isClickable = false -// -// } + + } binding.btnSubmit.isEnabled = false binding.btnSubmit.isClickable = false diff --git a/app/src/main/res/layout/user_item_view.xml b/app/src/main/res/layout/user_item_view.xml index d910040..61e08c5 100644 --- a/app/src/main/res/layout/user_item_view.xml +++ b/app/src/main/res/layout/user_item_view.xml @@ -78,6 +78,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:text="@string/start_incubation" + android:visibility="gone" android:textColor="@color/white" app:layout_constraintStart_toEndOf="@+id/btn_blood" app:layout_constraintBottom_toBottomOf="@+id/btn_blood" />