=== 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-19 08:13:38 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2011-05-19 08:14:24 +0000 @@ -22,19 +22,14 @@ /main.vm /dhis-web-maintenance-patient/relationshipType.vm /dhis-web-maintenance-patient/patientAndProgramMenu.vm - javascript/commons.js,javascript/relationship.js - - - - /content.vm - /dhis-web-maintenance-patient/relationshipTypeList.vm + javascript/relationship.js /dhis-web-maintenance-patient/responseRelationshipType.vm + plainTextError - - /dhis-web-commons/ajax/jsonResponseSuccess.vm + relationshipType.action + F_RELATIONSHIPTYPE_ADD - /content.vm + /main.vm /dhis-web-maintenance-patient/addRelationshipTypeForm.vm + /dhis-web-maintenance-patient/patientAndProgramMenu.vm + javascript/relationship.js F_RELATIONSHIPTYPE_ADD - /content.vm + /main.vm /dhis-web-maintenance-patient/updateRelationshipTypeForm.vm + /dhis-web-maintenance-patient/patientAndProgramMenu.vm + javascript/relationship.js F_PATIENTATTRIBUTE_UPDATE - - /dhis-web-commons/ajax/jsonResponseSuccess.vm + relationshipType.action + F_RELATIONSHIPTYPE_UPDATE @@ -816,13 +815,7 @@ /main.vm /dhis-web-maintenance-patient/patientAttributeGroup.vm /dhis-web-maintenance-patient/patientAndProgramMenu.vm - javascript/commons.js,javascript/patientAttributeGroup.js - - - - /content.vm - /dhis-web-maintenance-patient/patientAttributeGroupList.vm + javascript/patientAttributeGroup.js /dhis-web-maintenance-patient/responsePatientAttributeGroup.vm + plainTextError - - /dhis-web-commons/ajax/jsonResponseSuccess.vm + patientAttributeGroup.action + F_PATIENTATTRIBUTE_ADD - /content.vm + /main.vm /dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm + /dhis-web-maintenance-patient/patientAndProgramMenu.vm + javascript/patientAttributeGroup.js + style/basic.css F_PATIENTATTRIBUTE_ADD - /content.vm + /main.vm /dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm + /dhis-web-maintenance-patient/patientAndProgramMenu.vm + javascript/patientAttributeGroup.js F_PATIENTATTRIBUTE_UPDATE - - /dhis-web-commons/ajax/jsonResponseSuccess.vm + patientAttributeGroup.action + F_PATIENTATTRIBUTE_UPDATE @@ -877,29 +876,14 @@ /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 - - - /content.vm + /main.vm /dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm + /dhis-web-maintenance-patient/patientAndProgramMenu.vm + javascript/patientIdentifierType.js F_PATIENTIDENTIFIERTYPE_ADD @@ -916,17 +900,29 @@ - /content.vm + /main.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 - - /dhis-web-commons/ajax/jsonResponseSuccess.vm + patientIdentifierType.action + F_PATIENTIDENTIFIERTYPE_ADD - - /dhis-web-commons/ajax/jsonResponseSuccess.vm + patientIdentifierType.action + 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-05-18 01:07:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm 2011-05-19 08:14:24 +0000 @@ -1,10 +1,12 @@ - - -

- +

$i18n.getString( "add_new_patient_attribute_group" )

@@ -77,6 +76,7 @@

+

\ 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-05-18 01:07:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm 2011-05-19 08:14:24 +0000 @@ -4,19 +4,16 @@ jQuery('name').focus(); validation( 'addPatientIdentifierTypeForm', function(form){ - addPatientIdentifierType(); + form.submit(); }); checkValueIsExist( "name", "validatePatientIdentifierType.action"); }); - - -

$i18n.getString( "add_new_patient_identifier_type" )

- +
@@ -85,6 +82,7 @@
+
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipTypeForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipTypeForm.vm 2011-05-18 01:07:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipTypeForm.vm 2011-05-19 08:14:24 +0000 @@ -9,9 +9,6 @@ }); - -

-

$i18n.getString( "add_new_relationship_type" )

