=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java 2011-07-21 08:26:15 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java 2011-07-25 02:08:33 +0000 @@ -580,7 +580,7 @@ // Inline Javascript to add to HTML before outputting // --------------------------------------------------------------------- - final String jsCodeForBoolean = " name=\"entryselect\" $DISABLED data=\"{compulsory:$COMPULSORY}\" onchange=\"saveOpt( $DATAELEMENTID )\" style=\" text-align:center;\" "; + final String jsCodeForBoolean = " name=\"entryselect\" $DISABLED data=\"{compulsory:$COMPULSORY, deName:'$DATAELEMENTNAME'}\" onchange=\"saveOpt( $DATAELEMENTID )\" style=\" text-align:center;\" "; StringBuffer sb = new StringBuffer(); @@ -806,7 +806,7 @@ // Inline Javascript to add to HTML before outputting // --------------------------------------------------------------------- - final String jsCodeForCombo = " name=\"entryselect\" $DISABLED data=\"{compulsory:$COMPULSORY}\" onchange=\"saveOpt( $DATAELEMENTID )\""; + final String jsCodeForCombo = " name=\"entryselect\" $DISABLED data=\"{compulsory:$COMPULSORY, deName:'$DATAELEMENTNAME'}\" onchange=\"saveOpt( $DATAELEMENTID )\""; StringBuffer sb = new StringBuffer(); === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/DataRecordingSelectAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/DataRecordingSelectAction.java 2011-07-08 07:22:42 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/DataRecordingSelectAction.java 2011-07-25 02:08:33 +0000 @@ -94,12 +94,10 @@ throws Exception { patient = patientService.getPatient( patientId ); + + programs.addAll( patient.getPrograms() ); + selectedStateManager.setSelectedPatient( patient ); - - for ( Program program : patient.getPrograms() ) - { - programs.add( program ); - } return SUCCESS; } === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/MultiDataEntrySelectAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/MultiDataEntrySelectAction.java 2011-05-20 09:23:01 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/MultiDataEntrySelectAction.java 2011-07-25 02:08:33 +0000 @@ -113,16 +113,8 @@ { patientAttributes = patientAttributeService.getAllPatientAttributes(); - // --------------------------------------------------------------------- - // Validate selected OrganisationUnit - // --------------------------------------------------------------------- - organisationUnit = selectedStateManager.getSelectedOrganisationUnit(); - // --------------------------------------------------------------------- - // Load assigned Programs - // --------------------------------------------------------------------- - if( organisationUnit != null ) { programs = programService.getPrograms( organisationUnit ); === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SearchPatientAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SearchPatientAction.java 2011-05-10 07:25:28 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SearchPatientAction.java 2011-07-25 02:08:33 +0000 @@ -148,6 +148,17 @@ return SUCCESS; } + if ( searchText != null ) + { + int index = searchText.indexOf( ' ' ); + + if ( index != -1 && index == searchText.lastIndexOf( ' ' ) ) + { + String[] keys = searchText.split( " " ); + searchText = keys[0] + " " + keys[1]; + } + } + if ( searchingAttributeId != null && searchText != null ) { PatientAttribute searchingPatientAttribute = patientAttributeService === 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 2011-07-14 09:31:24 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2011-07-25 02:08:33 +0000 @@ -1,28 +1,19 @@
-

- - -     - - - -

