dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8471
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-10-11 12:35:09 +0700
message:
  Small change UI for search person form.
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/activityPlanSelect.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-10-03 02:46:58 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java	2012-10-11 05:35:09 +0000
@@ -219,7 +219,7 @@
         Period period )
     {
         String sql = convertCondition( aggregationCondition, orgunit, period );
-        
+
         Collection<Integer> patientIds = aggregationConditionStore.executeSQL( sql );
 
         if ( patientIds == null )
@@ -831,7 +831,7 @@
 
         if ( propertyName.equals( PROPERTY_AGE ) )
         {
-            sql += "DATE('" + startDate + "') - DATE(birthdate) ";
+            sql += "DATE('" + endDate + "') - DATE(birthdate) ";
         }
         else
         {

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm	2012-10-05 03:29:50 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm	2012-10-11 05:35:09 +0000
@@ -1,7 +1,12 @@
 <script>
 	jQuery(document).ready(	function(){
 		validation( 'activityPlanForm', function(form){
-			showActitityList();
+			if(getFieldValue('export')=='false'){
+				showActitityList();
+			}
+			else{
+				exportActitityList('xls');
+			}
 		});
 		
 		setFieldValue('searchByProgramStage', 'true');
@@ -20,8 +25,9 @@
 	<input type='hidden' id='orgunitId' name='orgunitId' value='$organisationUnit.id' >
 	<input type="hidden" id='hideLink' name='hideLink' value='false'>
 	<input type='hidden' id='isSearchByProgram' name='isSearchByProgram' value='false' >
+	<input type='hidden' id='export' name= 'export'>
 	<div id='advanced-search' style='width:550px;'>
-		<table style="margin-bottom:8px">    
+		<table style="margin-bottom:8px;width:550px;">    
 			<tr>
 				<td>
 					<label>$i18n.getString( "registering_unit" )</label>
@@ -68,8 +74,7 @@
 						<option value='ALL'>$i18n.getString("all")</option>
 					</select>
 					<input type='text' id='startDueDate' name='startDueDate' class='hidden'>
-				</td>
-				<td>
+					&nbsp;
 					<input type='checkbox' id='useCalendar' name='useCalendar' onchange="displayCadendar();"> $i18n.getString('use_calendar')
 				</td>
 			</tr>
@@ -89,8 +94,8 @@
 			<tr>
 				<td></td>
 				<td>
-					<input type="submit" class='large-button' id='listPatientBtn' value="$i18n.getString( 'show_activity_list' )">
-					<input type="button" class='large-button' value="$i18n.getString( 'export_xls' )" onclick='exportActitityList("xls");'>
+					<input type="submit" class='large-button' id='listPatientBtn' value="$i18n.getString( 'show_activity_list' )" onclick="setFieldValue('export', false);">
+					<input type="submit" class='large-button' value="$i18n.getString( 'export_xls' )" onclick="setFieldValue('export', false);">
 				</td>
 			</tr>
 		</table>