Browse Source

api working of eligible bank

PankajBranch
Hemant Khadase 2 years ago
parent
commit
b03ab207f4
5 changed files with 43 additions and 25 deletions
  1. +1
    -1
      app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt
  2. +2
    -2
      app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt
  3. +32
    -11
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt
  4. +3
    -2
      app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt
  5. +5
    -9
      app/src/main/res/layout/fragment_bajajfd_step_two.xml

+ 1
- 1
app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt View File

@ -146,7 +146,7 @@ interface ApiInterface {
): Response<JsonObject> ): Response<JsonObject>
@GET("GetFDBankList?FDProvider=Bajaj") @GET("GetFDBankList?FDProvider=Bajaj")
suspend fun bankListApi(@Header("token") token: String): Response<JsonObject>
suspend fun bankListApi(@Header("token") token: String, @Query("Language") language : String): Response<JsonObject>
@GET("GetIFSC_Autofill?") @GET("GetIFSC_Autofill?")
suspend fun getIFSCApi(@Query("prefix") ifsc : String): Response<JsonObject> suspend fun getIFSCApi(@Query("prefix") ifsc : String): Response<JsonObject>


+ 2
- 2
app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt View File

@ -74,8 +74,8 @@ class MainRepository constructor(private val apiInterface: ApiInterface) {
suspend fun cityCheck(cityRequest: CityRequest, token: String) = suspend fun cityCheck(cityRequest: CityRequest, token: String) =
apiInterface.cityApi(cityRequest, token) apiInterface.cityApi(cityRequest, token)
suspend fun bankListCheck(token: String) =
apiInterface.bankListApi(token)
suspend fun bankListCheck(token: String, language: String) =
apiInterface.bankListApi(token, language)
suspend fun ifscCodeCheck(str: String) = suspend fun ifscCodeCheck(str: String) =
apiInterface.getIFSCApi(str) apiInterface.getIFSCApi(str)


+ 32
- 11
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt View File

@ -33,6 +33,7 @@ import com.nivesh.production.bajajfd.model.*
import com.nivesh.production.bajajfd.repositories.MainRepository import com.nivesh.production.bajajfd.repositories.MainRepository
import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity
import com.nivesh.production.bajajfd.ui.providerfactory.StepTwoModelProviderFactory import com.nivesh.production.bajajfd.ui.providerfactory.StepTwoModelProviderFactory
import com.nivesh.production.bajajfd.util.Common
import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorAutoCompleteMethod import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorAutoCompleteMethod
import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorMethod import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorMethod
import com.nivesh.production.bajajfd.util.Common.Companion.commonSpinnerErrorMethod import com.nivesh.production.bajajfd.util.Common.Companion.commonSpinnerErrorMethod
@ -132,7 +133,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
binding.edtDOB.setOnClickListener { binding.edtDOB.setOnClickListener {
removeError(binding.tlDOB) removeError(binding.tlDOB)
datePicker(binding.edtDOB)
datePicker(binding.edtDOB, 1)
} }
@ -390,7 +391,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
binding.edtNomineeDOB.setOnClickListener { binding.edtNomineeDOB.setOnClickListener {
removeError(binding.tlNomineeDOB) removeError(binding.tlNomineeDOB)
datePicker(binding.edtNomineeDOB)
datePicker(binding.edtNomineeDOB, 2)
} }
binding.spNomineeRelation.setText( binding.spNomineeRelation.setText(
@ -401,9 +402,6 @@ class StepTwoBajajFDFragment : BaseFragment() {
binding.spNomineeRelation.setOnItemClickListener { _, _, _, _ -> binding.spNomineeRelation.setOnItemClickListener { _, _, _, _ ->
removeError(binding.tlNomineeRelation) removeError(binding.tlNomineeRelation)
} }
binding.cbNomineeSameAddress.setOnCheckedChangeListener { _, _ ->
}
// Guardian Details // Guardian Details
binding.edtGuardianName.addTextChangedListener(object : TextWatcher { binding.edtGuardianName.addTextChangedListener(object : TextWatcher {
@ -663,7 +661,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
(activity as BajajFdMainActivity).nomineeDetails.NomineePincode = 0 (activity as BajajFdMainActivity).nomineeDetails.NomineePincode = 0
// Applicant Nominee Guardian Details // Applicant Nominee Guardian Details
(activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianSalutation = ""
(activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianSalutation = binding.spGuardianRelation.text.toString()
(activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianName = (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianName =
binding.edtGuardianName.text.toString() binding.edtGuardianName.text.toString()
if (binding.edtGuardianAge.text.toString().isEmpty()) { if (binding.edtGuardianAge.text.toString().isEmpty()) {
@ -685,8 +683,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
(activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress1 = (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress1 =
binding.edtGuardianAddress.text.toString() binding.edtGuardianAddress.text.toString()
(activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress2 = "" (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress2 = ""
(activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress3 =
binding.spGuardianRelation.text.toString()
(activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress3 = ""
// Applicant Bank Details // Applicant Bank Details
(activity as BajajFdMainActivity).fdBankDetails.AccountType = (activity as BajajFdMainActivity).fdBankDetails.AccountType =
@ -930,6 +927,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
clientBankList.AccountNumber.toString() clientBankList.AccountNumber.toString()
) )
showHideBankDetail() showHideBankDetail()
} else { } else {
showDialogValidation( showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
@ -1016,7 +1014,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
binding.rvClientBankList.adapter = bankListAdapter binding.rvClientBankList.adapter = bankListAdapter
} }
private fun datePicker(edtDOB: TextInputEditText) {
private fun datePicker(edtDOB: TextInputEditText, number : Int) {
val year = cal.get(Calendar.YEAR) val year = cal.get(Calendar.YEAR)
val month = cal.get(Calendar.MONTH) val month = cal.get(Calendar.MONTH)
val day = cal.get(Calendar.DAY_OF_MONTH) val day = cal.get(Calendar.DAY_OF_MONTH)
@ -1030,6 +1028,15 @@ class StepTwoBajajFDFragment : BaseFragment() {
.plus(dayOfMonth.toString()) .plus(dayOfMonth.toString())
) )
edtDOB.setSelection(edtDOB.text.toString().length) edtDOB.setSelection(edtDOB.text.toString().length)
if (number == 2){
if (isMinor(years.toString().plus("-").plus(monthOfYear + 1).plus("-")
.plus(dayOfMonth.toString()))
){
guardianCodeVisibility(View.VISIBLE)
}else{
guardianCodeVisibility(View.GONE)
}
}
}, year, month, day }, year, month, day
) )
datePickerDialog.datePicker.maxDate = cal.timeInMillis datePickerDialog.datePicker.maxDate = cal.timeInMillis
@ -1039,6 +1046,15 @@ class StepTwoBajajFDFragment : BaseFragment() {
datePickerDialog.show() datePickerDialog.show()
} }
private fun guardianCodeVisibility(visibility: Int) {
binding.tlGuardianName.visibility = visibility
binding.tlGuardianName.visibility = visibility
binding.tlGuardianName.visibility = visibility
binding.tlGuardianName.visibility = visibility
binding.tlGuardianName.visibility = visibility
}
private fun panCheckApi() { private fun panCheckApi() {
val panCheck = PanCheckRequest() val panCheck = PanCheckRequest()
panCheck.clientCode = panCheck.clientCode =
@ -1703,7 +1719,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
private fun apiForEligibleBankList() { private fun apiForEligibleBankList() {
stepTwoBajajFDViewModel.bankListApi(token, activity as BajajFdMainActivity)
stepTwoBajajFDViewModel.bankListApi(token,getString(R.string.language), activity as BajajFdMainActivity)
stepTwoBajajFDViewModel.getFDBankListMutableData.observe(viewLifecycleOwner) { response -> stepTwoBajajFDViewModel.getFDBankListMutableData.observe(viewLifecycleOwner) { response ->
when (response) { when (response) {
is Resource.Success -> { is Resource.Success -> {
@ -1720,7 +1736,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
dialogForBankList(getFDBankListResponse.Response.BankList) dialogForBankList(getFDBankListResponse.Response.BankList)
} }
} }
// 650 -> refreshToken()
650 -> refreshToken()
else -> { else -> {
showDialogValidation( showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
@ -1746,6 +1762,11 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
} }
private fun refreshToken() {
}
private fun dialogForBankList(bankList: List<Bank>) { private fun dialogForBankList(bankList: List<Bank>) {
val dialog = Dialog(activity as BajajFdMainActivity) val dialog = Dialog(activity as BajajFdMainActivity)
dialog.setContentView(R.layout.layout_bank_list) dialog.setContentView(R.layout.layout_bank_list)


+ 3
- 2
app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt View File

@ -13,6 +13,7 @@ import com.nivesh.production.bajajfd.util.Common.Companion.handleResponse1
import com.nivesh.production.bajajfd.util.Constants.Companion.token import com.nivesh.production.bajajfd.util.Constants.Companion.token
import com.nivesh.production.bajajfd.util.Resource import com.nivesh.production.bajajfd.util.Resource
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.intellij.lang.annotations.Language
class StepTwoBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { class StepTwoBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() {
@ -117,12 +118,12 @@ class StepTwoBajajFDViewModel(private val mainRepository: MainRepository) : View
} }
val getFDBankListMutableData: MutableLiveData<Resource<JsonObject>> = MutableLiveData() val getFDBankListMutableData: MutableLiveData<Resource<JsonObject>> = MutableLiveData()
fun bankListApi( token: String,activity : Activity) = viewModelScope.launch(
fun bankListApi( token: String,language: String, activity : Activity) = viewModelScope.launch(
Common.handleError(activity) Common.handleError(activity)
) { ) {
if (Common.isNetworkAvailable(activity)) { if (Common.isNetworkAvailable(activity)) {
getFDBankListMutableData.postValue(Resource.Loading()) getFDBankListMutableData.postValue(Resource.Loading())
val response = mainRepository.bankListCheck(token)
val response = mainRepository.bankListCheck(token, language)
getFDBankListMutableData.postValue(handleResponse(response)) getFDBankListMutableData.postValue(handleResponse(response))
} }
} }


+ 5
- 9
app/src/main/res/layout/fragment_bajajfd_step_two.xml View File

@ -705,16 +705,9 @@
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<CheckBox
android:id="@+id/cbNomineeSameAddress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_5"
android:text="@string/nomineeAddressSameAsPrimaryApplicantAddress"
android:textSize="@dimen/text_size_10" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlGuardianName" android:id="@+id/tlGuardianName"
android:visibility="gone"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -735,6 +728,7 @@
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlGuardianAge" android:id="@+id/tlGuardianAge"
android:visibility="gone"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -755,6 +749,7 @@
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlGuardianRelation" android:id="@+id/tlGuardianRelation"
android:visibility="gone"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -780,9 +775,9 @@
android:textSize="@dimen/text_size_14" /> android:textSize="@dimen/text_size_14" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlGuardianAddress" android:id="@+id/tlGuardianAddress"
android:visibility="gone"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -803,6 +798,7 @@
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlGuardianPinCode" android:id="@+id/tlGuardianPinCode"
android:visibility="gone"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"


Loading…
Cancel
Save

Powered by TurnKey Linux.