Center Name
This commit is contained in:
17
.idea/deploymentTargetDropDown.xml
generated
17
.idea/deploymentTargetDropDown.xml
generated
@@ -1,17 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="deploymentTargetDropDown">
|
|
||||||
<runningDeviceTargetSelectedWithDropDown>
|
|
||||||
<Target>
|
|
||||||
<type value="RUNNING_DEVICE_TARGET" />
|
|
||||||
<deviceKey>
|
|
||||||
<Key>
|
|
||||||
<type value="VIRTUAL_DEVICE_PATH" />
|
|
||||||
<value value="C:\Users\moham\.android\avd\BillPay.avd" />
|
|
||||||
</Key>
|
|
||||||
</deviceKey>
|
|
||||||
</Target>
|
|
||||||
</runningDeviceTargetSelectedWithDropDown>
|
|
||||||
<timeTargetWasSelectedWithDropDown value="2023-06-19T10:21:12.395164900Z" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -34,7 +34,8 @@ data class UserData(
|
|||||||
var deviceId: String = "",
|
var deviceId: String = "",
|
||||||
var kitSerial: String = "",
|
var kitSerial: String = "",
|
||||||
var csvPath: String = "",
|
var csvPath: String = "",
|
||||||
var reportPath: String = ""
|
var reportPath: String = "",
|
||||||
|
var CenterName: String = ""
|
||||||
){
|
){
|
||||||
enum class Gender {
|
enum class Gender {
|
||||||
MALE,
|
MALE,
|
||||||
|
|||||||
@@ -75,13 +75,17 @@ class AbhaRegistrationFragment : BaseFragment() {
|
|||||||
val abhaId = binding.etAbhaId.text.toString()
|
val abhaId = binding.etAbhaId.text.toString()
|
||||||
val userName = binding.etName.text.toString()
|
val userName = binding.etName.text.toString()
|
||||||
val aadharId = binding.aadharID.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 {
|
userData.apply {
|
||||||
name = userName
|
name = userName
|
||||||
AadharId = aadharId
|
AadharId = aadharId
|
||||||
AbhaId = abhaId
|
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)
|
viewModel.insert(userData)
|
||||||
@@ -159,7 +163,9 @@ class AbhaRegistrationFragment : BaseFragment() {
|
|||||||
).show()
|
).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) {
|
with(binding) {
|
||||||
if (!checkAbhaIDNumber(abhaId)) {
|
if (!checkAbhaIDNumber(abhaId)) {
|
||||||
etAbhaId.error = "Invalid Abha ID"
|
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"
|
etName.error = "Name field can't be empty or less than 3 characters"
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
if (!checkCenterName(centerName)) {
|
||||||
|
etName.error = "Center name can't be empty"
|
||||||
|
return false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -189,6 +199,10 @@ class AbhaRegistrationFragment : BaseFragment() {
|
|||||||
return userName.isNotEmpty() && userName.length >= 3
|
return userName.isNotEmpty() && userName.length >= 3
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun checkCenterName(centerName: String): Boolean {
|
||||||
|
return centerName.isNotEmpty()
|
||||||
|
}
|
||||||
|
|
||||||
private fun navigateToUserDetailsFragment(userId: String) {
|
private fun navigateToUserDetailsFragment(userId: String) {
|
||||||
val action =
|
val action =
|
||||||
AbhaRegistrationFragmentDirections.actionRegistrationFragmentToUserDetailsRegistrationFragment(
|
AbhaRegistrationFragmentDirections.actionRegistrationFragmentToUserDetailsRegistrationFragment(
|
||||||
|
|||||||
@@ -154,6 +154,25 @@
|
|||||||
android:maxLength="12" />
|
android:maxLength="12" />
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
|
android:id="@+id/et_centerName"
|
||||||
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/et_aadharID">
|
||||||
|
|
||||||
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
|
android:id="@+id/centerName"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:hint="@string/center_name"
|
||||||
|
android:inputType="text"
|
||||||
|
android:maxLength="12" />
|
||||||
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tv_scanMessage"
|
android:id="@+id/tv_scanMessage"
|
||||||
style="@style/title2"
|
style="@style/title2"
|
||||||
@@ -163,7 +182,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
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/et_aadharID" />
|
app:layout_constraintTop_toBottomOf="@+id/et_centerName" />
|
||||||
|
|
||||||
<com.google.android.material.button.MaterialButton
|
<com.google.android.material.button.MaterialButton
|
||||||
android:id="@+id/btnProceed"
|
android:id="@+id/btnProceed"
|
||||||
|
|||||||
@@ -73,7 +73,7 @@
|
|||||||
<string name="is_patient_under_any_medication_details">Is Under Medication: %1$s</string>
|
<string name="is_patient_under_any_medication_details">Is Under Medication: %1$s</string>
|
||||||
<string name="is_patient_undergoing_any_blood_transfusion_details">Is Under Blood Transfusion: %1$s</string>
|
<string name="is_patient_undergoing_any_blood_transfusion_details">Is Under Blood Transfusion: %1$s</string>
|
||||||
<string name="sickle_cell_family_history">Sickle cell Family History: %1$s</string>
|
<string name="sickle_cell_family_history">Sickle cell Family History: %1$s</string>
|
||||||
|
<string name="center_name">Center Name</string>
|
||||||
|
|
||||||
|
|
||||||
<string-array name="category">
|
<string-array name="category">
|
||||||
|
|||||||
Reference in New Issue
Block a user