dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8145
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-09-20 10:00:16 +0700
message:
  Close New Event dialogue/pop-up after to create an event and open dataentry of the new event; Display an access denied pop-up if a person cannot enroll any program in Dashboard
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/javascript/commons.js
  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/relationshipPatient.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.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-09-19 14:21:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-09-20 03:00:16 +0000
@@ -147,7 +147,7 @@
 no_duplicate_found=No duplicate person found
 patient_system_id=System generated ID
 identifier_duplicate=Person identifier duplicate
-has_guardian=Has guardian
+has_guardian=Has guardian/caretaker
 add_new_person=Add new person
 search_existing_person=Search existing person
 search_by=Search by
@@ -453,4 +453,5 @@
 remove_this_event = Remove this event
 overdue_scheduled = Overdue/Scheduled
 scheduled_overdue_incomplete = Scheduled/Overdue/Incomplete
-relationships = Relationships
\ No newline at end of file
+relationships = Relationships
+no_program_available_for_enrollment = No program is available for enrollment
\ No newline at end of file

=== 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	2012-09-18 03:50:06 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-09-20 03:00:16 +0000
@@ -629,7 +629,10 @@
 				jQuery('#tb_' + programInstanceId + ' .arrow-left').removeClass("hidden");
 				jQuery('#tb_' + programInstanceId + ' .arrow-right').removeClass("hidden");
 			}
-			setInnerHTML('createEventMessage_' + programInstanceId,i18n_create_event_success);
+			jQuery('#ps_' + programStageInstanceId ).focus();
+			jQuery('#createNewEncounterDiv_' + programInstanceId).dialog("close");
+			loadDataEntry( programStageInstanceId );
+			showSuccessMessage(i18n_create_event_success);
 		});
 }
 

=== 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-09-19 13:39:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-09-20 03:00:16 +0000
@@ -442,7 +442,6 @@
 			   dataType: "xml",
 			   success: function( result ){
 					handleResponse (result);
-					
 					var selectedProgramStageInstance = jQuery( '#' + prefixId + getFieldValue('programStageInstanceId') );
 					var box = jQuery(".stage-object-selected");
 					box.val( box.attr('psname') + "  " + executionDate );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js	2012-09-07 09:18:04 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js	2012-09-20 03:00:16 +0000
@@ -43,7 +43,7 @@
 			{
 				disableCompletedButton(true);
 			}
-			
+			resize();
 			hideLoader();
 			hideById('contentDiv'); 
 		} );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2012-09-12 13:36:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2012-09-20 03:00:16 +0000
@@ -1,6 +1,10 @@
+#if($programs.size()==0)
+	$i18n.getString("no_program_available_for_enrollment");
+#else
 <script>
 	jQuery(document).ready(	function(){
 		datePickerInRangeValid( 'dateOfIncidentField' , 'enrollmentDateField' );
+		setFieldValue("dateOfIncidentField", "");
 		var unSave = false;
 	});	
 </script>
@@ -54,6 +58,7 @@
 	</table>
 </form>
 
+#end
 <script>
 	var i18n_enroll = '$encoder.jsEscape( $i18n.getString( "enroll" ) , "'")';
 	var i18n_program_stage = '$encoder.jsEscape( $i18n.getString( "program_stage" ) , "'")';