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

20/06/2023 -test session bug resolve

Browse Source
This commit is contained in:
smileomi18@gmail.com
2023-06-23 10:51:30 +05:30
parent a8bf3647a1
commit 9c0694584c
12 changed files with 210 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/gradle.xml generated
View File

@@ -7,8 +7,8 @@
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="$PROJECT_DIR$/../../andriod studio gradle/gradle-7.3" />
<option name="gradleJvm" value="17" />
<option name="gradleHome" value="$USER_HOME$/andriod studio gradle/gradle-7.3" />
<option name="gradleJvm" value="Embedded JDK" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />

6
.idea/misc.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>

13
.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]/shelved.patch generated Normal file
View File

@@ -0,0 +1,13 @@
Index: .idea/misc.xml
===================================================================
diff --git a/.idea/misc.xml b/.idea/misc.xml
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
- <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

77
.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]1/shelved.patch generated Normal file
View File

@@ -0,0 +1,77 @@
Index: app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
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
--- 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
@@ -68,6 +68,7 @@
aadharID.setText(user.AadharId)
etAbhaId.setText(user.AbhaId)
etName.setText(user.name)
+
}
}
Index: .idea/deploymentTargetDropDown.xml
===================================================================
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
Index: .idea/vcs.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
Index: .idea/gradle.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,8 +7,8 @@
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="gradleHome" value="$PROJECT_DIR$/../../andriod studio gradle/gradle-7.3" />
- <option name="gradleJvm" value="17" />
+ <option name="gradleHome" value="$USER_HOME$/andriod studio gradle/gradle-7.3" />
+ <option name="gradleJvm" value="Embedded JDK" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />

4
.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16__Changes_.xml generated Normal file
View File

@@ -0,0 +1,4 @@
<changelist name="Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]" date="1687326381685" recycled="false" toDelete="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 21-06-2023 11:16 [Changes]" />
</changelist>

4
.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16__Changes_1.xml generated Normal file
View File

@@ -0,0 +1,4 @@
<changelist name="Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]1" date="1687326391788" recycled="true" deleted="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]1/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 21-06-2023 11:16 [Changes]" />
</changelist>

6
.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

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

