- - - - - - - - - - - - -

$i18n.getString('program')	- -
$i18n.getString( "report_date" )	- -

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

$i18n.getString( "registering_unit" )

+ $i18n.getString("program") * +

+ + + +

$i18n.getString('use_data_from_level')

+ $i18n.getString('selected') + $i18n.getString('children_only') + $i18n.getString('all') +

$i18n.getString('show_hierachy_from_level')

+ #foreach( $level in $levels ) + $level.name + #end +

$i18n.getString('report_date')

+ $i18n.getString('to') + +

$i18n.getString('data_elements')

+ + + + + + + + +

+ +

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

+ + + + \ No newline at end of file === 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-06-18 09:40:23 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2012-06-23 11:05:13 +0000 @@ -82,7 +82,7 @@ - #elseif($hasOptionSet) + #elseif($hasOptionSet=='true') #else === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2012-06-15 04:55:20 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2012-06-23 11:05:13 +0000 @@ -1,87 +1,265 @@ -function organisationUnitSelected( orgUnits ) +function organisationUnitSelected( orgUnits, orgUnitNames ) { - hideById('dataEntryFormDiv'); - disable( 'executionDate' ); - setFieldValue('executionDate', ''); - $('#executionDate').unbind('change'); - - disable('createEventBtn'); - disable('deleteCurrentEventBtn'); - - $.getJSON( 'loadAnonymousPrograms.action',{} - , function( json ) - { - clearListById( 'programId' ); - addOptionById( 'programId', '', i18n_please_select ); - - var preSelectedProgramId = getFieldValue('selectedProgramId'); - for ( i in json.programInstances ) - { - if( preSelectedProgramId == json.programInstances[i].id ) - { - $('#programId').append(''); - } - else - { - $('#programId').append(''); - } - } - - if( byId('programId').selectedIndex > 0 ) - { - loadEventForm(); - } - } ); + setFieldValue( 'orgunitId', orgUnits[0] ); + setFieldValue( 'orgunitName', orgUnitNames[0] ); + hideById('listDiv'); + hideById('dataEntryInfor'); } selection.setListenerFunction( organisationUnitSelected ); - -function loadEventForm() +function getDataElements() +{ + hideById('dataEntryInfor'); + hideById('listDiv'); + clearListById('dataElementId'); + programStageId = jQuery('#programId option:selected').attr('programStageId'); + setFieldValue('programStageId', programStageId ); + + if( programStageId == '') + { + removeAllAttributeOption(); + jQuery('#criteriaDiv :input').each( function( idx, item ){ + disable(this.id); + }); + enable('orgunitName'); + enable('programId'); + hideById('listDiv'); + setFieldValue('searchText'); + return; + } + + jQuery.getJSON( "getProgramStageDataElementList.action", + { + programStageId: getFieldValue('programStageId') + }, + function( json ) + { + jQuery( '#dataElementId').append( '' ); + for ( i in json.programStageDataElements ) { + jQuery( '#dataElementId').append( '' ); + + if( json.programStageDataElements[i].compulsory=='true' ){ + jQuery( '#compulsoryDE').append( ''); + } + } + + jQuery('#criteriaDiv :input').each( function( idx, item ){ + enable(this.id); + }); + }); +} + +function removeAllAttributeOption() +{ + jQuery( '#advancedSearchTB tbody tr' ).each( function( i, item ) + { + if(i>0){ + jQuery( item ).remove(); + } + }) +} + +function validateSearchEvents( listAll ) { - hideById('dataEntryFormDiv'); - setFieldValue('executionDate', ''); - disable( 'executionDate' ); - disable('createEventBtn'); - disable('deleteCurrentEventBtn'); + var flag = true; + if( listAll && jQuery( '#compulsoryDE option' ).length == 0 ){ + flag = false; + } + else if( !listAll ) + { + jQuery( '#advancedSearchTB tbody tr' ).each( function( i, row ){ + jQuery( this ).find(':input').each( function( idx, item ){ + var input = jQuery( item ); + if( input.attr('type') != 'button' && idx==0 && input.val()=='' ){ + showWarningMessage( i18n_specify_data_element ); + flag = false; + } + }) + }); + } + + if(flag){ + searchEvents( listAll ); + } +} + +function searchEvents( listAll ) +{ + hideById('dataEntryInfor'); + hideById('listDiv'); - var programId = getFieldValue('programId'); - if( programId == '' ) - { - $('#executionDate').unbind('change'); - return; - } - - showLoader(); - - jQuery.getJSON( "loadProgramStageInstances.action", - { - programId: programId + var params = ''; + if(listAll){ + params += '&startDate='; + params += '&endDate='; + jQuery( '#compulsoryDE option' ).each( function( i, item ){ + var input = jQuery( item ); + params += '&searchingValues=de_' + input.val() + '_false_'; + }); + } + else{ + params += '&startDate=' + getFieldValue('startDate'); + params += '&endDate=' + getFieldValue('endDate'); + jQuery( '#advancedSearchTB tbody tr' ).each( function(){ + var searchingValue = ''; + jQuery( this ).find(':input').each( function( idx, item ){ + var input = jQuery( item ); + if( input.attr('type') != 'button' ){ + if( idx==0 && input.val()!=''){ + searchingValue = 'de_' + input.val() + '_false_'; + } + else if( input.val()!='' ){ + searchingValue += getValueFormula(input.val().toLowerCase()); + } + } + }); + params += '&searchingValues=' + searchingValue; + }) + } + + + + params += '&facilityLB=' + $('input[name=facilityLB]:checked').val(); + params += '&level=' + $('input[name=level]:checked').val(); + params += '&orgunitIds=' + getFieldValue('orgunitId'); + params += '&programStageId=' + getFieldValue('programStageId'); + params += '&orderByOrgunitAsc=' + true; + + contentDiv = 'listDiv'; + showLoader(); + + $.ajax({ + type: "POST", + url: 'searchProgramStageInstances.action', + data: params, + success: function( html ){ + hideById('loaderDiv'); + hideById('dataEntryInfor'); + setInnerHTML( 'listDiv', html ); + showById('listDiv'); + } + }); +} + +function getValueFormula( value ) +{ + if( value.indexOf('"') != value.lastIndexOf('"') ) + { + value = value.replace(/"/g,"'"); + } + // if key is [xyz] && [=xyz] + if( value.indexOf("'")==-1 ){ + var flag = value.match(/[>|>=|<|<=|=|!=]+[ ]*/); + + if( flag == null ) + { + value = "='"+ value + "'"; + } + else + { + value = value.replace( flag, flag + "'"); + value += "'"; + } + } + // if key is ['xyz'] && [='xyz'] + // if( value.indexOf("'") != value.lastIndexOf("'") ) + else + { + var flag = value.match(/[>|>=|<|<=|=|!=]+[ ]*/); + + if( flag == null ) + { + value = "="+ value; + } + } + + return value; +} + +function removeEvent( psId ) +{ + removeItem( psId, '', i18n_comfirm_delete_event, 'removeCurrentEncounter.action' ); +} + +function showUpdateEvent( psId ) +{ + hideById('selectDiv'); + hideById('searchDiv'); + hideById('listDiv'); + setFieldValue('programStageInstanceId', psId); + showLoader(); + + $( '#dataEntryFormDiv' ).load( "dataentryform.action", + { + programStageInstanceId: psId + },function( ) + { + var programName = jQuery('#programId option:selected').text(); + programName += ' - ' + i18n_report_date + ' : ' + jQuery('#incidentDate').val(); + + setInnerHTML('programName', programName ); + + if( getFieldValue('completed')=='true' ){ + disable('completeBtn'); + } + else{ + enable('completeBtn'); + } + + hideById('loaderDiv'); + showById('dataEntryInfor'); + showById('entryFormContainer'); + } ); +} + +function backEventList() +{ + hideById('dataEntryInfor'); + showById('selectDiv'); + showById('searchDiv'); + showById('listDiv'); +} + +function showAddEventForm() +{ + jQuery.postJSON( "createAnonymousEncounter.action", + { + programId: jQuery('#programId option:selected').val(), + executionDate: getFieldValue('executionDateNewEvent') }, function( json ) { - if( json.programStageInstances.length > 0 ) + if(json.response=='success') { - setFieldValue( 'programStageInstanceId', json.programStageInstances[0].id ); - setFieldValue( 'selectedProgramId', programId ); - $('#executionDate').bind('change'); - loadEventRegistrationForm(); + setFieldValue('programStageInstanceId', json.message ); + showUpdateEvent( json.message ) } else { - enable( 'executionDate' ); - enable('createEventBtn'); - disable('deleteCurrentEventBtn'); - disable('completeBtn'); - hideById('loaderDiv'); + showWarningMessage( json.message ); } - - }); + }); } + + + + + + + + + + + function loadEventRegistrationForm() { + hideById('selectDiv'); + hideById('searchDiv'); + hideById('listDiv'); + showLoader(); $( '#dataEntryFormDiv' ).load( "dataentryform.action", { programStageInstanceId:getFieldValue('programStageInstanceId') @@ -121,6 +299,55 @@ } ); } + + + + + + + +function loadEventForm() +{ + hideById('dataEntryFormDiv'); + setFieldValue('executionDate', ''); + disable( 'executionDate' ); + disable('createEventBtn'); + disable('deleteCurrentEventBtn'); + + var programId = getFieldValue('programId'); + if( programId == '' ) + { + $('#executionDate').unbind('change'); + return; + } + + showLoader(); + + jQuery.getJSON( "loadProgramStageInstances.action", + { + programId: programId + }, + function( json ) + { + if( json.programStageInstances.length > 0 ) + { + setFieldValue( 'programStageInstanceId', json.programStageInstances[0].id ); + setFieldValue( 'selectedProgramId', programId ); + $('#executionDate').bind('change'); + loadEventRegistrationForm(); + } + else + { + enable( 'executionDate' ); + enable('createEventBtn'); + disable('deleteCurrentEventBtn'); + disable('completeBtn'); + hideById('loaderDiv'); + } + + }); +} + function createNewEvent() { jQuery.postJSON( "createAnonymousEncounter.action", @@ -150,40 +377,3 @@ }); } -function deleteCurrentEvent() -{ - var result = window.confirm( i18n_comfirm_delete_current_event ); - - if ( result ) - { - jQuery.postJSON( "removeCurrentEncounter.action", - { - programStageInstanceId: getFieldValue('programStageInstanceId') - }, - function( json ) - { - var type = json.response; - - if( type == 'success' ) - { - hideById('dataEntryFormDiv'); - byId('programId').selectedIndex = 0; - - disable('deleteCurrentEventBtn'); - enable('createEventBtn'); - - setFieldValue('executionDate',''); - enable( 'executionDate' ); - $('#executionDate').unbind('change'); - - selection.enable(); - - showSuccessMessage( i18n_delete_current_event_success ); - } - else if( type == 'input' ) - { - showWarningMessage( json.message ); - } - }); - } -} === 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-20 06:32:51 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2012-06-23 11:05:13 +0000 @@ -619,16 +619,24 @@ var flag = false; jQuery("#dataEntryFormDiv input[name='entryfield'],select[name='entryselect']").each(function(){ jQuery(this).parent().removeClass("errorCell"); - if( jQuery(this).metadata({ - "type":"attr", - "name":"data" - }).compulsory ){ - if( !jQuery(this).val() || jQuery(this).val() == "undifined" ){ + + var arrData = jQuery( this ).attr('data').replace('{','').replace('}','').replace(/'/g,"").split(','); + var data = new Array(); + for( var i in arrData ) + { + var values = arrData[i].split(':'); + var key = jQuery.trim( values[0] ); + var value = jQuery.trim( values[1] ) + data[key] = value; + } + var compulsory = data['compulsory']; + if( compulsory == 'true' && + ( !jQuery(this).val() || jQuery(this).val() == "undifined" ) ){ flag = true; jQuery(this).parent().addClass("errorCell"); } - } }); + if( flag ){ alert(i18n_error_required_field); return; === 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-20 09:46:37 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2012-06-23 11:05:13 +0000 @@ -38,8 +38,7 @@ jQuery('#listPatientDiv').load("searchRegistrationPatient.action", { sortPatientAttributeId: getFieldValue('sortPatientAttributeId') - } - , function(){ + }, function(){ showById('listPatientDiv'); jQuery( "#loaderDiv" ).hide(); }); @@ -57,7 +56,7 @@ url: 'validatePatient.action', data: getParamsForDiv('editPatientDiv'), success:addValidationCompleted - }); + }); } function addValidationCompleted( data ) @@ -632,7 +631,7 @@ } else if( statusSearching == 1 ) { - searchAdvancedPatients(); + searchAdvancedPatient(); } } === added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageDataElements.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageDataElements.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageDataElements.vm 2012-06-23 11:05:13 +0000 @@ -0,0 +1,11 @@ +#set( $size = ${programStageDataElements.size()} ) +{ "programStageDataElements": [ + #foreach( ${programStageDataElement} in $!{programStageDataElements} ) + { + "id": "${programStageDataElement.dataElement.id}", + "name": "$!encoder.jsonEncode( ${programStageDataElement.dataElement.name} )", + "compulsory": "${programStageDataElement.compulsory}" + }#if( $velocityCount < $size ),#end + #end + ] +} \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2012-06-14 03:58:46 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2012-06-23 11:05:13 +0000 @@ -48,8 +48,8 @@ - - + + === added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.vm 2012-06-23 11:05:13 +0000 @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + +

