← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8384: Don't open a single entry form of person.

 

------------------------------------------------------------
revno: 8384
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-10-05 13:46:22 +0700
message:
  Don't open a single entry form of person.
removed:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventPatient.vm
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm
  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/index.vm
  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/form.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.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-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java	2012-10-05 03:50:06 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java	2012-10-05 06:46:22 +0000
@@ -549,7 +549,7 @@
         {
             sql += statementBuilder.limitRecord( min, max );
         }
- System.out.println("\n\n ==== \n " + sql );       
+
         return sql;
     }
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-09-25 02:08:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-10-05 06:46:22 +0000
@@ -50,7 +50,8 @@
 
 <script>
 	var i18n_create_new_event = '$encoder.jsEscape( $i18n.getString( "create_new_event" ) , "'" )';
-	#if( $programStageInstance.programInstance.completed=="true")
+	#if( $programStageInstance.programInstance.program.type=='1' && 
+		$programStageInstance.programInstance.completed=="true")
 		jQuery("[id=entryFormContainer] :input").prop('disabled', true);
 		jQuery("[id=entryFormContainer] :input").datepicker("destroy");
 		jQuery("[id=executionDate]").prop('disabled', true);

=== 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-08-16 16:40:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-10-05 06:46:22 +0000
@@ -1,3 +1,8 @@
+<h3>
+ <a href="javascript:backMainPage();">$i18n.getString( 'single_event_with_registration' )</a>
+ &raquo; <span id='singleProgramName' name='singleProgramName'></span>
+</h3>
+
 <form id='dataRecordingSelectForm' name='dataRecordingSelectForm' method='post'>
 <div class="actions" style='margin-top:30px;' #if($program.type!=1) style='display:none;' #end>
 	<input type="button" class='stage-object' id="newEncounterBtn" value="$i18n.getString('create_new_event')" onClick="javascript: registerIrregularEncounter( getFieldValue('executionDate') );" disabled="disabled" >
@@ -21,29 +26,6 @@
 		</table>
 	</tr>
 </table>
-		
-<div id='inputCriteria' class="page inputCriteria" style="width:490px;height:29px;">	
-	<input type='hidden' id='programStageId' name='programStageId'>
-	<table>
-	   <tr id='programIdTR'>
-			<td class='text-column'><label for="programId">$i18n.getString( "program" )</label></td>
-			<td>
-				<select id="programId" name="programId" class="criteria" onchange="loadProgramStages();" #if( $programs.size() == 0 ) disabled="disabled" #end>
-					<option value="0">[$i18n.getString( "select" )]</option>
-					#foreach( $program in $programs )
-						<option value="$program.id" type="$program.type" #if( $programId && $program.id == $programId ) selected="selected" #end>$encoder.htmlEncode( $program.name )</option>
-					#end
-				</select>
-			</td>
-		</tr>
-	</table>
-</div>
+<input type='hidden' id='programStageId' name='programStageId'>
 
 </form>
-
-<script>
-	jQuery('#dataRecordingSelectForm').ready(function(){ 
-		byId('programId').selectedIndex = 1;
-		loadProgramStages();
-	});
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2012-09-27 10:20:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2012-10-05 06:46:22 +0000
@@ -14,9 +14,9 @@
 	#end
 		
 	#if( $auth.hasAccess( "dhis-web-caseentry", "multipledataEntrySelect" ) )
-		#introListImgItem( "multipledataEntrySelect.action" "multiple_individual_records" "dhis-web-maintenance-dataset" )
-		#introListImgItem( "singleEventSelect.action" "single_event_with_registration" "dhis-web-maintenance-dataset" )
-		#introListImgItem( "anonymousRegistration.action" "anonymous_events" "dhis-web-maintenance-dataset" )
+		#introListImgItem( "multipledataEntrySelect.action" "multiple_individual_records" "attribute" )
+		#introListImgItem( "singleEventSelect.action" "single_event_with_registration" "attribute" )
+		#introListImgItem( "anonymousRegistration.action" "anonymous_events" "attribute" )
 	#end
 	
 	#if( $auth.hasAccess( "dhis-web-caseentry", "reportSelect" ) )

