dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18011
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7418: Validation for adding new patient in single event with registration.
------------------------------------------------------------
revno: 7418
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-06-27 14:34:44 +0700
message:
Validation for adding new patient in single event with registration.
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/addSingleEventRegistration.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/patient.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/responseDuplicate.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-06-27 05:12:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-06-27 07:34:44 +0000
@@ -369,3 +369,4 @@
complete_and_add_new_event = Complete & Add new
no_compulsary_data_elements = No compulsary data elements
single_event_with_registration = Single event with registration
+show_data_entry = Show data entry
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addSingleEventRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addSingleEventRegistration.vm 2012-06-27 05:12:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addSingleEventRegistration.vm 2012-06-27 07:34:44 +0000
@@ -40,7 +40,7 @@
<h3>$i18n.getString( "add_new_patient" )</h3>
<input type="hidden" id="representativeId" name="representativeId"/>
<input type="hidden" id="relationshipTypeId" name="relationshipTypeId"/>
- <table id='editPatientDiv'>
+ <table id='patientForm'>
#parse( "/dhis-web-caseentry/patientForm.vm" )
</table>
=== 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-06-25 02:11:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-06-27 07:34:44 +0000
@@ -344,4 +344,44 @@
default:
return;
}
+}
+
+
+// -----------------------------------------------------------------------------
+// check duplicate patient
+// -----------------------------------------------------------------------------
+
+function checkDuplicate( divname )
+{
+ $.postUTF8( 'validatePatient.action',
+ {
+ fullName: jQuery( '#' + divname + ' [id=fullName]' ).val(),
+ dobType: jQuery( '#' + divname + ' [id=dobType]' ).val(),
+ gender: jQuery( '#' + divname + ' [id=gender]' ).val(),
+ birthDate: jQuery( '#' + divname + ' [id=birthDate]' ).val(),
+ age: jQuery( '#' + divname + ' [id=age]' ).val()
+ }, function( xmlObject, divname )
+ {
+ checkDuplicateCompleted( xmlObject, divname );
+ });
+}
+
+function checkDuplicateCompleted( messageElement, divname )
+{
+ checkedDuplicate = true;
+ var type = jQuery(messageElement).find('message').attr('type');
+ var message = jQuery(messageElement).find('message').text();
+
+ if( type == 'success')
+ {
+ showSuccessMessage(i18n_no_duplicate_found);
+ }
+ if ( type == 'input' )
+ {
+ showWarningMessage(message);
+ }
+ else if( type == 'duplicate' )
+ {
+ showListPatientDuplicate( messageElement, true );
+ }
}
\ No newline at end of file
=== 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-06-25 14:15:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2012-06-27 07:34:44 +0000
@@ -157,10 +157,14 @@
function saveVal( dataElementId )
{
+ if( byId('programStageId') == null) return;
var programStageId = byId('programStageId').value;
+
var fieldId = programStageId + '-' + dataElementId + '-val';
var field = byId( fieldId );
+ if( field == null) return;
+
var fieldValue = jQuery.trim( field.value );
var arrData = jQuery( "#" + fieldId ).attr('data').replace('{','').replace('}','').replace(/'/g,"").split(',');
@@ -855,6 +859,9 @@
return false;
}
}
+ },
+ blur: function( event, ui ){
+ input.autocomplete( "close" );
}
})
.addClass( "ui-widget" );
=== 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-06-27 05:12:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js 2012-06-27 07:34:44 +0000
@@ -126,7 +126,8 @@
showById('dataRecordingSelectDiv');
hideLoader();
hideById('contentDiv');
- if( getFieldValue('isRegistration') )
+ jQuery("#dataRecordingSelectDiv [id=inputCriteria]").show();
+ if( getFieldValue('isRegistration') == 'true' )
{
jQuery("#dataRecordingSelectDiv [id=inputCriteria]").hide();
var singleProgramId = getFieldValue('programIdAddPatient');
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2012-06-27 05:12:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2012-06-27 07:34:44 +0000
@@ -139,44 +139,6 @@
return params;
}
-// -----------------------------------------------------------------------------
-// check duplicate patient
-// -----------------------------------------------------------------------------
-
-function checkDuplicate( divname )
-{
- $.postUTF8( 'validatePatient.action',
- {
- fullName: jQuery( '#' + divname + ' [id=fullName]' ).val(),
- dobType: jQuery( '#' + divname + ' [id=dobType]' ).val(),
- gender: jQuery( '#' + divname + ' [id=gender]' ).val(),
- birthDate: jQuery( '#' + divname + ' [id=birthDate]' ).val(),
- age: jQuery( '#' + divname + ' [id=age]' ).val()
- }, function( xmlObject, divname )
- {
- checkDuplicateCompleted( xmlObject, divname );
- });
-}
-
-function checkDuplicateCompleted( messageElement, divname )
-{
- checkedDuplicate = true;
- var type = jQuery(messageElement).find('message').attr('type');
- var message = jQuery(messageElement).find('message').text();
-
- if( type == 'success')
- {
- showSuccessMessage(i18n_no_duplicate_found);
- }
- if ( type == 'input' )
- {
- showWarningMessage(message);
- }
- else if( type == 'duplicate' )
- {
- showListPatientDuplicate( messageElement, true );
- }
-}
/**
* Show list patient duplicate by jQuery thickbox plugin
* @param rootElement : root element of the response xml
=== 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-06-27 05:12:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js 2012-06-27 07:34:44 +0000
@@ -47,7 +47,40 @@
function validateData()
{
- addPatient();
+ $("#patientForm :input").attr("disabled", true);
+ $.ajax({
+ type: "POST",
+ url: 'validatePatient.action',
+ data: getParamsForDiv('patientForm'),
+ success: function( data ){
+ var type = jQuery(data).find('message').attr('type');
+ var message = jQuery(data).find('message').text();
+
+ if ( type == 'success' )
+ {
+ removeDisabledIdentifier( );
+ addPatient();
+ }
+ else
+ {
+ $("#patientForm :input").attr("disabled", true);
+ if ( type == 'error' )
+ {
+ showErrorMessage( i18n_adding_patient_failed + ':' + '\n' + message );
+ }
+ else if ( type == 'input' )
+ {
+ showWarningMessage( message );
+ }
+ else if( type == 'duplicate' )
+ {
+ showListPatientDuplicate(data, false);
+ }
+
+ $("#patientForm :input").attr("disabled", false);
+ }
+ }
+ });
}
function addPatient()
@@ -55,7 +88,7 @@
$.ajax({
type: "POST",
url: 'addPatient.action',
- data: getParamsForDiv('editPatientDiv'),
+ data: getParamsForDiv('patientForm'),
success: function(json) {
var patientId = json.message.split('_')[0];
addData( getFieldValue('programIdAddPatient'), patientId )
@@ -80,3 +113,83 @@
return false;
}
+function showListPatientDuplicate( rootElement, validate )
+{
+ var message = jQuery(rootElement).find('message').text();
+ var patients = jQuery(rootElement).find('patient');
+
+ var sPatient = "";
+ jQuery( patients ).each( function( i, patient )
+ {
+ sPatient += "<hr style='margin:5px 0px;'><table>";
+ sPatient += "<tr><td class='bold'>" + i18n_patient_system_id + "</td><td>" + jQuery(patient).find('systemIdentifier').text() + "</td></tr>" ;
+ sPatient += "<tr><td class='bold'>" + i18n_patient_full_name + "</td><td>" + jQuery(patient).find('fullName').text() + "</td></tr>" ;
+ sPatient += "<tr><td class='bold'>" + i18n_patient_gender + "</td><td>" + jQuery(patient).find('gender').text() + "</td></tr>" ;
+ sPatient += "<tr><td class='bold'>" + i18n_patient_date_of_birth + "</td><td>" + jQuery(patient).find('dateOfBirth').text() + "</td></tr>" ;
+ sPatient += "<tr><td class='bold'>" + i18n_patient_age + "</td><td>" + jQuery(patient).find('age').text() + "</td></tr>" ;
+ sPatient += "<tr><td class='bold'>" + i18n_patient_phone_number + "</td><td>" + jQuery(patient).find('phoneNumber').text() + "</td></tr>";
+
+ var identifiers = jQuery(patient).find('identifier');
+ if( identifiers.length > 0 )
+ {
+ sPatient += "<tr><td colspan='2' class='bold'>" + i18n_patient_identifiers + "</td></tr>";
+
+ jQuery( identifiers ).each( function( i, identifier )
+ {
+ sPatient +="<tr class='identifierRow'>"
+ +"<td class='bold'>" + jQuery(identifier).find('name').text() + "</td>"
+ +"<td>" + jQuery(identifier).find('value').text() + "</td> "
+ +"</tr>";
+ });
+ }
+
+ var attributes = jQuery(patient).find('attribute');
+ if( attributes.length > 0 )
+ {
+ sPatient += "<tr><td colspan='2' class='bold'>" + i18n_patient_attributes + "</td></tr>";
+
+ jQuery( attributes ).each( function( i, attribute )
+ {
+ sPatient +="<tr class='attributeRow'>"
+ +"<td class='bold'>" + jQuery(attribute).find('name').text() + "</td>"
+ +"<td>" + jQuery(attribute).find('value').text() + "</td> "
+ +"</tr>";
+ });
+ }
+ sPatient += "<tr><td colspan='2'><input type='button' id='"+ jQuery(patient).find('id').first().text() + "' value='" + i18n_show_data_entry + "' onclick='showSelectedDataRecoding(" + jQuery(patient).find('id').first().text() + ");showEntryFormDiv(); '/></td></tr>";
+ sPatient += "</table>";
+ });
+
+ var result = i18n_duplicate_warning;
+ if( !validate )
+ {
+ result += "<input type='button' value='" + i18n_create_new_patient + "' onClick='removeDisabledIdentifier( );addPatient();'/>";
+ result += "<br><hr style='margin:5px 0px;'>";
+ }
+
+ result += "<br>" + sPatient;
+ jQuery('#resultSearchDiv' ).html( result );
+ jQuery('#resultSearchDiv' ).dialog({
+ title: i18n_duplicated_patient_list,
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 800,
+ height: 400
+ });
+}
+
+function showEntryFormDiv()
+{
+ hideById('singleEventForm');
+ jQuery("#resultSearchDiv").dialog("close");
+}
+
+function removeDisabledIdentifier()
+{
+ jQuery("input.idfield").each(function(){
+ if( jQuery(this).is(":disabled"))
+ jQuery(this).val("");
+ });
+}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm 2012-05-29 15:37:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm 2012-06-27 07:34:44 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<message type="duplicate">$encoder.xmlEncode( $message )
-#foreach( $patient in $patients )
+#foreach( $patient in $patients )
<patient>
<id>$patient.id</id>
<fullName>$encoder.xmlEncode( $patient.getFullName() )</fullName>
=== 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-06-27 05:12:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm 2012-06-27 07:34:44 +0000
@@ -23,6 +23,8 @@
<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>
@@ -31,29 +33,72 @@
#parse( "dhis-web-commons/loader/loader.vm" )
<script type="text/javascript">
- var i18n_id = '$encoder.jsEscape( $i18n.getString( "id" ), "'")';
- var i18n_full_name = '$encoder.jsEscape( $i18n.getString( "full_name" ), "'")';
- var i18n_gender = '$encoder.jsEscape( $i18n.getString( "gender" ), "'")';
- var i18n_dob_type = '$encoder.jsEscape( $i18n.getString( "dob_type" ), "'")';
- var i18n_date_of_birth = '$encoder.jsEscape( $i18n.getString( "date_of_birth" ), "'")';
- var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
+ var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'")';
+ var i18n_please_select_village = '[' + '$encoder.jsEscape( $i18n.getString( "please_select_village" ), "'")' + ']';
+ var i18n_specify_search_criteria = '$encoder.jsEscape( $i18n.getString( "specify_search_criteria" ) , "'")';
+ var i18n_select_program = '[' + '$encoder.jsEscape( $i18n.getString( "select_program" ), "'")' + ']';
+ var i18n_save_success = '$encoder.jsEscape( $i18n.getString( "save_success" ) , "'")';
+ var i18n_list_all_patient = '$encoder.jsEscape( $i18n.getString( "list_all_patient" ) , "'")';
+ var i18n_enrol_success = '$encoder.jsEscape( $i18n.getString( "enrol_success" ) , "'")';
+ var i18n_unenrol_success = '$encoder.jsEscape( $i18n.getString( "unenrol_success" ) , "'")';
+ var i18n_list_patients_by_program = '$encoder.jsEscape( $i18n.getString( "list_patients_by_program" ) , "'" )';
+ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_patient" ) , "'" )';
+ var i18n_adding_patient_failed = '$encoder.jsEscape( $i18n.getString( "adding_patient_failed" ), "'")';
+ var i18n_updating_patient_failed = '$encoder.jsEscape( $i18n.getString( "updating_patient_failed" ), "'")';
+ var i18n_program_enrollment_failed = '$encoder.jsEscape( $i18n.getString( "program_enrollment_failed" ) , "'")';
+ var i18n_saving_value_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_status_code" ) , "'")';
+ var i18n_saving_value_failed_error_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_error_code" ) , "'")';
+ var i18n_searching_patient_failed = '$encoder.jsEscape( $i18n.getString( "searching_patient_failed" ) , "'")';
+ var i18n_date_invalid = '$encoder.jsEscape( $i18n.getString( "date_invalid" ) , "'")';
+ var i18n_date_less_incident = '$encoder.jsEscape( $i18n.getString( "date_less_incident" ) , "'")';
+ var i18n_enroll_to_program = '$encoder.jsEscape( $i18n.getString( "enroll_to_program" ) , "'")';
+ var i18n_update = '$encoder.jsEscape( $i18n.getString( "update" ) , "'")';
+ var i18n_oucode_must_have_9_digits = '$encoder.jsEscape( $i18n.getString( "oucode_must_be_valid" ) , "'")';
+ 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" ) , "'")';
+ var i18n_patient_date_of_birth = '$encoder.jsEscape( $i18n.getString( "date_of_birth" ) , "'")';
+ var i18n_patient_dob_type = '$encoder.jsEscape( $i18n.getString( "dob_type" ), "'")';
+ var i18n_patient_age = '$encoder.jsEscape( $i18n.getString( "age" ) , "'")';
+ var i18n_patient_phone_number = '$encoder.jsEscape( $i18n.getString( "phone_number" ) , "'")';
+ var i18n_edit_this_patient = '$encoder.jsEscape( $i18n.getString( "edit_this_patient" ) , "'")';
+ var i18n_no_duplicate_found = '$encoder.jsEscape( $i18n.getString( "no_duplicate_found" ) , "'")';
+ var i18n_patient_system_id = '$encoder.jsEscape( $i18n.getString( "patient_system_id" ) , "'")';
+ var i18n_child_representative = '$encoder.jsEscape( $i18n.getString( "child_representative" ) , "'")';
+ var i18n_no_patients_found = '$encoder.jsEscape( $i18n.getString( "no_patients_found" ) , "'")';
+ var i18n_search_result = '$encoder.jsEscape( $i18n.getString( "search_result" ) , "'")';
+ var i18n_duplicated_patient_list = '$encoder.jsEscape( $i18n.getString( "duplicated_patient_list" ) , "'")';
+ var i18n_duplicate_warning = '$encoder.jsEscape( $i18n.getString( "duplicate_warning" ) , "'")';
+ var i18n_search_by_name_identifier = '$encoder.jsEscape( $i18n.getString( "search_by_name_identifier" ) , "'")';
+ var i18n_search_by_program = '$encoder.jsEscape( $i18n.getString( "search_by_program" ) , "'")';
+ var i18n_create_new_patient = '$encoder.jsEscape( $i18n.getString( "create_new_patient" ) , "'")';
+ var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
+ var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
+ var i18n_choose_this_person = '$encoder.jsEscape( $i18n.getString( "choose_this_person" ) , "'")';
+ var i18n_representative_info = '$encoder.jsEscape( $i18n.getString( "representative_info" ) , "'")';
var i18n_select = '[' + '$encoder.jsEscape( $i18n.getString( "select" ), "'")' + ']';
- var i18n_program_stages_history_plan = '$encoder.jsEscape( $i18n.getString( "program_stages_history_plan" ) , "'")';
+ var i18n_program_stages_history_plan = '$encoder.jsEscape( $i18n.getString( "program_stages_history_plan" ) , "'")';
+
var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';
var i18n_value_must_number = '$encoder.jsEscape( $i18n.getString( "value_must_number" ) , "'")';
var i18n_value_must_positive_integer = '$encoder.jsEscape( $i18n.getString( "value_must_positive_integer" ) , "'")';
var i18n_value_must_negative_integer = '$encoder.jsEscape( $i18n.getString( "value_must_negative_integer" ) , "'")';
- var i18n_invalid_date = '$encoder.jsEscape( $i18n.getString( "invalid_date" ) , "'")' + ".\n " + '$encoder.jsEscape( $i18n.getString( "format_date" ) , "'")' + " '" + dateFormat.replace('yy', 'yyyy') + " '" ;
- var i18n_saving_value_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_status_code" ) , "'")';
- var i18n_saving_value_failed_error_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_error_code" ) , "'")';
- var i18n_searching_patient_failed = '$encoder.jsEscape( $i18n.getString( "searching_patient_failed" ) , "'")';
+ var i18n_invalid_date = '$encoder.jsEscape( $i18n.getString( "invalid_date" ) , "'")' + ".\n "
+
var i18n_complete_confirm_message = '$encoder.jsEscape( $i18n.getString( "complete_confirm_message" ) , "'")';
+ var i18n_date_is_greater_then_or_equals_due_date = '$encoder.jsEscape( $i18n.getString( "date_is_greater_then_or_equals_due_date" ) , "'")';
+ var i18n_male = '$encoder.jsEscape( $i18n.getString( "male" ) , "'")';
+ var i18n_female = '$encoder.jsEscape( $i18n.getString( "female" ) , "'")';
+
+ var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")';
+ var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_items" ) , "'")';
+
var i18n_error_required_field = '$encoder.jsEscape( $i18n.getString( "error_required_field" ) , "'")';
- var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")';
- var i18n_date_is_greater_then_or_equals_due_date = '$encoder.jsEscape( $i18n.getString( "date_is_greater_then_or_equals_due_date" ) , "'")';
var i18n_program_stage = '$encoder.jsEscape( $i18n.getString( "program_stage" ) , "'")';
- var i18n_scheduled_for = '$encoder.jsEscape( $i18n.getString( "scheduled_for" ) , "'")';
- 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_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
@@ -61,8 +106,10 @@
var i18n_male = '$encoder.jsEscape( $i18n.getString( "male" ) , "'")';
var i18n_female = '$encoder.jsEscape( $i18n.getString( "female" ) , "'")';
var i18n_specify_search_criteria = '$encoder.jsEscape( $i18n.getString( "specify_search_criteria" ) , "'")';
- i18n_please_select = '$encoder.jsEscape( $i18n.getString( "please_select" ) , "'")';
- var i18n_save_success = '$encoder.jsEscape( $i18n.getString( "save_success" ) , "'")';
+ 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" ) , "'")';
+
datePickerValid( 'executionDateNewEvent', true );
var searchTextBox = '<input type="text" id="searchText" name="searchText" onkeyup="searchPatientsOnKeyUp( event );">';