$i18n.getString( "search_result_matching_the_search_criteria" ):			+ #if($!listAll) + $i18n.getString( "list_all_events" ) + #else + $i18n.getString( "search_events_by_dataelements" ) + #end +
$i18n.getString( "total_result" )			$!total

+ + + + + + + #set( $noCol = $grid.getHeaders().size() + 3 ) + + + +

+ + + + + #set($index = 0) + #foreach( $col in $grid.getHeaders() ) + #if( $index > 0 ) + + #end + #set($index = $index + 1) + #end + + + + + + #set($noCols = $grid.getHeaders().size()) + #foreach( $row in $grid.getRows() ) + #set($index = 0) + + + + #foreach( $col in $row ) + #if( $index == 0 ) + #set($psid = $col) + #elseif( $index < $noCols ) + + #end + #set($index = $index + 1) + #end + + + #set( $mark = !$mark) + + + #end + +

#	$col.name	$i18n.getString( "operations" )
+ #set( $nr = ( ( $paging.getCurrentPage() - 1 ) * $paging.pageSize ) + $velocityCount ) + $nr +	$!col	+ + +

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

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css 2012-06-20 06:32:51 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css 2012-06-23 11:05:13 +0000 @@ -15,14 +15,13 @@ } input[type="text"] { - width: 250px; + width: 255px; } select { - width: 253px; + width: 265px; } - .button-list { text-align:right; @@ -67,6 +66,8 @@ text-align: left; } +.errorCell{background-color: #FFCFCF} + /*----------------------------------------------------------------------------*/ /* button list /*----------------------------------------------------------------------------*/ @@ -78,7 +79,6 @@ width:100%; } - div.actions { float: right; === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2012-06-14 13:19:46 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2012-06-23 11:05:13 +0000 @@ -99,8 +99,8 @@ - - + +

$i18n.getString( "anonymous_events" ) #openHelp( "patient" )