=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2011-05-16 06:44:39 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2011-05-18 01:07:51 +0000 @@ -22,14 +22,19 @@ /main.vm /dhis-web-maintenance-patient/relationshipType.vm /dhis-web-maintenance-patient/patientAndProgramMenu.vm - javascript/relationship.js + javascript/commons.js,javascript/relationship.js + + + + /content.vm + /dhis-web-maintenance-patient/relationshipTypeList.vm /dhis-web-maintenance-patient/responseRelationshipType.vm - plainTextError - relationshipType.action - + + /dhis-web-commons/ajax/jsonResponseSuccess.vm F_RELATIONSHIPTYPE_ADD - /main.vm + /content.vm /dhis-web-maintenance-patient/addRelationshipTypeForm.vm - /dhis-web-maintenance-patient/patientAndProgramMenu.vm - javascript/relationship.js F_RELATIONSHIPTYPE_ADD - /main.vm + /content.vm /dhis-web-maintenance-patient/updateRelationshipTypeForm.vm - /dhis-web-maintenance-patient/patientAndProgramMenu.vm - javascript/relationship.js F_PATIENTATTRIBUTE_UPDATE - relationshipType.action - + + /dhis-web-commons/ajax/jsonResponseSuccess.vm F_RELATIONSHIPTYPE_UPDATE @@ -815,7 +816,13 @@ /main.vm /dhis-web-maintenance-patient/patientAttributeGroup.vm /dhis-web-maintenance-patient/patientAndProgramMenu.vm - javascript/patientAttributeGroup.js + javascript/commons.js,javascript/patientAttributeGroup.js + + + + /content.vm + /dhis-web-maintenance-patient/patientAttributeGroupList.vm /dhis-web-maintenance-patient/responsePatientAttributeGroup.vm - plainTextError - patientAttributeGroup.action - + + /dhis-web-commons/ajax/jsonResponseSuccess.vm F_PATIENTATTRIBUTE_ADD - /main.vm + /content.vm /dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm - /dhis-web-maintenance-patient/patientAndProgramMenu.vm - javascript/patientAttributeGroup.js - style/basic.css F_PATIENTATTRIBUTE_ADD - /main.vm + /content.vm /dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm - /dhis-web-maintenance-patient/patientAndProgramMenu.vm - javascript/patientAttributeGroup.js F_PATIENTATTRIBUTE_UPDATE - patientAttributeGroup.action - + + /dhis-web-commons/ajax/jsonResponseSuccess.vm F_PATIENTATTRIBUTE_UPDATE @@ -876,14 +877,29 @@ /dhis-web-commons/ajax/jsonResponseInput.vm plainTextError + + + /main.vm + + /dhis-web-maintenance-patient/patientIdentifierType.vm + /dhis-web-maintenance-patient/patientAndProgramMenu.vm + javascript/commons.js,javascript/patientIdentifierType.js + + + + /content.vm + + /dhis-web-maintenance-patient/listPatientIdentifierType.vm + + - /main.vm + /content.vm /dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm - /dhis-web-maintenance-patient/patientAndProgramMenu.vm - javascript/patientIdentifierType.js F_PATIENTIDENTIFIERTYPE_ADD @@ -900,29 +916,17 @@ - /main.vm + /content.vm /dhis-web-maintenance-patient/updatePatientIdentifierType.vm - /dhis-web-maintenance-patient/patientAndProgramMenu.vm - javascript/patientIdentifierType.js F_PATIENTIDENTIFIERTYPE_UPDATE - - /main.vm - - /dhis-web-maintenance-patient/listPatientIdentifierType.vm - /dhis-web-maintenance-patient/patientAndProgramMenu.vm - javascript/patientIdentifierType.js - - /dhis-web-maintenance-patient/responsePatientIdentifierType.vm - plainTextError - patientIdentifierType.action - + + /dhis-web-commons/ajax/jsonResponseSuccess.vm F_PATIENTIDENTIFIERTYPE_ADD - patientIdentifierType.action - + + /dhis-web-commons/ajax/jsonResponseSuccess.vm F_PATIENTIDENTIFIERTYPE_UPDATE === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm 2011-04-28 08:15:18 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm 2011-05-18 01:07:51 +0000 @@ -1,12 +1,10 @@ - + + +

