dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #06369
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2018: Fixed India Module(s) Bugs that are occured while merging
------------------------------------------------------------
revno: 2018
committer: Bharath Kumar <chbharathk@xxxxxxxxx>
branch nick: trunk
timestamp: Sun 2010-06-20 12:57:46 +0530
message:
Fixed India Module(s) Bugs that are occured while merging
modified:
local/in/dhis-in-services/dhis-in-service-configuration/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-in-services/dhis-in-service-dbmanager/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetPeriodsAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateRoutineReportAnalyserResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/upward/action/GenerateUpwardReportAnalyserResultAction.java
--
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/in/dhis-in-services/dhis-in-service-configuration/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-in-services/dhis-in-service-configuration/src/main/resources/META-INF/dhis/beans.xml 2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-configuration/src/main/resources/META-INF/dhis/beans.xml 2010-06-20 07:27:46 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
<!-- Store definitions -->
=== modified file 'local/in/dhis-in-services/dhis-in-service-dbmanager/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-in-services/dhis-in-service-dbmanager/src/main/resources/META-INF/dhis/beans.xml 2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-dbmanager/src/main/resources/META-INF/dhis/beans.xml 2010-06-20 07:27:46 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
<!-- Store definitions -->
=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/META-INF/dhis/beans.xml 2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/META-INF/dhis/beans.xml 2010-06-20 07:27:46 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
<!-- Store definitions -->
=== modified file 'local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/META-INF/dhis/beans.xml 2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/META-INF/dhis/beans.xml 2010-06-20 07:27:46 +0000
@@ -2,7 +2,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
<!-- Store definitions -->
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetPeriodsAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetPeriodsAction.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetPeriodsAction.java 2010-06-20 07:27:46 +0000
@@ -161,9 +161,18 @@
periodNameList.add( simpleDateFormat1.format( p1.getStartDate() ) + "-" + year );
}
}
+ else if ( periodType.getName().equalsIgnoreCase( "daily" ) )
+ {
+ simpleDateFormat1 = new SimpleDateFormat( "yyyy-MM-dd" );
+
+ for ( Period p1 : periods )
+ {
+ periodNameList.add( simpleDateFormat1.format( p1.getStartDate() ) );
+ }
+ }
else
{
- simpleDateFormat1 = new SimpleDateFormat( "yyyy-mm-dd" );
+ simpleDateFormat1 = new SimpleDateFormat( "yyyy-MM-dd" );
for ( Period p1 : periods )
{
String tempPeriodName = simpleDateFormat1.format( p1.getStartDate() ) + " - "
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateRoutineReportAnalyserResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateRoutineReportAnalyserResultAction.java 2010-06-15 11:26:37 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateRoutineReportAnalyserResultAction.java 2010-06-20 07:27:46 +0000
@@ -298,7 +298,7 @@
{
return simpleYearFormat;
}
-
+
private List<String> deCodeType;
private List<String> serviceType;
@@ -856,7 +856,10 @@
tempStr = orgUnitPPP.getParent().getName();
}
-
+ else if ( deCodeString.equalsIgnoreCase( "FACILITYCOMMENT" ) )
+ {
+ tempStr = currentOrgUnit.getComment();
+ }
else if ( deCodeString.equalsIgnoreCase( "PERIOD" )
|| deCodeString.equalsIgnoreCase( "PERIOD-NOREPEAT" ) )
{
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/upward/action/GenerateUpwardReportAnalyserResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/upward/action/GenerateUpwardReportAnalyserResultAction.java 2010-06-15 11:26:37 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/upward/action/GenerateUpwardReportAnalyserResultAction.java 2010-06-20 07:27:46 +0000
@@ -395,6 +395,7 @@
int deFlag2;
+ int isAggregated = 0;
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -2017,6 +2018,8 @@
*/
private String getResultDataValue( String formula, Date startDate, Date endDate, OrganisationUnit organisationUnit )
{
+ isAggregated = 0;
+
try
{
//6b1b7b5b7b5b7
@@ -2057,12 +2060,15 @@
if ( aggregatedValue == AggregationService.NO_VALUES_REGISTERED )
{
replaceString = NULL_REPLACEMENT;
- deFlag2 = 1;
- } else
+ deFlag2 = 0;
+ }
+ else
{
replaceString = String.valueOf( aggregatedValue );
deFlag2 = 1;
+
+ isAggregated = 0;
}
} else
@@ -2158,6 +2164,11 @@
resultValue = buffer.toString();
}
+ //if( isAggregated == 0 )
+ //{
+ // resultValue = " ";
+ //}
+
if ( resultValue.equalsIgnoreCase( "" ) )
{
resultValue = " ";