-
$i18n.getString( "report_date_warning" ) -
+
#if( !$useDefaultForm)
#if( $customDataEntryFormCode ) === 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 2011-07-08 07:22:42 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2011-07-25 02:08:33 +0000 @@ -29,6 +29,8 @@ #end + + @@ -37,7 +39,13 @@ - + + + + + @@ -45,7 +53,7 @@ - +
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js 2011-07-14 09:31:24 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js 2011-07-25 02:08:33 +0000 @@ -6,21 +6,23 @@ hideById('dataEntryFormDiv'); hideById('dataRecordingSelectDiv'); showById('searchPatientDiv'); - - jQuery.post("searchform.action", - { - }, - function (data) - { - enable('listPatientBtn'); - enable('searchingAttributeId'); - enable('searchBtn'); - jQuery('#searchText').removeAttr( 'readonly' ); - - setFieldValue( 'orgunitName', data.getElementsByTagName( "name" )[0].firstChild.nodeValue ); - - hideLoader(); - },'xml'); + + $.ajax({ + url: "searchform.action", + dataType: "xml", + cache: false, + success: function (data) + { + enable('listPatientBtn'); + enable('searchingAttributeId'); + enable('searchBtn'); + jQuery('#searchText').removeAttr( 'readonly' ); + + setFieldValue( 'orgunitName', $(data).find( "name" ).text() ); + + hideLoader(); + } + }); } selection.setListenerFunction( organisationUnitSelected ); @@ -139,48 +141,68 @@ function loadDataEntry() { - hideById('dataEntryFormDiv'); - if( getFieldValue('programStageId') == '0' ) + setInnerHTML('dataEntryFormDiv', ''); + showById('dataEntryFormDiv') + setFieldValue( 'dueDate', '' ); + setFieldValue( 'executionDate', '' ); + + if( getFieldValue('programStageId') == null + || getFieldValue('programStageId') == 0 ) { disable('validationBtn'); disable('completeBtn'); return; } - // Load data-entry form showLoader(); var useDefaultForm = jQuery("#useDefaultForm").attr('checked') ? true : false; - jQuery('#dataEntryFormDiv').load("dataentryform.action", - { - programStageId:getFieldValue('programStageId'), - useDefaultForm : useDefaultForm - }, - function( ) - { - }).slideDown('fast', function() - { + + $.ajax({ + url: "dataentryform.action", + data: 'programStageId='+getFieldValue('programStageId')+'&useDefaultForm=' +useDefaultForm, + cache: false, + dataType: "html", + success: function( html ) + { + setInnerHTML('dataEntryFormDiv', html ); enable('validationBtn'); enable('completeBtn'); enable('useDefaultForm'); hideLoader(); hideById('contentDiv'); - }); + } + }); } //----------------------------------------------------------------------------- // Search Patient //----------------------------------------------------------------------------- -function validateSearch() +function searchPatientsOnKeyUp( event ) +{ + var key = getKeyCode( event ); + + if ( key==13 )// Enter + { + validateSearch(); + } +} + +function getKeyCode(e) +{ + if (window.event) + return window.event.keyCode; + return (e)? e.which : null; +} + +function validateSearch( event ) { - var request = new Request(); - request.setResponseTypeXML( 'message' ); - request.setCallbackSuccess( searchValidationCompleted ); + var request = new Request(); + request.setResponseTypeXML( 'message' ); + request.setCallbackSuccess( searchValidationCompleted ); request.sendAsPost('searchText=' + getFieldValue( 'searchText' )); - request.send( 'validateSearch.action' ); - - return false; + request.send( 'validateSearch.action' ); } function searchValidationCompleted( messageElement ) @@ -220,10 +242,12 @@ function showPatientDetails( patientId ) { - var request = new Request(); - request.setResponseTypeXML( 'patient' ); - request.setCallbackSuccess( patientReceived ); - request.send( 'getPatient.action?id=' + patientId ); + $.ajax({ + url: 'getPatient.action?id=' + patientId, + cache: false, + dataType: "xml", + success: patientReceived + }); } function patientReceived( patientElement ) @@ -232,12 +256,12 @@ // Get common-information // ---------------------------------------------------------------------------- - var id = patientElement.getElementsByTagName( "id" )[0].firstChild.nodeValue; - var fullName = patientElement.getElementsByTagName( "fullName" )[0].firstChild.nodeValue; - var gender = patientElement.getElementsByTagName( "gender" )[0].firstChild.nodeValue; - var dobType = patientElement.getElementsByTagName( "dobType" )[0].firstChild.nodeValue; - var birthDate = patientElement.getElementsByTagName( "dateOfBirth" )[0].firstChild.nodeValue; - var bloodGroup= patientElement.getElementsByTagName( "bloodGroup" )[0].firstChild.nodeValue; + var id = jQuery(patientElement).find( "id" ).text(); + var fullName = jQuery(patientElement).find( "fullName" ).text(); + var gender = jQuery(patientElement).find( "gender" ).text(); + var dobType = jQuery(patientElement).find( "dobType" ).text(); + var birthDate = jQuery(patientElement).find( "dateOfBirth" ).text(); + var bloodGroup= jQuery(patientElement).find( "bloodGroup" ).text(); var commonInfo = '' + i18n_id + ': ' + id + "
" + '' + i18n_full_name + ': ' + fullName + "
" @@ -252,29 +276,29 @@ // Get identifier // ---------------------------------------------------------------------------- - var identifiers = patientElement.getElementsByTagName( "identifier" ); - + var identifiers = jQuery(patientElement).find( "identifier" ); var identifierText = ''; - for ( var i = 0; i < identifiers.length; i++ ) - { - identifierText = identifierText + identifiers[ i ].getElementsByTagName( "identifierText" )[0].firstChild.nodeValue + '
'; - } + $( identifiers ).each( function( i, item ) + { + identifierText += $( item ).text() + '
'; + }); + identifiers = ( identifiers.length == 0 ) ? i18n_none : identifiers; setInnerHTML( 'identifierField', identifierText ); // ---------------------------------------------------------------------------- // Get attribute // ---------------------------------------------------------------------------- - var attributes = patientElement.getElementsByTagName( "attribute" ); - + var attributes = jQuery(patientElement).find( "attribute" ); var attributeValues = ''; - for ( var i = 0; i < attributes.length; i++ ) - { - attributeValues = attributeValues + '' + attributes[ i ].getElementsByTagName( "name" )[0].firstChild.nodeValue + ': ' + attributes[ i ].getElementsByTagName( "value" )[0].firstChild.nodeValue + '
'; - } + $( attributes ).each( function( i, item ) + { + attributeValues += '' + $(item).find("name").text()+ ': ' + $(item).find("value").text() + '
'; + }); + attributeValues = ( attributeValues.length == 0 ) ? i18n_none : attributeValues; setInnerHTML( 'attributeField', attributeValues ); @@ -282,14 +306,13 @@ // Get programs // ---------------------------------------------------------------------------- - var programs = patientElement.getElementsByTagName( "program" ); - + var programs = jQuery(patientElement).find( "program" ); var programName = ''; - for ( var i = 0; i < programs.length; i++ ) - { - programName = programName + programs[ i ].getElementsByTagName( "name" )[0].firstChild.nodeValue + '
'; - } + $( programs ).each( function( i, item ) + { + programName += $(item).text() + '
'; + }); programName = ( programName.length == 0 ) ? i18n_none : programName; setInnerHTML( 'programField', programName ); @@ -817,6 +840,7 @@ if ( code == 0 ) { markValue( resultColor ); + showById('entryFormContainer'); showById('dataEntryFormDiv'); showById('entryForm'); } @@ -876,9 +900,7 @@ showData : function(data) { - jQuery("#orgUnitNameField").text(data.orgUnitName); - jQuery("#programStageName").text(data.programStageName); - jQuery("#dataelementName").text(data.dataElementName); + jQuery("#dataelementName").text(data.deName); }, resetData : function() === 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 2011-05-10 07:25:28 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm 2011-07-25 02:08:33 +0000 @@ -63,10 +63,10 @@ $encoder.htmlEncode( $patient.getAge() ) - $i18n.getString( + $i18n.getString( 'data_entry' ) - $i18n.getString( + $i18n.getString( 'show_details' ) #if( $mark ) @@ -90,17 +90,15 @@ - - === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 2011-07-14 09:31:24 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 2011-07-25 02:08:33 +0000 @@ -4,9 +4,6 @@ }); - -
- - +
@@ -51,28 +48,25 @@   + +
+ 		-
+
+
- - + +
$i18n.getString("org_unit_name") :
$i18n.getString("program_stage_name") :
$i18n.getString("org_unit_name") : $!patient.organisationUnit.name
$i18n.getString("program_stage_name") : $!programStageInstance.programStage.name
$i18n.getString("datae_element_name") :
@@ -81,7 +75,7 @@ #if( $programStageInstance.executionDate ) #else $i18n.getString( "report_date_warning" ) #end -
+