ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Resolved issue where the aggregated weeks do not start at the correct point in time.

Browse source 
Former-commit-id: 278186f35cef87a3e4ca46ecf816d01338f6b104
This commit is contained in:
Daniel Collin 2016-02-09 15:32:08 +01:00
parent 14608d80eb
commit 1182878809
2 changed files with 86 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/se/hal/util/TimeUtility.java
View file

@ -31,12 +31,23 @@ public class TimeUtility {
Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(timestamp);
boolean clear = false;
int weeks = getWeeksFromTimestamp(periodLengthInMs);
if(weeks > 0){
int currentWeek = cal.get(Calendar.WEEK_OF_YEAR);
cal.set(Calendar.WEEK_OF_YEAR, (currentWeek/weeks)*weeks);
clear = true;
}
int days = getDaysFromTimestamp(periodLengthInMs);
if(days > 0){
if(days%7 > 0){
int currentDay = cal.get(Calendar.DAY_OF_YEAR);
cal.set(Calendar.DAY_OF_YEAR, (currentDay/days)*days);
clear = true;
}else if(clear){
cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
}
int hours = getHourOfDayFromTimestamp(periodLengthInMs);
if(hours > 0){
int currentHour = cal.get(Calendar.HOUR_OF_DAY);
@ -45,6 +56,7 @@ public class TimeUtility {
}else if(clear){
cal.set(Calendar.HOUR_OF_DAY, 0);
}
int minutes = getMinuteOfHourFromTimestamp(periodLengthInMs);
if(minutes > 0){
int currentMinute = cal.get(Calendar.MINUTE);
@ -53,6 +65,7 @@ public class TimeUtility {
}else if(clear){
cal.set(Calendar.MINUTE, 0);
}
int seconds = getSecondOfMinuteFromTimestamp(periodLengthInMs);
if(seconds > 0){
int currentSecond = cal.get(Calendar.SECOND);
@ -61,6 +74,7 @@ public class TimeUtility {
}else if(clear){
cal.set(Calendar.SECOND, 0);
}
int milliseconds = getMillisecondInSecondFromTimestamp(periodLengthInMs);
if(milliseconds > 0){
int currentMillisecond = cal.get(Calendar.MILLISECOND);
@ -68,6 +82,7 @@ public class TimeUtility {
}else if(clear){
cal.set(Calendar.MILLISECOND, 0);
}
return cal.getTimeInMillis();
}
@ -101,12 +116,24 @@ public class TimeUtility {
return (int) (ms / DAY_IN_MS);
}
public static int getWeeksFromTimestamp(long ms) throws NumberFormatException{
if(ms < 0)
throw new NumberFormatException("argument must be positive");
return (int) (ms / WEEK_IN_MS);
}
public static String msToString(long ms) throws NumberFormatException{
if(ms < 0)
throw new NumberFormatException("argument must be positive");
String retval = "";
int days = getDaysFromTimestamp(ms);
retval += days + "days+";
int weeks = getWeeksFromTimestamp(ms);
if(weeks > 0){
retval += weeks + "w+";
}
int days = getDaysFromTimestamp(ms) % 7;
if(days > 0){
retval += days + "d+";
}
int hours = getHourOfDayFromTimestamp(ms);
retval += (hours<10?"0"+hours:hours);
int minutes = getMinuteOfHourFromTimestamp(ms);