@@ -36,6 +33,7 @@

+

\ 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-19 08:12:45 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/commons.js 2011-05-19 08:14:24 +0000 @@ -101,20 +101,10 @@ if( $(this).attr('type') != 'button' ) { var elementId = $(this).attr('id'); - - if( jQuery(this).context.multiple ) - { - for ( var i in jQuery(this).val() ) - { - params += elementId + "="+ jQuery(this).val()[i] + "&"; - } - }else - { - params += elementId + "="+ jQuery(this).val() + "&"; - } + 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-18 01:07:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2011-05-19 08:14:24 +0000 @@ -151,6 +151,7 @@ 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 2011-05-18 01:07:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js 2011-05-19 08:14:24 +0000 @@ -39,6 +39,10 @@ removeItem( patientAttributeGroupId, name, i18n_confirm_delete, 'removePatientAttributeGroup.action' ); } +// ----------------------------------------------------------------------------- +// Show and Hide tooltip +// ----------------------------------------------------------------------------- + function patientAttributeGroupAssociation(){ selectAllById('selectedAttributeGroups'); var form = document.getElementById( 'patientAttributeGroupAssociationForm' ); @@ -46,92 +50,6 @@ } // ----------------------------------------------------------------------------- -// 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 2011-05-18 01:07:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js 2011-05-19 08:14:24 +0000 @@ -26,91 +26,4 @@ function removePatientIdentifierType( patientIdentifierTypeId, name ) { removeItem( patientIdentifierTypeId, name, i18n_confirm_delete, 'removePatientIdentifierType.action' ); -} - -// ----------------------------------------------------------------------------- -// 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(); - }); -} - +} \ 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/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-18 01:07:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js 2011-05-19 08:14:24 +0000 @@ -21,6 +21,87 @@ } // ----------------------------------------------------------------------------- +// 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 // ----------------------------------------------------------------------------- @@ -186,6 +267,38 @@ } } + +/*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 //------------------------------------------------------------------------------ @@ -326,144 +439,3 @@ 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 2011-05-18 01:07:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm 2011-05-19 08:14:24 +0000 @@ -9,37 +9,36 @@ + - + $i18n.getString( "name" ) - $i18n.getString( "operations" ) + $i18n.getString( "operations" ) - #set( $mark = false ) #foreach( $identifierType in $identifierTypes ) - + $encoder.htmlEncode( $identifierType.name ) - - $i18n.getString( 'edit' ) + + $i18n.getString( 'edit' ) - + $i18n.getString( 'remove' ) - + $i18n.getString( 'show_details' ) - #set( $mark = !$mark) #end @@ -59,3 +58,10 @@ + + === 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-18 01:07:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm 2011-05-19 08:14:24 +0000 @@ -5,6 +5,8 @@ #parse( "/dhis-web-commons/loader/loader.vm" )
+

+ === removed 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 2011-05-18 01:07:51 +0000 +++ 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 @@ -1,63 +0,0 @@ - -

$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 ) - $i18n.getString( - - $i18n.getString( - - $i18n.getString( -
- 		- - - -
=== removed 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 2011-05-18 01:07:51 +0000 +++ 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 @@ -1,16 +0,0 @@ -
- #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 2011-05-18 01:07:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm 2011-05-19 08:14:24 +0000 @@ -1,13 +1,67 @@ -
- #parse( "/dhis-web-maintenance-patient/relationshipTypeList.vm" ) -
- -#parse( "/dhis-web-commons/loader/loader.vm" ) - -
-

- - + +

$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 ) + $i18n.getString( + + $i18n.getString( + + $i18n.getString( +
+ 		+ +
- - -

-

$i18n.getString( "update_patient_attribute_group" )

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

+

=== 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-05-18 01:07:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm 2011-05-19 08:14:24 +0000 @@ -1,18 +1,16 @@ - -

$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-05-18 01:07:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm 2011-05-19 08:14:24 +0000 @@ -10,9 +10,6 @@ }); - -

-

$i18n.getString( "update_relationship_type" )

@@ -47,6 +44,7 @@

+