=== 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-03-13 09:23:23 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2012-03-13 09:47:39 +0000 @@ -9,7 +9,7 @@ disable('createEventBtn'); disable('deleteCurrentEventBtn'); - $.get( 'loadAnonymousPrograms.action',{} + $.getJSON( 'loadAnonymousPrograms.action',{} , function( json ) { clearListById( 'programId' ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js 2012-03-13 08:24:08 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js 2012-03-13 09:47:39 +0000 @@ -50,7 +50,7 @@ return; } - $.post( 'getProgramStages.action', { programId:programId }, getProgramStagesCompleted ); + $.getJSON( 'getProgramStages.action', { programId:programId }, getProgramStagesCompleted ); } function getProgramStagesCompleted( programstageElement ) @@ -89,7 +89,7 @@ return; } - $.post( 'getProgramStages.action', { programId:programId }, getProgramStagesFomulaCompleted ); + $.getJSON( 'getProgramStages.action', { programId:programId }, getProgramStagesFomulaCompleted ); } function getProgramStagesFomulaCompleted( programstageElement ) @@ -127,7 +127,7 @@ var programStage = document.getElementById( 'programStage' ); var psId = programStage.options[ programStage.selectedIndex ].value; - $.post( 'getPSDataElements.action', { psId:psId }, getPrgramStageDataElementsCompleted ); + $.getJSON( 'getPSDataElements.action', { psId:psId }, getPrgramStageDataElementsCompleted ); } function getPrgramStageDataElementsCompleted( dataelementElement ) @@ -176,7 +176,7 @@ function showCaseAggregationDetails( caseAggregationId ) { - jQuery.post( 'getCaseAggregation.action', { id:caseAggregationId }, function ( json ) + jQuery.getJSON( 'getCaseAggregation.action', { id:caseAggregationId }, function ( json ) { setInnerHTML( 'descriptionField', json.caseAggregation.description ); setInnerHTML( 'operatorField', json.caseAggregation.operator ); @@ -194,7 +194,7 @@ function getConditionDescription() { - $.post( 'getCaseAggregationDescription.action', + $.postUTF8( 'getCaseAggregationDescription.action', { condition:getFieldValue('aggregationCondition') },function (data) @@ -209,7 +209,7 @@ function testCaseAggregationCondition() { - $.postJSON( 'testCaseAggregationCondition.action', + $.postUTF8( 'testCaseAggregationCondition.action', { condition:getFieldValue('aggregationCondition') },function (json) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2012-01-11 07:42:49 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2012-03-13 09:47:39 +0000 @@ -4,7 +4,7 @@ function showPatientAttributeDetails( patientAttributeId ) { - jQuery.post( 'getPatientAttribute.action', { id: patientAttributeId }, + jQuery.getJSON( 'getPatientAttribute.action', { id: patientAttributeId }, function ( json ) { setInnerHTML( 'nameField', json.patientAttribute.name ); setInnerHTML( 'descriptionField', json.patientAttribute.description ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js 2012-01-11 07:42:49 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js 2012-03-13 09:47:39 +0000 @@ -4,7 +4,7 @@ function showPatientAttributeGroupDetails( patientAttributeGroupId ) { - jQuery.post( 'getPatientAttributeGroup.action', { id: patientAttributeGroupId }, + jQuery.getJSON( 'getPatientAttributeGroup.action', { id: patientAttributeGroupId }, function ( json ) { setInnerHTML( 'nameField', json.patientAttributeGroup.name ); setInnerHTML( 'descriptionField', json.patientAttributeGroup.description ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientChart.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientChart.js 2012-01-11 07:42:49 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientChart.js 2012-03-13 09:47:39 +0000 @@ -1,9 +1,9 @@ function showPatientChartDetails( patientChartId ) { - jQuery.postJSON( "getPatientChart.action", { + jQuery.getJSON( "getPatientChart.action", { id:patientChartId - }, function(json){ + }, function( json ){ setInnerHTML( 'titleField', json.title ); var typeMap = { === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js 2012-01-11 07:42:49 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js 2012-03-13 09:47:39 +0000 @@ -4,7 +4,7 @@ function showPatientIdentifierTypeDetails( patientIdentifierTypeId ) { - jQuery.post( 'getPatientIdentifierType.action', { id: patientIdentifierTypeId }, + jQuery.getJSON( 'getPatientIdentifierType.action', { id: patientIdentifierTypeId }, function ( json ) { setInnerHTML( 'nameField', json.patientIdentifierType.name ); setInnerHTML( 'descriptionField', json.patientIdentifierType.description ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2012-02-24 02:10:12 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2012-03-13 09:47:39 +0000 @@ -4,7 +4,7 @@ function showProgramDetails( programId ) { - jQuery.post( "getProgram.action", { + jQuery.getJSON( "getProgram.action", { id:programId }, function(json){ setInnerHTML( 'nameField', json.program.name ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js 2012-01-11 07:42:49 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js 2012-03-13 09:47:39 +0000 @@ -4,7 +4,7 @@ function showProgramAttributeDetails( programAttributeId ) { - jQuery.post( 'getProgramAttribute.action', { id: programAttributeId }, function ( json ) { + jQuery.getJSON( 'getProgramAttribute.action', { id: programAttributeId }, function ( json ) { setInnerHTML( 'nameField', json.programAttribute.name ); setInnerHTML( 'descriptionField', json.programAttribute.description ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js 2012-03-07 02:40:08 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js 2012-03-13 09:47:39 +0000 @@ -38,7 +38,7 @@ function showProgramStageDetails( programStageId ) { - jQuery.post( 'getProgramStage.action', { id: programStageId }, function ( json ) { + jQuery.getJSON( 'getProgramStage.action', { id: programStageId }, function ( json ) { setInnerHTML( 'nameField', json.programStage.name ); setInnerHTML( 'descriptionField', json.programStage.description ); setInnerHTML( 'stageInProgramField', json.programStage.stageInProgram ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programValidation.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programValidation.js 2012-01-15 14:53:46 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programValidation.js 2012-03-13 09:47:39 +0000 @@ -14,7 +14,7 @@ function showProgramValidationDetails ( programValidationId ) { - jQuery.post( 'getProgramValidation.action', { validationId: programValidationId }, function ( json ) { + jQuery.getJSON( 'getProgramValidation.action', { validationId: programValidationId }, function ( json ) { setInnerHTML( 'descriptionField', json.validation.description ); setInnerHTML( 'leftSideField', json.validation.leftSide ); if( json.validation.rightSide != '1==1') @@ -69,7 +69,7 @@ function getValidationDescription( decriptionDiv, sideDiv ) { - $.post("getCaseAggregationDescription.action", + $.get("getCaseAggregationDescription.action", { condition: getFieldValue( sideDiv ) }, === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js 2012-01-11 07:42:49 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js 2012-03-13 09:47:39 +0000 @@ -4,7 +4,7 @@ function showRelationshipTypeDetails( relationshipTypeId ) { - jQuery.post( 'getRelationshipType.action', { id: relationshipTypeId }, function ( json ) { + jQuery.getJSON( 'getRelationshipType.action', { id: relationshipTypeId }, function ( json ) { setInnerHTML( 'aIsToBField', json.relationshipType.aIsToB ); setInnerHTML( 'bIsToAField', json.relationshipType.bIsToA ); setInnerHTML( 'descriptionField', json.relationshipType.description ); @@ -19,7 +19,7 @@ function validateAddRelationshipType() { - $.postJSON( + $.postUTF8( 'validateRelationshipType.action', { "aIsToB": getFieldValue( 'aIsToB' ), === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js 2012-01-11 07:42:49 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js 2012-03-13 09:47:39 +0000 @@ -13,7 +13,7 @@ function showValidationCriteriaDetails( criteriaId ) { - jQuery.post( 'getValidationCriteria.action', { id: criteriaId }, function ( json ) { + jQuery.getJSON( 'getValidationCriteria.action', { id: criteriaId }, function ( json ) { setInnerHTML( 'nameField', json.validationCriteria.name ); setInnerHTML( 'descriptionField', json.validationCriteria.description ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewDataEntryForm.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewDataEntryForm.js 2012-02-11 13:58:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewDataEntryForm.js 2012-03-13 09:47:39 +0000 @@ -46,7 +46,7 @@ function loadExistedForm() { - jQuery.post("showDataEntryForm.action",{ + jQuery.get("showDataEntryForm.action",{ dataEntryFormId: getFieldValue( 'existedDataEntryId' ) }, function( html ){ jQuery("#designTextarea").ckeditorGet().setData( html );