=== 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-10-05 05:02:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-10-05 06:46:22 +0000
@@ -1458,6 +1458,8 @@
 	hideById('addRelationshipDiv');
 	hideById('migrationPatientDiv');
 	hideById('smsManagementDiv');
+	hideById('dataEntryFormDiv');
+	
 	setInnerHTML('listEventDiv','');
 				
 	jQuery('#loaderDiv').show();

=== 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-10-04 04:31:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-10-05 06:46:22 +0000
@@ -2,85 +2,16 @@
 // Load program-stages by the selected program
 //--------------------------------------------------------------------------------------------
 
-function loadProgramStages()
+function loadProgramStages( programId )
 {
-	jQuery('#createNewEncounterDiv').dialog('close');
-	hideById('dataEntryFormDiv');
-	setFieldValue('executionDate','');
-	setFieldValue('dueDate','');
-	disableCompletedButton(true);
-	disable('uncompleteBtn');
-	disable('validationBtn');
-	hideById('inputCriteriaDiv');
-	$('#programStageIdTR').html('');
-	hideById('colorHelpLink');
-	
-	var programId = jQuery('#dataRecordingSelectDiv [name=programId]').val();
-	if ( programId == 0 )
-	{
-		return;
-	}
-	
 	jQuery.getJSON( "loadProgramStageInstances.action",
 		{
 			programId: programId
 		},  
 		function( json ) 
 		{    
-			hideById('executionDateTB');
-			if(byId('repeatableProgramStageId').options.length == 0)
-			{
-				hideById("newEncounterBtn");
-			}
-			
-			var type = jQuery('#dataRecordingSelectDiv [name=programId] option:selected').attr('type');
-			if( type == 1 )
-			{
-				showById('colorHelpLink');
-				for ( i in json.programStageInstances ) 
-				{
-					if( i!= 0 )
-					{
-						$('#programStageIdTR').append('<td><img src="images/rightarrow.png"></td>');
-					}
-
-					var status =json.programStageInstances[i].status;
-					var programStageInstanceId = json.programStageInstances[i].id;
-					var programStageId = json.programStageInstances[i].programStageId;
-					var programStageName= json.programStageInstances[i].programStageName;
-					var elementId = prefixId + programStageInstanceId;
-					
-					$('#programStageIdTR').append('<td><input name="programStageBtn" '
-						+ 'id="' + elementId + '"' 
-						+ 'type="button" class="stage-object" '
-						+ 'psid="' + programStageId + '"' 
-						+ 'psname="' + programStageName + '" '
-						+ 'dueDate="' + json.programStageInstances[i].dueDate + '"'
-						+ 'value="'+ programStageName + ' ' + json.programStageInstances[i].dueDate + '" '
-						+ 'onclick="javascript:loadDataEntry(' + programStageInstanceId + ')"></td>');
-					setEventColorStatus( programStageInstanceId, status );
-				}
-				
-				disableCompletedButton(true);
-				disable('validationBtn');
-				showById('programStageIdTB');
-				showById('programInstanceFlowDiv');
-			}
-			// Load entry form for Single-event program or normal program with only one program-stage
-			else 
-			{
-				jQuery('#dueDateTR').attr('class','hidden');
-				disableCompletedButton(false);
-				hideById('programStageIdTB');
-				hideById('programInstanceFlowDiv');
-				var programStageInstanceId = '';
-				if( json.programStageInstances.length == 1 )
-				{
-					programStageInstanceId = json.programStageInstances[0].id;
-				}
-				loadDataEntry( programStageInstanceId );
-			}
-	});
+			loadDataEntry( json.programStageInstances[0].id );
+		});
 }
 
 //------------------------------------------------------------------------------
