diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index db248ac..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/example/hposregistration/data/user/UserData.kt b/app/src/main/java/com/example/hposregistration/data/user/UserData.kt index 00c3a06..525717c 100644 --- a/app/src/main/java/com/example/hposregistration/data/user/UserData.kt +++ b/app/src/main/java/com/example/hposregistration/data/user/UserData.kt @@ -34,7 +34,8 @@ data class UserData( var deviceId: String = "", var kitSerial: String = "", var csvPath: String = "", - var reportPath: String = "" + var reportPath: String = "", + var CenterName: String = "" ){ enum class Gender { MALE, diff --git a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt index cc260f3..b481995 100644 --- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt +++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt @@ -75,13 +75,17 @@ class AbhaRegistrationFragment : BaseFragment() { val abhaId = binding.etAbhaId.text.toString() val userName = binding.etName.text.toString() val aadharId = binding.aadharID.text.toString() + val centerName = binding.centerName.text.toString() - if (validateInputs(abhaId, aadharId, userName)) { + if (validateInputs(abhaId, aadharId, userName, centerName)) { userData.apply { name = userName AadharId = aadharId AbhaId = abhaId - _id = aadharId + userName.substring(0, 3).uppercase() + CenterName = centerName + _id = + aadharId + userName.substring(0, 3).uppercase() + centerName.substring(0, 3) + .uppercase() } viewModel.insert(userData) @@ -159,7 +163,9 @@ class AbhaRegistrationFragment : BaseFragment() { ).show() } - private fun validateInputs(abhaId: String, aadharId: String, userName: String): Boolean { + private fun validateInputs( + abhaId: String, aadharId: String, userName: String, centerName: String + ): Boolean { with(binding) { if (!checkAbhaIDNumber(abhaId)) { etAbhaId.error = "Invalid Abha ID" @@ -173,6 +179,10 @@ class AbhaRegistrationFragment : BaseFragment() { etName.error = "Name field can't be empty or less than 3 characters" return false } + if (!checkCenterName(centerName)) { + etName.error = "Center name can't be empty" + return false + } } return true } @@ -189,6 +199,10 @@ class AbhaRegistrationFragment : BaseFragment() { return userName.isNotEmpty() && userName.length >= 3 } + private fun checkCenterName(centerName: String): Boolean { + return centerName.isNotEmpty() + } + private fun navigateToUserDetailsFragment(userId: String) { val action = AbhaRegistrationFragmentDirections.actionRegistrationFragmentToUserDetailsRegistrationFragment( diff --git a/app/src/main/res/layout/fragment_abha_registration.xml b/app/src/main/res/layout/fragment_abha_registration.xml index c0d1d53..c9794a2 100644 --- a/app/src/main/res/layout/fragment_abha_registration.xml +++ b/app/src/main/res/layout/fragment_abha_registration.xml @@ -154,6 +154,25 @@ android:maxLength="12" /> + + + + + + app:layout_constraintTop_toBottomOf="@+id/et_centerName" /> Is Under Medication: %1$s Is Under Blood Transfusion: %1$s Sickle cell Family History: %1$s - + Center Name