' ).load( 'showAddRepresentative.action' ).dialog({
- title: i18n_child_representative,
- maximize: true,
- closable: true,
- modal:true,
- overlay:{background:'#000000', opacity:0.1},
- width: 800,
- height: 450
- });
- }else
- {
- jQuery("#representativeDiv :input.idfield").each(function(){
- if( jQuery(this).is(":disabled"))
- {
- jQuery(this).removeAttr("disabled").val("");
- }
- });
- jQuery("#representativeId").val("");
- jQuery("#relationshipTypeId").val("");
- }
-}
-
-// ----------------------------------------------------------------
-// Add Patient
-// ----------------------------------------------------------------
-
-function showAddPatientForm()
-{
- hideById('listPatientDiv');
- hideById('selectDiv');
- hideById('searchPatientDiv');
- hideById('migrationPatientDiv');
-
- jQuery('#loaderDiv').show();
- jQuery('#editPatientDiv').load('showAddPatientForm.action'
- , function()
- {
- showById('editPatientDiv');
- jQuery('#loaderDiv').hide();
- });
-
-}
-
-function addPatient()
-{
- $.ajax({
- type: "POST",
- url: 'addPatient.action',
- data: getParamsForDiv('editPatientDiv'),
- success: function(json) {
- var type = json.response;
- showProgramEnrollmentSelectForm( json.message );
- jQuery('#resultSearchDiv').dialog('close');
- }
- });
- return false;
-}
-
-// ----------------------------------------------------------------
-// Update Patient
-// ----------------------------------------------------------------
-
-function showUpdatePatientForm( patientId )
-{
- hideById('listPatientDiv');
- setInnerHTML('editPatientDiv', '');
- hideById('selectDiv');
- hideById('searchPatientDiv');
- hideById('migrationPatientDiv');
-
- jQuery('#loaderDiv').show();
- jQuery('#editPatientDiv').load('showUpdatePatientForm.action',
- {
- id:patientId
- }, function()
- {
- showById('editPatientDiv');
- jQuery('#searchPatientsDiv').dialog('close');
- jQuery('#loaderDiv').hide();
- });
-
- jQuery('#resultSearchDiv').dialog('close');
-}
-
-function updatePatient()
-{
- $.ajax({
- type: "POST",
- url: 'updatePatient.action',
- data: getParamsForDiv('editPatientDiv'),
- success: function( json ) {
- showProgramEnrollmentSelectForm( getFieldValue('id') );
- }
- });
-}
-
-// ----------------------------------------------------------------
-// Enrollment program
-// ----------------------------------------------------------------
-
-function showProgramEnrollmentSelectForm( patientId )
-{
- hideById('listPatientDiv');
- hideById('editPatientDiv');
- hideById('selectDiv');
- hideById('searchPatientDiv');
- hideById('migrationPatientDiv');
-
- jQuery('#loaderDiv').show();
- jQuery('#enrollmentDiv').load('showProgramEnrollmentForm.action',
- {
- id:patientId
- }, function()
- {
- showById('enrollmentDiv');
-
- jQuery('#loaderDiv').hide();
- });
-}
-
-function showProgramEnrollmentForm( patientId, programId )
-{
- if( programId == 0 )
- {
- jQuery('#enrollBtn').attr('value',i18n_enroll_to_program);
- hideEnrolmentField();
-
- hideById('programEnrollmentDiv');
-
- return;
- }
-
- jQuery('#loaderDiv').show();
- jQuery('#programEnrollmentDiv').load('enrollmentform.action',
- {
- patientId:patientId,
- programId:programId
- }, function()
- {
- showById('programEnrollmentDiv');
- showEnrolmentField();
-
- var singleEvent = jQuery('#enrollmentDiv [name=programId] option:selected').attr('singleevent');
-
- if(singleEvent=='true')
- {
- hideEnrolmentField();
- }
- else
- {
- showEnrolmentField();
- var hideDateOfIncident = jQuery('#programEnrollmentSelectDiv [name=programId] option:selected').attr('hidedateofincident');
-
- if( hideDateOfIncident=='true')
- {
- hideById( 'dateOfIncidentTR');
- }
- else
- {
- showById( 'dateOfIncidentTR');
- }
- }
-
- jQuery('#loaderDiv').hide();
- });
-}
-
-function validateProgramEnrollment()
-{
- $.ajax({
- type: "GET",
- url: 'validatePatientProgramEnrollment.action',
- data: getParamsForDiv('programEnrollmentSelectDiv'),
- success: function(json) {
- hideById('message');
- var type = json.response;
- if ( type == 'success' )
- {
- saveProgramEnrollment();
- }
- else if ( type == 'error' )
- {
- setMessage( i18n_program_enrollment_failed + ':' + '\n' + message );
- }
- else if ( type == 'input' )
- {
- setMessage( json.message );
- }
- }
- });
- return false;
-}
-
-function saveProgramEnrollment()
-{
- $.ajax({
- type: "POST",
- url: 'saveProgramEnrollment.action',
- data: getParamsForDiv('programEnrollmentSelectDiv'),
- success: function( html ) {
- setInnerHTML('programEnrollmentDiv', html );
- jQuery('#enrollBtn').attr('value',i18n_update);
- showSuccessMessage( i18n_enrol_success );
- }
- });
- return false;
-}
-
-// ----------------------------------------------------------------
-// Un-Enrollment program
-// ----------------------------------------------------------------
-
-function showUnenrollmentSelectForm( patientId )
-{
- hideById('listPatientDiv');
- hideById('editPatientDiv');
- hideById('selectDiv');
- hideById('searchPatientDiv');
- hideById('migrationPatientDiv');
-
- jQuery('#loaderDiv').show();
- jQuery('#enrollmentDiv').load('showProgramUnEnrollmentForm.action',
- {
- patientId:patientId
- }, function()
- {
- showById('enrollmentDiv');
- jQuery('#loaderDiv').hide();
- });
-}
-
-function showUnenrollmentForm( programInstanceId )
-{
- if( programInstanceId == 0 )
- {
- hideById( 'unenrollmentFormDiv' );
- return;
- }
-
- jQuery('#loaderDiv').show();
- jQuery.getJSON( "getProgramInstance.action",
- {
- programInstanceId:programInstanceId
- },
- function( json )
- {
- showById( 'unenrollmentFormDiv' );
- jQuery( "#loaderDiv" ).hide();
- });
-}
-
-function unenrollmentForm( programInstanceId )
-{
- if( programInstanceId == 0 )
- {
- disable('enrollBtn');
- return;
- }
-
- $.ajax({
- type: "POST",
- url: 'removeEnrollment.action',
- data: getParamsForDiv('enrollmentDiv'),
- success: function( json )
- {
- showSuccessMessage( i18n_unenrol_success );
- hideEnrolmentField( 'enrollmentDateTR' );
- jQuery('#enrollmentDiv [name=programId]').val('0');
- hideById( 'programEnrollmentDiv' );
- }
- });
-}
-
-//-----------------------------------------------------------------------------
-//Save
-//-----------------------------------------------------------------------------
-
-function saveDueDate( programStageInstanceId, programStageInstanceName )
-{
- var field = document.getElementById( 'value_' + programStageInstanceId + '_date' );
-
- var dateOfIncident = new Date( byId('dateOfIncident').value );
- var dueDate = new Date(field.value);
-
- if( dueDate < dateOfIncident )
- {
- field.style.backgroundColor = '#FFCC00';
- alert( i18n_date_less_incident );
- return;
- }
-
- field.style.backgroundColor = '#ffffcc';
-
- var dateDueSaver = new DateDueSaver( programStageInstanceId, field.value, '#ccffcc' );
- dateDueSaver.save();
-}
-
-//----------------------------------------------------
-// Show relationship with new patient
-//----------------------------------------------------
-
-function showRelationshipList( patientId )
-{
- hideById('addRelationshipDiv');
-
- if ( getFieldValue('isShowPatientList') == 'false' )
- {
- hideById('selectDiv');
- hideById('searchPatientDiv');
- hideById('listPatientDiv');
-
- jQuery('#loaderDiv').show();
- jQuery('#listRelationshipDiv').load('showRelationshipList.action',
- {
- id:patientId
- }, function()
- {
- showById('listRelationshipDiv');
- jQuery('#loaderDiv').hide();
- });
- }
- else
- {
- loadPatientList();
- }
-}
-
-// ----------------------------------------------------------------
-// Click Back to Search button
-// ----------------------------------------------------------------
-
-function onClickBackBtn()
-{
- showById('selectDiv');
- showById('searchPatientDiv');
- showById('listPatientDiv');
-
- hideById('editPatientDiv');
- hideById('enrollmentDiv');
- hideById('listRelationshipDiv');
- hideById('addRelationshipDiv');
- hideById('migrationPatientDiv');
-}
-
-function loadPatientList()
-{
- hideById('editPatientDiv');
- hideById('enrollmentDiv');
- hideById('listRelationshipDiv');
- hideById('addRelationshipDiv');
- hideById('dataRecordingSelectDiv');
- hideById('dataEntryFormDiv');
- hideById('migrationPatientDiv');
-
- showById('selectDiv');
- showById('searchPatientDiv');
-
- if( statusSearching == 0)
- {
- loadAllPatients();
- }
- else if( statusSearching == 1 )
- {
- searchAdvancedPatients();
- }
-}
-
-// -----------------------------------------------------------------------------
-// Load all patients
-// -----------------------------------------------------------------------------
-
-function loadAllPatients()
-{
- hideById('listPatientDiv');
-
- var sortPatientAttributeId = getFieldValue('sortPatientAttributeId');
-
- jQuery('#loaderDiv').show();
- contentDiv = 'listPatientDiv';
- jQuery('#listPatientDiv').load('searchRegistrationPatient.action',{
- listAll:true,
- sortPatientAttributeId: (sortPatientAttributeId ? sortPatientAttributeId : "")
- },
- function(){
- statusSearching = 0;
- showById('listPatientDiv');
- jQuery('#loaderDiv').hide();
- });
- hideLoader();
-}
-
-function addPhoneToList( elementList, _id, _patientName, _phoneNo )
-{
- var list = jQuery( "#" + elementList );
- list.append( "
" );
-
- jQuery( "tr#tr" + _id ).hide();
-}
-
-
-function removePhoneFromList( elementList, _id )
-{
- var list = jQuery( "#" + elementList + " option[value='" + _id + "']" ).remove();
-
- jQuery( "tr#tr" + _id ).show();
-}
-
-//-----------------------------------------------------------------------------
-// Saver objects
-//-----------------------------------------------------------------------------
-
-function DateDueSaver( programStageInstanceId_, dueDate_, resultColor_ )
-{
- var programStageInstanceId = programStageInstanceId_;
- var dueDate = dueDate_;
- var resultColor = resultColor_;
-
- this.save = function()
- {
- var params = 'programStageInstanceId=' + programStageInstanceId + '&dueDate=' + dueDate;
- $.ajax({
- type: "POST",
- url: "saveDueDate.action",
- data: params,
- dataType: "xml",
- success: function(result){
- handleResponse (result);
- },
- error: function(request,status,errorThrown) {
- handleHttpError (request);
- }
- });
- };
-
- function handleResponse( rootElement )
- {
- var codeElement = rootElement.getElementsByTagName( 'code' )[0];
- var code = parseInt( codeElement.firstChild.nodeValue );
-
- if ( code == 0 )
- {
- markValue( resultColor );
- }
- else
- {
- markValue( COLOR_GREY );
- window.alert( i18n_saving_value_failed_status_code + '\n\n' + code );
- }
- }
-
- function handleHttpError( errorCode )
- {
- markValue( COLOR_GREY );
- window.alert( i18n_saving_value_failed_error_code + '\n\n' + errorCode );
- }
-
- function markValue( color )
- {
-
- var element = document.getElementById( 'value_' + programStageInstanceId + '_date' );
-
- element.style.backgroundColor = color;
- }
-}
-
-
-// -----------------------------------------------------------------------------
-// remove value of all the disabled identifier fields
-// an identifier field is disabled when its value is inherited from another person ( underAge is true )
-// we don't save inherited identifiers. Only save the representative id.
-// -----------------------------------------------------------------------------
-
-function removeDisabledIdentifier()
-{
- jQuery("input.idfield").each(function(){
- if( jQuery(this).is(":disabled"))
- jQuery(this).val("");
- });
-}
-
-function addEventForPatientForm( divname )
-{
- jQuery("#" + divname + " [id=searchPatientByNameBtn]").click(function() {
- getPatientsByName( divname );
- });
-
- jQuery("#" + divname + " [id=checkDuplicateBtn]").click(function() {
- checkDuplicate( divname );
- });
-
- jQuery("#" + divname + " [id=dobType]").change(function() {
- dobTypeOnChange( divname );
- });
-}
-
-function showRepresentativeInfo( patientId)
-{
- jQuery('#representativeInfo' ).dialog({
- title: i18n_representative_info,
- maximize: true,
- closable: true,
- modal:true,
- overlay:{background:'#000000', opacity:0.1},
- width: 400,
- height: 300
- });
-}
-
-function hideEnrolmentField()
-{
- setFieldValue( 'enrollmentDate', '' );
- setFieldValue( 'dateOfIncident', '' );
- hideById('enrollmentDateTR');
- hideById('dateOfIncidentTR');
- hideById('enrollBtn');
-}
-
-function showEnrolmentField()
-{
- showById('enrollmentDateTR');
- showById('dateOfIncidentTR');
- showById('enrollBtn');
-}
-
-function saveIdentifierAndAttribute()
-{
- $.ajax({
- type: "POST",
- url: 'savePatientIdentifierAndAttribute.action',
- data: getParamsForDiv('programEnrollmentInforForm'),
- success: function(json)
- {
- showSuccessMessage( i18n_save_success );
- }
- });
-}
-
-//--------------------------------------------------------------------------------------------
-// Show selected data-recording
-//--------------------------------------------------------------------------------------------
-
-function showSelectedDataRecoding( patientId )
-{
- showLoader();
- hideById('searchPatientDiv');
- hideById('dataEntryFormDiv');
- hideById('migrationPatientDiv');
- jQuery('#dataRecordingSelectDiv').load( 'selectDataRecording.action',
- {
- patientId: patientId
- },
- function()
- {
- jQuery('#dataRecordingSelectDiv [id=patientInfoDiv]').hide();
- jQuery('#dataRecordingSelectDiv [id=backBtnFromEntry]').hide();
- showById('dataRecordingSelectDiv');
-
- var programId = jQuery('#programEnrollmentSelectDiv [id=programId] option:selected').val();
- $('#dataRecordingSelectDiv [id=programId]').val( programId );
- $('#dataRecordingSelectDiv [id=programIdTR]').hide();
-
- loadProgramStages();
- hideLoader();
- hideById('contentDiv');
- });
-}
-
-function searchPatient()
-{
- $.ajax({
- url: 'searchRegistrationPatient.action',
- type:"POST",
- data: getParamsForDiv('searchPatientDiv'),
- success: function( html ){
- statusSearching = 1;
- setInnerHTML( 'listPatientDiv', html );
- showById('listPatientDiv');
- jQuery( "#loaderDiv" ).hide();
- }
- });
-}
-
-//--------------------------------------------------------------------------------------------
-// Migration patient
-//--------------------------------------------------------------------------------------------
-
-function getPatientLocation( patientId )
-{
- hideById('listPatientDiv');
- hideById('selectDiv');
- hideById('searchPatientDiv');
-
- jQuery('#loaderDiv').show();
-
- jQuery('#migrationPatientDiv').load("getPatientLocation.action",
- {
- patientId: patientId
- }
- , function(){
- showById( 'migrationPatientDiv' );
- jQuery( "#loaderDiv" ).hide();
- });
-}
-
-function verifyOrgunitRegistration( patientId )
-{
- $.getJSON( 'verifyOrgunitRegistration.action', {}
- , function( json )
- {
- var type = json.response;
- if( type == 'success' )
- {
- registerPatientLocation( patientId );
- }
- else if( type == 'input' )
- {
- showWarningMessage( i18n_can_not_register_patient_for_orgunit);
- }
- } );
-}
-
-function registerPatientLocation( patientId )
-{
- $.getJSON( 'registerPatientLocation.action',{ patientId:patientId }
- , function( json )
- {
- showSuccessMessage( i18n_save_success );
- } );
-}
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/patient.js 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/patient.js 2012-06-04 08:37:52 +0000
@@ -0,0 +1,268 @@
+isAjax = true;
+
+function organisationUnitSelected( orgUnits, orgUnitNames )
+{
+ showById('selectDiv');
+ hideById('listPatientDiv');
+
+ setFieldValue( "selectedOrgunitText", orgUnitNames[0] );
+}
+
+selection.setListenerFunction( organisationUnitSelected );
+
+// ----------------------------------------------------------------------------
+// Search patients by name
+// ----------------------------------------------------------------------------
+
+function getPatientsByName( divname )
+{
+ var fullName = jQuery('#' + divname + ' [id=fullName]').val().replace(/^\s+|\s+$/g,"");
+ if( fullName.length > 0)
+ {
+ contentDiv = 'resultSearchDiv';
+ $('#resultSearchDiv' ).load("getPatientsByName.action",
+ {
+ fullName: fullName
+ }).dialog({
+ title: i18n_search_result,
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{ background:'#000000', opacity: 0.8},
+ width: 800,
+ height: 400
+ });
+ }
+ else
+ {
+ alert( i18n_no_patients_found );
+ }
+}
+
+// -----------------------------------------------------------------------------
+// Advanced search
+// -----------------------------------------------------------------------------
+
+function addAttributeOption()
+{
+ var rowId = 'advSearchBox' + jQuery('#advancedSearchTB select[name=searchingAttributeId]').length + 1;
+ var contend = '
' + getInnerHTML('searchingAttributeIdTD') + ' | ';
+ contend += '
' + searchTextBox ;
+ contend += ' | ';
+ contend = '
' + contend + '
';
+
+ jQuery('#advancedSearchTB > tbody:last').append( contend );
+}
+
+function removeAttributeOption( rowId )
+{
+ jQuery( '#' + rowId ).remove();
+}
+
+//------------------------------------------------------------------------------
+// Search patients by selected attribute
+//------------------------------------------------------------------------------
+
+function searchingAttributeOnChange( this_ )
+{
+ var container = jQuery(this_).parent().parent().attr('id');
+ var attributeId = jQuery('#' + container+ ' [id=searchingAttributeId]').val();
+ var element = jQuery('#' + container+ ' [id=searchText]');
+ var valueType = jQuery('#' + container+ ' [id=searchingAttributeId] option:selected').attr('valueType');
+
+ if( attributeId == '-1' )
+ {
+ element.replaceWith( getDateField( container ) );
+ datePickerValid( container + ' [id=searchText]' );
+ return;
+ }
+
+ $('#' + container+ ' [id=searchText]').datepicker("destroy");
+ $('#' + container+ ' [id=dateOperator]').replaceWith("");
+
+ if( attributeId == '0' )
+ {
+ element.replaceWith( programComboBox );
+ }
+ else if ( attributeId == '-2' )
+ {
+ element.replaceWith( genderSelector );
+ }
+ else if ( valueType=='YES/NO' )
+ {
+ element.replaceWith( trueFalseBox );
+ }
+ else
+ {
+ element.replaceWith( searchTextBox );
+ }
+}
+
+function getDateField( container )
+{
+ var dateField = '
';
+ dateField += '
';
+ return dateField;
+}
+
+//-----------------------------------------------------------------------------
+// Search Patient
+//-----------------------------------------------------------------------------
+
+function searchPatientsOnKeyUp( event )
+{
+ var key = getKeyCode( event );
+
+ if ( key == 13 )// Enter
+ {
+ searchAdvancedPatients()();
+ }
+}
+
+function getKeyCode(e)
+{
+ if (window.event)
+ return window.event.keyCode;
+ return (e)? e.which : null;
+}
+
+function searchAdvancedPatients()
+{
+ hideById( 'listPatientDiv' );
+
+ var searchTextFields = jQuery( '[name=searchText]' );
+ var flag = true;
+
+ jQuery( searchTextFields ).each( function( i, item )
+ {
+ if( jQuery( item ).val() == '' )
+ {
+ showWarningMessage( i18n_specify_search_criteria );
+ flag = false;
+ }
+ });
+
+ if ( !flag ) return;
+
+ contentDiv = 'listPatientDiv';
+ jQuery( "#loaderDiv" ).show();
+ searchPatient();
+
+}
+
+// ----------------------------------------------------------------
+// Get Params form Div
+// ----------------------------------------------------------------
+
+function getParamsForDiv( patientDiv)
+{
+ var params = '';
+ var dateOperator = '';
+
+ jQuery("#" + patientDiv + " :input").each(function()
+ {
+ var elementId = $(this).attr('id');
+
+ if( $(this).attr('type') == 'checkbox' )
+ {
+ var checked = jQuery(this).is( ':checked' );
+ params += elementId + "=" + checked + "&";
+ }
+ else if( elementId == 'dateOperator' )
+ {
+ dateOperator = jQuery(this).val();
+ }
+ else if( $(this).attr('type') != 'button' )
+ {
+ var value = "";
+ if( jQuery(this).val() != '' )
+ {
+ value = htmlEncode(jQuery(this).val());
+ }
+ if( dateOperator != '' )
+ {
+ value = dateOperator + "'" + value + "'";
+ dateOperator = "";
+ }
+ params += elementId + "="+ value + "&";
+ }
+ } );
+
+ return params;
+}
+
+// -----------------------------------------------------------------------------
+// Load all patients
+// -----------------------------------------------------------------------------
+
+function loadAllPatients()
+{
+ hideById( 'listPatientDiv' );
+
+ var sortPatientAttributeId = getFieldValue('sortPatientAttributeId');
+
+ jQuery('#loaderDiv').show();
+ contentDiv = 'listPatientDiv';
+ jQuery('#listPatientDiv').load('searchRegistrationPatient.action',{
+ listAll:true,
+ sortPatientAttributeId: (sortPatientAttributeId ? sortPatientAttributeId : "")
+ },
+ function(){
+ statusSearching = 0;
+ showById('listPatientDiv');
+ jQuery('#loaderDiv').hide();
+ });
+ hideLoader();
+}
+
+function addPhoneToList( elementList, _id, _patientName, _phoneNo )
+{
+ var list = jQuery( "#" + elementList );
+ list.append( "
" );
+
+ jQuery( "tr#tr" + _id ).hide();
+}
+
+function removePhoneFromList( elementList, _id )
+{
+ var list = jQuery( "#" + elementList + " option[value='" + _id + "']" ).remove();
+
+ jQuery( "tr#tr" + _id ).show();
+}
+
+function searchPatient()
+{
+ $.ajax({
+ url: 'searchRegistrationPatient.action',
+ type:"POST",
+ data: getParamsForDiv( 'advancedSearchTB' ),
+ success: function( html ){
+ statusSearching = 1;
+ setInnerHTML( 'listPatientDiv', html );
+ showById('listPatientDiv');
+ jQuery( "#loaderDiv" ).hide();
+ }
+ });
+}
+
+//--------------------------------------------------------------------------------------------
+// Migration patient
+//--------------------------------------------------------------------------------------------
+
+function getPatientLocation( patientId )
+{
+ hideById('listPatientDiv');
+ hideById('selectDiv');
+ hideById('searchPatientDiv');
+
+ jQuery('#loaderDiv').show();
+
+ jQuery('#migrationPatientDiv').load("getPatientLocation.action",
+ {
+ patientId: patientId
+ }
+ , function(){
+ showById( 'migrationPatientDiv' );
+ jQuery( "#loaderDiv" ).hide();
+ });
+}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/patientRegistrationList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/patientRegistrationList.vm 2012-05-09 02:52:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/patientRegistrationList.vm 2012-06-04 08:37:52 +0000
@@ -1,24 +1,38 @@
-
-
- | $i18n.getString( "search_result_matching_the_search_criteria" ): |
- |
- |
-
- #if($!listAll)
- $i18n.getString( "list_all_patients" )
- #else
- $i18n.getString( "search_patients_by_attributes" )
- #end
- |
-
-
-
- | $i18n.getString( "total_result" ) |
- |
- |
- $!total |
-
-
+
+
+
+
+
+ | $i18n.getString( "search_result_matching_the_search_criteria" ): |
+ |
+ |
+
+ #if( $!listAll )
+ $i18n.getString( "list_all_patients" )
+ #else
+ $i18n.getString( "search_patients_by_attributes" )
+ #end
+ |
+
+
+
+ | $i18n.getString( "total_result" ) |
+ |
+ |
+ $!total |
+
+
+
#if( $patients.size() > 0 )
@@ -88,17 +102,15 @@
| $!patient.getAge() |
- #if($mapPatientOrgunit.size()!=0)
-
- $!mapPatientOrgunit.get($patient.id) |
-
+ #if( $mapPatientOrgunit.size() > 0 )
+ $!mapPatientOrgunit.get($patient.id) |
#end
#if ( $!patient.phoneNumber() && $!patient.phoneNumber() != "" )
#else
- 
+ 
#end
|
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/sendBeneficiarySMSPage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/sendBeneficiarySMSPage.vm 2012-05-24 05:13:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/sendBeneficiarySMSPage.vm 2012-06-04 08:37:52 +0000
@@ -65,7 +65,7 @@
-
+
@@ -108,7 +117,9 @@
|
|
+ ondblclick="removePhoneFromList( 'recipients', this.value );">
+
+
| $i18n.getString( "message" ) |
|---|
|
@@ -179,20 +190,9 @@
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" ) , "'")';
@@ -227,21 +227,14 @@
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_complete_confirm_message = '$encoder.jsEscape( $i18n.getString( "complete_confirm_message" ) , "'")';
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_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")';
var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_items" ) , "'")';
- var i18n_please_fill_out_only_one_of_these_fields = '$encoder.jsEscape( $i18n.getString( "please_fill_out_only_one_of_these_fields" ) , "'")';
- var checkedDuplicate = false;
+
// -1: no search anything
// 0: show list all patient
// 1: search with conditions
@@ -260,7 +253,13 @@
trueFalseBox += '';
trueFalseBox += '';
+ var genderSelector = '';
+
var programComboBox = '