Navigation

Changeset 4986

Timestamp:

07/19/08 18:42:17 (4 months ago)

Author:

bmamlin

Message:

logic-api-refactoring: Added HOURS to available Duration units

Files:

r4158	r4986
18	18	* Represents a duration of time — e.g., one year, two weeks, or 18 months. Used within criteria
19	19	*
	20	* @see org.openmrs.logic.LogicCriteria
20	21	*/
21	22	public class Duration {
22	23
23	24	public static enum Units {
24		SECONDS, MINUTES, DAYS, WEEKS, MONTHS, YEARS
	25	SECONDS, MINUTES, HOURS, DAYS, WEEKS, MONTHS, YEARS
25	26	}
26	27
…	…
54	55	case MINUTES:
55	56	return duration / 1440;
	57	case HOURS:
	58	return duration / 24;
56	59	case DAYS:
57	60	return duration;
58	61	case WEEKS:
59	62	return duration * 7;
	63	case MONTHS:
	64	return duration * 30;
60	65	case YEARS:
61	66	return duration * 365;
…	…
78	83	case MINUTES:
79	84	return d * 60000;
	85	case HOURS:
	86	return d * 3600000;
80	87	case DAYS:
81	88	return d * 86400000;
…	…
137	144	/**
138	145	*
	146	* Returns a duration for the given number of hours
	147	*
	148	* @param duration number of hours for duration
	149	* @return
	150	*/
	151	public static Duration hours(Double duration) {
	152	return new Duration(duration, Units.HOURS);
	153	}
	154
	155	/**
	156	*
	157	* Returns a duration for the given number of hours
	158	*
	159	* @param duration number of hours for duration
	160	* @return
	161	*/
	162	public static Duration hours(int duration) {
	163	return hours(new Double(duration));
	164	}
	165
	166	/**
	167	*
139	168	* Returns a duration for the given number of days
140	169	*