dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11873
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3489: (local vn) Changed from Source to OrganisationUnit. And disabled the relative stuff of Calculated...
------------------------------------------------------------
revno: 3489
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-04-29 11:06:56 +0700
message:
(local vn) Changed from Source to OrganisationUnit. And disabled the relative stuff of CalculatedDataElement
modified:
local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/ReportExcelDeletionHandler.java
local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemDeletionHandler.java
local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/ViewByPeriodFormAction.java
local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExpressionUtils.java
local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitAtLevels.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 'local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/ReportExcelDeletionHandler.java'
--- local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/ReportExcelDeletionHandler.java 2010-04-20 13:16:00 +0000
+++ local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/ReportExcelDeletionHandler.java 2011-04-29 04:06:56 +0000
@@ -27,7 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.source.Source;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.system.deletion.DeletionHandler;
/**
@@ -59,7 +59,7 @@
}
@Override
- public void deleteSource( Source source )
+ public void deleteOrganisationUnit( OrganisationUnit source )
{
for ( ReportExcel reportExcel : reportExcelService.getALLReportExcel() )
{
=== modified file 'local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemDeletionHandler.java'
--- local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemDeletionHandler.java 2010-04-20 13:16:00 +0000
+++ local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/ExcelItemDeletionHandler.java 2011-04-29 04:06:56 +0000
@@ -27,7 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.source.Source;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.system.deletion.DeletionHandler;
/**
@@ -59,7 +59,7 @@
}
@Override
- public void deleteSource( Source source )
+ public void deleteOrganisationUnit( OrganisationUnit source )
{
for ( ExcelItemGroup excelItemGroup : excelItemService.getAllExcelItemGroup() )
{
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/ViewByPeriodFormAction.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/ViewByPeriodFormAction.java 2011-03-04 05:53:30 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/ViewByPeriodFormAction.java 2011-04-29 04:06:56 +0000
@@ -94,7 +94,7 @@
{
DataSet dataSet = dataSetService.getDataSet( id );
- selectionTreeManager.setSelectedOrganisationUnits( dataSet.getOrganisationUnits() );
+ selectionTreeManager.setSelectedOrganisationUnits( dataSet.getSources() );
periods = new ArrayList<Period>( periodService.getPeriodsByPeriodType( dataSet.getPeriodType() ) );
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExpressionUtils.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExpressionUtils.java 2011-03-28 06:49:08 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExpressionUtils.java 2011-04-29 04:06:56 +0000
@@ -29,14 +29,11 @@
import static org.hisp.dhis.expression.Expression.SEPARATOR;
-import java.util.Collection;
import java.util.Date;
-import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.hisp.dhis.aggregation.AggregationService;
-import org.hisp.dhis.dataelement.CalculatedDataElement;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.dataelement.DataElementCategoryService;
@@ -95,7 +92,7 @@
.getDataElementCategoryOptionCombo( optionComboId );
// CalculatedDataElement
- if ( dataElement instanceof CalculatedDataElement )
+ /*if ( dataElement instanceof CalculatedDataElement )
{
CalculatedDataElement calculatedDataElement = (CalculatedDataElement) dataElement;
@@ -126,9 +123,9 @@
}
matcher.appendReplacement( buffer, value + "" );
- }
+ }*/
// Normal
- else
+ //else
{
replaceString = getValue( dataElement, optionCombo, organisationUnit, startDate, endDate,
aggregationService )
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitAtLevels.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitAtLevels.vm 2010-05-26 04:01:21 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/organisationUnitAtLevels.vm 2011-04-29 04:06:56 +0000
@@ -58,8 +58,4 @@
jQuery(document).ready(function(){
tableSorter( 'listTable' );
});
-
-
-</script>
-
-
+</script>
\ No newline at end of file