$i18n.getString( "add_new_patient_attribute_group" )

\ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm 2011-04-28 08:15:18 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm 2011-05-18 01:07:51 +0000 @@ -4,16 +4,19 @@ jQuery('name').focus(); validation( 'addPatientIdentifierTypeForm', function(form){ - form.submit(); + addPatientIdentifierType(); }); checkValueIsExist( "name", "validatePatientIdentifierType.action"); }); + + +

$i18n.getString( "add_new_patient_identifier_type" )

- + \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/commons.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/commons.js 2011-05-13 09:11:13 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/commons.js 2011-05-18 01:07:51 +0000 @@ -101,10 +101,20 @@ if( $(this).attr('type') != 'button' ) { var elementId = $(this).attr('id'); - params += elementId + "="+ jQuery(this).val() + "&"; + + if( jQuery(this).context.multiple ) + { + for ( var i in jQuery(this).val() ) + { + params += elementId + "="+ jQuery(this).val()[i] + "&"; + } + }else + { + params += elementId + "="+ jQuery(this).val() + "&"; + } } }); - + return params; } === 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 2011-05-16 09:29:20 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2011-05-18 01:07:51 +0000 @@ -151,7 +151,6 @@ showById('editPatientAttributeForm'); jQuery('#loaderDiv').hide(); }); - } function updatePatientAttribute() === 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 2010-09-27 07:33:12 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js 2011-05-18 01:07:51 +0000 @@ -39,10 +39,6 @@ removeItem( patientAttributeGroupId, name, i18n_confirm_delete, 'removePatientAttributeGroup.action' ); } -// ----------------------------------------------------------------------------- -// Show and Hide tooltip -// ----------------------------------------------------------------------------- - function patientAttributeGroupAssociation(){ selectAllById('selectedAttributeGroups'); var form = document.getElementById( 'patientAttributeGroupAssociationForm' ); @@ -50,6 +46,92 @@ } // ----------------------------------------------------------------------------- +// Add Attribute-Group +// ----------------------------------------------------------------------------- + +function showAddPatientAttributeGroupForm( ) +{ + hideById('attributeGroupList'); + jQuery('#loaderDiv').show(); + jQuery('#editAttributeGroupForm').load('showAddPatientAttributeGroupForm.action', + { + }, function() + { + showById('editAttributeGroupForm'); + jQuery('#loaderDiv').hide(); + }); +} + +function addPatientAttributeGroup() +{ + $.ajax({ + type: "POST", + url: 'addPatientAttributeGroup.action', + data: getParamsForDiv('addPatientAttributeGroupForm'), + success: function( json ) { + if( json.response == 'success') + { + onClickBackBtn(); + } + } + }); + + return false; +} + +// ----------------------------------------------------------------------------- +// Update Attribute-Group +// ----------------------------------------------------------------------------- + +function showUpdatePatientAttributeGroupForm( attributeId ) +{ + hideById('attributeGroupList'); + jQuery('#loaderDiv').show(); + jQuery('#editAttributeGroupForm').load('showUpdatePatientAttributeGroupForm.action', + { + id:attributeId + }, function() + { + showById('editAttributeGroupForm'); + jQuery('#loaderDiv').hide(); + }); +} + +function updatePatientAttributeGroup() +{ + $.ajax({ + type: "POST", + url: 'updatePatientAttributeGroup.action', + data: getParamsForDiv('updatePatientAttributeGroupForm'), + success: function( json ) { + if( json.response == 'success') + { + onClickBackBtn(); + } + } + }); + + return false; +} + +// ------------------------------------------------------------------ +// Click Back button +// ------------------------------------------------------------------ + +function onClickBackBtn() +{ + hideById('editAttributeGroupForm'); + jQuery('#loaderDiv').show(); + jQuery('#attributeGroupList').load('patientAttributeGroupList.action', + { + }, function() + { + showById('attributeGroupList'); + jQuery('#loaderDiv').hide(); + }); +} + +// ----------------------------------------------------------------------------- // Show and Hide tooltip // ----------------------------------------------------------------------------- === 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 2010-09-27 07:33:12 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js 2011-05-18 01:07:51 +0000 @@ -26,4 +26,91 @@ function removePatientIdentifierType( patientIdentifierTypeId, name ) { removeItem( patientIdentifierTypeId, name, i18n_confirm_delete, 'removePatientIdentifierType.action' ); -} \ No newline at end of file +} + +// ----------------------------------------------------------------------------- +// Add Patient Identifier Type +// ----------------------------------------------------------------------------- + +function showAddPatientIdentifierTypeForm( ) +{ + hideById('identifierTypeList'); + jQuery('#loaderDiv').show(); + jQuery('#editIdentifierTypeForm').load('showAddPatientIdentifierTypeForm.action', + { + }, function() + { + showById('editIdentifierTypeForm'); + jQuery('#loaderDiv').hide(); + }); +} + +function addPatientIdentifierType() +{ + $.ajax({ + type: "POST", + url: 'addPatientIdentifierType.action', + data: getParamsForDiv('addPatientIdentifierTypeForm'), + success: function( json ) { + if( json.response == 'success') + { + onClickBackBtn(); + } + } + }); + + return false; +} + +// ----------------------------------------------------------------------------- +// Update Patient Identifier Type +// ----------------------------------------------------------------------------- + +function showUpdatePatientIdentifierTypeForm( identifierTypeId ) +{ + hideById('identifierTypeList'); + jQuery('#loaderDiv').show(); + jQuery('#editIdentifierTypeForm').load('showUpdatePatientIdentifierTypeForm.action', + { + id:identifierTypeId + }, function() + { + showById('editIdentifierTypeForm'); + jQuery('#loaderDiv').hide(); + }); +} + +function updatePatientIdentifierType() +{ + $.ajax({ + type: "POST", + url: 'updatePatientIdentifierType.action', + data: getParamsForDiv('updatePatientIdentifierTypeForm'), + success: function( json ) { + if( json.response == 'success') + { + onClickBackBtn(); + } + } + }); + + return false; +} + +// ------------------------------------------------------------------ +// Click Back button +// ------------------------------------------------------------------ + +function onClickBackBtn() +{ + hideById('editIdentifierTypeForm'); + jQuery('#loaderDiv').show(); + jQuery('#identifierTypeList').load('patientIdentifierTypeList.action', + { + }, function() + { + showById('identifierTypeList'); + jQuery('#loaderDiv').hide(); + }); +} + === 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 2011-05-13 09:11:13 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js 2011-05-18 01:07:51 +0000 @@ -21,87 +21,6 @@ } // ----------------------------------------------------------------------------- -// Add RelationshipType -// ----------------------------------------------------------------------------- - -function validateAddRelationshipType() -{ - $.postJSON( - 'validateRelationshipType.action', - { - "aIsToB": getFieldValue( 'aIsToB' ), - "bIsToA": getFieldValue( 'bIsToA' ) - }, - function( json ) - { - if ( json.response == "success" ) - { - var form = document.getElementById( 'addRelationshipTypeForm' ); - form.submit(); - }else if ( json.response == "input" ) - { - setHeaderMessage( json.message ); - } - else if ( json.response == "error" ) - { - setHeaderMessage( "i18n_adding_patient_atttibute_failed + ':' + '\n'" +json.message ); - } - } - ); -} - -// ----------------------------------------------------------------------------- -// Update RelationshipType -// ----------------------------------------------------------------------------- - -function validateUpdateRelationshipType() -{ - $.postJSON( - 'validateRelationshipType.action', - { - "id": getFieldValue( 'id' ), - "aIsToB": getFieldValue( 'aIsToB' ), - "bIsToA": getFieldValue( 'bIsToA' ) - }, - function( json ) - { - if ( json.response == "success" ) - { - var form = document.getElementById( 'updateRelationshipTypeForm' ); - form.submit(); - }else if ( json.response == "input" ) - { - setHeaderMessage( json.message ); - } - else if ( json.response == "error" ) - { - setHeaderMessage( "i18n_adding_patient_atttibute_failed + ':' + '\n'" +json.message ); - } - } - ); -} - -function updateValidationCompleted( messageElement ) -{ - var type = messageElement.getAttribute( 'type' ); - var message = messageElement.firstChild.nodeValue; - - if( type == 'success' ) - { - var form = document.getElementById( 'updateRelationshipTypeForm' ); - form.submit(); - } - else if( type == 'error' ) - { - window.alert( i18n_saving_program_failed + ':' + '\n' + message ); - } - else if( type == 'input' ) - { - setHeaderMessage( message ); - } -} - -// ----------------------------------------------------------------------------- // Remove RelationshipType // ----------------------------------------------------------------------------- @@ -267,38 +186,6 @@ } } - -/*function removeRelationship( relationshipId, patientA, aIsToB, patientB ) -{ - - var result = window.confirm( i18n_confirm_delete_relationship + '\n\n' + patientA + ' is ' + aIsToB + ' to ' + patientB ); - - if( result ) - { - var request = new Request(); - request.setResponseTypeXML( 'message' ); - request.setCallbackSuccess( removeRelationshipCompleted ); - request.send( 'removeRelationship.action?relationshipId=' + relationshipId ); - } -} - -function removeRelationshipCompleted( messageElement ) -{ - var type = messageElement.getAttribute( 'type' ); - var message = messageElement.firstChild.nodeValue; - - if( type == 'success' ) - { - window.location = "getRelationshipList.action"; - } - else if( type = 'error' ) - { - setInnerHTML( 'warningField', message ); - - showWarning(); - } -}*/ - //------------------------------------------------------------------------------ // Relationship partner //------------------------------------------------------------------------------ @@ -439,3 +326,144 @@ setHeaderMessage( message ); } } + +// ----------------------------------------------------------------------------- +// Add Relationship Type +// ----------------------------------------------------------------------------- + +function showAddRelationshipTypeForm() +{ + hideById('relationshipTypeList'); + jQuery('#loaderDiv').show(); + jQuery('#editRelationshipTypeForm').load('showAddRelationshipTypeForm.action', + { + }, function() + { + showById('editRelationshipTypeForm'); + jQuery('#loaderDiv').hide(); + }); +} + + +function validateAddRelationshipType() +{ + $.postJSON( + 'validateRelationshipType.action', + { + "aIsToB": getFieldValue( 'aIsToB' ), + "bIsToA": getFieldValue( 'bIsToA' ) + }, + function( json ) + { + if ( json.response == "success" ) + { + addRelationshipType(); + }else if ( json.response == "input" ) + { + setHeaderMessage( json.message ); + } + else if ( json.response == "error" ) + { + setHeaderMessage( "i18n_adding_patient_atttibute_failed + ':' + '\n'" +json.message ); + } + } + ); +} + +function addRelationshipType() +{ + $.ajax({ + type: "POST", + url: 'addRelationshipType.action', + data: getParamsForDiv('addRelationshipTypeForm'), + success: function( json ) { + if( json.response == 'success') + { + onClickBackBtn(); + } + } + }); + + return false; +} + +// ----------------------------------------------------------------------------- +// Update Relationship Type +// ----------------------------------------------------------------------------- + +function showUpdateRelationshipTypeForm( relationshipTypeId ) +{ + hideById('relationshipTypeList'); + jQuery('#loaderDiv').show(); + jQuery('#editRelationshipTypeForm').load('showUpdateRelationshipTypeForm.action', + { + id:relationshipTypeId + }, function() + { + showById('editRelationshipTypeForm'); + jQuery('#loaderDiv').hide(); + }); +} + + +function validateUpdateRelationshipType() +{ + $.postJSON( + 'validateRelationshipType.action', + { + "id": getFieldValue( 'id' ), + "aIsToB": getFieldValue( 'aIsToB' ), + "bIsToA": getFieldValue( 'bIsToA' ) + }, + function( json ) + { + if ( json.response == "success" ) + { + updatePatientIdentifierType(); + }else if ( json.response == "input" ) + { + setMessage( json.message ); + } + else if ( json.response == "error" ) + { + setMessage( "i18n_adding_patient_atttibute_failed + ':' + '\n'" +json.message ); + } + } + ); +} + +function updatePatientIdentifierType() +{ + $.ajax({ + type: "POST", + url: 'updateRelationshipType.action', + data: getParamsForDiv('updateRelationshipTypeForm'), + success: function( json ) { + if( json.response == 'success') + { + onClickBackBtn(); + } + } + }); + + return false; +} + +// ------------------------------------------------------------------ +// Click Back button +// ------------------------------------------------------------------ + +function onClickBackBtn() +{ + hideById('editRelationshipTypeForm'); + jQuery('#loaderDiv').show(); + jQuery('#relationshipTypeList').load('relationshipTypeList.action', + { + }, function() + { + showById('relationshipTypeList'); + jQuery('#loaderDiv').hide(); + }); +} + + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm 2010-10-05 11:58:15 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm 2011-05-18 01:07:51 +0000 @@ -9,36 +9,37 @@ - - + $i18n.getString( "name" ) - $i18n.getString( "operations" ) + $i18n.getString( "operations" ) + #set( $mark = false ) #foreach( $identifierType in $identifierTypes ) - + $encoder.htmlEncode( $identifierType.name ) - -

