dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #10677
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2926: Displaying nothing rather than 0 or null in jasper reports view of report table. Cleaned up here ...
Merge authors:
Lars Helge Øverland (larshelge)
------------------------------------------------------------
revno: 2926 [merge]
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-02-27 23:35:43 +0100
message:
Displaying nothing rather than 0 or null in jasper reports view of report table. Cleaned up here and there.
removed:
dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetScheduledExportStatusAction.java
dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseDataElement.vm
dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseExport.vm
dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseIndicator.vm
dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseInput.vm
dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseOrganisationUnit.vm
dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responsePeriod.vm
dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseSuccess.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responsePeriod.vm
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/WeeklyPeriodTypeTest.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CodecUtils.java
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/CodecUtilsTest.java
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridPdfResult.java
dhis-2/dhis-web/dhis-web-commons/src/main/resources/grid.vm
dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetAllDataMartExportsAction.java
dhis-2/dhis-web/dhis-web-datamart/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAttributeAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/RemoveProgramAttributeAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowValidationDEAssociationsFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ValidateProgramAttributeAction.java
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java 2011-02-08 13:26:02 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java 2011-02-27 22:34:30 +0000
@@ -242,8 +242,8 @@
for ( Period period : relatives )
{
- period.setName( dynamicNames ? format.formatPeriod( period ) : periodNames[c++] );
- period.setShortName( format.formatPeriod( period ) );
+ period.setName( dynamicNames && format != null ? format.formatPeriod( period ) : periodNames[c++] );
+ period.setShortName( format != null ? format.formatPeriod( period ) : null );
periods.add( period );
}
@@ -264,8 +264,8 @@
private Period getRelativePeriod( CalendarPeriodType periodType, String periodName, Date current, boolean dynamicNames, I18nFormat format )
{
Period period = periodType.createPeriod( current );
- period.setName( dynamicNames ? format.formatPeriod( period ) : periodName );
- period.setShortName( format.formatPeriod( period ) );
+ period.setName( dynamicNames && format != null ? format.formatPeriod( period ) : periodName );
+ period.setShortName( format != null ? format.formatPeriod( period ) : null );
return period;
}
=== modified file 'dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/WeeklyPeriodTypeTest.java'
--- dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/WeeklyPeriodTypeTest.java 2011-02-25 04:16:18 +0000
+++ dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/WeeklyPeriodTypeTest.java 2011-02-27 21:10:14 +0000
@@ -28,11 +28,11 @@
*/
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.Calendar;
-import java.util.Date;
import java.util.List;
import org.junit.Ignore;
@@ -99,6 +99,7 @@
}
@Test
+ @Ignore //TODO fix this test seems to fail for different people, might be related to locale
public void isoDates()
{
WeeklyPeriodType weekly = new WeeklyPeriodType();
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CodecUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CodecUtils.java 2010-12-26 15:38:45 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CodecUtils.java 2011-02-27 20:49:36 +0000
@@ -49,7 +49,7 @@
private static final String REGEX_NUMERIC = "([0-9]*)";
private static final String SEPARATOR = "_";
- private static final String ILLEGAL_FILENAME_CHARS_REGEX = "[/\\?%*:|\"<>.]";
+ private static final String ILLEGAL_FILENAME_CHARS_REGEX = "[/\\?%*:|\"'<>.]";
/**
* Encrypts a string with Base64 encoding.
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/CodecUtilsTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/CodecUtilsTest.java 2010-12-26 15:38:45 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/CodecUtilsTest.java 2011-02-27 20:49:36 +0000
@@ -55,5 +55,6 @@
assertEquals( "foobar", CodecUtils.filenameEncode( "foo?%*bar" ) );
assertEquals( "foobar", CodecUtils.filenameEncode( "%foo/:|bar<>" ) );
assertEquals( "foobar", CodecUtils.filenameEncode( "?foo.bar/" ) );
+ assertEquals( "foobar", CodecUtils.filenameEncode( "'foo'bar'" ) );
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridPdfResult.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridPdfResult.java 2011-02-23 21:08:31 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridPdfResult.java 2011-02-27 22:34:30 +0000
@@ -103,6 +103,7 @@
table.setHeaderRows( 1 );
+ //TODO make wider
table.addCell( getTitleCell( grid.getTitle(), grid.getVisibleWidth() ) );
table.addCell( getEmptyCell( grid.getVisibleWidth(), 30 ) );
table.addCell( getSubtitleCell( grid.getSubtitle(), grid.getVisibleWidth() ) );
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/grid.vm'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/grid.vm 2011-02-24 14:45:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/grid.vm 2011-02-27 22:34:30 +0000
@@ -84,7 +84,7 @@
<band height="51" splitType="Stretch">
#set( $x = 10 )
#foreach( $header in $grid.getVisibleHeaders() )
- #if( $header.meta ) #set( $offset = 110 ) #else #set( $offset = 60 ) #end
+ #if( $header.meta ) #set( $offset = 110 ) #else #set( $offset = 55 ) #end
<staticText>
<reportElement x="${x}" y="26" width="${offset}" height="20"/>
<textElement #if( !$header.meta )textAlignment="Center"#end>
@@ -103,13 +103,13 @@
<band height="21" splitType="Stretch">
#set( $x = 10 )
#foreach( $header in $grid.getVisibleHeaders() )
- #if( $header.meta ) #set( $offset = 110 ) #else #set( $offset = 60 ) #end
+ #if( $header.meta ) #set( $offset = 110 ) #else #set( $offset = 55 ) #end
<textField>
<reportElement x="${x}" y="0" width="${offset}" height="20"/>
<textElement #if( !$header.meta )textAlignment="Center"#end>
<font size="9"/>
</textElement>
- <textFieldExpression class="${header.type}"><![CDATA[${dollar}F{${header.column}}]]></textFieldExpression>
+ <textFieldExpression class="java.lang.String"><![CDATA[ ( ${dollar}F{${header.column}} != null ? String.valueOf( ${dollar}F{${header.column}} ) : "" ) ]]></textFieldExpression>
</textField>
#set( $x = ( $x + $offset ) )
#end
=== modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetAllDataMartExportsAction.java'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetAllDataMartExportsAction.java 2010-12-11 20:38:50 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetAllDataMartExportsAction.java 2011-02-27 20:49:36 +0000
@@ -98,8 +98,6 @@
exports = new ArrayList<DataMartExport>( dataMartService.getDataMartExportsBetween( paging.getStartPos(), paging.getPageSize() ) );
}
-// exports = new ArrayList<DataMartExport>( dataMartService.getAllDataMartExports() );
-
Collections.sort( exports, new DataMartExportComparator() );
return SUCCESS;
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetScheduledExportStatusAction.java'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetScheduledExportStatusAction.java 2011-01-11 13:11:31 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetScheduledExportStatusAction.java 1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-package org.hisp.dhis.datamart.action;
-
-/*
- * Copyright (c) 2004-2010, 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.
- */
-
-import static org.hisp.dhis.datamart.DataMartScheduler.STATUS_RUNNING;
-
-import org.hisp.dhis.datamart.DataMartScheduler;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- */
-public class GetScheduledExportStatusAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataMartScheduler dataMartScheduler;
-
- public void setDataMartScheduler( DataMartScheduler dataMartScheduler )
- {
- this.dataMartScheduler = dataMartScheduler;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private String status;
-
- public String getStatus()
- {
- return status;
- }
-
- private boolean running;
-
- public boolean isRunning()
- {
- return running;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- {
- String status_ = dataMartScheduler.getDataMartExportStatus();
-
- status = status_;
-
- running = status_.equals( STATUS_RUNNING );
-
- return SUCCESS;
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/struts.xml 2011-02-03 16:35:12 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/struts.xml 2011-02-27 21:10:14 +0000
@@ -38,7 +38,7 @@
</action>
<action name="cancelExport" class="org.hisp.dhis.datamart.action.CancelExportAction">
- <result name="success" type="velocity-xml">/dhis-web-datamart/responseExport.vm</result>
+ <result name="success" type="velocity-xml">../dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
@@ -69,8 +69,8 @@
</action>
<action name="validateDataMartExport" class="org.hisp.dhis.datamart.action.ValidateDataMartExportAction">
- <result name="success" type="velocity-xml">/dhis-web-datamart/responseSuccess.vm</result>
- <result name="input" type="velocity-xml">/dhis-web-datamart/responseInput.vm</result>
+ <result name="success" type="velocity-xml">../dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
+ <result name="input" type="velocity-xml">../dhis-web-commons/ajax/xmlResponseInput.vm</result>
</action>
</package>
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseDataElement.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseDataElement.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseDataElement.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataElements>
-#foreach( $dataElement in $dataElements )
- <dataElement>
- <id>$dataElement.id</id>
- <name>$encoder.xmlEncode( $dataElement.name )</name>
- </dataElement>
-#end
-</dataElements>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseExport.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseExport.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseExport.vm 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-$encoder.htmlEncode( $message )
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseIndicator.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseIndicator.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseIndicator.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<indicators>
-#foreach( $indicator in $indicators )
- <indicator>
- <id>$indicator.id</id>
- <name>$encoder.xmlEncode( $indicator.name )</name>
- </indicator>
-#end
-</indicators>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseInput.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseInput.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseInput.vm 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-<message type="input">$encoder.xmlEncode( $message )</message>
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseOrganisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseOrganisationUnit.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseOrganisationUnit.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<organisationUnits>
-#foreach ( $unit in $organisationUnits )
- <organisationUnit>
- <id>$unit.id</id>
- <name>$encoder.xmlEncode( $unit.name )</name>
- </organisationUnit>
-#end
-</organisationUnits>
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responsePeriod.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responsePeriod.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responsePeriod.vm 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<periods>
-#foreach( $period in $periods )
- <period>
- <id>$period.id</id>
- <startDate>$period.startDate</startDate>
- <endDate>$period.endDate</endDate>
- </period>
-#end
-</periods>
=== removed file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseSuccess.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseSuccess.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/responseSuccess.vm 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-<message type="success">$encoder.xmlEncode( $message )</message>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAttributeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAttributeAction.java 2010-11-09 02:09:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAttributeAction.java 2011-02-27 21:18:07 +0000
@@ -116,7 +116,6 @@
opt.setName( optionName );
opt.setProgramAttribute( programAttribute );
programAttribute.addAttributeOptions( opt );
-// programAttributeOptionService.addProgramAttributeOption( opt );
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAction.java 2010-09-25 10:03:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAction.java 2011-02-27 21:18:07 +0000
@@ -137,6 +137,5 @@
selectionTreeManager.setSelectedOrganisationUnits( program.getOrganisationUnits() );
return SUCCESS;
-
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeListAction.java 2010-11-09 02:09:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeListAction.java 2011-02-27 21:18:07 +0000
@@ -79,5 +79,4 @@
return SUCCESS;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/RemoveProgramAttributeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/RemoveProgramAttributeAction.java 2010-11-09 02:09:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/RemoveProgramAttributeAction.java 2011-02-27 21:18:07 +0000
@@ -27,7 +27,6 @@
package org.hisp.dhis.patient.action.program;
-import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.program.ProgramAttribute;
import org.hisp.dhis.program.ProgramAttributeService;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowValidationDEAssociationsFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowValidationDEAssociationsFormAction.java 2010-05-14 02:25:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowValidationDEAssociationsFormAction.java 2011-02-27 21:18:07 +0000
@@ -115,11 +115,8 @@
stages = program.getProgramStages();
- // Get program-stage-validations
-
validations = programStageDEValidationService.getProgramStageDataElementValidations( program );
return SUCCESS;
}
-
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ValidateProgramAttributeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ValidateProgramAttributeAction.java 2010-11-09 02:09:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ValidateProgramAttributeAction.java 2011-02-27 21:18:07 +0000
@@ -99,7 +99,6 @@
if ( match != null && (id == null || !match.getId().equals( id )) )
{
- System.out.println( "\n match.id : " + match.getId() );
message = i18n.getString( "duplicate_names" );
return ERROR;
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2011-02-23 19:20:08 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2011-02-27 22:34:30 +0000
@@ -304,7 +304,7 @@
get_report_as_xls = Download as Excel
get_report_as_csv = Download as CSV
get_report_as_pdf = Download as PDF
-get_report_as_jasper = Download as Jasper
+get_report_as_jasper = Download as Report
get_report_as_jrxml = Download as JRXML
user_organisation_unit = Include current user organisation unit
select_category_combo = Select category combination
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml 2011-02-18 20:20:07 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml 2011-02-27 21:14:25 +0000
@@ -340,7 +340,7 @@
<result name="pdf" type="gridPdfResult"/>
<result name="html" type="velocity">/dhis-web-commons/ajax/htmlGrid.vm</result>
</action>
-
+
<action name="displayOrgUnitDistribution" class="org.hisp.dhis.reporting.orgunitdistribution.action.GetOrgUnitDistributionOptionsAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-reporting/viewOrgUnitDistribution.vm</param>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.js 2011-02-23 21:08:31 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.js 2011-02-27 20:49:36 +0000
@@ -39,7 +39,7 @@
return false;
}
- setWaitMessage( i18n_please_wait );
+ setMessage( i18n_please_wait + "..." );
var doDataMart = ( $( "#doDataMart" ).length && $( "#doDataMart" ).val() == "true" );
=== removed file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responsePeriod.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responsePeriod.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responsePeriod.vm 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<periods>
-#foreach( $period in $periods )
- <period>
- <id>$period.id</id>
- <startDate>$period.startDate</startDate>
- <endDate>$period.endDate</endDate>
- <name>$!encoder.xmlEncode( $period.name )</name>
- </period>
-#end
-</periods>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm 2011-02-23 14:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm 2011-02-27 22:34:30 +0000
@@ -8,8 +8,8 @@
<tr>
<td>#filterDiv( "displayManageTableForm" )</td>
<td colspan="10" style="text-align:right">
- <input type="button" value="$i18n.getString( 'add_report_table' )" style="width:250px" onclick="window.location.href='displayAddTableForm.action?dimension=false'"><br>
- <input type="button" value="$i18n.getString( 'add_dataelement_dimension_table' )" style="width:250px" onclick="window.location.href='displayAddTableForm.action?dimension=true'">
+ <input type="button" value="$i18n.getString( 'add_report_table' )" style="width:220px" onclick="window.location.href='displayAddTableForm.action?dimension=false'"><br>
+ <input type="button" value="$i18n.getString( 'add_dataelement_dimension_table' )" style="width:220px" onclick="window.location.href='displayAddTableForm.action?dimension=true'">
</td>
</tr>
</table>
