From 21d4aa5624d97c9e83875338d1eb9244bc71c8ec Mon Sep 17 00:00:00 2001
From: "smileomi18@gmail.com" <smi@glab22>
Date: Wed, 28 Jun 2023 16:34:20 +0530
Subject: [PATCH] 20/06/2023 -test session bug resolve

---
 .../shelved.patch                             | 77 ---------------
 ..._Update_at_21-06-2023_11_16__Changes_1.xml |  4 -
 .../ReviewDetailsRegistrationFragment.kt      |  6 +-
 .../UserDetailsRegistrationFragment.kt        | 97 ++++++++++---------
 .../fragment_user_details_registration.xml    | 29 +-----
 5 files changed, 57 insertions(+), 156 deletions(-)
 delete mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]1/shelved.patch
 delete mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16__Changes_1.xml

diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]1/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]1/shelved.patch
deleted file mode 100644
index cb3673a..0000000
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]1/shelved.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-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$" />
diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16__Changes_1.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16__Changes_1.xml
deleted file mode 100644
index 90bf95d..0000000
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16__Changes_1.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<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>
\ No newline at end of file
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 f39b770..a912fba 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
@@ -140,14 +140,14 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
                     R.string.is_patient_undergoing_any_blood_transfusion_details, "No"
                 )
             }
-            if (userData.sickleCellHistory != "") {
+            if (userData.sickleCellHistory == null) {
                 binding.tvSickleCellFamilyHistory.text = requireContext().getString(
-                    R.string.sickle_cell_family_history, userData.sickleCellHistory
+                    R.string.sickle_cell_family_history, "No"
                 )
 
             }else{
                 binding.tvSickleCellFamilyHistory.text = requireContext().getString(
-                    R.string.sickle_cell_family_history, "No"
+                    R.string.sickle_cell_family_history, userData.sickleCellHistory
                 )
             }
         }
diff --git a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/UserDetailsRegistrationFragment.kt b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/UserDetailsRegistrationFragment.kt
index da037e6..1b9b9e2 100644
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/UserDetailsRegistrationFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/UserDetailsRegistrationFragment.kt
@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -77,59 +78,64 @@ class UserDetailsRegistrationFragment : Fragment() {
                     yes1.isChecked = it
                 }
             }
-            user.sickleCellHistory.let { etFamilyHistory.setText(it) }
-            user.isUnderMedication.let {
-                if (it != null) {
-                    yes.isChecked = it
-                }
-            }
-            user.isUnderTransfusion.let {
-                if (it != null) {
-                    yes1.isChecked = it
-                }
-            }
-//            user.sickleCellHistory.let {
-//                if (it != null && binding.etFamilyHistory.isVisible) {
-//                    if (it.isNotEmpty()) {
-//
+//            user.sickleCellHistory.let{
+//                if (it != null) {
+//                    if (binding.etFamilyHistory.isVisible) {
+//                        binding.etFamilyHistory.setText(it)
 //                        yes1history.isChecked = true
-//
-//
+//                    }else{
+//                        no1history.isChecked = true
 //                    }
-//
-//                }else{
-//                    no1history.isChecked = true
 //                }
 //            }
-
-
-            user.sickleCellHistory?.let {
-                if (binding.etFamilyHistory.isVisible) {
-                    binding.etFamilyHistory.setText(it)
+//            user.isUnderMedication.let {
+//                if (it != null) {
+//                    yes.isChecked = it
+//                }
+//            }
+            user.sickleCellHistory.let {
+                if (it != null) {
                     yes1history.isChecked = true
                 }
             }
 
+//            user.sickleCellHistory.let{
+//                if (it != null) {
+//                    if(yes1history.isChecked){
+//                        yes1history.isChecked = true
+//                    }else if(no1history.isChecked){
+//                        no1history.isChecked
+//                    }
+//
+//
+//                }
+//            }
 
 
+            if (yes1history.isChecked) {
+                if (binding.yes1history.isChecked) View.VISIBLE else View.GONE
 
-            binding.yes1history.setOnClickListener {
                 user.sickleCellHistory.let { etFamilyHistory.setText(it) }
-                binding.tilFamilyHistory.visibility =
-                    if (binding.yes1history.isChecked) View.VISIBLE else View.GONE
+
+
+
+
+            } else {
+                binding.tilFamilyHistory.visibility = View.GONE
             }
 
+            binding.yes1history.setOnClickListener {
+                binding.tilFamilyHistory.visibility =
+                    if (binding.yes1history.isChecked) View.VISIBLE else View.GONE
+                user.sickleCellHistory.let { etFamilyHistory.setText(it) }
+
+            }
+//
             binding.no1history.setOnClickListener {
                 binding.tilFamilyHistory.visibility =
                     if (binding.no1history.isChecked) View.GONE else View.VISIBLE
             }
 
-            if (yes1history.isChecked) {
-                binding.tilFamilyHistory.visibility = View.VISIBLE
-
-            } else {
-                binding.tilFamilyHistory.visibility = View.GONE
-            }
 
         }
     }
@@ -259,21 +265,24 @@ class UserDetailsRegistrationFragment : Fragment() {
             }
             userData.isUnderMedication = yes.isChecked
             userData.isUnderTransfusion = yes1.isChecked
-            val familyHistory = etFamilyHistory.text.toString()
-            if (familyHistory.isEmpty()) {
-                etFamilyHistory.error = "Please enter your family history"
-                return false
-            } else {
-            userData.isUnderMedication = yes.isChecked
-            userData.isUnderTransfusion = yes1.isChecked
+            userData.sickleCellHistory = yes1history.isChecked.toString()
 
-            if(etFamilyHistory.isVisible) {
+            if (yes1history.isChecked) {
                 val familyHistory = etFamilyHistory.text.toString()
+                if (familyHistory.isEmpty()) {
+                    etFamilyHistory.error = "Please enter your family history"
+                    return false
+                }
+
                 userData.sickleCellHistory = familyHistory
-            }else{
-                userData.sickleCellHistory = ""
+            } else {
+
+                userData.sickleCellHistory = null
+
             }
+
             return true
+
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_user_details_registration.xml b/app/src/main/res/layout/fragment_user_details_registration.xml
index 18a7f52..45bd043 100644
--- a/app/src/main/res/layout/fragment_user_details_registration.xml
+++ b/app/src/main/res/layout/fragment_user_details_registration.xml
@@ -419,33 +419,6 @@
                     android:text="No"
                     android:textSize="16dp" />
             </RadioGroup>
-                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"
@@ -456,7 +429,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/historyradiogroup">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/et_familyHistory"