+
+
$i18n.getString( "details" ) |
|
- |
+ |
|
@@ -29,10 +31,29 @@
#end
-
- |
+
+ |
+
+
+ |
+
+
+ |
+
+ Use JDBC data source
+ Use report table data source
+ |
+
+
+ $i18n.getString( "report_table" ) |
+
+
+ $i18n.getString( "report_table" ) |
- |
-
- |
-
-
-
-
-
- |
+
+ $i18n.getString( "relative_periods" ) |
+
+ #parse( "/dhis-web-reporting/relativePeriodsInput.vm" ) |
+
+
+ |
+
- |
-
+ |
|
@@ -60,6 +80,4 @@
-$i18n.getString( "omit_report_table_explanation" ).
-
$!message
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm 2012-07-25 12:53:40 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm 2012-09-23 14:24:14 +0000
@@ -431,45 +431,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ #parse( "/dhis-web-reporting/relativePeriodsInput.vm" )
|
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/report.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/report.js 2012-07-19 07:37:36 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/report.js 2012-09-23 14:24:14 +0000
@@ -1,6 +1,6 @@
function addReport()
{
- if ( !hasText( "upload" ) )
+ if ( $( "#id" ).val().length == 0 && !hasText( "upload" ) )
{
setMessage( i18n_please_specify_file );
return false;
@@ -35,6 +35,12 @@
}
}
+function toggleDataSource()
+{
+ $( ".reportTableDataSource" ).toggle();
+ $( ".jdbcDataSource" ).toggle();
+}
+
// -----------------------------------------------------------------------------
// View details
// -----------------------------------------------------------------------------
=== added file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/relativePeriodsInput.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/relativePeriodsInput.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/relativePeriodsInput.vm 2012-09-23 15:49:44 +0000
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2012-08-22 12:45:25 +0000
+++ dhis-2/pom.xml 2012-09-23 15:49:44 +0000
@@ -667,7 +667,7 @@
net.sf.jasperreports
jasperreports
- 4.5.1
+ 4.7.0
xalan