Merge branch 'HemantBranch' of https://git.nivesh.com:443/hemant.khadase/BajajFDLib into ManojBranch

app/src/main/java/com/nivesh/production/bajajfd/interfaces/BajajFDInterface.kt

@@ -1,5 +1,7 @@
 package com.nivesh.production.bajajfd.interfaces
 
+import com.nivesh.production.bajajfd.model.CreateFDRequest
+
 interface BajajFDInterface {
     fun stepOneApi(data: String?)
     fun stepTwoApi(data: CreateFDRequest)

app/src/main/java/com/nivesh/production/bajajfd/model/DataObject.kt

@@ -3,15 +3,15 @@ package com.nivesh.production.bajajfd.model
 import java.io.Serializable
 
 data class DataObject(
-    val BSE_State_Code: String,
-    val CAMS_statecode: String,
-    val Country_Id: Int,
-    val State_Code: String,
-    val State_Id: Int,
-    val State_Name: String,
-    val signzyCode: String
+    var BSE_State_Code: String? = "",
+    var CAMS_statecode: String? = "",
+    var Country_Id: Int? = 0,
+    var State_Code: String?= "",
+    var State_Id: Int? = 0,
+    var State_Name: String? = "",
+    var signzyCode: String? = ""
 ): Serializable {
     override fun toString(): String {
-        return State_Name
+        return State_Name.toString()
     }
 }

app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt

@@ -119,14 +119,14 @@ class StepThreeBajajFDFragment : Fragment() {
                 val getCodes: GetCodes = parent.getItemAtPosition(position) as GetCodes
                 when (getCodes.Value) {
                     resources.getString(R.string.aadhar) ->
-                        setAadharUploadLayout()
+                        setAadhaarUploadLayout()
                     else -> {
                         setOtherUploadLayout(getCodes.Value)
                     }
                 }
             }
 
-        titleApi()
+        docTypeApi()
         return root
     }
 
@@ -214,7 +214,7 @@ class StepThreeBajajFDFragment : Fragment() {
             View.INVISIBLE
     }
 
