dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9035
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-11-15 09:37:17 +0700
message:
  Minor fix.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.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-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js	2012-11-14 09:37:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js	2012-11-15 02:37:17 +0000
@@ -246,19 +246,19 @@
 	hideById('listDiv');
 	
 	var params = '';
-	jQuery( '#displayInReports option' ).each( function( i, item ){
-		var input = jQuery( item );
-		params += '&searchingValues=de_' + input.val() + '_false_';
-	});
 	
 	if(listAll){	
-		params += '&startDate=';
+		params  = 'startDate=';
 		params += '&endDate=';
+		jQuery( '#displayInReports option' ).each( function( i, item ){
+			var input = jQuery( item );
+			params += '&searchingValues=de_' + input.val() + '_false_';
+		});
 	}
 	else{
 		var value = '';
 		var searchingValue = '';
-		params += '&startDate=' + getFieldValue('startDate');
+		params  = '&startDate=' + getFieldValue('startDate');
 		params += '&endDate=' + getFieldValue('endDate');
 		if(byId("incompleted").checked)
 		{

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.vm	2012-11-14 05:52:34 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.vm	2012-11-15 02:37:17 +0000
@@ -1,9 +1,9 @@
-#if($!message)
+#if($message)
 	<span id='message' style="display:block;">$message</span>
 #else
 	<table>
 		<tr>
-			<td class='text-column' >$i18n.getString( "search_result_matching_the_search_criteria" ):</td>
+			<td class='text-column'>$i18n.getString( "search_result_matching_the_search_criteria" ):</td>
 			<td>&nbsp;</td>
 			<td>&nbsp;</td>
 			<td id='searchInforTD'></td>