' ).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 ); + } ); +} === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/sendSMS.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/sendSMS.js 2012-04-03 03:17:19 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/sendSMS.js 2012-05-09 02:52:11 +0000 @@ -1,4 +1,4 @@ -var isChecked = false; +var _target = ""; var isOrgunitSelected = false; function selectedOrganisationUnitSendSMS( unitIds ) @@ -6,27 +6,43 @@ isOrgunitSelected = (unitIds && unitIds.length > 0); } -function toggleSMSGUI( checked ) +function toggleSMSGUI( _value ) { - if ( checked ) { + if ( _value == "phone" ) + { + showById( 'phoneType' ); + hideById( 'orgunitType' ); + } + else if ( _value == "user" || _value == "unit" ) + { selectionTree.clearSelectedOrganisationUnits(); selectionTree.buildSelectionTree(); hideById( 'phoneType' ); showById( 'orgunitType' ); - } else { - showById( 'phoneType' ); - hideById( 'orgunitType' ); - } - - isChecked = checked; + } + else { + window.location.href = "showBeneficiarySMSForm.action"; + } + + _target = _value; +} + +function toggleAll( checked ) +{ + var list = jQuery( "input[type=checkbox][name=patientSMSCheckBox]" ); + + for ( var i in list ) + { + list[i].checked = checked; + } } function sendSMSMessage( _form ) { var params = ""; - if ( !isChecked ) + if ( _target == "phone" ) { var list = getFieldValue( "recipient" ); @@ -48,7 +64,7 @@ params = "?" + params.substring( 0, params.length - 1 ); } - else + else if ( _target == "user" || _target == "unit" ) { if ( !isOrgunitSelected ) { @@ -56,11 +72,20 @@ return; } } + else + { + if ( hasElements( 'recipients' ) ) + { + params = "?" + getParamString( 'recipients', 'recipients' ); + } + else { markInvalid( "recipients", i18n_list_empty ); } + } jQuery.postUTF8( _form.action + params, { gatewayId: getFieldValue( 'gatewayId' ), - smsMessage: getFieldValue( 'smsMessage' ) + smsMessage: getFieldValue( 'smsMessage' ), + sendTarget: getFieldValue( 'sendTarget' ) }, function ( json ) { if ( json.response == "success" ) { === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/menu.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/menu.vm 2012-03-14 10:36:55 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/menu.vm 2012-05-09 02:52:11 +0000 @@ -1,6 +1,6 @@

DHIS Mobile Configuration

$i18n.getString( "patient_mobile_setting" )
$i18n.getString( "mobile_dataset" )
$i18n.getString( "sms_service_configuration" )

$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

+ + + #foreach( $attribute in $patientAttributes ) + #if($attribute)#end + #end + + + + + #if($mapPatientOrgunit.size()!=0) + + #end + + + + + + #foreach( $attribute in $patientAttributes ) + #if($attribute) + + #end + #end + + + + + #if($mapPatientOrgunit.size()!=0) + + #end + + + + + + #set( $mark = false ) + #foreach( $patient in $patients ) + + + + + #foreach( $attribute in $patientAttributes ) + #if( $attribute ) + #set ( $key = $patient.id + '-' + $attribute.id ) + + #end + #end + + + + + + + + + + #if($mapPatientOrgunit.size()!=0) + + + + #end + + + + + #set( $mark = !$mark) + #end + + +

#	$attribute.name	$i18n.getString( "full_name" )	$i18n.getString( "gender" )	$i18n.getString( "date_of_birth" )	$i18n.getString( "age" )	$i18n.getString( "hierachy_orgunit" )	$i18n.getString( "operations" )
+ #set( $nr = ( ( $paging.getCurrentPage() - 1 ) * $paging.pageSize ) + $velocityCount ) + $nr +	+ #if( $attribute.valueType == 'YES/NO') + $i18n.getString( $mapPatientPatientAttr.get($key) ) + #else + $mapPatientPatientAttr.get($key) + #end +	$!patient.getFullName()	$i18n.getString($!patient.gender)	$format.formatDate( $!patient.birthDate)	$!patient.getAge()	$!mapPatientOrgunit.get($patient.id)	+ #if ( $!patient.phoneNumber() && $!patient.phoneNumber() != "" ) + + #else + + #end +

+ #parse( "/dhis-web-commons/paging/paging.vm" ) +

$i18n.getString( "send_sms_beneficiary" )

+ + + + + + + + + + + + + + + + + + +

$i18n.getString( "gateway_type" )
$i18n.getString( "type" ):	+ #set( $keys = $!gatewayMap.keySet() ) + +
$i18n.getString( "send_sms_to_target" )	+ +

+ + + + + + + + + + + + + + + + + + + +

$i18n.getString( "search_details" )
$i18n.getString( "registering_unit" )
+ + * +	+ +	+ +

+ + + #parse( "dhis-web-commons/loader/loader.vm" ) +

+ + + + + + + + + + + + + + +

$i18n.getString( "phone_number" )
+
$i18n.getString( "message" )

No Sms service available

Send SMS

$i18n.getString( "send_sms" )

@@ -46,12 +45,19 @@ - - + + - +

$i18n.getString( "message" )
$i18n.getString( "org_unit_tree" )	$i18n.getString( "send_sms_to_target" )	+ +

" + i18n_patient_system_id + "	" + jQuery(patient).find('systemIdentifier').text() + "
" + i18n_patient_full_name + "	" + jQuery(patient).find('fullName').text() + "
" + i18n_patient_gender + "	" + jQuery(patient).find('gender').text() + "
" + i18n_patient_date_of_birth + "	" + jQuery(patient).find('dateOfBirth').text() + "
" + i18n_patient_age + "	" + jQuery(patient).find('age').text() + "
" + i18n_patient_blood_group + "	" + jQuery(patient).find('bloodGroup').text() + "
" + i18n_patient_phone_number + "	" + jQuery(patient).find('phoneNumber').text() + "
" + i18n_patient_identifiers + "
" + jQuery(identifier).find('name').text() + "	" + jQuery(identifier).find('value').text() + "
" + i18n_patient_attributes + "
" + jQuery(attribute).find('name').text() + "	" + jQuery(attribute).find('value').text() + "