@@ -580,7 +511,9 @@
 					{
 						selectedProgram.remove();
 						hideById('programInstanceDiv');
-						hideById('entryFormContainer');
+						if( !isCreateEvent ){
+							hideById('entryFormContainer');
+						}
 						var completedRow = jQuery('#td_' + programInstanceId).html();
 						jQuery('#completedList' ).append('<option value="' +  programInstanceId + '">' + getInnerHTML('infor_' + programInstanceId ) + '</option>');
 						hideById('tr1_' + programInstanceId );
@@ -590,8 +523,6 @@
 					selection.enable();
 					hideLoader();
 					hideById('contentDiv');
-					
-					
 					if( isCreateEvent )
 					{
 						showAddEventForm();

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js	2012-09-11 09:46:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js	2012-10-05 06:46:22 +0000
@@ -71,9 +71,10 @@
 {
 	hideById('dataRecordingSelectDiv');
 	hideById('dataEntryFormDiv');
+	hideById('addNewDiv');
 	showById('searchDiv');
 	showById('contentDiv');
-	hideById('addNewDiv');
+	showById('mainLinkLbl');
 	jQuery('#createNewEncounterDiv').dialog('close');
 	jQuery('#resultSearchDiv').dialog('close');
 }
@@ -128,7 +129,7 @@
 // Show selected data-recording
 //--------------------------------------------------------------------------------------------
 
-function showSelectedDataRecoding( patientId )
+function showSelectedDataRecoding( patientId, programId )
 {
 	showLoader();
 	hideById('searchDiv');
@@ -142,21 +143,10 @@
 			showById('dataRecordingSelectDiv');
 			hideLoader();
 			hideById('contentDiv');
-			jQuery("#dataRecordingSelectDiv [id=inputCriteria]").show();
-			if( getFieldValue('isRegistration') == 'true' )
-			{
-				jQuery("#dataRecordingSelectDiv [id=inputCriteria]").hide();
-				var singleProgramId = getFieldValue('programIdAddPatient');
-				jQuery("#dataRecordingSelectDiv select[id='programId'] option").each(function(){
-					if( jQuery(this).val()==singleProgramId){
-						jQuery(this).attr('selected', 'selected');
-						if( jQuery("#dataRecordingSelectDiv select[id='programId'] option").length > 2)
-						{
-							loadProgramStages();
-						}
-					}
-				});
-			}
+			hideById('contentDiv');
+			hideById('mainLinkLbl');
+			setInnerHTML('singleProgramName',jQuery('#programIdAddPatient option:selected').text());
+			loadProgramStages( programId );
 		});
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js	2012-08-02 13:10:04 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js	2012-10-05 06:46:22 +0000
@@ -1,4 +1,6 @@
+
 var _continue = false;
+
 function orgunitSelected( orgUnits, orgUnitNames )
 {	
 	organisationUnitSelected( orgUnits, orgUnitNames );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2012-09-21 01:10:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2012-10-05 06:46:22 +0000
@@ -78,10 +78,7 @@
 				#if($value=="")
 					#set($value=$patient.getFullName())
 				#end
-				<td onclick="javascript:showPatientDashboardForm( '$patient.id' )">
-					$value
-				</td>
-					
+				<td>$value</td>
 				<td>			
 					$i18n.getString( $patient.gender )
 				</td>
@@ -95,7 +92,7 @@
 				<td>$!mapPatientOrgunit.get($patient.id)</td>
 				#end
 				<td>
-					<a href="javascript:showById('backBtnFromEntry');setInnerHTML('addNewDiv','');unSave = false;showSelectedDataRecoding('$patient.id');" title="$i18n.getString( 'data_entry' )"><img src="images/data_entry.png" alt="$i18n.getString( 'data_entry' )"></a>   
+					<a href="javascript:setInnerHTML('addNewDiv','');unSave = false;showSelectedDataRecoding('$patient.id', getFieldValue('programIdAddPatient'));" title="$i18n.getString( 'data_entry' )"><img src="images/data_entry.png" alt="$i18n.getString( 'data_entry' )"></a>   
 					<a href="javascript:showPatientHistory( '$patient.id' )" title='$i18n.getString( "patient_details_and_history" )'><img src="../images/information.png" alt='$i18n.getString( "patient_details_and_history" )'></a>
                 </td>               				
 			</tr>

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventPatient.vm	2012-09-21 01:10:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventPatient.vm	1970-01-01 00:00:00 +0000
@@ -1,104 +0,0 @@
-<table>
-	<tr>
-		<td class='text-column' >$i18n.getString( "search_result_matching_the_search_criteria" ):</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>
-		#if($!listAll)
-			$i18n.getString( "list_all_patients" )
-		#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>$!total</td>
-	</tr>
-</table>
-
-<br>
-<table class="entryScreen">
-  <tr>
-    <td>    
-      <table class="listTable">                   
-          <col width="40"/>
-          <col/>
-          <col width="60"/>
-          <col width="90"/>
-          <col width="60"/>
-		  #if($mapPatientOrgunit.size()!=0)
-		  <col/>
-		  #end
-		  <col width="80"/>
-          <tr>
-			<th>#</th>
-            <th>$i18n.getString( "full_name" )</th>        
-            <th>$i18n.getString( "gender" )</th>
-            <th>$i18n.getString( "date_of_birth" )</th>
-            <th>$i18n.getString( "age" )</th>   
-			#if($mapPatientOrgunit.size()!=0)
-			<th>$i18n.getString( "hierachy_orgunit" )</th>
-			#end			
-            <th>$i18n.getString( "operations" )</th>
-          </tr>
-          
-          <tbody id="list">	
-          #set( $mark = false )
-          
-          #foreach( $patient in $patients )
-          	<tr #alternate( $mark )>
-				<td>
-					#set( $nr = ( ( $paging.getCurrentPage() - 1  ) * $paging.pageSize ) + $velocityCount )
-					$nr
-                </td>
-				<td>			
-					$encoder.htmlEncode( $patient.getFullName() )
-				</td>			
-				<td>			
-					$i18n.getString( $patient.gender )
-				</td>
-				<td>			
-					$format.formatDate( $patient.birthDate )
-				</td>
-				<td>            
-                    $encoder.htmlEncode( $patient.getAge() )
-                </td>	
-				#if($mapPatientOrgunit.size()!=0)
-				<td>$!mapPatientOrgunit.get($patient.id)</td>
-				#end
-				<td>
-					<a href="javascript:showById('backBtnFromEntry');unSave=false;showSelectedDataRecoding('$patient.id');" title="$i18n.getString( 'data_entry' )"><img src="images/data_entry.png" alt="$i18n.getString( 'data_entry' )"></a>   
-					<a href="javascript:showPatientHistory( '$patient.id' )" title='$i18n.getString( "patient_details_and_history" )'><img src="../images/information.png" alt='$i18n.getString( "patient_details_and_history" )'></a>
-                </td>               				
-			</tr>
-			#if( $mark )
-				#set( $mark = false )
-			#else
-				#set( $mark = true )
-			#end
-    	#end
-    	</tbody>
-		<tr>
-		<td colspan="7">
-			<p></p>
-			<div class="paging-container">
-				#parse( "/dhis-web-commons/paging/paging.vm" )
-			</div>
-		</td>
-		<td></td>
-	  </tr>
-	  </table>
-    </td>
-  </tr>
-</table>
-
-<div id="detailsInfo"></div>
-
-<span id="message"></span>
-<script>
-	var i18n_patient_details_and_history = '$encoder.jsEscape( $i18n.getString( "patient_details_and_history" ) , "'" )';
-</script>

=== 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-09-11 09:46:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm	2012-10-05 06:46:22 +0000
@@ -13,7 +13,8 @@
 	});
 </script>
 
