Fix issue moneymanagerex#13

AlessandroLazzari · Feb 2, 2015 · 06b0910 · 06b0910
1 parent 8fdce8b
commit 06b0910
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
@@ -164,6 +164,8 @@
         <item>12</item>
         <item>13</item>
         <item>14</item>
+        <item>15</item>
+        <item>16</item>
     </integer-array>
 
     <string-array name="frequencies_items">
@@ -182,6 +184,8 @@
         <item>@string/in_x_months</item>
         <item>@string/every_x_days</item>
         <item>@string/every_x_months</item>
+        <item>@string/montly_last_days</item>
+        <item>@string/montly_last_bussines_day</item>
     </string-array>
 
     <!-- Define font entries and values -->
@@ -310,4 +314,6 @@
         <item>@string/sort_by_usage</item>
     </string-array>
 
+    <string name="montly_last_days">Montly (last day)</string>
+    <string name="montly_last_bussines_day">Montly (last business day)</string>
 </resources>
diff --git a/src/com/money/manager/ex/utils/DateUtils.java b/src/com/money/manager/ex/utils/DateUtils.java
@@ -168,6 +168,14 @@ public static Date getDateNextOccurence(Date date, int repeats) {
             case 12: //in_x_months
             case 13: //every_x_days
             case 14: //every_x_months
+                break;
+            case 15: //month (last day)
+                calendar.add(Calendar.MONTH, 1);
+                calendar.set(Calendar.DAY_OF_MONTH, 1);
+                calendar.add(Calendar.DATE, -1);
+                break;
+            case 16: //month (last business day)
+
         }
         return calendar.getTime();
     }