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

Center Name

Browse Source
This commit is contained in:
mohamedkaif356
2023-06-21 11:15:58 +05:30
parent 9f7e1b49a6
commit b442a80e8c
5 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.idea/deploymentTargetDropDown.xml generated
View File

@@ -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>

3
app/src/main/java/com/example/hposregistration/data/user/UserData.kt
View File

@@ -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,

20
app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt
View File

@@ -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(

21
app/src/main/res/layout/fragment_abha_registration.xml
View File

@@ -154,6 +154,25 @@
android:maxLength="12" />
</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
android:id="@+id/tv_scanMessage"
style="@style/title2"
@@ -163,7 +182,7 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="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
android:id="@+id/btnProceed"

2
app/src/main/res/values/strings.xml
View File

@@ -73,7 +73,7 @@
<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="sickle_cell_family_history">Sickle cell Family History: %1$s</string>
<string name="center_name">Center Name</string>
<string-array name="category">