-<h3>$i18n.getString( "single_event_with_registration" ) #openHelp('single_event_with_registration')</h3>
+<h3 id='mainLinkLbl'>$i18n.getString( "single_event_with_registration" ) #openHelp('single_event_with_registration')</h3>
+
 <input type='hidden' id='isRegistration' name= 'isRegistration' value='true'>
 <input type='hidden' id='listAll' name='listAll'>
 <select class='hidden' id='repeatableProgramStageId' name='repeatableProgramStageId'></select>
@@ -25,18 +26,24 @@
 
 <p><input type="button" class='button' value="$i18n.getString( 'back_to_search' )" id='backBtnFromEntry' onclick='backMainPage();' style='display:none;'></p>
 <span id='message'></span>
+
+<div class='hidden'>
+	<input id='executionDateNewEvent' name='executionDateNewEvent'>
+</div>
+
+#parse( "dhis-web-commons/loader/loader.vm" )
+
 <div id='contentDiv'></div>
 <div id='addNewDiv'></div>
 <div id='dataRecordingSelectDiv'></div>
 <div id='dataEntryFormDiv'></div>
-<div id='resultSearchDiv'></div>
-
-<div class='hidden'>
-	<input id='executionDateNewEvent' name='executionDateNewEvent'>
-</div>
-
-
-#parse( "dhis-web-commons/loader/loader.vm" )
+<div id='patientDashboard'></div> <!-- Patient dashboard -->
+<div id='editPatientDiv'></div> <!-- Add Patient Form -->
+<div id='resultSearchDiv' style='font-size:13px'></div> <!-- List searching patients -->
+<div id='enrollmentDiv'></div> <!-- Program Enrollment Form -->
+<div id='listRelationshipDiv'></div> <!-- List relationship -->
+<div id='addRelationshipDiv'></div> <!-- Add relationship -->
+<div id='migrationPatientDiv'></div> <!-- Migration Patient -->
 
 <script type="text/javascript">
 	var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'")';
