dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5955
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-02-14 15:31:39 +0700
message:
  (patient) Don't show result-details after running Query Builder.
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResultDetails.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-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java	2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java	2012-02-14 08:31:39 +0000
@@ -393,8 +393,7 @@
 
     public Collection<DataElement> getDataElementsInCondition( String aggregationExpression )
     {
-        String regExp = "\\[" + OBJECT_PROGRAM_STAGE_DATAELEMENT + SEPARATOR_OBJECT + "[0-9]+" + SEPARATOR_ID
-            + "[0-9]+" + SEPARATOR_ID + "[0-9]+" + "\\]";
+        String regExp = "\\[" + OBJECT_PROGRAM_STAGE_DATAELEMENT + SEPARATOR_OBJECT + "[0-9]+" + SEPARATOR_ID + "[0-9]+" + "\\]";
 
         Collection<DataElement> dataElements = new HashSet<DataElement>();
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResultDetails.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResultDetails.vm	2012-02-07 08:39:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResultDetails.vm	2012-02-14 08:31:39 +0000
@@ -36,7 +36,7 @@
 				#foreach( $dataValue in $dataValues )
 				<tr #alternate( $mark )>
 					<td>$dataValue.programStageInstance.programStage.name</td>
-					<td>$dataValue.dataElement.name $dataValue.optionCombo.name</td>
+					<td>$dataValue.dataElement.name</td>
 					<td>$dataValue.value</td>
 					<td>$format.formatDate($dataValue.timestamp)</td>
 				</tr>
@@ -54,7 +54,7 @@
 		</tr>
 		#foreach( $stageInstance in $mapEvents.keySet() )
 			#set($dataValues = $mapEvents.get($stageInstance) )
-			#if ( $!dataValues.size() == 0 )
+			#if ( $dataValues.size() == 0 )
 				#set($hasDataValue = false )
 				<tr>
 					<td colspan='4'></td>
@@ -71,7 +71,7 @@
 				#foreach( $dataValue in $dataValues )
 					<tr #alternate( $mark )>
 						<td>$dataValue.programStageInstance.programStage.name</td>
-						<td>$dataValue.dataElement.name $dataValue.optionCombo.name</td>
+						<td>$dataValue.dataElement.name</td>
 						<td>$dataValue.value</td>
 						<td>$format.formatDate($dataValue.timestamp)</td>
 					</tr>