@@ -68,6 +68,8 @@ class AbhaRegistrationFragment : BaseFragment() {
aadharID.setText(user.AadharId)
etAbhaId.setText(user.AbhaId)
etName.setText(user.name)
centerName.setText(user.CenterName)
}
}
@@ -83,9 +85,7 @@ class AbhaRegistrationFragment : BaseFragment() {
AadharId = aadharId
AbhaId = abhaId
CenterName = centerName
_id =
aadharId + userName.substring(0, 3).uppercase() + centerName.substring(0, 3)
.uppercase()
_id = aadharId + userName.substring(0, 3).uppercase() + centerName.substring(0, 3).uppercase()
}
viewModel.insert(userData)
@@ -180,7 +180,7 @@ class AbhaRegistrationFragment : BaseFragment() {
return false
}
if (!checkCenterName(centerName)) {
etName.error = "Center name can't be empty"
etCenterName.error = "Center name can't be empty or less than 3 characters"
return false
}
}
@@ -188,11 +188,11 @@ class AbhaRegistrationFragment : BaseFragment() {
}
private fun checkAbhaIDNumber(abhaId: String): Boolean {
return abhaId.isNotEmpty() || abhaId.length == 14
return abhaId.isNotEmpty() && abhaId.length >= 14
}
private fun checkAadharIDNumber(aadharId: String): Boolean {
return aadharId.isNotEmpty() || aadharId.length == 12
return aadharId.isNotEmpty() && aadharId.length >= 12
}
private fun checkUserName(userName: String): Boolean {
@@ -200,7 +200,7 @@ class AbhaRegistrationFragment : BaseFragment() {
}
private fun checkCenterName(centerName: String): Boolean {
return centerName.isNotEmpty()
return centerName.isNotEmpty() && centerName.length >= 3
}
private fun navigateToUserDetailsFragment(userId: String) {

9
app/src/main/java/com/example/hposregistration/ui/fragments/registration/CaptureUserImageFragment.kt
View File

@@ -72,6 +72,10 @@ class CaptureUserImageFragment : Fragment() {
userData = user
if (userData.userImage.isNotEmpty()) {
binding.userImage.loadImageFromUri(Uri.parse(user.userImage))
binding.btnSubmit.isEnabled = true
binding.btnSubmit.setOnClickListener {
navigate()
}
}
}
}
@@ -100,6 +104,7 @@ class CaptureUserImageFragment : Fragment() {
if (grantedPermissions.isNotEmpty()) {
binding.userImage.setOnClickListener {
takePicture()
}
}
@@ -119,6 +124,10 @@ class CaptureUserImageFragment : Fragment() {
private fun submitImage(uri: Uri) {
userData.userImage = uri.toString()
viewModel.insert(userData)
navigate()
}
private fun navigate() {
val action = CaptureUserImageFragmentDirections
.actionCaptureUserImageFragment2ToReviewDetailsRegistrationFragment(args.userId)
findNavController().navigate(action)

8
app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt
View File

@@ -124,11 +124,19 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
binding.tvIsUnderMedication.text = requireContext().getString(
R.string.is_patient_under_any_medication_details, "Yes"
)
} else {
binding.tvIsUnderMedication.text = requireContext().getString(
R.string.is_patient_under_any_medication_details, "No"
)
}
if (userData.isUnderTransfusion!!) {
binding.tvIsUnderTransfusion.text = requireContext().getString(
R.string.is_patient_undergoing_any_blood_transfusion_details, "Yes"
)
}else{
binding.tvIsUnderTransfusion.text = requireContext().getString(
R.string.is_patient_undergoing_any_blood_transfusion_details, "No"
)
}
if (userData.sickleCellHistory != "") {

22
app/src/main/java/com/example/hposregistration/ui/fragments/registration/UserDetailsRegistrationFragment.kt
View File

@@ -4,6 +4,7 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.RadioButton
import android.widget.Toast
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
@@ -14,6 +15,7 @@ import com.example.hposregistration.databinding.FragmentUserDetailsRegistrationB
import com.example.hposregistration.ui.viewmodels.RegistrationViewModel
import dagger.hilt.android.AndroidEntryPoint
@AndroidEntryPoint
class UserDetailsRegistrationFragment : Fragment() {
@@ -66,8 +68,17 @@ class UserDetailsRegistrationFragment : Fragment() {
user.state.let { etState.setText(it) }
user.pinCode.let { etPincode.setText(it) }
user.bloodGroup.let { etBloodGroup.setText(it, false) }
cbItem1.isChecked = user.isUnderMedication ?: false
cbItem2.isChecked = user.isUnderTransfusion ?: false
user.isUnderMedication.let {
if (it != null) {
yes.isChecked = it
}
}
user.isUnderTransfusion.let {
if (it != null) {
yes1.isChecked = it
}
}
user.sickleCellHistory.let { etFamilyHistory.setText(it) }
}
}
@@ -194,11 +205,8 @@ class UserDetailsRegistrationFragment : Fragment() {
} else {
userData.bloodGroup = bloodGroup
}
userData.isUnderMedication = cbItem1.isChecked
userData.isUnderTransfusion = cbItem2.isChecked
userData.isUnderMedication = yes.isChecked
userData.isUnderTransfusion = yes1.isChecked
val familyHistory = etFamilyHistory.text.toString()
if (familyHistory.isEmpty()) {
etFamilyHistory.error = "Please enter your family history"

64
app/src/main/res/layout/fragment_user_details_registration.xml
View File

@@ -8,7 +8,9 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
tools:layout_editor_absoluteX="-16dp"
tools:layout_editor_absoluteY="158dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -314,7 +316,7 @@
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.checkbox.MaterialCheckBox
<TextView
android:id="@+id/cb_item1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -324,14 +326,66 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/til_blood_group" />
<com.google.android.material.checkbox.MaterialCheckBox
<RadioGroup
android:id="@+id/radioGroup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:orientation="horizontal"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cb_item1">
<RadioButton
android:id="@+id/yes"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="Yes"
android:textSize="16dp" />
<RadioButton
android:id="@+id/no"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:checked="true"
android:text="No"
android:textSize="16dp" />
</RadioGroup>
<TextView
android:id="@+id/cb_item2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:text="@string/is_patient_undergoing_any_blood_transfusion"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cb_item1" />
app:layout_constraintTop_toBottomOf="@id/radioGroup" />
<RadioGroup
android:id="@+id/radioGroup1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:orientation="horizontal"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cb_item2">
<RadioButton
android:id="@+id/yes1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="Yes"
android:textSize="16dp" />
<RadioButton
android:id="@+id/no1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="No"
android:textSize="16dp" />
</RadioGroup>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_familyHistory"
@@ -342,7 +396,7 @@
android:layout_marginTop="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cb_item2">
app:layout_constraintTop_toBottomOf="@id/radioGroup1">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/et_familyHistory"