dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #28037
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13974: Renamed dhis-service-patient to dhis-service-tracker and dhis-web-maintenance-patient to dhis-web...
------------------------------------------------------------
revno: 13974
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-02-10 17:37:03 +0700
message:
Renamed dhis-service-patient to dhis-service-tracker and dhis-web-maintenance-patient to dhis-web-maintenance-program
renamed:
dhis-2/dhis-services/dhis-service-patient/ => dhis-2/dhis-services/dhis-service-tracker/
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/ => dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/ => dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/
modified:
dhis-2/dhis-services/dhis-service-analytics/pom.xml
dhis-2/dhis-services/dhis-service-dxf2/pom.xml
dhis-2/dhis-services/dhis-service-eventreporting/pom.xml
dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties
dhis-2/dhis-services/dhis-service-mobile/pom.xml
dhis-2/dhis-services/dhis-service-tracker/pom.xml
dhis-2/dhis-services/pom.xml
dhis-2/dhis-web/dhis-web-caseentry/pom.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addCaseAggregation.vm
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-light/pom.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/pom.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-program/src/main/webapp/WEB-INF/web.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addCaseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/index.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/menu.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm
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/pom.xml
dhis-2/dhis-web/dhis-web-portal/india-pom.xml
dhis-2/dhis-web/dhis-web-portal/pom.xml
dhis-2/pom.xml
tools/dhis-adhoc/pom.xml
--
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-analytics/pom.xml'
--- dhis-2/dhis-services/dhis-service-analytics/pom.xml 2014-01-09 21:56:49 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/pom.xml 2014-02-10 10:37:03 +0000
@@ -27,7 +27,7 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-patient</artifactId>
+ <artifactId>dhis-service-tracker</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/pom.xml'
--- dhis-2/dhis-services/dhis-service-dxf2/pom.xml 2014-01-09 21:56:49 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/pom.xml 2014-02-10 10:37:03 +0000
@@ -24,7 +24,7 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-patient</artifactId>
+ <artifactId>dhis-service-tracker</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/pom.xml'
--- dhis-2/dhis-services/dhis-service-eventreporting/pom.xml 2014-01-09 21:56:49 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/pom.xml 2014-02-10 10:37:03 +0000
@@ -27,7 +27,7 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-patient</artifactId>
+ <artifactId>dhis-service-tracker</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
=== modified file 'dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties 2014-02-09 19:00:29 +0000
+++ dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties 2014-02-10 10:37:03 +0000
@@ -43,7 +43,7 @@
dhis-web-maintenance-user=Users
dhis-web-maintenance-dataadmin=Data Administration
dhis-web-maintenance-settings=Settings
-dhis-web-maintenance-patient=Persons and Programs
+dhis-web-maintenance-program=Tracked Entities and Programs
dhis-web-maintenance-mobile=Mobile Configuration
dhis-web-maintenance-appmanager=App Management
dhis-web-caseentry=Individual Records
@@ -76,7 +76,7 @@
intro_dhis-web-maintenance-user=Maintain users in terms of authorities and passwords, user roles and groups.
intro_dhis-web-maintenance-dataadmin=Maintain resource tables, check data integrity, see statistics and more.
intro_dhis-web-maintenance-settings=Maintain user and system settings related to appearance, notifications and more.
-intro_dhis-web-maintenance-patient=Maintain beneficiaries and programs including attributes and identifiers.
+intro_dhis-web-maintenance-program=Maintain tracked entities and programs including attributes and identifiers.
intro_dhis-web-maintenance-mobile=Maintain data sets plus settings for mobile reporting and SMS configuration.
intro_dhis-web-maintenance-appmanager=Access and upload apps, which are extensions to the standard user interface.
intro_dhis-web-caseentry=Register beneficiaries, enter data for encounters and events and view reports.
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/pom.xml'
--- dhis-2/dhis-services/dhis-service-mobile/pom.xml 2014-01-09 21:56:49 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/pom.xml 2014-02-10 10:37:03 +0000
@@ -24,7 +24,7 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-patient</artifactId>
+ <artifactId>dhis-service-tracker</artifactId>
</dependency>
</dependencies>
=== renamed directory 'dhis-2/dhis-services/dhis-service-patient' => 'dhis-2/dhis-services/dhis-service-tracker'
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/pom.xml'
--- dhis-2/dhis-services/dhis-service-patient/pom.xml 2014-01-09 21:56:49 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/pom.xml 2014-02-10 10:37:03 +0000
@@ -9,7 +9,7 @@
<version>2.15-SNAPSHOT</version>
</parent>
- <artifactId>dhis-service-patient</artifactId>
+ <artifactId>dhis-service-tracker</artifactId>
<packaging>jar</packaging>
<name>DHIS Patient API Implementations</name>
=== modified file 'dhis-2/dhis-services/pom.xml'
--- dhis-2/dhis-services/pom.xml 2014-01-09 21:56:49 +0000
+++ dhis-2/dhis-services/pom.xml 2014-02-10 10:37:03 +0000
@@ -26,7 +26,7 @@
<module>dhis-service-administration</module>
<module>dhis-service-datamart-default</module>
<module>dhis-service-i18n</module>
- <module>dhis-service-patient</module>
+ <module>dhis-service-tracker</module>
<!-- Level 3 -->
<module>dhis-service-dxf2</module>
<module>dhis-service-analytics</module>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/pom.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/pom.xml 2014-01-09 21:56:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/pom.xml 2014-02-10 10:37:03 +0000
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-patient</artifactId>
+ <artifactId>dhis-service-tracker</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addCaseAggregation.vm 2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addCaseAggregation.vm 2014-02-10 10:37:03 +0000
@@ -99,7 +99,7 @@
</tbody>
</table>
-#parse( "/dhis-web-maintenance-patient/caseAggregationForm.vm" )
+#parse( "/dhis-web-maintenance-program/caseAggregationForm.vm" )
<p>
<input type="submit" value="$i18n.getString( 'add' )" />
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2014-01-23 15:04:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2014-02-10 10:37:03 +0000
@@ -22,7 +22,7 @@
<value>dhis-web-maintenance-dataset</value>
<value>dhis-web-maintenance-mobile</value>
<value>dhis-web-maintenance-organisationunit</value>
- <value>dhis-web-maintenance-patient</value>
+ <value>dhis-web-maintenance-program</value>
<value>dhis-web-maintenance-settings</value>
<value>dhis-web-maintenance-user</value>
<value>dhis-web-appmanager</value>
=== modified file 'dhis-2/dhis-web/dhis-web-light/pom.xml'
--- dhis-2/dhis-web/dhis-web-light/pom.xml 2014-01-09 21:56:49 +0000
+++ dhis-2/dhis-web/dhis-web-light/pom.xml 2014-02-10 10:37:03 +0000
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-patient</artifactId>
+ <artifactId>dhis-service-tracker</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
=== renamed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient' => 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program'
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/pom.xml 2014-01-09 21:56:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/pom.xml 2014-02-10 10:37:03 +0000
@@ -9,12 +9,12 @@
<version>2.15-SNAPSHOT</version>
</parent>
- <artifactId>dhis-web-maintenance-patient</artifactId>
+ <artifactId>dhis-web-maintenance-program</artifactId>
<packaging>war</packaging>
<name>DHIS Patient Management</name>
<build>
- <finalName>dhis-web-maintenance-patient</finalName>
+ <finalName>dhis-web-maintenance-program</finalName>
</build>
<dependencies>
=== 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-patient/src/main/resources/struts.xml 2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml 2014-02-10 10:37:03 +0000
@@ -6,13 +6,13 @@
<include file="dhis-web-commons.xml" />
- <package name="dhis-web-maintenance-patient" extends="dhis-web-commons"
- namespace="/dhis-web-maintenance-patient">
+ <package name="dhis-web-maintenance-program" extends="dhis-web-commons"
+ namespace="/dhis-web-maintenance-program">
<action name="index" class="org.hisp.dhis.trackedentity.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/index.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+ <param name="page">/dhis-web-maintenance-program/index.vm</param>
+ <param name="menu">/dhis-web-maintenance-program/menu.vm</param>
</action>
<!-- RelationshipType -->
@@ -20,8 +20,8 @@
<action name="relationshipType"
class="org.hisp.dhis.trackedentity.action.relationship.GetRelationshipTypeListAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/relationshipType.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+ <param name="page">/dhis-web-maintenance-program/relationshipType.vm</param>
+ <param name="menu">/dhis-web-maintenance-program/menu.vm</param>
<param name="javascripts">javascript/relationship.js</param>
</action>
@@ -50,7 +50,7 @@
<action name="showAddRelationshipTypeForm" class="org.hisp.dhis.trackedentity.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/addRelationshipTypeForm.vm</param>
+ <param name="page">/dhis-web-maintenance-program/addRelationshipTypeForm.vm</param>
<param name="javascripts">javascript/relationship.js</param>
<param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_RELATIONSHIPTYPE_ADD</param>
@@ -59,7 +59,7 @@
<action name="showUpdateRelationshipTypeForm"
class="org.hisp.dhis.trackedentity.action.relationship.GetRelationshipTypeAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm</param>
+ <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>
@@ -92,8 +92,8 @@
class="org.hisp.dhis.trackedentity.action.trackedentityattribute.GetAttributeListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">
- /dhis-web-maintenance-patient/attribute.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+ /dhis-web-maintenance-program/attribute.vm</param>
+ <param name="menu">/dhis-web-maintenance-program/menu.vm</param>
<param name="javascripts">javascript/attribute.js</param>
</action>
@@ -143,7 +143,7 @@
class="org.hisp.dhis.trackedentity.action.program.GetUnAnonymousProgramAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">
- /dhis-web-maintenance-patient/addAttributeForm.vm</param>
+ /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>
@@ -153,7 +153,7 @@
class="org.hisp.dhis.trackedentity.action.trackedentityattribute.ShowUpdateAttributeAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">
- /dhis-web-maintenance-patient/updateAttibuteForm.vm</param>
+ /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>
@@ -195,8 +195,8 @@
class="org.hisp.dhis.trackedentity.action.trackedentityattribute.ShowAttributeVisitScheduleFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">
- /dhis-web-maintenance-patient/attributeVisitSchedule.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+ /dhis-web-maintenance-program/attributeVisitSchedule.vm</param>
+ <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>
@@ -212,8 +212,8 @@
class="org.hisp.dhis.trackedentity.action.trackedentityattribute.ShowAttributeInListNoProgramAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">
- /dhis-web-maintenance-patient/attributeInListNoProgram.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+ /dhis-web-maintenance-program/attributeInListNoProgram.vm</param>
+ <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>
@@ -230,8 +230,8 @@
<action name="program"
class="org.hisp.dhis.trackedentity.action.program.GetProgramListAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/programList.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+ <param name="page">/dhis-web-maintenance-program/programList.vm</param>
+ <param name="menu">/dhis-web-maintenance-program/menu.vm</param>
<param name="javascripts">javascript/program.js</param>
</action>
@@ -264,7 +264,7 @@
<action name="showAddProgramForm"
class="org.hisp.dhis.trackedentity.action.program.ShowAddProgramFormAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/addProgramForm.vm</param>
+ <param name="page">/dhis-web-maintenance-program/addProgramForm.vm</param>
<param name="javascripts">javascript/program.js</param>
<param name="stylesheets">style/basic.css</param>
<param name="anyAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
@@ -273,7 +273,7 @@
<action name="showUpdateProgramForm"
class="org.hisp.dhis.trackedentity.action.program.ShowUpdateProgramFormAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/updateProgramForm.vm</param>
+ <param name="page">/dhis-web-maintenance-program/updateProgramForm.vm</param>
<param name="javascripts">javascript/program.js</param>
<param name="stylesheets">style/basic.css</param>
<param name="anyAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
@@ -303,7 +303,7 @@
<action name="showProgramUserroleForm"
class="org.hisp.dhis.trackedentity.action.program.ShowProgramUserroleFormAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/programUserrole.vm</param>
+ <param name="page">/dhis-web-maintenance-program/programUserrole.vm</param>
<param name="javascripts">javascript/program.js</param>
<param name="stylesheets">style/basic.css</param>
<param name="anyAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
@@ -319,7 +319,7 @@
<action name="defineProgramAssociationsForm"
class="org.hisp.dhis.trackedentity.action.program.GetProgramAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/programAssociations.vm</param>
+ <param name="page">/dhis-web-maintenance-program/programAssociations.vm</param>
<param name="anyAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
</action>
@@ -335,7 +335,7 @@
<action name="programStage"
class="org.hisp.dhis.trackedentity.action.programstage.GetProgramStageListAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/programStage.vm</param>
+ <param name="page">/dhis-web-maintenance-program/programStage.vm</param>
<param name="javascripts">javascript/programStage.js</param>
</action>
@@ -354,7 +354,7 @@
</result>
<result name="success" type="velocity">/main.vm</result>
<param name="page">
- /dhis-web-maintenance-patient/addProgramStageForm.vm</param>
+ /dhis-web-maintenance-program/addProgramStageForm.vm</param>
<param name="javascripts">javascript/commons.js,javascript/programStage.js</param>
<param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAMSTAGE_ADD</param>
@@ -390,7 +390,7 @@
class="org.hisp.dhis.trackedentity.action.programstage.GetProgramStageAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">
- /dhis-web-maintenance-patient/updateProgramStageForm.vm</param>
+ /dhis-web-maintenance-program/updateProgramStageForm.vm</param>
<param name="javascripts">javascript/commons.js,javascript/programStage.js</param>
<param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAMSTAGE_ADD</param>
@@ -418,7 +418,7 @@
<action name="programStageList"
class="org.hisp.dhis.trackedentity.action.programstage.GetProgramStageListAction">
<result name="success" type="velocity">/content.vm</result>
- <param name="page">/dhis-web-maintenance-patient/programStageList.vm</param>
+ <param name="page">/dhis-web-maintenance-program/programStageList.vm</param>
<param name="javascripts">javascript/programStage.js</param>
</action>
@@ -428,7 +428,7 @@
class="org.hisp.dhis.trackedentity.action.programstage.GetProgramStageSectionListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">
- /dhis-web-maintenance-patient/programStageSection.vm</param>
+ /dhis-web-maintenance-program/programStageSection.vm</param>
<param name="javascripts">javascript/commons.js,javascript/programStageSection.js</param>
<param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAMSTAGE_SECTION_MANAGEMENT</param>
@@ -438,7 +438,7 @@
class="org.hisp.dhis.trackedentity.action.programstage.ShowAddProgramStageSectionAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">
- /dhis-web-maintenance-patient/addProgramStageSectionForm.vm</param>
+ /dhis-web-maintenance-program/addProgramStageSectionForm.vm</param>
<param name="javascripts">javascript/commons.js,javascript/programStageSection.js</param>
<param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAMSTAGE_SECTION_ADD</param>
@@ -455,7 +455,7 @@
class="org.hisp.dhis.trackedentity.action.programstage.GetProgramStageSectionAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">
- /dhis-web-maintenance-patient/updateProgramStageSectionForm.vm</param>
+ /dhis-web-maintenance-program/updateProgramStageSectionForm.vm</param>
<param name="javascripts">javascript/commons.js,javascript/programStageSection.js</param>
<param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAMSTAGE_SECTION_ADD</param>
@@ -490,7 +490,7 @@
class="org.hisp.dhis.trackedentity.action.programstage.GetProgramStageAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">
- /dhis-web-maintenance-patient/programStageSectionSortOder.vm</param>
+ /dhis-web-maintenance-program/programStageSectionSortOder.vm</param>
<param name="javascripts">javascript/commons.js,javascript/programStageSection.js</param>
<param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAMSTAGE_SECTION_MANAGEMENT</param>
@@ -517,7 +517,7 @@
<action name="viewDataEntryForm"
class="org.hisp.dhis.trackedentity.action.dataentryform.ViewDataEntryFormAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/viewDataEntryForm.vm</param>
+ <param name="page">/dhis-web-maintenance-program/viewDataEntryForm.vm</param>
<param name="javascripts">
../dhis-web-commons/ckeditor/ckeditor.js,
../dhis-web-commons/ckeditor/adapters/jquery.js,
@@ -560,14 +560,14 @@
<action name="getSelectedDataElements"
class="org.hisp.dhis.trackedentity.action.dataentryform.GetSelectedDataElementsAction">
<result name="success" type="velocity-xml">
- /dhis-web-maintenance-patient/responseSelDataElementList.vm
+ /dhis-web-maintenance-program/responseSelDataElementList.vm
</result>
</action>
<action name="showDataEntryForm"
class="org.hisp.dhis.trackedentity.action.dataentryform.ShowDataEntryFormAction">
<result name="success" type="velocity">
- /dhis-web-maintenance-patient/dataEntryFormCode.vm
+ /dhis-web-maintenance-program/dataEntryFormCode.vm
</result>
</action>
@@ -583,8 +583,8 @@
<action name="trackedEntityForm"
class="org.hisp.dhis.trackedentity.action.dataentryform.GetTrackedEntityFormListAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/trackedEntityForm.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+ <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>
</action>
@@ -592,7 +592,7 @@
<action name="viewTrackedEntityForm"
class="org.hisp.dhis.trackedentity.action.dataentryform.ViewTrackedEntityFormAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/viewTrackedEntityForm.vm</param>
+ <param name="page">/dhis-web-maintenance-program/viewTrackedEntityForm.vm</param>
<param name="javascripts">
../dhis-web-commons/ckeditor/ckeditor.js,
../dhis-web-commons/ckeditor/adapters/jquery.js,
@@ -630,7 +630,7 @@
<action name="showTrackedEntityForm"
class="org.hisp.dhis.trackedentity.action.dataentryform.ShowTrackedEntityFormAction">
<result name="success" type="velocity">
- /dhis-web-maintenance-patient/dataEntryFormCode.vm
+ /dhis-web-maintenance-program/dataEntryFormCode.vm
</result>
</action>
@@ -646,8 +646,8 @@
<action name="attributeGroup"
class="org.hisp.dhis.trackedentity.action.trackedentityattributegroup.GetAttributeGroupListAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/attributeGroup.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+ <param name="page">/dhis-web-maintenance-program/attributeGroup.vm</param>
+ <param name="menu">/dhis-web-maintenance-program/menu.vm</param>
<param name="javascripts">javascript/attributeGroup.js</param>
</action>
@@ -676,7 +676,7 @@
<action name="showAddAttributeGroupForm" class="org.hisp.dhis.trackedentity.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/addAttributeGroupForm.vm</param>
+ <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>
@@ -685,7 +685,7 @@
<action name="showUpdateAttributeGroupForm"
class="org.hisp.dhis.trackedentity.action.trackedentityattributegroup.GetAttributeGroupAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/updateAttibuteGroupForm.vm</param>
+ <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>
@@ -715,7 +715,7 @@
<action name="showSortAttributeGroup"
class="org.hisp.dhis.trackedentity.action.trackedentityattributegroup.GetAttributeGroupListAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/sortAttributeGroupForm.vm</param>
+ <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>
@@ -732,8 +732,8 @@
<action name="caseAggregation"
class="org.hisp.dhis.trackedentity.action.caseaggregation.GetAllCaseAggregationConditionAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/caseAggregation.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+ <param name="page">/dhis-web-maintenance-program/caseAggregation.vm</param>
+ <param name="menu">/dhis-web-maintenance-program/menu.vm</param>
<param name="javascripts">javascript/caseaggregation.js</param>
<param name="stylesheets">style/basic.css</param>
</action>
@@ -741,7 +741,7 @@
<action name="showAddCaseAggregationForm"
class="org.hisp.dhis.trackedentity.action.caseaggregation.ShowAddCaseAggregationConditionFormAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/addCaseAggregation.vm</param>
+ <param name="page">/dhis-web-maintenance-program/addCaseAggregation.vm</param>
<param name="javascripts">javascript/commons.js,javascript/caseaggregation.js</param>
<param name="stylesheets">style/basic.css</param>
</action>
@@ -749,7 +749,7 @@
<action name="showUpdateCaseAggregationForm"
class="org.hisp.dhis.trackedentity.action.caseaggregation.ShowUpdateCaseAggregationConditionFormAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/updateCaseAggregation.vm</param>
+ <param name="page">/dhis-web-maintenance-program/updateCaseAggregation.vm</param>
<param name="javascripts">javascript/commons.js,javascript/caseaggregation.js</param>
<param name="stylesheets">style/basic.css</param>
</action>
@@ -776,28 +776,28 @@
<action name="getDataElementsByDataset"
class="org.hisp.dhis.trackedentity.action.caseaggregation.GetDataElementsByDataSetAction">
<result name="success" type="velocity-json">
- /dhis-web-maintenance-patient/responseAggerateDataElement.vm
+ /dhis-web-maintenance-program/responseAggerateDataElement.vm
</result>
</action>
<action name="getParamsByProgram"
class="org.hisp.dhis.trackedentity.action.caseaggregation.GetParamsByProgramAction">
<result name="success" type="velocity-json">
- /dhis-web-maintenance-patient/jsonParamsByProgram.vm
+ /dhis-web-maintenance-program/jsonParamsByProgram.vm
</result>
</action>
<action name="getTrackedEntityDataElements"
class="org.hisp.dhis.trackedentity.action.caseaggregation.GetTrackedEntityDataElementsAction">
<result name="success" type="velocity-json">
- /dhis-web-maintenance-patient/jsonTrackedEntityDataElements.vm
+ /dhis-web-maintenance-program/jsonTrackedEntityDataElements.vm
</result>
</action>
<action name="getAggPSDataElements"
class="org.hisp.dhis.trackedentity.action.caseaggregation.GetAggPSDataElementsAction">
<result name="success" type="velocity-xml">
- /dhis-web-maintenance-patient/responseAggDataElement.vm
+ /dhis-web-maintenance-program/responseAggDataElement.vm
</result>
</action>
@@ -812,7 +812,7 @@
<action name="getCaseAggregationDescription"
class="org.hisp.dhis.trackedentity.action.caseaggregation.GetAggConditionDescriptionAction">
<result name="success" type="velocity">
- /dhis-web-maintenance-patient/responseCaseAggDescription.vm
+ /dhis-web-maintenance-program/responseCaseAggDescription.vm
</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
@@ -842,7 +842,7 @@
<action name="getCaseAggConditionByDataset"
class="org.hisp.dhis.trackedentity.action.caseaggregation.GetAllCaseAggregationConditionAction">
<result name="success" type="velocity">/content.vm</result>
- <param name="page">/dhis-web-maintenance-patient/caseAggregationList.vm</param>
+ <param name="page">/dhis-web-maintenance-program/caseAggregationList.vm</param>
</action>
<action name="getProgramStages"
@@ -858,15 +858,15 @@
<action name="validationCriteria"
class="org.hisp.dhis.trackedentity.action.program.GetProgramAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/validationCriteria.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+ <param name="page">/dhis-web-maintenance-program/validationCriteria.vm</param>
+ <param name="menu">/dhis-web-maintenance-program/menu.vm</param>
<param name="javascripts">javascript/validationcriteria.js</param>
</action>
<action name="showAddValidationCriteriaForm"
class="org.hisp.dhis.trackedentity.action.program.GetProgramAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/addValidationCriteria.vm</param>
+ <param name="page">/dhis-web-maintenance-program/addValidationCriteria.vm</param>
<param name="javascripts">javascript/validationcriteria.js</param>
<param name="requiredAuthorities">F_VALIDATIONCRITERIA_ADD</param>
</action>
@@ -881,7 +881,7 @@
<action name="showUpdateValidationCriteriaForm"
class="org.hisp.dhis.trackedentity.action.validation.GetValidationCriteriaAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/updateValidationCriteria.vm</param>
+ <param name="page">/dhis-web-maintenance-program/updateValidationCriteria.vm</param>
<param name="javascripts">javascript/validationcriteria.js</param>
<param name="requiredAuthorities">F_VALIDATIONCRITERIA_ADD</param>
</action>
@@ -923,7 +923,7 @@
<action name="programValidation"
class="org.hisp.dhis.trackedentity.action.validation.GetProgramValidationListAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/programValidationList.vm</param>
+ <param name="page">/dhis-web-maintenance-program/programValidationList.vm</param>
<param name="javascripts">javascript/programValidation.js</param>
<param name="requiredAuthorities">F_PROGRAM_VALIDATION</param>
</action>
@@ -931,7 +931,7 @@
<action name="showAddSingleProgramValidationForm"
class="org.hisp.dhis.trackedentity.action.program.GetProgramAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm</param>
+ <param name="page">/dhis-web-maintenance-program/addSingleProgramValidationForm.vm</param>
<param name="javascripts">javascript/programValidation.js</param>
<param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAM_VALIDATION</param>
@@ -948,7 +948,7 @@
<action name="showUpdateMultiProgramValidationForm"
class="org.hisp.dhis.trackedentity.action.validation.GetProgramValidationAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm</param>
+ <param name="page">/dhis-web-maintenance-program/updateMultiProgramValidationForm.vm</param>
<param name="javascripts">javascript/programValidation.js</param>
<param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAM_VALIDATION</param>
@@ -957,7 +957,7 @@
<action name="showUpdateSingleProgramValidationForm"
class="org.hisp.dhis.trackedentity.action.validation.GetProgramValidationAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm</param>
+ <param name="page">/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm</param>
<param name="javascripts">javascript/programValidation.js</param>
<param name="stylesheets">style/basic.css</param>
<param name="requiredAuthorities">F_PROGRAM_VALIDATION</param>
@@ -990,7 +990,7 @@
<action name="getProgramExpressionDescription"
class="org.hisp.dhis.trackedentity.action.validation.GetProgramExpressionDescriptionAction">
<result name="success" type="velocity">
- /dhis-web-maintenance-patient/responseCaseAggDescription.vm
+ /dhis-web-maintenance-program/responseCaseAggDescription.vm
</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
@@ -1000,8 +1000,8 @@
<action name="viewScheduleTasks"
class="org.hisp.dhis.trackedentity.action.schedule.GetScheduleParamsAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/scheduleSendMessage.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+ <param name="page">/dhis-web-maintenance-program/scheduleSendMessage.vm</param>
+ <param name="menu">/dhis-web-maintenance-program/menu.vm</param>
<param name="javascripts">javascript/scheduling.js</param>
<param name="schedule">true</param>
<param name="requiredAuthorities">F_SCHEDULING_SEND_MESSAGE</param>
@@ -1010,7 +1010,7 @@
<action name="scheduleTasks"
class="org.hisp.dhis.trackedentity.action.schedule.ScheduleSendMessageTasksAction">
<result name="success" type="velocity-json">
- /dhis-web-maintenance-patient/jsonResponseScheduleTasks.vm
+ /dhis-web-maintenance-program/jsonResponseScheduleTasks.vm
</result>
<param name="requiredAuthorities">F_SCHEDULING_SEND_MESSAGE</param>
</action>
@@ -1018,8 +1018,8 @@
<action name="viewScheduledCaseAggCondTasks"
class="org.hisp.dhis.trackedentity.action.schedule.GetScheduleAggQueryBuilderParamsAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+ <param name="page">/dhis-web-maintenance-program/viewScheduledCaseAggTasks.vm</param>
+ <param name="menu">/dhis-web-maintenance-program/menu.vm</param>
<param name="javascripts">javascript/scheduling.js</param>
<param name="requiredAuthorities">F_SCHEDULING_CASE_AGGREGATE_QUERY_BUILDER</param>
</action>
@@ -1027,7 +1027,7 @@
<action name="scheduleCaseAggTasks"
class="org.hisp.dhis.trackedentity.action.schedule.ScheduleCaseAggregateConditionAction">
<result name="success" type="velocity-json">
- /dhis-web-maintenance-patient/jsonResponseScheduleTasks.vm
+ /dhis-web-maintenance-program/jsonResponseScheduleTasks.vm
</result>
<param name="requiredAuthorities">F_SCHEDULING_CASE_AGGREGATE_QUERY_BUILDER</param>
</action>
@@ -1037,8 +1037,8 @@
<action name="programIndicator"
class="org.hisp.dhis.trackedentity.action.programtindicator.GetProgramIndicatorListAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/programIndicator.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+ <param name="page">/dhis-web-maintenance-program/programIndicator.vm</param>
+ <param name="menu">/dhis-web-maintenance-program/menu.vm</param>
<param name="javascripts">javascript/programIndicator.js</param>
<param name="requiredAuthorities">F_PROGRAM_INDICATOR_MANAGEMENT</param>
</action>
@@ -1054,7 +1054,7 @@
<action name="showAddProgramIndicator"
class="org.hisp.dhis.trackedentity.action.program.GetProgramAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/addProgramIndicator.vm</param>
+ <param name="page">/dhis-web-maintenance-program/addProgramIndicator.vm</param>
<param name="javascripts">javascript/commons.js,javascript/programIndicator.js</param>
<param name="requiredAuthorities">F_ADD_PROGRAM_INDICATOR</param>
</action>
@@ -1069,7 +1069,7 @@
<action name="showUpdateProgramIndicator"
class="org.hisp.dhis.trackedentity.action.programtindicator.GetProgramIndicatorAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/updateProgramIndicator.vm</param>
+ <param name="page">/dhis-web-maintenance-program/updateProgramIndicator.vm</param>
<param name="javascripts">javascript/commons.js,javascript/programIndicator.js</param>
<param name="requiredAuthorities">F_ADD_PROGRAM_INDICATOR</param>
</action>
@@ -1112,8 +1112,8 @@
<action name="programReminder"
class="org.hisp.dhis.trackedentity.action.program.GetProgramAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/programReminder.vm</param>
- <param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+ <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>
</action>
@@ -1121,7 +1121,7 @@
<action name="showAddProgramReminder"
class="org.hisp.dhis.trackedentity.action.trackedentityinstancereminder.ShowAddProgramReminderAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/addProgramReminder.vm</param>
+ <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>
</action>
@@ -1136,7 +1136,7 @@
<action name="showUpdateProgramReminder"
class="org.hisp.dhis.trackedentity.action.trackedentityinstancereminder.GetInstanceReminderAction">
<result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-patient/updateProgramReminder.vm</param>
+ <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>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/WEB-INF/web.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/WEB-INF/web.xml 2013-04-30 16:15:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/WEB-INF/web.xml 2014-02-10 10:37:03 +0000
@@ -18,7 +18,7 @@
<filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class>
<init-param>
<param-name>redirectPath</param-name>
- <param-value>dhis-web-maintenance-patient/index.action</param-value>
+ <param-value>dhis-web-maintenance-program/index.action</param-value>
</init-param>
</filter>
<filter>
=== renamed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient' => 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program'
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm 2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addCaseAggregation.vm 2014-02-10 10:37:03 +0000
@@ -100,7 +100,7 @@
</tbody>
</table>
-#parse( "/dhis-web-maintenance-patient/caseAggregationForm.vm" )
+#parse( "/dhis-web-maintenance-program/caseAggregationForm.vm" )
<p>
<input type="submit" value="$i18n.getString( 'add' )" />
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramIndicator.vm 2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm 2014-02-10 10:37:03 +0000
@@ -79,7 +79,7 @@
</table>
<br>
-#parse( "/dhis-web-maintenance-patient/programIndicatorForm.vm" )
+#parse( "/dhis-web-maintenance-program/programIndicatorForm.vm" )
<p>
<input type="submit" value="$i18n.getString( 'add' )" style="width:163px;" >
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm 2013-12-17 01:29:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm 2014-02-10 10:37:03 +0000
@@ -59,7 +59,7 @@
</tr>
</table>
-#parse( "/dhis-web-maintenance-patient/expressionBuilderForm.vm" )
+#parse( "/dhis-web-maintenance-program/expressionBuilderForm.vm" )
<script>
hideById( "expression-container" );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm 2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregation.vm 2014-02-10 10:37:03 +0000
@@ -53,7 +53,7 @@
</tr>
</thead>
<tbody id="list">
- #parse( "/dhis-web-maintenance-patient/caseAggregationList.vm" )
+ #parse( "/dhis-web-maintenance-program/caseAggregationList.vm" )
</tbody>
</table>
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm 2014-02-10 05:42:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/index.vm 2014-02-10 10:37:03 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( "dhis-web-maintenance-patient" )</h3>
+<h3>$i18n.getString( "dhis-web-maintenance-program" )</h3>
<ul class="introList">
#introListImgItem( "attribute.action" "attribute" "patient" )
@@ -9,10 +9,10 @@
#introListImgItem( "program.action" "program" "program" )
#introListImgItem( "caseAggregation.action" "aggregation_query_builder" "caseaggregationmapping" )
- #if( $auth.hasAccess( "dhis-web-maintenance-patient", "viewScheduleTasks" ) )
+ #if( $auth.hasAccess( "dhis-web-maintenance-program", "viewScheduleTasks" ) )
#introListImgItem( "viewScheduleTasks.action" "schedule_automated_message_reminder" "scheduling" )
#end
- #if($auth.hasAccess( "dhis-web-maintenance-patient", "viewScheduledCaseAggCondTasks" ) )
+ #if($auth.hasAccess( "dhis-web-maintenance-program", "viewScheduledCaseAggCondTasks" ) )
#introListImgItem( "viewScheduledCaseAggCondTasks.action" "schedule_automated_aggregation" "scheduling" )
#end
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm 2014-02-10 05:42:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/menu.vm 2014-02-10 10:37:03 +0000
@@ -13,13 +13,13 @@
<li><a href="caseAggregation.action">$i18n.getString( "aggregation_query_builder" )</a></li>
</ul>
-#if( $auth.hasAccess( "dhis-web-maintenance-patient", "viewScheduleTasks" ) || $auth.hasAccess( "dhis-web-maintenance-patient", "viewScheduledCaseAggCondTasks" ) )
+#if( $auth.hasAccess( "dhis-web-maintenance-program", "viewScheduleTasks" ) || $auth.hasAccess( "dhis-web-maintenance-program", "viewScheduledCaseAggCondTasks" ) )
<h2>$i18n.getString( "scheduling" )</h2>
<ul>
- #if( $auth.hasAccess( "dhis-web-maintenance-patient", "viewScheduleTasks" ) )
+ #if( $auth.hasAccess( "dhis-web-maintenance-program", "viewScheduleTasks" ) )
<li><a href="viewScheduleTasks.action">$i18n.getString( "schedule_automated_message_reminder" )</a></li>
#end
- #if($auth.hasAccess( "dhis-web-maintenance-patient", "viewScheduledCaseAggCondTasks" ) )
+ #if($auth.hasAccess( "dhis-web-maintenance-program", "viewScheduledCaseAggCondTasks" ) )
<li><a href="viewScheduledCaseAggCondTasks.action">$i18n.getString( "schedule_automated_aggregation" )</a></li>
#end
</ul>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm 2014-02-10 10:37:03 +0000
@@ -43,7 +43,7 @@
data-can-update="$security.canUpdate( $program )"
data-can-manage-template-message="#if($program.type!=3)true#{else}false#end"
data-can-delete="$security.canDelete( $program )"
- data-can-manage-form="#if( $auth.hasAccess( "dhis-web-maintenance-patient", "programIndicator" ) && $program.type !='3' )true#{else}false#end">
+ data-can-manage-form="#if( $auth.hasAccess( "dhis-web-maintenance-program", "programIndicator" ) && $program.type !='3' )true#{else}false#end">
<td>$encoder.htmlEncode( $!program.displayName )</td>
</tr>
#end
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm 2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm 2014-02-10 10:37:03 +0000
@@ -101,7 +101,7 @@
</tbody>
</table>
-#parse( "/dhis-web-maintenance-patient/caseAggregationForm.vm" )
+#parse( "/dhis-web-maintenance-program/caseAggregationForm.vm" )
<p>
<input type="submit" value="$i18n.getString( 'update' )" >
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramIndicator.vm 2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm 2014-02-10 10:37:03 +0000
@@ -79,7 +79,7 @@
</table>
<br>
-#parse( "/dhis-web-maintenance-patient/programIndicatorForm.vm" )
+#parse( "/dhis-web-maintenance-program/programIndicatorForm.vm" )
<p>
<input type="submit" value="$i18n.getString( 'add' )" style="width:163px;" >
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm 2013-12-17 01:29:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm 2014-02-10 10:37:03 +0000
@@ -61,7 +61,7 @@
</tr>
</table>
-#parse( "/dhis-web-maintenance-patient/expressionBuilderForm.vm" )
+#parse( "/dhis-web-maintenance-program/expressionBuilderForm.vm" )
</form>
=== 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-04 10:20:22 +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 10:37:03 +0000
@@ -24,7 +24,7 @@
M_dhis-web-validationrule-local-in=See Validation Analysis module
M_dhis-web-excel-reporting=See Excel Report module
M_dhis-web-caseentry=See Individual Records
-M_dhis-web-maintenance-patient=See Persons And Programs module
+M_dhis-web-maintenance-program=See Tracked Entity And Programs module
M_dhis-web-mapping=See GIS module
M_dhis-web-light=See Light module
M_dhis-web-mobile=See Smartphone module
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/pom.xml 2014-01-09 21:56:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/pom.xml 2014-02-10 10:37:03 +0000
@@ -21,7 +21,7 @@
<module>dhis-web-maintenance-settings</module>
<module>dhis-web-maintenance-user</module>
<module>dhis-web-maintenance-dataadmin</module>
- <module>dhis-web-maintenance-patient</module>
+ <module>dhis-web-maintenance-program</module>
<module>dhis-web-maintenance-mobile</module>
</modules>
<properties>
=== modified file 'dhis-2/dhis-web/dhis-web-portal/india-pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/india-pom.xml 2014-02-10 04:13:08 +0000
+++ dhis-2/dhis-web/dhis-web-portal/india-pom.xml 2014-02-10 10:37:03 +0000
@@ -95,7 +95,7 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-maintenance-patient</artifactId>
+ <artifactId>dhis-web-maintenance-program</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml 2014-02-10 04:13:08 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml 2014-02-10 10:37:03 +0000
@@ -103,7 +103,7 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-maintenance-patient</artifactId>
+ <artifactId>dhis-web-maintenance-program</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2014-01-09 21:56:49 +0000
+++ dhis-2/pom.xml 2014-02-10 10:37:03 +0000
@@ -322,7 +322,7 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-patient</artifactId>
+ <artifactId>dhis-service-tracker</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
=== modified file 'tools/dhis-adhoc/pom.xml'
--- tools/dhis-adhoc/pom.xml 2014-01-22 19:19:32 +0000
+++ tools/dhis-adhoc/pom.xml 2014-02-10 10:37:03 +0000
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-patient</artifactId>
+ <artifactId>dhis-service-tracker</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