+ +

- +

- +

+ #set( $mark = !$mark) #end @@ -58,10 +59,3 @@ - - === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm 2011-05-16 09:29:20 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm 2011-05-18 01:07:51 +0000 @@ -5,8 +5,6 @@ #parse( "/dhis-web-commons/loader/loader.vm" )

- === added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroupList.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroupList.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroupList.vm 2011-05-18 01:07:51 +0000 @@ -0,0 +1,63 @@ + +

$i18n.getString( "patient_attribute_group_management" )

+ + + + + + +

+ + + + + + + + + + + + + + + + + #set( $mark = false ) + #foreach( $patientAttributeGroup in $patientAttributeGroups ) + + + + + + + + + + + + #set( $mark = !$mark) + #end + + + +

$i18n.getString( "attribute_name" )	$i18n.getString( "operations" )

$encoder.htmlEncode( $patientAttributeGroup.name )	+ +	+ +	+ +

+ + + +

=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientIdentifierType.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientIdentifierType.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientIdentifierType.vm 2011-05-18 01:07:51 +0000 @@ -0,0 +1,16 @@ +

+ #parse( "/dhis-web-maintenance-patient/listPatientIdentifierType.vm" ) +

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

+ + + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm 2010-10-04 13:31:37 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm 2011-05-18 01:07:51 +0000 @@ -1,67 +1,13 @@ - -

$i18n.getString( "relationship_type_management" )

- - - - - - -

- - - - - - - - - - - - - - - - - - - - #foreach( $relationshipType in $relationshipTypes ) - - - - - - - - - - - - - - #end - - - -

$i18n.getString( "relationship_type" )	$i18n.getString( "description" )	$i18n.getString( "operations" )

$encoder.htmlEncode( $relationshipType.aIsToB )/$encoder.htmlEncode( $relationshipType.bIsToA )	$encoder.htmlEncode( $relationshipType.description )	- -	- -	- -

- -

+ #parse( "/dhis-web-maintenance-patient/relationshipTypeList.vm" ) +

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

+ + + + +

$i18n.getString( "update_patient_attribute_group" )

@@ -84,7 +88,6 @@

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm 2011-04-28 08:15:18 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm 2011-05-18 01:07:51 +0000 @@ -1,16 +1,18 @@ + +

$i18n.getString( "update_patient_identifier_type" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm 2011-04-28 08:15:18 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm 2011-05-18 01:07:51 +0000 @@ -10,6 +10,9 @@ }); + +