dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11072: Small change in program-tracking.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 29 May 2013 08:41:18 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 11072
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-05-29 15:36:29 +0700
message:
  Small change in program-tracking.
added:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/images/risk_small.png
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.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/webapp/dhis-web-caseentry/javascript/commons.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js
  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/programEnrollmentForm.vm
  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
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.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/jdbc/JdbcCaseAggregationConditionManager.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java	2013-05-22 14:56:12 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java	2013-05-29 08:36:29 +0000
@@ -367,7 +367,7 @@
             sql += "GROUP BY ou.organisationunitid, ou.name";
 
         }
-        System.out.println( "\n\n === \n " + sql );
+        
         sql = sql.replaceAll( "COMBINE", "" );
 
         return sql;

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java	2013-05-27 04:33:25 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java	2013-05-29 08:36:29 +0000
@@ -207,7 +207,7 @@
                     }
 
                     patientDataValue = getValue( patientDataValues, dataElementUid );
-System.out.println( "\n\n === \n patientDataValue : " + patientDataValue );
+                    
                     dataElementValue = patientDataValue != null ? patientDataValue.getValue() : dataElementValue;
                 }
                 else

=== 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-29 07:33:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-05-29 08:36:29 +0000
@@ -623,8 +623,8 @@
 display_totals = Display totals
 cancelled_programs = Cancelled programs
 quit = Quit
-unmark_followup = Un-mark followup
-mark_followup = Mark followup
+unmark_risk = Un-mark risk
+mark_risk = Mark risk
 save_comment = Save comment
 program_enrollment = Program enrollment
 stored_by = Stored by
@@ -635,7 +635,6 @@
 intro_program_stage_completeness = Monitor the completeness of events and produce completeness reports for each program.
 program_stage_completeness_form = Program stage completeness
 number_of_events = Number of events
-followup = Follow-up
 filter_on_section = Filter on section
 dataelementname = Data element
 categoryoptioncomboname = Category option combo
@@ -652,4 +651,6 @@
 access_log = View access Log
 risk = Risk
 show_only_risk_cases = Show only Risk cases
-toggle_risk_status = Toggle risk status
\ No newline at end of file
+toggle_risk_status = Toggle risk status
+with = with
+status_events = events
\ No newline at end of file

=== added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/images/risk_small.png'
Binary files dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/images/risk_small.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/images/risk_small.png	2013-05-29 08:36:29 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-05-28 07:09:29 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-05-29 08:36:29 +0000
@@ -2073,11 +2073,13 @@
 			 {
 				showById('imgMarkFollowup');
 				hideById('imgUnmarkFollowup');
+				showById("followup_" + programInstanceId);
 			 }
 			 else
 			 {
 				hideById('imgMarkFollowup');
 				showById('imgUnmarkFollowup');
+				hideById("followup_" + programInstanceId);
 			 }
 		});
 }

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2013-05-29 06:09:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2013-05-29 08:36:29 +0000
@@ -90,7 +90,6 @@
 		}, 
 		function()
 		{
-			setInnerHTML('searchInforLbl',i18n_list_all_patients);
 			showById('colorHelpLink');
 			showById('listEventDiv');
 			hideLoader();

=== 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-05-29 06:09:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-05-29 08:36:29 +0000
@@ -1,4 +1,4 @@
-<table>
+<table style='margin-top:-25px;'>
 	<tr>
 		<td colspan='3'>
 			<h3><a name="mainPagelink" href="javascript:onClickBackBtn();">$i18n.getString( 'patient_management' )</a>
@@ -132,6 +132,7 @@
 								onclick='javascript:loadActiveProgramStageRecords("$programInstance.id", "$programStageInstance.id")' >
 								<td id='td_$programInstance.id'>
 									<a><span id='infor_$programInstance.id'>$programInstance.program.displayName ($format.formatDate($programInstance.enrollmentDate))</span></a>
+									<img id='followup_$programInstance.id' src='images/risk_small.png' #if($programInstance.followup=='true') #else class='hidden' #end >
 								</td>
 							</tr>
 							#if($programInstance.program.type==1 && $programStageInstance)

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2013-05-28 05:49:19 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2013-05-29 08:36:29 +0000
@@ -50,8 +50,9 @@
 		</div>
 	#end
 	
-	#if( ($identifierTypes && $identifierTypes.size() > 0)
-		|| ($patientAttributes && $patientAttributes.size() > 0) )
+	#if($auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" )  &&
+		( ($identifierTypes && $identifierTypes.size() > 0)
+		|| ($patientAttributes && $patientAttributes.size() > 0) ) )
 		<!-- Identifiers and Attributes TAB -->
 		<div id="tab-2">
 			<form id='patientPropertyForm' name='patientPropertyForm' method="POST">

=== 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-29 07:33:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2013-05-29 08:36:29 +0000
@@ -1,23 +1,8 @@
 <script src="javascript/tooltip.js" type="text/javascript"></script>
 <table>
 	<tr>
-		<td class='text-column' >$i18n.getString( "search_result_matching_the_search_criteria" ):</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td id='searchInforLbl'>
-		#if($!listAll)
-			$i18n.getString( "list_events" )
-		#else
-			$i18n.getString( "search_patients" )
-		#end
-		</td>
-	</tr>	
-	
-	<tr>
-		<td class='text-column'>$i18n.getString( "total_result" ):</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td id='totalTd'>$!total</td>
+		<td>$i18n.getString('total_result'): </td>
+		<td id='totalTd'></td>
 	</tr>
 </table>
 
