Merge pull request openMF#700 from mayank-kgp/repaid

Fix 693: repaid every field
SigmaZardan · Jun 26, 2017 · cc876f6 · cc876f6
2 parents 21eeca4 + 2fa4f3a
commit cc876f6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/...g-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountFragment.java b/...g-android/src/main/java/com/mifos/mifosxdroid/online/loanaccount/LoanAccountFragment.java
@@ -409,6 +409,9 @@ private void inflateRepaidMonthSpinners() {
                 .setDropDownViewResource(layout.simple_spinner_dropdown_item);
         spRepaymentFreqDayOfWeek.setAdapter(mRepaymentFrequencyDayOfWeekTypeOptionsAdapter);
         spRepaymentFreqDayOfWeek.setOnItemSelectedListener(this);
+        spRepaymentFreqNthDay.setSelection(mListRepaymentFrequencyNthDayTypeOptions.size() - 1);
+        spRepaymentFreqDayOfWeek.setSelection(
+                mListRepaymentFrequencyDayOfWeekTypeOptions.size() - 1);
     }
 
     private void inflateLoansProductSpinner() {
@@ -471,6 +474,8 @@ public void showLoanAccountTemplate(LoanTemplate loanTemplate) {
         for (RepaymentFrequencyNthDayTypeOptions options : mRepaymentFrequencyNthDayTypeOptions) {
             mListRepaymentFrequencyNthDayTypeOptions.add(options.getValue());
         }
+        mListRepaymentFrequencyNthDayTypeOptions.add(
+                getResources().getString(R.string.select_week_hint));
 
         mListRepaymentFrequencyDayOfWeekTypeOptions.clear();
         mRepaymentFrequencyDaysOfWeekTypeOptions = mLoanTemplate
@@ -479,6 +484,8 @@ public void showLoanAccountTemplate(LoanTemplate loanTemplate) {
                 : mRepaymentFrequencyDaysOfWeekTypeOptions) {
             mListRepaymentFrequencyDayOfWeekTypeOptions.add(options.getValue());
         }
+        mListRepaymentFrequencyDayOfWeekTypeOptions.add(
+                getResources().getString(R.string.select_day_hint));
 
         mListLoanPurposeOptions.clear();
         for (com.mifos.objects.templates.loans.LoanPurposeOptions loanPurposeOptions :
@@ -619,15 +626,25 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
                 }
                 break;
             case R.id.sp_repayment_freq_nth_day:
-                repaymentFrequencyNthDayType = mLoanTemplate
-                        .getRepaymentFrequencyNthDayTypeOptions()
-                        .get(position).getId();
+                if (mListRepaymentFrequencyNthDayTypeOptions.get(position)
+                        .equals(getResources().getString(R.string.select_week_hint))) {
+                    repaymentFrequencyNthDayType = null;
+                } else {
+                    repaymentFrequencyNthDayType = mLoanTemplate
+                            .getRepaymentFrequencyNthDayTypeOptions()
+                            .get(position).getId();
+                }
                 break;
 
             case R.id.sp_repayment_freq_day_of_week:
-                repaymentFrequencyDayOfWeek = mLoanTemplate
-                        .getRepaymentFrequencyDaysOfWeekTypeOptions()
-                        .get(position).getId();
+                if (mListRepaymentFrequencyDayOfWeekTypeOptions.get(position)
+                        .equals(getResources().getString(R.string.select_day_hint))) {
+                    repaymentFrequencyDayOfWeek = null;
+                } else {
+                    repaymentFrequencyDayOfWeek = mLoanTemplate
+                            .getRepaymentFrequencyDaysOfWeekTypeOptions()
+                            .get(position).getId();
+                }
                 break;
 
             case R.id.sp_fund :

diff --git a/mifosng-android/src/main/res/values/strings.xml b/mifosng-android/src/main/res/values/strings.xml
@@ -354,6 +354,8 @@
     <string name="loan_disbursement_date">Disbursement Date</string>
     <string name="loan_account_linking_option_label">Link Savings</string>
     <string name="select_linkage_account_hint">Select Account</string>
+    <string name="select_week_hint">Select Week</string>
+    <string name="select_day_hint">Select Day</string>
     <string name="savings_interest_earned">Interest Earned</string>
     <string name="sync">Sync</string>
     <string name="enter_center_id">Center Id</string>