diff --git a/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt b/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt index b125f3d..5b303e2 100644 --- a/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt +++ b/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt @@ -68,9 +68,8 @@ class UserListFragment : BaseFragment() { viewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable -> if (isNetworkAvailable) { isOnline = isNetworkAvailable - fetchFromLocalDB() -// fetchFromServer() -// checkForLocalDBData() + fetchFromServer() + checkForLocalDBData() } else { isOnline = isNetworkAvailable fetchFromLocalDB() @@ -177,10 +176,10 @@ class UserListFragment : BaseFragment() { private fun fetchFromLocalDB() { binding.uploadData.visibility = View.GONE viewModel.allUserData.observe(viewLifecycleOwner) { userDataList -> -// if (isOnline) { -// binding.noList.visibility = View.GONE -// binding.rvOrder.visibility = View.VISIBLE -// } else { + if (isOnline) { + binding.noList.visibility = View.GONE + binding.rvOrder.visibility = View.VISIBLE + } else { if (userDataList.isEmpty()) { binding.noList.visibility = View.VISIBLE binding.rvOrder.visibility = View.GONE @@ -192,7 +191,7 @@ class UserListFragment : BaseFragment() { adapter.differ.submitList(userDataList) binding.rvOrder.adapter = adapter } -// } + } } } diff --git a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt index d8746e6..ae2c5f1 100644 --- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt +++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt @@ -61,17 +61,17 @@ class ReviewDetailsRegistrationFragment : BaseFragment() { } binding.btnSubmit.setOnClickListener { -// if (isOnline) { -// showProgressBar(binding.progressBarCL) -// addDataToFirebase() -// } else { + if (isOnline) { + showProgressBar(binding.progressBarCL) + addDataToFirebase() + } else { Toast.makeText( requireContext(), - R.string.test_details_stored_locally, + R.string.internt_not_local, Toast.LENGTH_SHORT ).show() navigateToUserListFragment() -// } + } } binding.btnEdit.setOnClickListener { diff --git a/app/src/main/res/layout/fragment_user_list.xml b/app/src/main/res/layout/fragment_user_list.xml index dd10574..4c3db74 100644 --- a/app/src/main/res/layout/fragment_user_list.xml +++ b/app/src/main/res/layout/fragment_user_list.xml @@ -40,7 +40,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - android:text="@string/no_data_available" + android:text="@string/internet_is_not_available_and_there_is_no_data_available_in_local_db" android:textColor="@color/red" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 3e54eab..3f8d895 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -115,9 +115,11 @@ पिता / पति का नाम दर्ज करें क्या आप ऐप्लिकेशन से लॉग आउट करना चाहते हैं? लॉग आउट +<<<<<<< HEAD +======= स्थानीय डेटाबेस में कोई डेटा उपलब्ध नहीं है टेस्ट विवरण स्थानीय रूप से संग्रहित हैं - प्रदर्शन के लिए कोई पंजीकरण उपलब्ध नहीं है +>>>>>>> parent of 5d42da8 (csv) डीबी पंजीकरण अपलोड करें क्या आप स्थानीय डीबी को क्लाउड पर अपलोड करना चाहते हैं? diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index 7dafd07..0bdd11e 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -123,9 +123,6 @@ ಡಿಬಿ ನೋಂದಾಯಿಸುವ ಕೊರಕು ನೀವು ಲೋಕಲ್ ಡಿಬಿ ನೋಂದಾಯಿಸನ್ನು ಮೇಘಮಾರ್ಗಕ್ಕೆ ಅಪ್ಲೋಡ್ ಮಾಡಲು ಇಚ್ಛಿಸುವಿರಾ? ಅಪ್ಲೋಡ್ - ಸ್ಥಳೀಯ ಡಿಬಿಯಲ್ಲಿ ಯಾವುದೇ ಡೇಟಾ ಲಭ್ಯವಿಲ್ಲ - ಪರೀಕ್ಷಾ ವಿವರಗಳನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ - ಅಪ್ಲೋಡ್ ಯಶಸ್ವಿಯಾಗಿ ನಡೆಯಿತು ದಯವಿಟ್ಟು ಸರಿಯಾದ ಲಾಗಿನ್ ಐಡಿ ನಮೂದಿಸಿ ದಯವಿಟ್ಟು ಸರಿಯಾದ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fe0a2eb..a600066 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -61,7 +61,6 @@ Edit User Details Internet is not available and there is no Data available in Local DB - there is no Data available in Local DB User ID: %1$s Abha Number: %1$s Aadhar Number: %1$s @@ -101,15 +100,10 @@ You have scanned the Abha ID, need to enter Aadhar ID manually Invalid Abha ID Invalid Aadhar ID - No registrations available for display - Name field can\'t be empty or less than 3 characters Center name can\'t be empty or less than 3 characters Registration Done Successfully Internet not available, test details stored locally - There is no data available in Local DB - Test details stored locally - Please enter all the details properly Please enter a valid birth year between 1900 and 2023 Please fill the field