@@ -37,6 +22,7 @@
 		</tr>
 	</thead>
 	<tbody id="list">
+	#set($noPatient=0)
 	#set($patientId='')
 	#set($count=1)
 	#set($class='listRow')
@@ -45,6 +31,7 @@
 		#set($patient = $programStageInstance.programInstance.patient)
 		<tr>
 			#if( $patientId != $patient.id )
+				#set($noPatient=$noPatient + 1)
 			<td name="infor_$patient.id" class='$class'>
 				#set( $comment = $!programStageInstance.programInstance.patientComment.commentText )
 				#if( $$!programStageInstance.programInstance.followup == 'true') 
@@ -121,3 +108,11 @@
 <div id="detailsInfo"></div>
 
 #end
+
+<script>
+	var i18n_patient = '$encoder.jsEscape( $i18n.getString( "patient" ) , "'")';
+	var i18n_with = '$encoder.jsEscape( $i18n.getString( "with" ) , "'")';
+	var i18n_events = '$encoder.jsEscape( $i18n.getString( "status_events" ) , "'")';
+	var totalHeader = $noPatient + " " + i18n_patient + " " + i18n_with + " " + jQuery('#statusEvent option:selected').text() + " " + i18n_events
+	setInnerHTML('totalTd', totalHeader);
+</script>

=== 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-05-29 07:33:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	2013-05-29 08:36:29 +0000
@@ -16,8 +16,8 @@
 				<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/risk_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/unrisk_large.png'></a>			
+					<a href='javascript:markForFollowup($programStageInstance.programInstance.id, false)' #if( $programStageInstance.programInstance.followup == 'false') class='hidden' #end id='imgMarkFollowup' title='$i18n.getString("unmark_risk")' ><img src='images/risk_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_risk")' ><img src='images/unrisk_large.png'></a>			
 				</td>
 			</tr>
 			<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2013-05-28 09:04:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2013-05-29 08:36:29 +0000
@@ -86,14 +86,20 @@
 		<tr>
 			<td id='searchingAttributeIdTD' class="hidden">
 			  <select class='search-field' id="searchObjectId" name="searchObjectId" #if( $patientAttributes.size() == 0 ) disabled="disabled" #end onchange="searchObjectOnChange(this)">
-				<option value="iden">$i18n.getString( "search_by_name_identifier" )</option>
+				#if( $auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" ) )
+					<option value="iden">$i18n.getString( "search_by_name_identifier" )</option>
+				#end
+				
 				<option value="prg">$i18n.getString( "search_by_program" )</option>
-				<option value="fixedAttr_birthDate">$i18n.getString( "date_of_birth" )</option>
-				<option value="fixedAttr_age">$i18n.getString( "age_year" )</option>
-				<option value="fixedAttr_gender">$i18n.getString( "gender" )</option>
-				<option value="fixedAttr_phoneNumber">$i18n.getString( "phone_number" )</option>
-				#foreach( $attribute in $patientAttributes )
-					<option value="attr_$attribute.id" valueType='$attribute.valueType'>$encoder.htmlEncode( $attribute.displayName )</option>
+				
+				#if( $auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" ) )
+					<option value="fixedAttr_birthDate">$i18n.getString( "date_of_birth" )</option>
+					<option value="fixedAttr_age">$i18n.getString( "age_year" )</option>
+					<option value="fixedAttr_gender">$i18n.getString( "gender" )</option>
+					<option value="fixedAttr_phoneNumber">$i18n.getString( "phone_number" )</option>
+					#foreach( $attribute in $patientAttributes )
+						<option value="attr_$attribute.id" valueType='$attribute.valueType'>$encoder.htmlEncode( $attribute.displayName )</option>
+					#end
 				#end
 			  </select>
 			  <em title="$i18n.getString( 'required' )" class="required">*</em></label>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm	2013-05-29 07:33:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm	2013-05-29 08:36:29 +0000
@@ -32,8 +32,8 @@
 			#else
 				#set($followup='false')
 			#end
-			<a href='javascript:markForFollowup($programInstance.id, false)' #if( $followup == 'false') class='hidden' #end id='imgMarkFollowup' title='$i18n.getString("unmark_followup")' ><img src='images/risk_large.png'></a>
-			<a href='javascript:markForFollowup($programInstance.id, true)' #if( $followup == 'true') class='hidden' #end id='imgUnmarkFollowup' title='$i18n.getString("mark_followup")' ><img src='images/unrisk_large.png'></a>			
+			<a href='javascript:markForFollowup($programInstance.id, false)' #if( $followup == 'false') class='hidden' #end id='imgMarkFollowup' title='$i18n.getString("unmark_risk")' ><img src='images/risk_large.png'></a>
+			<a href='javascript:markForFollowup($programInstance.id, true)' #if( $followup == 'true') class='hidden' #end id='imgUnmarkFollowup' title='$i18n.getString("mark_risk")' ><img src='images/unrisk_large.png'></a>			
 		</td>
 		<td rowspan='3' colspan='8'>
 			<textarea id="comment" name='comment' maxlength="360" style="height:100px;width:100%">$!encoder.htmlEncode( $programInstance.patientComment.commentText )</textarea>