dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7582
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-07-12 13:36:35 +0700
message:
  Add color quick help for dataentry form in patient module.
modified:
  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/dataRecordingSelect.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.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/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	2012-07-11 04:13:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-07-12 06:36:35 +0000
@@ -375,4 +375,11 @@
 patients = persons
 saving = Saving
 renaming = Renaming
-deleting = Deleting
\ No newline at end of file
+deleting = Deleting
+color_quick_help = Color quick help
+color = Color
+what_do_colors_mean = What do colors mean ?
+event_is_completed = Event is completed.
+the_stage_is_started_but_not_completed_yet = The stage is started, but not completed yet.
+the_stage_is_started_and_due_date_is_after_the_current_date = The stage is started and due date is after the current date.
+the_stage_is_not_started_and_due_date_is_before_the_current_date = The stage is not started and due date is before the current date.
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-06-27 05:12:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-07-12 06:36:35 +0000
@@ -25,7 +25,7 @@
 </script>
 
 <form id='dataRecordingSelectForm' name='dataRecordingSelectForm' method='post'>
-   	
+
 <table class="mainPageTable" id='patientInfoDiv'> 
 	<tr>
 		<td valign="top">
@@ -46,8 +46,34 @@
 	</tr>
 	<tr>
 		<td>
-			<a href="javascript:showHistoryPlan()" id='historyPlanLink' title="$i18n.getString( 'see_history_plan' )" class="hidden">$i18n.getString('see_history_plan')</a>
-			<div id="currentSelection" class="hidden history"></div>
+			<a href="javascript:showColorHelp()" id='colorHelpLink' title="$i18n.getString( 'what_do_colors_mean' )" class="hidden">$i18n.getString('what_do_colors_mean')</a>
+			<div id="colorHelpDiv" class="hidden history">
+				<table>
+					<col width='80px;'/>
+					<thead>
+						<tr>
+							<th>$i18n.getString('color')</th>
+							<th>$i18n.getString('description')</th>
+						</tr>
+					</thead>
+					<tr>
+						<td id='colorGreenTD' class='input-column'><script>byId('colorGreenTD').style.backgroundColor = COLOR_LIGHT_GREEN;</script></td>
+						<td>$i18n.getString('event_is_completed')</td>
+					</tr>
+					<tr>
+						<td id='colorLightredTD'><script>byId('colorLightredTD').style.backgroundColor = COLOR_LIGHT_LIGHTRED;</script></td>
+						<td>$i18n.getString('the_stage_is_started_but_not_completed_yet')</td>
+					</tr>
+					<tr>
+						<td id='colorYellowTD'><script>byId('colorYellowTD').style.backgroundColor = COLOR_LIGHT_YELLOW;</script></td>
+						<td>$i18n.getString('the_stage_is_started_and_due_date_is_after_the_current_date')</td>
+					</tr>
+					<tr>
+						<td id='colorRedTD'><script>byId('colorRedTD').style.backgroundColor = COLOR_LIGHT_RED;</script></td>
+						<td>$i18n.getString('the_stage_is_not_started_and_due_date_is_before_the_current_date')</td>
+					</tr>
+				</table>
+			</div>
 		</td>
 	</tr>
 </table>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-07-04 01:37:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-07-12 06:36:35 +0000
@@ -22,6 +22,7 @@
 	hideById('inputCriteriaDiv');
 	$('#programStageIdTR').html('');
 	hideById('programInstanceDiv');
+	hideById('colorHelpLink');
 	
 	var programId = jQuery('#dataRecordingSelectDiv [name=programId]').val();
 	if ( programId == 0 )
@@ -41,6 +42,7 @@
 			var type = jQuery('#dataRecordingSelectDiv [name=programId] option:selected').attr('type');
 			if( type == 1 && json.programStageInstances.length > 1 )
 			{
+				showById('colorHelpLink');
 				for ( i in json.programStageInstances ) 
 				{
 					if( i!= 0 )
@@ -78,7 +80,6 @@
 				jQuery('#dueDateTR').attr('class','hidden');
 				enable('completeBtn');
 				enable('completeInBelowBtn');
-				hideById('historyPlanLink');
 				hideById('programStageIdTR');
 				hideById('programInstanceFlowDiv');
 				var programStageInstanceId = '';
@@ -857,3 +858,15 @@
 			input.focus();
 		});
 }
+
+function showColorHelp()
+{
+	jQuery('#colorHelpDiv').dialog({
+		title: i18n_color_quick_help,
+		maximize: true, 
+		closable: true,
+		modal:false,
+		width: 500,
+		height: 180
+	}).show('fast');
+}
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2012-06-28 02:40:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2012-07-12 06:36:35 +0000
@@ -156,4 +156,5 @@
 	var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_items" ) , "'")';
 	var i18n_create_new_event = '$encoder.jsEscape( $i18n.getString( "create_new_event" ) , "'")';
 	var i18n_save_success = '$encoder.jsEscape( $i18n.getString( "save_success" ) , "'")';
+	var i18n_color_quick_help = '$encoder.jsEscape( $i18n.getString( "color_quick_help" ) , "'")';
 </script>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm	2012-07-10 07:39:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm	2012-07-12 06:36:35 +0000
@@ -51,7 +51,8 @@
 	var i18n_female = '$encoder.jsEscape( $i18n.getString( "female" ) , "'")';
 	var i18n_transgender = '$encoder.jsEscape( $i18n.getString( "transgender" ) , "'")';
 	var i18n_specify_search_criteria = '$encoder.jsEscape( $i18n.getString( "specify_search_criteria" ) , "'")';
-
+	var i18n_color_quick_help = '$encoder.jsEscape( $i18n.getString( "color_quick_help" ) , "'")';
+	
 	selection.setListenerFunction( organisationUnitSelected );
 	
 	var searchTextBox = '<input type="text" id="searchText" name="searchText" onkeyup="searchPatientsOnKeyUp( event );">';

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm	2012-07-10 07:39:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm	2012-07-12 06:36:35 +0000
@@ -111,6 +111,7 @@
 	var i18n_please_select = '$encoder.jsEscape( $i18n.getString( "please_select" ) , "'")';
 	var i18n_search_result = '$encoder.jsEscape( $i18n.getString( "search_result" ) , "'")';
 	var i18n_show_data_entry = '$encoder.jsEscape( $i18n.getString( "show_data_entry" ) , "'")';
+	var i18n_color_quick_help = '$encoder.jsEscape( $i18n.getString( "color_quick_help" ) , "'")';
 	
 	datePickerValid( 'executionDateNewEvent', true );