dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10600
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-04-17 16:20:46 +0700
message:
  Minor fix for program-indicator
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramIndicator.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramIndicator.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/program/DefaultProgramIndicatorService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java	2013-04-17 07:58:14 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java	2013-04-17 09:20:46 +0000
@@ -239,14 +239,15 @@
             DataElement dataElement = null;
 
             String key = matcher.group().replaceAll( "[\\[\\]]", "" ).split( SEPARATOR_OBJECT )[1];
-
-            Integer programStageId = Integer.parseInt( key.split( "." )[0] );
+            String[] infor = key.split( SEPARATOR_ID );
+            
+            Integer programStageId = Integer.parseInt( infor[0] );
             ProgramStage programStage = programStageService.getProgramStage( programStageId );
 
             ProgramStageInstance programStageInstance = programStageInstanceService.getProgramStageInstance(
                 programInstance, programStage );
 
-            Integer dataElementId = Integer.parseInt( key.split( "." )[1] );
+            Integer dataElementId = Integer.parseInt( infor[1] );
             dataElement = dataElementService.getDataElement( dataElementId );
 
             PatientDataValue dataValue = patientDataValueService

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-04-17 07:58:14 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-04-17 09:20:46 +0000
@@ -47,8 +47,8 @@
 				
 				#foreach($key in $programIndicatorsMap.keySet())
 				<tr class='bold'>
-					<td>$key</td>
-					<td>$programIndicatorsMap.get($key)</td>
+					<td>$encoder.htmlEncode($key)</td>
+					<td>$!programIndicatorsMap.get($key)</td>
 				</tr>
 				#end
 				

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramIndicator.vm	2013-04-17 07:58:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramIndicator.vm	2013-04-17 09:20:46 +0000
@@ -57,7 +57,6 @@
 			<td><label>$i18n.getString( "date_for_calculating" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
 			<td>
 				<select style="width:336px;" id="rootDate" name="rootDate" class="{validate:{required:true}}">
-					<option value=''>[$i18n.getString('please_select')]</option>
 					<option value='incident_date'>$i18n.getString('incident_date')</option>
 					<option value='execution_date'>$i18n.getString('execution_date')</option>
 					<option value='current_date'>$i18n.getString('current_date')</option>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramIndicator.vm	2013-04-17 07:58:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramIndicator.vm	2013-04-17 09:20:46 +0000
@@ -57,7 +57,6 @@
 		<td><label>$i18n.getString( "date_for_calculating" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
 		<td>
 			<select style="width:336px;" id="rootDate" name="rootDate" class="{validate:{required:true}}">
-				<option value=''>[$i18n.getString('please_select')]</option>
 				<option value='incident_date'>$i18n.getString('incident_date')</option>
 				<option value='execution_date'>$i18n.getString('execution_date')</option>
 				<option value='current_date'>$i18n.getString('current_date')</option>
@@ -65,6 +64,18 @@
 		</td>
 		<td></td>
 	</tr>
+	<tr>
+			<td><label>$i18n.getString( "program_stage" ) </label></td>
+			<td>
+				<select style="width:336px;" id="programStageId" name="programStageId" onChange="getPatientDataElements();">
+					<option value=''>[$i18n.getString('please_select')]</option>
+					#foreach( $programStage in $programIndicator.program.programStages )
+					<option value='$programStage.id'>$programStage.displayName</option>
+					#end
+				</select>
+			</td>
+			<td></td>
+		</tr>
 </table>
 <br>