dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11034
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-05-28 13:42:25 +0700
message:
  Not allow to edit star in program tracking list.
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.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/DefaultProgramInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2013-05-28 05:49:19 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2013-05-28 06:42:25 +0000
@@ -49,7 +49,6 @@
 import org.hisp.dhis.patientdatavalue.PatientDataValueService;
 import org.hisp.dhis.sms.outbound.OutboundSms;
 import org.hisp.dhis.system.grid.ListGrid;
-import org.smslib.OutboundMessage;
 import org.springframework.transaction.annotation.Transactional;
 
 /**

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-05-28 05:49:19 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-05-28 06:42:25 +0000
@@ -390,7 +390,7 @@
 enter_age_in_years = Enter age in years
 add_and_continue = Add and continue
 tracking = Tracking
-program_tracking = Program Tracking
+program_tracking = Lost to follow-up
 intro_program_tracking = Support the work practices around tracking persons within a health program that have not shown up for a scheduled visit.
 sms_reminder_list = SMS reminder list
 patient_did_not_register_a_phone_number = The person did not register a phone number
@@ -649,4 +649,5 @@
 hide = Hide
 none_program = None program
 none_dataset = None dataset
-access_log = Access Log
\ No newline at end of file
+access_log = Access Log
+risk = Risk
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2013-05-23 14:28:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2013-05-28 06:42:25 +0000
@@ -1016,7 +1016,7 @@
       <interceptor-ref name="organisationUnitTreeStack" />
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-caseentry/programTrackingSelect.vm</param>
-      <param name="menu">/dhis-web-caseentry/trackingMenu.vm</param>
+      <param name="menu">/dhis-web-caseentry/registrationMenu.vm</param>
       <param name="stylesheets">style/style.css</param>
       <param name="javascripts">
         ../dhis-web-commons/ouwt/ouwt.js,
@@ -1115,7 +1115,7 @@
       <interceptor-ref name="organisationUnitTreeStack" />
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-caseentry/activityPlanSelect.vm</param>
-      <param name="menu">/dhis-web-caseentry/trackingMenu.vm</param>
+      <param name="menu">/dhis-web-caseentry/registrationMenu.vm</param>
       <param name="stylesheets">style/style.css</param>
       <param name="javascripts">
         ../dhis-web-commons/ouwt/ouwt.js,

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2013-05-21 05:45:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2013-05-28 06:42:25 +0000
@@ -30,7 +30,7 @@
 	<thead>
 		<tr>
 			<th>#</th>
-			<th>$i18n.getString('followup')</th>
+			<th>$i18n.getString('risk')</th>
 			<th>$i18n.getString('date_scheduled')</th>
 			<th>$i18n.getString('full_name')</th>
 			<th>$i18n.getString('phone_number')</th>
@@ -49,8 +49,11 @@
 			</td>
 			<td>
 				#set( $comment = $!programStageInstance.programInstance.patientComment.commentText )
-				<a href='javascript:markForFollowup($programStageInstance.programInstance.id, false)' #if( $$!programStageInstance.programInstance.followup == 'false') class='hidden' #end id='imgMarkFollowup' title='$comment' ><img src='../images/marked.png'></a>
-				<a href='javascript:markForFollowup($programStageInstance.programInstance.id, true)' #if( $$!programStageInstance.programInstance.followup == 'true') class='hidden' #end id='imgUnmarkFollowup' ><img src='../images/unmarked.png'></a>			
+				#if( $$!programStageInstance.programInstance.followup == 'true') 
+				<img src='../images/marked.png' alt='$comment'>
+				#else
+				<img src='../images/unmarked.png'>			
+				#end
 			</td>
 			<td>
 				#if($!programStageInstance.executionDate)

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	2013-04-10 04:35:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	2013-05-28 06:42:25 +0000
@@ -7,14 +7,18 @@
 	#if( $patient )
 		<table>
 			<tr>            
-				<td>
+				<td class='coordinates1'>
 					<span class='bold' id="patientName">$i18n.getString( "full_name" ):</span>
 				</td>
-				<td>
+				<td class='coordinates2'>
 					$encoder.htmlEncode( $patient.getFullName() ) ( $i18n.getString( "$patient.gender" ) )
 				</td>
-				<td class='bold text-column' style="vertical-align:top">$i18n.getString('program'): </td>
-				<td style="vertical-align:right">$program.displayName</td>
+				<td class='bold coordinates1'>$i18n.getString('program'):</td>
+				<td class='coordinates2'>$program.displayName</td>
+				<td rowspan='2'>
+					<a href='javascript:markForFollowup($programStageInstance.programInstance.id, false)' #if( $programStageInstance.programInstance.followup == 'false') class='hidden' #end id='imgMarkFollowup' title='$i18n.getString("unmark_followup")' ><img src='../images/marked_large.png'></a>
+					<a href='javascript:markForFollowup($programStageInstance.programInstance.id, true)' #if( $programStageInstance.programInstance.followup == 'true') class='hidden' #end id='imgUnmarkFollowup' title='$i18n.getString("mark_followup")' ><img src='../images/unmarked_large.png'></a>			
+				</td>
 			</tr>
 			<tr>
 				<td>
@@ -23,8 +27,8 @@
 				<td>
 					$format.formatDate( $patient.birthDate ) ( $encoder.htmlEncode( $patient.getAge() ) )
 				</td>
-				<td class='bold text-column' style="vertical-align:top">$i18n.getString('program_stage'): </td>
-				<td style="vertical-align:right">$programStageInstance.programStage.displayName</td>
+				<td class='bold coordinates1' style="vertical-align:top">$i18n.getString('program_stage'):</td>
+				<td class='coordinates2'>$programStageInstance.programStage.displayName</td>
 			</tr>
 			<tr><td>&nbsp;</td></tr>
 		</table>