=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportModel.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportModel.java 2010-12-29 07:57:25 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportModel.java 2014-09-05 05:06:07 +0000 @@ -33,8 +33,9 @@ public class ReportModel { - public final static String RM_STATIC = "static"; - + public final static String RM_STATIC = "STATIC"; + + /* public final static String RM_DYNAMIC_WITH_ROOT = "dynamicwithrootfacility"; public final static String RM_DYNAMIC_WITHOUT_ROOT = "dynamicwithoutroot"; @@ -54,6 +55,7 @@ public final static String RM_PROGRESSIVE_ORGUNIT = "PROGRESSIVE-ORGUNIT"; public final static String RM_PROGRESSIVE_PERIOD = "PROGRESSIVE-PERIOD"; + */ public static List getReportModels() @@ -61,7 +63,7 @@ List reportModels = new ArrayList(); reportModels.add( RM_STATIC ); - + /* reportModels.add( RM_STATIC_DATAELEMENTS ); reportModels.add( RM_STATIC_FINANCIAL ); @@ -81,7 +83,8 @@ reportModels.add( RM_PROGRESSIVE_ORGUNIT ); reportModels.add( RM_PROGRESSIVE_PERIOD ); - + */ + return reportModels; } === modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportService.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportService.java 2012-07-26 09:20:56 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportService.java 2014-09-05 05:06:07 +0000 @@ -58,6 +58,8 @@ Report_in getReportByName( String name ); Collection getReportBySource( OrganisationUnit source ); + + Collection getReportBySourceAndReportType( OrganisationUnit source, String reportType ); Collection getAllReports(); === modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportStore.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportStore.java 2012-04-16 11:29:53 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportStore.java 2014-09-05 05:06:07 +0000 @@ -51,6 +51,8 @@ Report_in getReportByName( String name ); Collection getReportBySource( OrganisationUnit source ); + + Collection getReportBySourceAndReportType( OrganisationUnit source, String reportType ); Collection getAllReports(); === modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportType.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportType.java 2012-07-24 12:38:31 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportType.java 2014-09-05 05:06:07 +0000 @@ -32,6 +32,7 @@ public class ReportType { + /* public final static String RT_ROUTINE = "Routine"; public final static String RT_LINELIST = "Linelisting"; @@ -67,11 +68,14 @@ public final static String RT_RANKING_REPORT = "Ranking Reports"; public final static String RT_FEEDBACK_TEMPLATE = "Feedback Template"; + */ + + public final static String RT_BIRT = "Birt Report"; public static List getReportTypes() { List reportTypes = new ArrayList(); - + /* reportTypes.add( RT_AGGREGATION ); reportTypes.add( RT_FEEDBACK ); @@ -107,6 +111,9 @@ reportTypes.add( RT_RANKING_REPORT); reportTypes.add(RT_FEEDBACK_TEMPLATE); + */ + + reportTypes.add(RT_BIRT); return reportTypes; } === modified file 'local/in/dhis-in-services/dhis-in-service-reports/pom.xml' --- local/in/dhis-in-services/dhis-in-service-reports/pom.xml 2014-01-10 07:08:30 +0000 +++ local/in/dhis-in-services/dhis-in-service-reports/pom.xml 2014-09-05 05:06:07 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-in-services - 2.15-SNAPSHOT + 2.17-SNAPSHOT dhis-in-service-reports === modified file 'local/in/dhis-in-services/dhis-in-service-reports/src/main/java/org/hisp/dhis/reports/DefaultReportService.java' --- local/in/dhis-in-services/dhis-in-service-reports/src/main/java/org/hisp/dhis/reports/DefaultReportService.java 2012-07-27 12:16:33 +0000 +++ local/in/dhis-in-services/dhis-in-service-reports/src/main/java/org/hisp/dhis/reports/DefaultReportService.java 2014-09-05 05:06:07 +0000 @@ -220,6 +220,12 @@ } @Transactional + public Collection getReportBySourceAndReportType( OrganisationUnit source, String reportType ) + { + return reportStore.getReportBySourceAndReportType( source, reportType ); + } + + @Transactional public Collection getReportsByPeriodAndReportType( PeriodType periodType, String reportType ) { return reportStore.getReportsByPeriodAndReportType( periodType, reportType ); @@ -867,13 +873,13 @@ tempPeriod = (Period) periodList.get( 0 ); } - DataValue dataValue = dataValueService.getDataValue( organisationUnit, dataElement, tempPeriod, - optionCombo ); - + //DataValue dataValue = dataValueService.getDataValue( organisationUnit, dataElement, tempPeriod, optionCombo ); + DataValue dataValue = dataValueService.getDataValue( dataElement, tempPeriod, organisationUnit, optionCombo ); + if ( dataValue != null && dataValue.getValue() != null ) { replaceString = dataValue.getValue(); - } + } else { replaceString = ""; @@ -1015,8 +1021,8 @@ double aggregatedValue = 0.0; for ( Period tempPeriod : periodList ) { - DataValue dataValue = dataValueService.getDataValue( organisationUnit, dataElement, - tempPeriod, optionCombo ); + //DataValue dataValue = dataValueService.getDataValue( organisationUnit, dataElement, tempPeriod, optionCombo ); + DataValue dataValue = dataValueService.getDataValue( dataElement, tempPeriod, organisationUnit, optionCombo ); if ( dataValue != null ) { @@ -1047,8 +1053,8 @@ tempPeriod = (Period) periodList.get( 0 ); } - DataValue dataValue = dataValueService.getDataValue( organisationUnit, dataElement, tempPeriod, - optionCombo ); + //DataValue dataValue = dataValueService.getDataValue( organisationUnit, dataElement, tempPeriod, optionCombo ); + DataValue dataValue = dataValueService.getDataValue( dataElement, tempPeriod, organisationUnit, optionCombo ); if ( dataValue != null ) { @@ -1197,8 +1203,8 @@ tempPeriod = (Period) periodList.get( 0 ); } - DataValue dataValue = dataValueService.getDataValue( organisationUnit, dataElement, tempPeriod, - optionCombo ); + //DataValue dataValue = dataValueService.getDataValue( organisationUnit, dataElement, tempPeriod, optionCombo ); + DataValue dataValue = dataValueService.getDataValue( dataElement, tempPeriod, organisationUnit, optionCombo ); if ( dataValue != null ) { @@ -2030,9 +2036,10 @@ tempPeriod = periodService.getPeriod( periodIds.iterator().next() ); } - DataValue dataValue = dataValueService.getDataValue( organisationUnit, dataElement, tempPeriod, - optionCombo ); - + //DataValue dataValue = dataValueService.getDataValue( organisationUnit, dataElement, tempPeriod, optionCombo ); + + DataValue dataValue = dataValueService.getDataValue( dataElement, tempPeriod, organisationUnit, optionCombo ); + if ( dataValue != null && dataValue.getValue() != null ) { replaceString = dataValue.getValue(); === modified file 'local/in/dhis-in-services/dhis-in-service-reports/src/main/java/org/hisp/dhis/reports/hibernate/HibernateReportStore.java' --- local/in/dhis-in-services/dhis-in-service-reports/src/main/java/org/hisp/dhis/reports/hibernate/HibernateReportStore.java 2011-04-27 17:15:13 +0000 +++ local/in/dhis-in-services/dhis-in-service-reports/src/main/java/org/hisp/dhis/reports/hibernate/HibernateReportStore.java 2014-09-05 05:06:07 +0000 @@ -106,6 +106,23 @@ } @SuppressWarnings( "unchecked" ) + public Collection getReportBySourceAndReportType( OrganisationUnit source, String reportType ) + { + Session session = sessionFactory.getCurrentSession(); + + Criteria criteria = session.createCriteria( Report_in.class ); + criteria.createAlias( "sources", "s" ); + criteria.add( Restrictions.eq( "s.id", source.getId() ) ); + + criteria.add( Restrictions.eq( "reportType", reportType ) ); + + return criteria.list(); + } + + + + + @SuppressWarnings( "unchecked" ) public Collection getReportsByPeriodAndReportType( PeriodType periodType, String reportType ) { Session session = sessionFactory.getCurrentSession(); === modified file 'local/in/dhis-in-services/dhis-in-service-survey/pom.xml' --- local/in/dhis-in-services/dhis-in-service-survey/pom.xml 2014-01-10 07:08:30 +0000 +++ local/in/dhis-in-services/dhis-in-service-survey/pom.xml 2014-09-05 05:06:07 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-in-services - 2.15-SNAPSHOT + 2.17-SNAPSHOT dhis-in-service-survey === modified file 'local/in/dhis-in-services/dhis-service-aggregationengine/pom.xml' --- local/in/dhis-in-services/dhis-service-aggregationengine/pom.xml 2014-01-10 07:08:30 +0000 +++ local/in/dhis-in-services/dhis-service-aggregationengine/pom.xml 2014-09-05 05:06:07 +0000 @@ -5,8 +5,8 @@ org.hisp.dhis - dhis-services - 2.15-SNAPSHOT + dhis-in-services + 2.17-SNAPSHOT dhis-service-aggregationengine-default @@ -27,12 +27,12 @@ - + ../../ === modified file 'local/in/dhis-in-services/dhis-service-aggregationengine/src/main/java/org/hisp/dhis/aggregation/impl/indicator/IndicatorAggregation.java' --- local/in/dhis-in-services/dhis-service-aggregationengine/src/main/java/org/hisp/dhis/aggregation/impl/indicator/IndicatorAggregation.java 2013-08-23 16:05:01 +0000 +++ local/in/dhis-in-services/dhis-service-aggregationengine/src/main/java/org/hisp/dhis/aggregation/impl/indicator/IndicatorAggregation.java 2014-09-05 05:06:07 +0000 @@ -29,7 +29,6 @@ */ import static org.hisp.dhis.system.util.DateUtils.daysBetween; -import static org.hisp.dhis.system.util.MathUtils.INVALID; import static org.hisp.dhis.system.util.MathUtils.calculateExpression; import java.util.Date; @@ -37,7 +36,6 @@ import java.util.Map; import java.util.Set; -import org.hisp.dhis.aggregation.impl.cache.AggregationCache; import org.hisp.dhis.constant.ConstantService; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; @@ -58,13 +56,14 @@ // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- - + /* private AggregationCache aggregationCache; public void setAggregationCache( AggregationCache aggregationCache ) { this.aggregationCache = aggregationCache; } + */ private DataElementService dataElementService; @@ -106,7 +105,8 @@ double denominatorValue = calculateExpression( generateExpression( indicator.getDenominator(), startDate, endDate, organisationUnit, days ) ); - if ( denominatorValue == INVALID || denominatorValue == 0.0 ) + + if ( denominatorValue == 0.0 ) { return null; } @@ -114,7 +114,7 @@ double numeratorValue = calculateExpression( generateExpression( indicator.getNumerator(), startDate, endDate, organisationUnit, days ) ); - if ( numeratorValue == INVALID ) + if ( numeratorValue == 0.0 ) { return null; } @@ -150,6 +150,8 @@ { Map constantMap = constantService.getConstantMap(); + Map constantMap1 = new HashMap(); + Set operands = expressionService.getOperandsInExpression( expression ); Map valueMap = new HashMap(); @@ -159,9 +161,11 @@ DataElement dataElement = dataElementService.getDataElement( operand.getDataElementId() ); DataElementCategoryOptionCombo optionCombo = !operand.isTotal() ? categoryService.getDataElementCategoryOptionCombo( operand.getOptionComboId() ) : null; - valueMap.put( operand, aggregationCache.getAggregatedDataValue( dataElement, optionCombo, startDate, endDate, organisationUnit ) ); + //valueMap.put( operand, aggregationCache.getAggregatedDataValue( dataElement, optionCombo, startDate, endDate, organisationUnit ) ); } - return expressionService.generateExpression( expression, valueMap, constantMap, null, false ); + return expressionService.generateExpression( expression, valueMap, constantMap, constantMap1, null, false ); + + //return expressionService.generateExpression( expression, valueMap, constantMap, null, false ); } } === modified file 'local/in/dhis-in-services/dhis-service-aggregationengine/src/main/resources/META-INF/dhis/beans.xml' --- local/in/dhis-in-services/dhis-service-aggregationengine/src/main/resources/META-INF/dhis/beans.xml 2012-12-14 13:46:47 +0000 +++ local/in/dhis-in-services/dhis-service-aggregationengine/src/main/resources/META-INF/dhis/beans.xml 2014-09-05 05:06:07 +0000 @@ -62,7 +62,7 @@ - + === modified file 'local/in/dhis-in-services/pom.xml' --- local/in/dhis-in-services/pom.xml 2014-07-25 10:59:27 +0000 +++ local/in/dhis-in-services/pom.xml 2014-09-05 05:06:07 +0000 @@ -17,13 +17,17 @@ + dhis-in-service-survey dhis-in-service-configuration + dhis-in-service-lookup + dhis-in-service-reports + dhis-service-aggregationengine - dhis-in-service-lookup +