@@ -63,7 +70,6 @@
 	var i18n_patient_identifiers = '$encoder.jsEscape( $i18n.getString( "patient_identifiers" ) , "'")';
 	var i18n_patient_attributes = '$encoder.jsEscape( $i18n.getString( "patient_attributes" ) , "'")';
 	var i18n_patient_id = '$encoder.jsEscape( $i18n.getString( "id" ) , "'")';
-	var i18n_patient_id = '$encoder.jsEscape( $i18n.getString( "id" ), "'")';
 	var i18n_patient_full_name = '$encoder.jsEscape( $i18n.getString( "full_name" ) , "'")';
 	var i18n_patient_demographics = '$encoder.jsEscape( $i18n.getString( "demographics" ) , "'")';
 	var i18n_patient_gender = '$encoder.jsEscape( $i18n.getString( "gender" ) , "'")';
@@ -112,6 +118,19 @@
 	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" ) , "'")';
+	var i18n_add_person_successfully = '$encoder.jsEscape( $i18n.getString( "add_person_successfully" ) , "'")';
+	
+	var i18n_please_select_relationship_type = '$encoder.jsEscape( $i18n.getString( "please_select_relationship_type" ) , "'")';
+	var i18n_please_select_a_patient_for_setting_relationship = '$encoder.jsEscape( $i18n.getString( "please_select_a_patient_for_setting_relationship" ) , "'")';
+	var i18n_update_patient = '$encoder.jsEscape( $i18n.getString( "update_patient" ) , "'")';
+	var i18n_enroll_program = '$encoder.jsEscape( $i18n.getString( "enroll_program" ) , "'")';
+	var i18n_comfirm_delete_event = '$encoder.jsEscape( $i18n.getString( "comfirm_delete_event" ) , "'")';
+	var i18n_the_date_is_scheduled = '$encoder.jsEscape( $i18n.getString( "the_date_is_scheduled" ) , "'")';
+	var i18n_overdue = '$encoder.jsEscape( $i18n.getString( "overdue" ) , "'")';
+	var i18n_scheduled_in_future = '$encoder.jsEscape( $i18n.getString( "scheduled_in_future" ) , "'")';
+	var i18n_main_form_link = '$encoder.jsEscape( $i18n.getString( "patient_management" ) , "'")';
+	var i18n_comment_added = '$encoder.jsEscape( $i18n.getString( "comment_added" ) , "'")';
+	var i18n_main_form_link = '$encoder.jsEscape( $i18n.getString( "single_event_with_registration" ) , "'")';
 	
 	datePickerValid( 'executionDateNewEvent', true );