=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18nFormat.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18nFormat.java 2012-01-18 04:58:32 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18nFormat.java 2012-03-07 10:32:33 +0000
@@ -50,6 +50,10 @@
private static final String NAN = "NaN";
private static final String INVALID_DATE="Invalid date format";
+ public static final String FORMAT_DATE = "yyyy-MM-dd";
+ public static final String FORMAT_TIME = "HH:mm";
+ public static final String FORMAT_DATETIME = "yyyy-MM-dd HH:mm";
+
private ResourceBundle resourceBundle;
public I18nFormat( ResourceBundle resourceBundle )
@@ -115,7 +119,7 @@
return null;
}
- return commonParsing( date, resourceBundle.getString( "format.date" ) );
+ return commonParsing( date, FORMAT_DATE );
}
public Date parseTime( String time )
@@ -125,7 +129,7 @@
return null;
}
- return commonParsing( time, resourceBundle.getString( "format.time" ) );
+ return commonParsing( time, FORMAT_TIME );
}
public Date parseDateTime( String dateTime )
@@ -135,7 +139,7 @@
return null;
}
- return commonParsing( dateTime, resourceBundle.getString( "format.datetime" ) );
+ return commonParsing( dateTime, FORMAT_DATETIME );
}
public String formatDate( Date date )
@@ -145,7 +149,7 @@
return null;
}
- return commonFormatting( date, resourceBundle.getString( "format.date" ) );
+ return commonFormatting( date, FORMAT_DATE );
}
public String formatTime( Date date )
@@ -155,7 +159,7 @@
return null;
}
- return commonFormatting( date, resourceBundle.getString( "format.time" ) );
+ return commonFormatting( date, FORMAT_TIME );
}
public String formatDateTime( Date date )
@@ -165,7 +169,7 @@
return null;
}
- return commonFormatting( date, resourceBundle.getString( "format.datetime" ) );
+ return commonFormatting( date, FORMAT_DATETIME );
}
/**
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js 2012-03-06 03:17:52 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js 2012-03-07 10:32:33 +0000
@@ -69,9 +69,6 @@
"required" : true,
"rangelength" : [ 2, 25 ]
},
- "description" : {
- "required" : true
- },
"code" : {
"rangelength" : [ 0, 25 ],
"alphanumericwithbasicpuncspaces" : true,
@@ -150,9 +147,6 @@
"alphanumericwithbasicpuncspaces" : true,
"rangelength" : [ 2, 25 ]
},
- "description" : {
- "required" : true
- },
"code" : {
"alphanumericwithbasicpuncspaces" : true,
"notOnlyDigits" : false,
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2012-03-05 13:21:42 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2012-03-07 10:32:33 +0000
@@ -15,7 +15,7 @@
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm 2011-10-06 15:53:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm 2012-03-07 10:32:33 +0000
@@ -34,7 +34,7 @@
#end
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm 2011-04-15 16:34:17 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm 2012-03-07 10:32:33 +0000
@@ -92,9 +92,9 @@
- $i18n.getString( "start_date" ) ($i18n.getString( "format.date.label" )) |
+ $i18n.getString( "start_date" ) |
|
- $i18n.getString( "end_date" ) ($i18n.getString( "format.date.label" )) |
+ $i18n.getString( "end_date" ) |
|
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm 2011-03-28 15:28:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm 2012-03-07 10:32:33 +0000
@@ -43,11 +43,11 @@
- $i18n.getString( "start_date" ) ($i18n.getString( "format.date" )) |
+ $i18n.getString( "start_date" ) |
|
- $i18n.getString( "end_date" ) ($i18n.getString( "format.date" )) |
+ $i18n.getString( "end_date" ) |
|
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm 2011-03-28 15:28:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm 2012-03-07 10:32:33 +0000
@@ -44,11 +44,11 @@
- $i18n.getString( "start_date" ) ($i18n.getString( "format.date" )) |
+ $i18n.getString( "start_date" ) |
|
- $i18n.getString( "end_date" ) ($i18n.getString( "format.date" )) |
+ $i18n.getString( "end_date" ) |
|
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2012-03-06 03:17:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2012-03-07 10:32:33 +0000
@@ -68,7 +68,7 @@
|
- |
+ |
|
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2012-03-06 03:17:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2012-03-07 10:32:33 +0000
@@ -68,7 +68,7 @@
|
- |
+ |
|
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm 2012-03-06 03:17:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm 2012-03-07 10:32:33 +0000
@@ -38,7 +38,7 @@
|
- |
+ |
|
@@ -46,7 +46,7 @@
|
- |
+ |
|
|
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm 2012-03-06 03:17:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm 2012-03-07 10:32:33 +0000
@@ -48,7 +48,7 @@
|
- |
+ |
|
@@ -56,13 +56,13 @@
|
- |
+ |
|
|
#if( $numberOfChildren == 0 )
- |
+ |
|
#end
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm 2011-09-07 11:00:47 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm 2012-03-07 10:32:33 +0000
@@ -125,12 +125,12 @@
-
+
-
+
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/runValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/runValidationForm.vm 2012-01-22 06:34:56 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/runValidationForm.vm 2012-03-07 10:32:33 +0000
@@ -20,7 +20,7 @@