-    private fun setAadharUploadLayout() {
+    private fun setAadhaarUploadLayout() {
         binding.tvAadhaarFront.text = resources.getString(R.string.aadhaarFront)
         binding.tvAadhaarBack.text = resources.getString(R.string.aadhaarBack)
 
@@ -234,7 +234,7 @@ class StepThreeBajajFDFragment : Fragment() {
         }
     }
 
-    private fun titleApi() {
+    private fun docTypeApi() {
         if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) {
             val getCodeRequest = GetCodeRequest()
             getCodeRequest.ProductName = getString(R.string.bajajFD)

app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt

@@ -67,6 +67,7 @@ class StepTwoBajajFDFragment : Fragment() {
 
     private lateinit var stepTwoBajajFDViewModel: StepTwoBajajFDViewModel
     private lateinit var bankListAdapter: BankListAdapter
+    private lateinit var stateObject: DataObject
 
     companion object {
         fun getInstance(fdInterface: BajajFDInterface): StepTwoBajajFDFragment {
@@ -98,7 +99,9 @@ class StepTwoBajajFDFragment : Fragment() {
         listOfStates = ArrayList()
         listOfIFSC = ArrayList()
 
-        rbPaymentMode =  RadioButton(activity as BajajFdMainActivity)
+        stateObject = DataObject()
+
+        rbPaymentMode = RadioButton(activity as BajajFdMainActivity)
 
         // Personal Details
         binding.edtMobileNumber.filters = arrayOf<InputFilter>(LengthFilter(10))
@@ -121,7 +124,7 @@ class StepTwoBajajFDFragment : Fragment() {
         binding.edtMobileNumber.setText((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.mobile)
 
         // create an OnDateSetListener
-        if (!(activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_DOB.isNullOrEmpty()){
+        if (!(activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_DOB.isNullOrEmpty()) {
             binding.edtDOB.setText(getDate((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_DOB.toString()))
         }
         binding.edtDOB.setOnClickListener {
@@ -259,7 +262,6 @@ class StepTwoBajajFDFragment : Fragment() {
             }
         })
         binding.edtAddressLine1.setText((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_ADD1)
-
         binding.edtAddressLine2.addTextChangedListener(object : TextWatcher {
 
             override fun afterTextChanged(s: Editable?) {
@@ -273,7 +275,6 @@ class StepTwoBajajFDFragment : Fragment() {
             }
         })
         binding.edtAddressLine2.setText((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_ADD2)
-
         binding.edtAddressLine3.addTextChangedListener(object : TextWatcher {
 
             override fun afterTextChanged(s: Editable?) {
@@ -288,8 +289,9 @@ class StepTwoBajajFDFragment : Fragment() {
         })
         binding.edtAddressLine3.setText((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_ADD3)
 
-        binding.spState.setOnItemClickListener { _, _, _, _ ->
+        binding.spState.setOnItemClickListener { parent, _, position, _ ->
             removeError(binding.tlState)
+            stateObject = parent.getItemAtPosition(position) as DataObject
         }
         binding.spCity.setOnItemClickListener { _, _, _, _ ->
             removeError(binding.tlCity)
@@ -371,14 +373,24 @@ class StepTwoBajajFDFragment : Fragment() {
             }
         }
 
-        if (!(activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Nominees?.get(0)?.NomineeDOB.isNullOrEmpty()){
-            binding.edtNomineeDOB.setText(getDate((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Nominees?.get(0)?.NomineeDOB.toString()))
+        if (!(activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Nominees?.get(
+                0
+            )?.NomineeDOB.isNullOrEmpty()
+        ) {
+            binding.edtNomineeDOB.setText(
+                getDate(
+                    (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Nominees?.get(
+                        0
+                    )?.NomineeDOB.toString()
+                )
+            )
         }
         binding.edtNomineeDOB.setOnClickListener {
             removeError(binding.tlNomineeDOB)
             datePicker(binding.edtNomineeDOB)
         }
 
+        binding.spNomineeRelation.setText((activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.Nominees?.get(0)?.NomineeRelationship)
         binding.spNomineeRelation.setOnItemClickListener { _, _, _, _ ->
             removeError(binding.tlNomineeRelation)
         }
@@ -598,8 +610,8 @@ class StepTwoBajajFDFragment : Fragment() {
                     binding.edtAddressLine3.text.toString()
                 (activity as BajajFdMainActivity).applicantDetails.ApplicantCity =
                     binding.spCity.text.toString()
-                (activity as BajajFdMainActivity).applicantDetails.ApplicantState =
-                    binding.spState.text.toString()
+              //  (activity as BajajFdMainActivity).applicantDetails.ApplicantState = binding.spState.text.toString()
+                (activity as BajajFdMainActivity).applicantDetails.ApplicantState = stateObject.State_Code
                 (activity as BajajFdMainActivity).applicantDetails.ApplicantCountry = "India"
                 (activity as BajajFdMainActivity).applicantDetails.ApplicantPincode =
                     binding.edtPinCode.text.toString().toInt()
@@ -657,7 +669,7 @@ class StepTwoBajajFDFragment : Fragment() {
                 (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianState = ""
                 if (binding.edtGuardianPinCode.text.toString().isEmpty()) {
                     (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianPincode = 0
-                }else{
+                } else {
                     (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianPincode =
                         binding.edtGuardianPinCode.text.toString().toInt()
                 }
@@ -682,14 +694,20 @@ class StepTwoBajajFDFragment : Fragment() {
                 (activity as BajajFdMainActivity).fdBankDetails.PaymentMode =
                     rbPaymentMode.text.toString()
 
-                (activity as BajajFdMainActivity).createFDApplicantRequest.ApplicantDetails = (activity as BajajFdMainActivity).applicantDetails
-                (activity as BajajFdMainActivity).createFDApplicantRequest.ApplicantRelationDetails = (activity as BajajFdMainActivity).applicantRelationDetails
-                (activity as BajajFdMainActivity).createFDApplicantRequest.FdBankDetails = (activity as BajajFdMainActivity).fdBankDetails
-                (activity as BajajFdMainActivity).createFDApplicantRequest.NomineeDetails = (activity as BajajFdMainActivity).nomineeDetails
-                (activity as BajajFdMainActivity).createFDApplicantRequest.NomineeGuardianDetails = (activity as BajajFdMainActivity).nomineeGuardianDetails
+                (activity as BajajFdMainActivity).createFDApplicantRequest.ApplicantDetails =
+                    (activity as BajajFdMainActivity).applicantDetails
+                (activity as BajajFdMainActivity).createFDApplicantRequest.ApplicantRelationDetails =
+                    (activity as BajajFdMainActivity).applicantRelationDetails
+                (activity as BajajFdMainActivity).createFDApplicantRequest.FdBankDetails =
+                    (activity as BajajFdMainActivity).fdBankDetails
+                (activity as BajajFdMainActivity).createFDApplicantRequest.NomineeDetails =
+                    (activity as BajajFdMainActivity).nomineeDetails
+                (activity as BajajFdMainActivity).createFDApplicantRequest.NomineeGuardianDetails =
+                    (activity as BajajFdMainActivity).nomineeGuardianDetails
 
 
-                (activity as BajajFdMainActivity).createFDRequest.CreateFDApplicationRequest = (activity as BajajFdMainActivity).createFDApplicantRequest
+                (activity as BajajFdMainActivity).createFDRequest.CreateFDApplicationRequest =
+                    (activity as BajajFdMainActivity).createFDApplicantRequest
                 Log.e(
                     "CreateFDRequest",
                     "-->" + Gson().toJson((activity as BajajFdMainActivity).createFDRequest)
@@ -858,8 +876,11 @@ class StepTwoBajajFDFragment : Fragment() {
                 if (monthOfYear.toString().length == 1) {
                     "0".plus(monthOfYear)
                 }
-               // edtDOB.setText(getDate(dayOfMonth.toString() + "-" + (monthOfYear + 1) + "-" + years))
-                edtDOB.setText(years.toString().plus("-").plus(monthOfYear + 1).plus("-").plus(dayOfMonth.toString()))
+                // edtDOB.setText(getDate(dayOfMonth.toString() + "-" + (monthOfYear + 1) + "-" + years))
+                edtDOB.setText(
+                    years.toString().plus("-").plus(monthOfYear + 1).plus("-")
+                        .plus(dayOfMonth.toString())
+                )
                 edtDOB.setSelection(edtDOB.text.toString().length)
             }, year, month, day
         )
@@ -873,8 +894,10 @@ class StepTwoBajajFDFragment : Fragment() {
     private fun panCheckApi() {
         if (Common.isNetworkAvailable(activity as BajajFdMainActivity)) {
             val panCheck = PanCheckRequest()
-            panCheck.clientCode = "0"
-            panCheck.subBrokerCode = "0"
+            panCheck.clientCode =
+                (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
+            panCheck.subBrokerCode =
+                (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.sub_broker_code
             panCheck.panNumber = binding.edtPANNumber.text.toString()
             panCheck.mobileNumber = ""
             stepTwoBajajFDViewModel.panCheck(panCheck, token)
@@ -1317,11 +1340,15 @@ class StepTwoBajajFDFragment : Fragment() {
                                                 false
                                             )
                                             cityListApi(adapter.getItem(0)?.State_Id)
+
+                                            stateObject = adapter.getItem(0) as DataObject
+
                                         } else {
                                             for (title in listOfStates) {
                                                 if (title.State_Code == newTitleText) {
                                                     binding.spState.setText(title.State_Name, false)
                                                     cityListApi(title.State_Id)
+                                                    // val stateObject: DataObject = adapter.getItem(0) as DataObject
                                                     break
                                                 }
                                             }

app/src/main/res/layout/camera_gallery_layout.xml

@@ -18,7 +18,7 @@
         app:layout_constraintStart_toEndOf="@+id/tvCamera"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
-        android:contentDescription="@string/select_option" />
+        android:contentDescription="@string/selectOption" />
 
     <TextView
         android:id="@+id/tvSelectOption"
@@ -26,7 +26,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="@dimen/margin_10"
-        android:text="@string/select_option"
+        android:text="@string/selectOption"
         android:textColor="@color/black"
         android:textSize="@dimen/text_size_20"
         app:layout_constraintBottom_toTopOf="@+id/tvGallery"

app/src/main/res/layout/fragment_bajajfd_step_two.xml

@@ -190,7 +190,7 @@
                         app:layout_constraintTop_toBottomOf="@+id/tlDepositAmount">
 
                         <com.google.android.material.textfield.MaterialAutoCompleteTextView
-                            android:id="@+id/spDocType"
+                            android:id="@+id/spTitle"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:background="@drawable/rounded_corner_with_line"

app/src/main/res/values-hi-rIN/strings.xml

@@ -240,5 +240,7 @@
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
     <string name="aadhar">Aadhar</string>
+    <string name="gallery">Gallery</string>
+    <string name="camera">Camera</string>
 
 </resources>

app/src/main/res/values/strings.xml

@@ -192,6 +192,7 @@
     <string name="uploadFile">Upload File</string>
     <string name="photograph">Photograph <font color='#E9161E'>*</font></string>
     <string name="pan">PAN <font color='#E9161E'>*</font></string>
+    <string name="docType">Doctype</string>
 
 
     <!--  Step Four  -->
@@ -243,6 +244,9 @@
     <string name="gallery">Gallery</string>
     <string name="camera">Camera</string>
 
+    <string name="selectOption">Select Option</string>
+    <string name="gallery">Gallery</string>
+    <string name="camera">Camera</string>
 
     <array name="addressType">
         <item>Aadhaar Card</item>