Changed data concept to period

Author: Evgeniy Kanivets

app/src/main/java/com/blogspot/e_kanivets/moneytracker/helper/MTHelper.java

@@ -7,6 +7,7 @@
 import android.util.Log;
 
 import com.blogspot.e_kanivets.moneytracker.model.Category;
+import com.blogspot.e_kanivets.moneytracker.model.Period;
 import com.blogspot.e_kanivets.moneytracker.model.Record;
 import com.blogspot.e_kanivets.moneytracker.util.Constants;
 import com.blogspot.e_kanivets.moneytracker.util.MTApp;
@@ -30,6 +31,8 @@ public class MTHelper extends Observable {
     private List<Category> categories;
     private List<Record> records;
 
+    private Period period;
+
     public static MTHelper getInstance() {
         if(mtHelper == null) {
             mtHelper = new MTHelper();
@@ -39,6 +42,8 @@ public static MTHelper getInstance() {
 
     private MTHelper() {
         dbHelper = new DBHelper(MTApp.get());
+
+        initPeriod();
     }
 
     public void initialize() {
@@ -204,7 +209,11 @@ public int getCategoryIdByName(String name) {
         return -1;
     }
 
-    public String getFirstDayOfWeek() {
+    public Period getPeriod() {
+        return period;
+    }
+
+    private void initPeriod() {
         // get today and clear time of day
         Calendar cal = Calendar.getInstance();
         cal.set(Calendar.HOUR_OF_DAY, 0); // ! clear would not reset the hour of day !
@@ -215,13 +224,8 @@ public String getFirstDayOfWeek() {
         // set first day of week
         cal.set(Calendar.DAY_OF_WEEK, cal.getFirstDayOfWeek());
 
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-        return dateFormat.format(cal.getTime());
-    }
+        Date first = cal.getTime();
 
-    public String getLastDayOfWeek() {
-        // get today and clear time of day
-        Calendar cal = Calendar.getInstance();
         cal.set(Calendar.HOUR_OF_DAY, 0); // ! clear would not reset the hour of day !
         cal.clear(Calendar.MINUTE);
         cal.clear(Calendar.SECOND);
@@ -233,7 +237,18 @@ public String getLastDayOfWeek() {
         cal.set(Calendar.MINUTE, 59);
         cal.set(Calendar.SECOND, 59);
 
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-        return dateFormat.format(cal.getTime());
+        Date last = cal.getTime();
+
+        period = new Period(first, last);
+    }
+
+    public String getFirstDayOfWeek() {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        return dateFormat.format(period.getFirst());
+    }
+
+    public String getLastDayOfWeek() {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        return dateFormat.format(period.getLast());
     }
 }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/model/Period.java

@@ -0,0 +1,24 @@
+package com.blogspot.e_kanivets.moneytracker.model;
+
+import java.util.Date;
+
+/**
+ * Created by eugene on 10/09/14.
+ */
+public class Period {
+    private Date first;
+    private Date last;
+
+    public Period(Date first, Date last) {
+        this.first = first;
+        this.last = last;
+    }
+
+    public Date getFirst() {
+        return first;
+    }
+
+    public Date getLast() {
+        return last;
+    }
+}