dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #28039
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13976: Update the authority names ( tracker module )
------------------------------------------------------------
revno: 13976
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-02-10 18:24:32 +0700
message:
Update the authority names ( tracker module )
modified:
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java 2014-02-10 08:26:08 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java 2014-02-10 11:24:32 +0000
@@ -223,7 +223,7 @@
executeSql( "UPDATE program SET displayIncidentDate=false WHERE displayIncidentDate is null" );
executeSql( "UPDATE program SET relationshipFromA=false WHERE relationshipFromA is null" );
- executeSql( "update systemsetting set \"name\"='trackedEntityExcelTemplateFileName' where \"name\"='patientExcelTemplateFileName'" );
+ executeSql( "update userroleauthorities set \"name\"='trackedEntityExcelTemplateFileName' where \"name\"='patientExcelTemplateFileName'" );
executeSql( "update systemsetting set \"name\"='autoSavetTrackedEntityForm' where \"name\"='autoSavePatientRegistration'" );
executeSql( "UPDATE trackedentityattribute SET uniquefield=false WHERE uniquefield is null" );
@@ -243,6 +243,37 @@
executeSql( "DROP TABLE patientidentifier" );
executeSql( "DROP TABLE patientidentifiertype" );
executeSql( "ALTER TABLE trackedentityattribute RENAME CONSTRAINT fk_patientidentifiertype_periodtypeid TO trackedentityattribute_periodtypeid" );
+
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_REMOVE_EMPTY_EVENTS' where authority='F_PATIENT_REMOVE_EMPTY_EVENTS'" );
+ executeSql( "update userroleauthorities set authority='F_ACCESS_TRACKED_ENTITY_ATTRIBUTES' where authority='F_ACCESS_PATIENT_ATTRIBUTES'" );
+ executeSql( "update userroleauthorities set authority='F_ALLOW_EDIT_TRACKED_ENTITY_ATTRIBUTES' where authority='F_ALLOW_EDIT_PATIENT_ATTRIBUTES'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_ATTRIBUTE_ADD' where authority='F_TRACKED_ENTITY_INSTANCEATTRIBUTE_ADD'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_ATTRIBUTE_DELETE' where authority='F_TRACKED_ENTITY_INSTANCEATTRIBUTE_DELETE'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_ATTRIBUTEVALUE_ADD' where authority='F_TRACKED_ENTITY_INSTANCEATTRIBUTE_ADD'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_INSTANCE_CHANGE_LOCATION' where authority='F_PATIENT_CHANGE_LOCATION'" );
+ executeSql( "update userroleauthorities set authority='F_SEARCH_TRACKED_ENTITY_INSTANCE_IN_ALL_FACILITIES' where authority='F_SEARCH_PATIENT_IN_ALL_FACILITIES'" );
+ executeSql( "update userroleauthorities set authority='F_SEARCH_TRACKED_ENTITY_INSTANCE_IN_OTHER_ORGUNITS' where authority='F_SEARCH_PATIENT_IN_OTHER_ORGUNITS'" );
+ executeSql( "update userroleauthorities set authority='F_ADD_TRACKED_ENTITY_FORM' where authority='F_ADD_PATIENT_REGISTRATION_FORM'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_DATAVALUE_ADD' where authority='F_PATIENT_DATAVALUE_ADD'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_DATAVALUE_DELETE' where authority='F_PATIENT_DATAVALUE_DELETE'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_INSTANCE_ADD' where authority='F_PATIENT_ADD'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_INSTANCE_DELETE' where authority='F_PATIENT_DELETE'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_INSTANCE_SEARCH' where authority='F_PATIENT_SEARCH'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_INSTANCE_LIST' where authority='F_PATIENT_LIST'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_INSTANCE_HISTORY' where authority='F_PATIENT_HISTORY'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_INSTANCE_DASHBOARD' where authority='F_PATIENT_DASHBOARD'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_COMMENT_ADD' where authority='F_PATIENT_COMMENT_ADD'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_COMMENT_DELETE' where authority='F_PATIENT_COMMENT_DELETE'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_AGGREGATE_REPORT_PUBLIC_ADD' where authority='F_PATIENT_AGGREGATE_REPORT_PUBLIC_ADD'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_AGGREGATE_REPORT_PRIVATE_ADD' where authority='F_PATIENT_AGGREGATE_REPORT_PRIVATE_ADD'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_TABULAR_REPORT_PUBLIC_ADD' where authority='F_PATIENT_TABULAR_REPORT_PUBLIC_ADD'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_TABULAR_REPORT_PRIVATE_ADD' where authority='F_PATIENT_TABULAR_REPORT_PRIVATE_ADD'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_AGGREGATION' where authority='F_PATIENT_AGGREGATION'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_INSTANCE_MANAGEMENT' where authority='F_PATIENT_MANAGEMENT'" );
+ executeSql( "update userroleauthorities set authority='F_NAME_BASED_DATA_ENTRY' where authority='F_NAME_BASED_DATA_ENTRY'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_ATTRIBUTEVALUE_DELETE' where authority='F_PATIENTATTRIBUTEVALUE_DELETE'" );
+ executeSql( "update userroleauthorities set authority='F_TRACKED_ENTITY_INSTANCE_REMINDER_MANAGEMENT' where authority='F_PATIENT_REMINDER_MANAGEMENT'" );
+
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2014-02-10 11:24:32 +0000
@@ -34,20 +34,20 @@
<action name="searchAllFacilities" class="org.hisp.dhis.caseentry.action.NoAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
- <param name="requiredAuthorities">F_SEARCH_PATIENT_IN_ALL_FACILITIES</param>
+ <param name="requiredAuthorities">F_SEARCH_TRACKED_ENTITY_INSTANCE_IN_ALL_FACILITIES</param>
</action>
<action name="searchInOtherOrgunits" class="org.hisp.dhis.caseentry.action.NoAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
- <param name="requiredAuthorities">F_SEARCH_PATIENT_IN_OTHER_ORGUNITS</param>
+ <param name="requiredAuthorities">F_SEARCH_TRACKED_ENTITY_INSTANCE_IN_OTHER_ORGUNITS</param>
</action>
<action name="searchTrackedEntityInstance"
class="org.hisp.dhis.caseentry.action.trackedentity.SearchTrackedEntityInstanceAction">
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/listTrackedEntityInstance.vm</param>
- <param name="requiredAuthorities">F_PATIENT_SEARCH</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
</action>
<action name="listAllTrackedEntityInstances"
@@ -55,7 +55,7 @@
<result name="success" type="velocity">/content.vm</result>
<param name="listAll">true</param>
<param name="page">/dhis-web-caseentry/listTrackedEntityInstance.vm</param>
- <param name="requiredAuthorities">F_PATIENT_LIST</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_LIST</param>
</action>
<action name="selectDataRecording"
@@ -63,7 +63,7 @@
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/dataRecordingSelect.vm</param>
<param name="stylesheets">style/style.css</param>
- <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<action name="loadProgramStageInstances"
@@ -82,7 +82,7 @@
<action name="editDataEntryForm" class="org.hisp.dhis.caseentry.action.NoAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
- <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<action name="dataentryform"
@@ -98,7 +98,7 @@
</result>
<result name="programcompleted" type="velocity-json">/dhis-web-caseentry/jsonResponseProgramCompleted.vm
</result>
- <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<action name="uncompleteDataEntry"
@@ -106,7 +106,7 @@
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
- <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<action name="saveExecutionDate"
@@ -118,14 +118,14 @@
/dhis-web-commons/ajax/jsonResponseInput.vm
</result>
<param name="onExceptionReturn">plainTextError</param>
- <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<action name="registerIrregularEncounter"
class="org.hisp.dhis.caseentry.action.caseentry.RegisterIrregularEncounterAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
- <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<action name="cacheManifest" class="org.hisp.dhis.appcache.AppCacheAction">
@@ -169,7 +169,7 @@
<result name="input" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseInput.vm
</result>
- <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<action name="loadAnonymousPrograms"
@@ -258,7 +258,7 @@
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
- <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<action name="saveProgramInstanceComment"
@@ -266,7 +266,7 @@
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
- <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<!-- save value -->
@@ -277,7 +277,7 @@
<result name="input" type="velocity-xml">/dhis-web-caseentry/responseInput.vm
</result>
<param name="onExceptionReturn">plainTextError</param>
- <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<action name="saveCoordinatesEvent"
@@ -285,7 +285,7 @@
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
<param name="onExceptionReturn">plainTextError</param>
- <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<!-- save providing-facility -->
@@ -295,7 +295,7 @@
<result name="success" type="velocity">status.vm</result>
<result name="input" type="velocity">status.vm</result>
<param name="onExceptionReturn">plainTextError</param>
- <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<!-- Multi DataEntry -->
@@ -349,7 +349,7 @@
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
<param name="javascripts">../dhis-web-commons/javascripts/date.js</param>
- <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<action name="completeProgramStageDataEntry"
@@ -357,7 +357,7 @@
<result name="success" type="redirect">
getDataRecords.action?programId=${programId}
</result>
- <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<!-- Single-event DataEntry -->
@@ -390,13 +390,13 @@
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/addSingleEventRegistration.vm</param>
<param name="stylesheets">style/style.css</param>
- <param name="requiredAuthorities">F_PATIENT_ADD,F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_ADD,F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<action name="saveValues"
class="org.hisp.dhis.caseentry.action.caseentry.SaveValuesAction">
<result name="success" type="velocity-xml">status.vm</result>
- <param name="requiredAuthorities">F_PATIENT_ADD,F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_ADD,F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
</action>
<!-- Report -->
@@ -462,7 +462,7 @@
<param name="menu">/dhis-web-caseentry/caseAggregationMenu.vm</param>
<param name="javascripts">javascript/caseagg.js,javascript/caseAggregationForm.js</param>
<param name="stylesheets">style/style.css</param>
- <param name="requiredAuthorities">F_PATIENT_AGGREGATION</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_AGGREGATION</param>
</action>
<action name="validateCaseAggregation"
@@ -483,7 +483,7 @@
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/caseAggregationResult.vm</param>
<param name="menu">/dhis-web-caseentry/caseAggregationMenu.vm</param>
- <param name="requiredAuthorities">F_PATIENT_AGGREGATION</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_AGGREGATION</param>
</action>
<action name="saveAggregateDataValue"
@@ -516,14 +516,14 @@
,javascript/relationshipTrackedEntityInstance.js
</param>
<param name="stylesheets">style/style.css</param>
- <param name="requiredAuthorities">F_PATIENT_MANAGEMENT</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_MANAGEMENT</param>
</action>
<action name="searchRegistrationTrackedEntityInstance"
class="org.hisp.dhis.caseentry.action.trackedentity.SearchTrackedEntityInstanceAction">
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/trackedEntityInstanceRegistrationList.vm</param>
- <param name="requiredAuthorities">F_PATIENT_SEARCH</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
</action>
<action name="removeTrackedEntityInstance"
@@ -535,7 +535,7 @@
/dhis-web-commons/ajax/jsonResponseError.vm
</result>
<param name="onExceptionReturn">plainTextError</param>
- <param name="requiredAuthorities">F_PATIENT_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_DELETE</param>
</action>
<action name="addTrackedEntityInstance"
@@ -543,14 +543,14 @@
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
- <param name="requiredAuthorities">F_PATIENT_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_ADD</param>
</action>
<action name="showAddTrackedEntityInstanceForm"
class="org.hisp.dhis.caseentry.action.trackedentity.ShowAddTrackedEntityInstanceFormAction">
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/addTrackedEntityInstanceForm.vm</param>
- <param name="requiredAuthorities">F_PATIENT_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_ADD</param>
</action>
<action name="showUpdateTrackedEntityInstanceForm"
@@ -562,7 +562,7 @@
<param name="javascripts">
../dhis-web-commons/javascripts/jQuery/jquery-barcode.min.js
</param>
- <param name="requiredAuthorities">F_PATIENT_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_ADD</param>
</action>
<action name="updateTrackedEntityInstance"
@@ -570,7 +570,7 @@
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
- <param name="anyAuthorities">F_ALLOW_EDIT_PATIENT_PROPERTIES, F_ALLOW_EDIT_PATIENT_ATTRIBUTES, F_ALLOW_EDIT_PATIENT_IDENTIFIERS</param>
+ <param name="anyAuthorities">F_ALLOW_EDIT_TRACKED_ENTITY_PROPERTIES, F_ALLOW_EDIT_TRACKED_ENTITY_ATTRIBUTES, F_ALLOW_EDIT_TRACKED_ENTITY_IDENTIFIERS</param>
</action>
<action name="validateTrackedEntityInstance"
@@ -589,21 +589,21 @@
../dhis-web-commons/javascripts/date.js
</param>
<param name="stylesheets">style/style.css</param>
- <param name="requiredAuthorities">F_PATIENT_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_ADD</param>
</action>
<action name="searchPerson"
class="org.hisp.dhis.caseentry.action.trackedentity.SearchPersonAction">
<result name="success" type="velocity-xml">responseTrackedEntityInstances.vm
</result>
- <param name="requiredAuthorities">F_PATIENT_SEARCH</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
</action>
<action name="addRepresentative"
class="org.hisp.dhis.caseentry.action.trackedentity.AddRepresentativeAction">
<result name="success" type="velocity-xml">responseRepresentative.vm
</result>
- <param name="requiredAuthorities">F_PATIENT_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_ADD</param>
</action>
<action name="getTrackedEntityInstanceHistory"
@@ -612,7 +612,7 @@
<result name="xls" type="gridXlsResult" />
<result name="pdf" type="gridPdfResult" />
<param name="page">/dhis-web-caseentry/trackedEntityInstanceHistory.vm</param>
- <param name="requiredAuthorities">F_PATIENT_HISTORY</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_HISTORY</param>
</action>
<action name="getProgramReportHistory"
@@ -627,14 +627,14 @@
class="org.hisp.dhis.caseentry.action.trackedentity.GetTrackedEntityInstanceLocationAction">
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/trackedEntityInstanceLocation.vm</param>
- <param name="requiredAuthorities">F_PATIENT_CHANGE_LOCATION</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_CHANGE_LOCATION</param>
</action>
<action name="registerTrackedEntityInstanceLocation"
class="org.hisp.dhis.caseentry.action.trackedentity.RegisterTrackedEntityInstanceLocationAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
- <param name="requiredAuthorities">F_PATIENT_CHANGE_LOCATION</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_CHANGE_LOCATION</param>
</action>
<!-- Program Enrollment -->
@@ -698,7 +698,7 @@
<action name="saveAttribute"
class="org.hisp.dhis.caseentry.action.trackedentity.SaveAttributeAction">
<result name="success" type="velocity-xml">status.vm</result>
- <param name="requiredAuthorities">F_PATIENT_ADD, F_PROGRAM_ENROLLMENT</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_ADD, F_PROGRAM_ENROLLMENT</param>
</action>
<action name="setProgramInstanceStatus"
@@ -711,7 +711,7 @@
class="org.hisp.dhis.caseentry.action.trackedentity.GetProgramAction">
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/attributeFormDiv.vm</param>
- <param name="requiredAuthorities">F_PATIENT_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_ADD</param>
</action>
<action name="getAttributesByProgram"
@@ -750,7 +750,7 @@
class="org.hisp.dhis.caseentry.action.trackedentity.ShowAddRelationshipFormAction">
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/addRelationshipForm.vm</param>
- <param name="requiredAuthorities">F_RELATIONSHIP_ADD, F_PATIENT_ADD</param>
+ <param name="requiredAuthorities">F_RELATIONSHIP_ADD, F_TRACKED_ENTITY_INSTANCE_ADD</param>
</action>
<action name="validateSearchRelationship"
@@ -831,7 +831,7 @@
class="org.hisp.dhis.caseentry.action.trackedentity.GetTrackedEntityInstanceAction">
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/addRelationshipTrackedEntityInstanceForm.vm</param>
- <param name="requiredAuthorities">F_RELATIONSHIP_ADD, F_PATIENT_ADD</param>
+ <param name="requiredAuthorities">F_RELATIONSHIP_ADD, F_TRACKED_ENTITY_INSTANCE_ADD</param>
</action>
<!-- Tabular report -->
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml 2014-02-10 10:37:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml 2014-02-10 11:24:32 +0000
@@ -62,14 +62,14 @@
<param name="page">/dhis-web-maintenance-program/updateRelationshipTypeForm.vm</param>
<param name="javascripts">javascript/relationship.js</param>
<param name="stylesheets">style/basic.css</param>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_ADD</param>
</action>
<action name="updateRelationshipType"
class="org.hisp.dhis.trackedentity.action.relationship.UpdateRelationshipTypeAction">
<result name="success" type="redirect">relationshipType.action
</result>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_ADD</param>
</action>
<action name="validateRelationshipType"
@@ -129,14 +129,14 @@
<result name="error" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseError.vm
</result>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_DELETE</param>
</action>
<action name="addAttribute"
class="org.hisp.dhis.trackedentity.action.trackedentityattribute.AddAttributeAction">
<result name="success" type="redirect">attribute.action
</result>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_ADD</param>
</action>
<action name="showAddAttributeForm"
@@ -146,7 +146,7 @@
/dhis-web-maintenance-program/addAttributeForm.vm</param>
<param name="javascripts">javascript/attribute.js</param>
<param name="stylesheets">style/basic.css</param>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_ADD</param>
</action>
<action name="showUpdateAttributeForm"
@@ -156,14 +156,14 @@
/dhis-web-maintenance-program/updateAttibuteForm.vm</param>
<param name="javascripts">javascript/attribute.js</param>
<param name="stylesheets">style/basic.css</param>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_ADD</param>
</action>
<action name="updateAttribute"
class="org.hisp.dhis.trackedentity.action.trackedentityattribute.UpdateAttributeAction">
<result name="success" type="redirect">attribute.action
</result>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_ADD</param>
</action>
<action name="validateAttribute"
@@ -188,7 +188,7 @@
<result name="input" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseInput.vm
</result>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_DELETE</param>
</action>
<action name="attributeVisitSchedule"
@@ -199,13 +199,13 @@
<param name="menu">/dhis-web-maintenance-program/menu.vm</param>
<param name="javascripts">javascript/attribute.js</param>
<param name="stylesheets">style/basic.css</param>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_ADD</param>
</action>
<action name="saveAttributeVisitSchedule"
class="org.hisp.dhis.trackedentity.action.trackedentityattribute.SaveAttributeVisitScheduleAction">
<result name="success" type="redirect">index.action</result>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_ADD</param>
</action>
<action name="attributeInListNoProgram"
@@ -216,13 +216,13 @@
<param name="menu">/dhis-web-maintenance-program/menu.vm</param>
<param name="javascripts">javascript/attribute.js</param>
<param name="stylesheets">style/basic.css</param>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_ADD</param>
</action>
<action name="saveAttributeInListNoProgram"
class="org.hisp.dhis.trackedentity.action.trackedentityattribute.SaveAttributeInListNoProgramAction">
<result name="success" type="redirect">index.action</result>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_ADD</param>
</action>
<!-- Program -->
@@ -586,7 +586,7 @@
<param name="page">/dhis-web-maintenance-program/trackedEntityForm.vm</param>
<param name="menu">/dhis-web-maintenance-program/menu.vm</param>
<param name="javascripts">javascript/trackedEntityForm.js</param>
- <param name="requiredAuthorities">F_ADD_PATIENT_REGISTRATION_FORM</param>
+ <param name="requiredAuthorities">F_ADD_TRACKED_ENTITY_FORM</param>
</action>
<action name="viewTrackedEntityForm"
@@ -664,14 +664,14 @@
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_DELETE</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_DELETE</param>
</action>
<action name="addAttributeGroup"
class="org.hisp.dhis.trackedentity.action.trackedentityattributegroup.AddAttributeGroupAction">
<result name="success" type="redirect">attributeGroup.action
</result>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_ADD</param>
</action>
<action name="showAddAttributeGroupForm" class="org.hisp.dhis.trackedentity.action.NoAction">
@@ -679,7 +679,7 @@
<param name="page">/dhis-web-maintenance-program/addAttributeGroupForm.vm</param>
<param name="javascripts">javascript/attributeGroup.js</param>
<param name="stylesheets">style/basic.css</param>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_ADD</param>
</action>
<action name="showUpdateAttributeGroupForm"
@@ -688,14 +688,14 @@
<param name="page">/dhis-web-maintenance-program/updateAttibuteGroupForm.vm</param>
<param name="javascripts">javascript/attributeGroup.js</param>
<param name="stylesheets">style/basic.css</param>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_ADD</param>
</action>
<action name="updateAttributeGroup"
class="org.hisp.dhis.trackedentity.action.trackedentityattributegroup.UpdateAttributeGroupAction">
<result name="success" type="redirect">attributeGroup.action
</result>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_ADD</param>
</action>
<action name="validateAttributeGroup"
@@ -718,7 +718,7 @@
<param name="page">/dhis-web-maintenance-program/sortAttributeGroupForm.vm</param>
<param name="javascripts">javascript/attributeGroup.js</param>
<param name="stylesheets">style/basic.css</param>
- <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_ADD</param>
</action>
<action name="saveAttributeGroupSortOrder"
@@ -1115,7 +1115,7 @@
<param name="page">/dhis-web-maintenance-program/programReminder.vm</param>
<param name="menu">/dhis-web-maintenance-program/menu.vm</param>
<param name="javascripts">javascript/programReminder.js</param>
- <param name="requiredAuthorities">F_PATIENT_REMINDER_MANAGEMENT</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_REMINDER_MANAGEMENT</param>
</action>
<action name="showAddProgramReminder"
@@ -1123,14 +1123,14 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-program/addProgramReminder.vm</param>
<param name="javascripts">javascript/commons.js,javascript/programReminder.js</param>
- <param name="requiredAuthorities">F_PATIENT_REMINDER_MANAGEMENT</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_REMINDER_MANAGEMENT</param>
</action>
<action name="addProgramReminder"
class="org.hisp.dhis.trackedentity.action.trackedentityinstancereminder.AddProgramReminderAction">
<result name="success" type="redirect">programReminder.action?id=${programId}
</result>
- <param name="requiredAuthorities">F_PATIENT_REMINDER_MANAGEMENT</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_REMINDER_MANAGEMENT</param>
</action>
<action name="showUpdateProgramReminder"
@@ -1138,14 +1138,14 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-program/updateProgramReminder.vm</param>
<param name="javascripts">javascript/commons.js,javascript/programReminder.js</param>
- <param name="requiredAuthorities">F_PATIENT_REMINDER_MANAGEMENT</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_REMINDER_MANAGEMENT</param>
</action>
<action name="updateProgramReminder"
class="org.hisp.dhis.trackedentity.action.trackedentityinstancereminder.UpdateProgramReminderAction">
<result name="success" type="redirect">programReminder.action?id=${programId}
</result>
- <param name="requiredAuthorities">F_PATIENT_REMINDER_MANAGEMENT</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_REMINDER_MANAGEMENT</param>
</action>
<action name="removeProgramReminder"
@@ -1153,7 +1153,7 @@
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
- <param name="requiredAuthorities">F_PATIENT_REMINDER_MANAGEMENT</param>
+ <param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_REMINDER_MANAGEMENT</param>
</action>
<action name="getReminder"
@@ -1164,7 +1164,7 @@
<param name="onExceptionReturn">plainTextError</param>
</action>
- <action name="validateProgramPatientReminder"
+ <action name="validateProgramReminder"
class="org.hisp.dhis.trackedentity.action.trackedentityinstancereminder.ValidateProgramReminderAction">
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2014-02-10 10:37:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2014-02-10 11:24:32 +0000
@@ -122,19 +122,17 @@
F_RELATIONSHIPTYPE_ADD=Add Relationship Type
F_RELATIONSHIPTYPE_UPDATE=Update Relationship Type
F_ORGANISATION_REGISTRATION=Organisation Unit Registration
-F_PATIENT_REMOVE_EMPTY_EVENTS=Remove Empty Person Events
-F_ACCESS_PATIENT_ATTRIBUTES = View and Search Person Attributes and Identifiers
-F_ALLOW_EDIT_PATIENT_ATTRIBUTES = Add and Edit Person Attributes
-F_ALLOW_EDIT_PATIENT_PROPERTIES = Add and Edit Person Properties
-F_ALLOW_EDIT_PATIENT_IDENTIFIERS = Add and Edit Person Identifiers
-F_PATIENTATTRIBUTE_ADD=Add/Update Person Attribute
-F_PATIENTATTRIBUTE_DELETE=Delete Person Attribute
-F_PATIENTATTRIBUTEVALUE_ADD=Add Person Attribute Value
+F_TRACKED_ENTITY_REMOVE_EMPTY_EVENTS=Remove Empty Tracked Entity Events
+F_ACCESS_TRACKED_ENTITY_ATTRIBUTES = View and Search Tracked Entity Attributes and Identifiers
+F_ALLOW_EDIT_TRACKED_ENTITY_ATTRIBUTES = Add and Edit Tracked Entity Attributes
+F_TRACKED_ENTITY_ATTRIBUTE_ADD=Add/Update Tracked Entity Attribute
+F_TRACKED_ENTITY_ATTRIBUTE_DELETE=Delete Tracked Entity Attribute
+F_TRACKED_ENTITY_ATTRIBUTEVALUE_ADD=Add Tracked Entity Attribute Value
F_ADD_PROGRAM_INDICATOR = Add/Update Program Indicator
-F_PATIENT_CHANGE_LOCATION = Change Person Location
-F_SEARCH_PATIENT_IN_ALL_FACILITIES = Search Person In All Orgunits
-F_SEARCH_PATIENT_IN_OTHER_ORGUNITS = Search Person In Other Orgunits
-F_ADD_PATIENT_REGISTRATION_FORM=Add Person Registration Form
+F_TRACKED_ENTITY_CHANGE_LOCATION = Change Tracked Entity Instance Location
+F_SEARCH_TRACKED_ENTITY_IN_ALL_FACILITIES = Search Tracked Entity Instance In All Orgunits
+F_SEARCH_TRACKED_ENTITY_IN_OTHER_ORGUNITS = Search Tracked Entity Instance In Other Orgunits
+F_ADD_TRACKED_ENTITY_FORM=Add Tracked Entity Form
F_PROGRAM_INSTANCE_MANAGEMENT = Program Event Management
F_PROGRAM_INSTANCE_DELETE = Delete Program Enrollment
F_PROGRAM_TRACKING_MANAGEMENT = Program Tracking Management
@@ -147,24 +145,22 @@
F_PROGRAMSTAGE_SECTION_MANAGEMENT=Program Stage Section Management
F_PROGRAMSTAGE_SECTION_ADD=Add/Update Program Stage Section
F_PROGRAMSTAGE_SECTION_DELETE=Delete Program Stage Section
-F_PATIENTIDENTIFIERTYPE_ADD=Add/Update Person Identifier Type
-F_PATIENTIDENTIFIERTYPE_DELETE=Delete Person Identifier Type
F_PROGRAM_ATTRIBUTE_ADD=Add/Update Program Attribute
F_PROGRAM_ATTRIBUTE_DELETE=Delete Program Attribute
-F_PATIENT_DATAVALUE_ADD = Add/Update Person Data Value
-F_PATIENT_DATAVALUE_DELETE = Delete Person Data Value
-F_PATIENT_ADD=Add/Update Person
-F_PATIENT_DELETE=Delete Person
-F_PATIENT_SEARCH = Search Person
-F_PATIENT_LIST = List Person
-F_PATIENT_HISTORY = Load Person History
-F_PATIENT_DASHBOARD = Person Dashboard
-F_PATIENT_COMMENT_ADD = Add Person Comment
-F_PATIENT_COMMENT_DELETE = Delete Person Comment
-F_PATIENT_AGGREGATE_REPORT_PUBLIC_ADD = Add Public Person Aggregate Report
-F_PATIENT_AGGREGATE_REPORT_PRIVATE_ADD = Add Private Person Aggregate Report
-F_PATIENT_TABULAR_REPORT_PUBLIC_ADD = Add Public Cased based Report
-F_PATIENT_TABULAR_REPORT_PRIVATE_ADD = Add Private Person Aggregate Report
+F_TRACKED_ENTITY_DATAVALUE_ADD = Add/Update Tracked Entity Data Value
+F_TRACKED_ENTITY_DATAVALUE_DELETE = Delete Tracked Entity Data Value
+F_TRACKED_ENTITY_INSTANCE_ADD=Add/Update Tracked Entity Instance
+F_TRACKED_ENTITY_INSTANCE_DELETE=Delete Tracked Entity Instance
+F_TRACKED_ENTITY_INSTANCE_SEARCH = Search Tracked Entity Instance
+F_TRACKED_ENTITY_INSTANCE_LIST = List Tracked Entity Instance
+F_TRACKED_ENTITY_INSTANCE_HISTORY = Load Tracked Entity Instance History
+F_TRACKED_ENTITY_INSTANCE_DASHBOARD = Tracked Entity Instance Dashboard
+F_TRACKED_ENTITY_COMMENT_ADD = Add Tracked Entity Instance Comment
+F_TRACKED_ENTITY_COMMENT_DELETE = Delete Tracked Entity Instance Comment
+F_TRACKED_ENTITY_AGGREGATE_REPORT_PUBLIC_ADD = Add Public Tracked Entity Aggregate Report
+F_TRACKED_ENTITY_AGGREGATE_REPORT_PRIVATE_ADD = Add Private Tracked Entity Aggregate Report
+F_TRACKED_ENTITY_TABULAR_REPORT_PUBLIC_ADD = Add Public Cased based Report
+F_TRACKED_ENTITY_TABULAR_REPORT_PRIVATE_ADD = Add Private Tracked Entity Aggregate Report
F_PROGRAM_INDICATOR_MANAGEMENT=Manage Program Indicators
F_PROGRAM_STAGE_COMPLETENESS=View Program Stage Completeness Report
F_SCHEDULING_SEND_MESSAGE = Scheduling send messages
@@ -174,29 +170,28 @@
F_GENERATE_ACTIVITY_PLANS = Generate Activity Plans
F_GENERATE_PROGRAM_SUMMARY_REPORT = Generate Program Summary Report
F_GENERATE_STATISTICAL_PROGRAM_REPORT = Generate Program Statistics Report
-F_GENERATE_BENEFICIARY_TABULAR_REPORT = Generate Person Tabular report
-F_PATIENT_AGGREGATION = Person Aggregation
-F_GENERATE_PATIENT_CHART = Generate Person Chart
-F_PATIENT_MANAGEMENT = Person Management
+F_GENERATE_BENEFICIARY_TABULAR_REPORT = Generate Tracked Entity Tabular report
+F_TRACKED_ENTITY_AGGREGATION = Tracked Entity Aggregation
+F_TRACKED_ENTITY_INSTANCE_MANAGEMENT = Tracked Entity Instance Management
F_NAME_BASED_DATA_ENTRY = Multiple Individual Data Entry
F_SINGLE_EVENT_DATA_ENTRY = Single Event With Registration Data Entry
F_ANONYMOUS_DATA_ENTRY = Single Event Without Registration Data Entry
F_PROGRAM_ENROLLMENT = Program Enrollment
F_PROGRAM_UNENROLLMENT = Program Un-Enrollment
-F_PROGRAM_STAGE_INSTANCE_DELETE = Delete Person Visit
+F_PROGRAM_STAGE_INSTANCE_DELETE = Delete Tracked Entity Instance Visit
F_PROGRAM_STAGE_INSTANCE_REMINDER = Load event reminder messages
F_PROGRAM_TRACKING_SEARCH = Search events with registration
F_PROGRAM_STAGE_INSTANCE_SEARCH = Search events without registration
-F_RELATIONSHIP_MANAGEMENT = Person Relationship Management
-F_RELATIONSHIP_ADD = Add Person Relationship
-F_RELATIONSHIP_DELETE = Delete Person Relationship
+F_RELATIONSHIP_MANAGEMENT = Tracked Entity Relationship Management
+F_RELATIONSHIP_ADD = Add Tracked Entity Relationship
+F_RELATIONSHIP_DELETE = Delete Tracked Entity Relationship
F_SYSTEM_SETTING=Change system settings
F_COPY_EXCEL_ITEM_ADMINISTRATION=Copy Excel Item
F_EXCEL_TEMPLATE_MANAGEMENT_DELETE=Delete Excel Template
F_EXCEL_TEMPLATE_MANAGEMENT_LIST=List Excel Template
F_EXCEL_TEMPLATE_MAMAGEMENT_UPLOAD=Upload Excel Template
F_EXCEL_TEMPLATE_MANAGEMENT_RENAME=Rename Excel Template file
-F_PATIENTATTRIBUTEVALUE_DELETE=Delete Person Attribute Value
+F_TRACKED_ENTITY_ATTRIBUTEVALUE_DELETE=Delete Tracked Entity Attribute Value
F_GIS_ADMIN=Administrate GIS
F_MAP_PUBLIC_ADD=Add Public Map
F_MAP_EXTERNAL=Map External Access
@@ -240,7 +235,7 @@
F_METADATA_IMPORT=Import Meta-Data
F_LOCALE_ADD=Add Locale
F_LOCALE_DELETE=Delete Locale
-F_PATIENT_REMINDER_MANAGEMENT=Manage person reminders
+F_TRACKED_ENTITY_INSTANCE_REMINDER_MANAGEMENT=Manage Tracked Entity Instance Reminders
#-- FRED API module -----------------------------------------------------------#
