smiuser/hpos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Fixed displaying name and id, changes results displaying logic

Browse Source
This commit is contained in:
mohamedkaif356
2023-10-02 16:24:35 +05:30
parent 8482de6aeb
commit d42f5e31e5
3 changed files with 74 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
View File

@@ -22,6 +22,7 @@ import com.example.hpostesting.presentation.adapter.UserListAdapter
import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
import com.example.hpostesting.presentation.testRight.TestRightViewModel import com.example.hpostesting.presentation.testRight.TestRightViewModel
import com.firebase.ui.firestore.FirestoreRecyclerOptions import com.firebase.ui.firestore.FirestoreRecyclerOptions
import com.google.firebase.crashlytics.ktx.crashlytics
import com.google.firebase.firestore.Query import com.google.firebase.firestore.Query
import com.google.firebase.firestore.ktx.firestore import com.google.firebase.firestore.ktx.firestore
import com.google.firebase.ktx.Firebase import com.google.firebase.ktx.Firebase
@@ -52,11 +53,13 @@ class HomeFragment : Fragment() {
return super.onCreateView(inflater, container, savedInstanceState) return super.onCreateView(inflater, container, savedInstanceState)
} }
sharedPreference = requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE) sharedPreference =
requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
DataHolder.selectedTest = null DataHolder.selectedTest = null
return binding.root return binding.root
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
viewModel.allUserData.observe(viewLifecycleOwner) { userData -> viewModel.allUserData.observe(viewLifecycleOwner) { userData ->
@@ -94,6 +97,7 @@ class HomeFragment : Fragment() {
requireActivity().finish() requireActivity().finish()
} }
} }
private fun setUserId() { private fun setUserId() {
binding.btnSubmit.setOnClickListener { binding.btnSubmit.setOnClickListener {
val userId = binding.userId.text.toString() val userId = binding.userId.text.toString()
@@ -108,6 +112,7 @@ class HomeFragment : Fragment() {
} }
} }
} }
private fun loadUserData() { private fun loadUserData() {
try { try {
val dateFormat = SimpleDateFormat("yyyy-MM-dd") val dateFormat = SimpleDateFormat("yyyy-MM-dd")
@@ -134,12 +139,14 @@ class HomeFragment : Fragment() {
Firebase.crashlytics.recordException(e) Firebase.crashlytics.recordException(e)
} }
} }
private fun saveUserId(userId: String) { private fun saveUserId(userId: String) {
with(sharedPreference.edit()) { with(sharedPreference.edit()) {
putString(Constants.USER_ID, userId) putString(Constants.USER_ID, userId)
apply() apply()
} }
} }
private fun logoutUser(context: Context) { private fun logoutUser(context: Context) {
val builder = AlertDialog.Builder(context) val builder = AlertDialog.Builder(context)
builder.setTitle("Log Out") builder.setTitle("Log Out")
@@ -156,6 +163,7 @@ class HomeFragment : Fragment() {
val dialog = builder.create() val dialog = builder.create()
dialog.show() dialog.show()
} }
private fun getData(search: String?, field: String) { private fun getData(search: String?, field: String) {
search?.replaceFirstChar { search?.replaceFirstChar {
if (search.lowercase() if (search.lowercase()
@@ -172,6 +180,7 @@ class HomeFragment : Fragment() {
binding.rvOrder.adapter = rvAdapter binding.rvOrder.adapter = rvAdapter
rvAdapter.startListening() rvAdapter.startListening()
} }
private fun setSearch() { private fun setSearch() {
binding.searchProduct.setOnQueryTextListener(object : binding.searchProduct.setOnQueryTextListener(object :
androidx.appcompat.widget.SearchView.OnQueryTextListener { androidx.appcompat.widget.SearchView.OnQueryTextListener {
@@ -192,6 +201,7 @@ class HomeFragment : Fragment() {
false false
} }
} }
override fun onQueryTextChange(query: String?): Boolean { override fun onQueryTextChange(query: String?): Boolean {
return if (!query.isNullOrEmpty()) { return if (!query.isNullOrEmpty()) {
val field = when { val field = when {
@@ -209,6 +219,7 @@ class HomeFragment : Fragment() {
} }
}) })
} }
private fun checkForLocalDBData() { private fun checkForLocalDBData() {
viewModel.allUserData.observe(viewLifecycleOwner) { userDataList -> viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
val uploadDataVisibility = if (userDataList.isEmpty()) View.GONE else View.VISIBLE val uploadDataVisibility = if (userDataList.isEmpty()) View.GONE else View.VISIBLE
@@ -220,6 +231,7 @@ class HomeFragment : Fragment() {
binding.uploadData.visibility = uploadDataVisibility binding.uploadData.visibility = uploadDataVisibility
} }
} }
private fun showUploadDialog(context: Context) { private fun showUploadDialog(context: Context) {
val builder = AlertDialog.Builder(context) val builder = AlertDialog.Builder(context)
builder.setTitle(R.string.upload_db_registration_title) builder.setTitle(R.string.upload_db_registration_title)
@@ -248,9 +260,7 @@ class HomeFragment : Fragment() {
} }
dialog.dismiss() dialog.dismiss()
Toast.makeText( Toast.makeText(
requireContext(), requireContext(), R.string.upload_success_message, Toast.LENGTH_SHORT
R.string.upload_success_message,
Toast.LENGTH_SHORT
).show() ).show()
} }
} }
@@ -265,9 +275,7 @@ class HomeFragment : Fragment() {
} }
dialog.dismiss() dialog.dismiss()
Toast.makeText( Toast.makeText(
requireContext(), requireContext(), R.string.upload_success_message, Toast.LENGTH_SHORT
R.string.upload_success_message,
Toast.LENGTH_SHORT
).show() ).show()
} }
} }

16
app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
View File

@@ -67,7 +67,12 @@ class HemoCubeFragment : Fragment() {
if (bloodGroupText.isEmpty()) { if (bloodGroupText.isEmpty()) {
binding.etBloodGroup.error = "Please enter your blood group" binding.etBloodGroup.error = "Please enter your blood group"
} else { } else {
fetchResult() activity?.runOnUiThread {
binding.progressBar.visibility = View.VISIBLE
}
hemoCubeViewModel.uploadHemoCubeResultToDatabase(
isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, "")
)
} }
} }
if (isTestOngoing) { if (isTestOngoing) {
@@ -287,6 +292,7 @@ class HemoCubeFragment : Fragment() {
binding.btnSubmit.isEnabled = true binding.btnSubmit.isEnabled = true
binding.btnSubmit.isClickable = true binding.btnSubmit.isClickable = true
} }
fetchResult()
} }
stringData.contains("RESULT") || resultData.contains("REND") -> { stringData.contains("RESULT") || resultData.contains("REND") -> {
@@ -429,7 +435,7 @@ class HemoCubeFragment : Fragment() {
activity?.runOnUiThread { activity?.runOnUiThread {
binding.tvName.visibility = View.VISIBLE binding.tvName.visibility = View.VISIBLE
} }
binding.tvName.text = this.name binding.tvName.text = "Name: ${this.name}\n ID: ${this._id}"
deviceId = deviceSerialNo deviceId = deviceSerialNo
led1Buffer = led1BufferForDevice led1Buffer = led1BufferForDevice
led2Buffer = led2BufferForDevice led2Buffer = led2BufferForDevice
@@ -450,12 +456,6 @@ class HemoCubeFragment : Fragment() {
apply() apply()
} }
} }
activity?.runOnUiThread {
binding.progressBar.visibility = View.VISIBLE
}
hemoCubeViewModel.uploadHemoCubeResultToDatabase(
isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, "")
)
} }
} }
} catch (e: Exception) { } catch (e: Exception) {

106
app/src/main/res/layout/fragment_hemo_cube_reference.xml
View File

@@ -32,29 +32,29 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title" /> app:layout_constraintTop_toBottomOf="@id/tv_title" />
<!-- <TextView-->
<!-- android:id="@+id/tv_subtitle3"-->
<!-- style="@style/title2"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="24dp"-->
<!-- android:layout_marginTop="16dp"-->
<!-- android:text="@string/step5"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />-->
<TextView <TextView
android:id="@+id/tv_subtitle3"
style="@style/title2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="16dp"
android:text="@string/step5"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
<TextView
android:visibility="gone"
android:id="@+id/tv_name" android:id="@+id/tv_name"
style="@style/title2" style="@style/title2"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp" android:layout_marginHorizontal="24dp"
android:layout_marginTop="16dp" android:visibility="gone"
android:text="Name of person"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" /> app:layout_constraintTop_toBottomOf="@+id/btn_submit" />
<TextView <TextView
android:id="@+id/tv_subtitle4" android:id="@+id/tv_subtitle4"
style="@style/title1_1" style="@style/title1_1"
@@ -67,40 +67,36 @@
android:textSize="22sp" android:textSize="22sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" /> app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
<!-- <Button-->
<!-- android:visibility="gone"-->
<!-- android:id="@+id/btn_samplestart"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="16dp"-->
<!-- android:layout_marginTop="24dp"-->
<!-- android:clickable="false"-->
<!-- android:text="@string/Start_Sample"-->
<!-- android:textColor="@color/white"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@id/til_blood_group" />-->
<!-- <Button--> <!-- <Button-->
<!-- android:visibility="gone"--> <!-- android:id="@+id/btn_placebuffer"-->
<!-- android:id="@+id/btn_samplestart"--> <!-- android:layout_width="wrap_content"-->
<!-- android:layout_width="wrap_content"--> <!-- android:layout_height="wrap_content"-->
<!-- android:layout_height="wrap_content"--> <!-- android:layout_marginHorizontal="16dp"-->
<!-- android:layout_marginHorizontal="16dp"--> <!-- android:layout_marginTop="24dp"-->
<!-- android:layout_marginTop="24dp"--> <!-- android:clickable="false"-->
<!-- android:clickable="false"--> <!-- android:text="@string/place_buffer"-->
<!-- android:text="@string/Start_Sample"--> <!-- android:textColor="@color/white"-->
<!-- android:textColor="@color/white"--> <!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"--> <!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"--> <!-- app:layout_constraintTop_toBottomOf="@id/btn_submit" />-->
<!-- app:layout_constraintTop_toBottomOf="@id/til_blood_group" />-->
<!-- <Button-->
<!-- android:id="@+id/btn_placebuffer"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="16dp"-->
<!-- android:layout_marginTop="24dp"-->
<!-- android:clickable="false"-->
<!-- android:text="@string/place_buffer"-->
<!-- android:textColor="@color/white"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@id/btn_submit" />-->
<Button <Button
@@ -149,16 +145,16 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<!-- <Button--> <!-- <Button-->
<!-- android:id="@+id/btn_buffer"--> <!-- android:id="@+id/btn_buffer"-->
<!-- android:layout_width="wrap_content"--> <!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"--> <!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/new_buffer"--> <!-- android:text="@string/new_buffer"-->
<!-- android:textColor="@color/white"--> <!-- android:textColor="@color/white"-->
<!-- android:layout_margin="10dp"--> <!-- android:layout_margin="10dp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"--> <!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"--> <!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintEnd_toStartOf="@id/btn_kit"/>--> <!-- app:layout_constraintEnd_toStartOf="@id/btn_kit"/>-->
<!-- <Button--> <!-- <Button-->
<!-- android:id="@+id/btn_read"--> <!-- android:id="@+id/btn_read"-->