=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateFormat.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateFormat.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateFormat.java 2014-04-29 10:17:33 +0000 @@ -0,0 +1,71 @@ +package org.hisp.dhis.calendar; + +/* + * Copyright (c) 2004-2014, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @author Morten Olav Hansen + */ +public class DateFormat +{ + private final String name; + + private final String jdkDateFormat; + + private final String jodaDateFormat; + + private final String jsDateFormat; + + public DateFormat( String name, String jdkDateFormat, String jodaDateFormat, String jsDateFormat ) + { + this.name = name; + this.jdkDateFormat = jdkDateFormat; + this.jodaDateFormat = jodaDateFormat; + this.jsDateFormat = jsDateFormat; + } + + public String name() + { + return name; + } + + public String getJdk() + { + return jdkDateFormat; + } + + public String getJoda() + { + return jodaDateFormat; + } + + public String getJs() + { + return jsDateFormat; + } +} === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.period.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.period.js 2014-04-29 03:34:48 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.period.js 2014-04-29 10:17:33 +0000 @@ -257,6 +257,9 @@ period['id'] = 'Daily_' + period['startDate']; period['iso'] = startDate.formatDate("yyyymmdd"); + period['_startDate'] = startDate; + period['_endDate'] = startDate; + periods.push(period); startDate.add(1, 'd');