← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #19023

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8135: [mobile] change the name of "Activity Plan" to "Visit Schedule"

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 8135
committer: Long <Long@Long-Laptop>
branch nick: dhis2
timestamp: Wed 2012-09-19 16:46:40 +0700
message:
  [mobile] change the name of "Activity Plan" to "Visit Schedule"
modified:
  dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/GetBeneficiaryRegistrationOrganisationUnitAction.java
  dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetFindBeneficiaryFormAction.java
  dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryList.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/findRelatedPatientForm.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/trackingMenu.vm


--
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-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/GetBeneficiaryRegistrationOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/GetBeneficiaryRegistrationOrganisationUnitAction.java	2012-07-18 04:43:02 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/GetBeneficiaryRegistrationOrganisationUnitAction.java	2012-09-19 09:46:40 +0000
@@ -42,6 +42,7 @@
     implements Action
 {
     public static final String REDIRECT = "redirect";
+    
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetFindBeneficiaryFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetFindBeneficiaryFormAction.java	2012-09-19 04:37:21 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetFindBeneficiaryFormAction.java	2012-09-19 09:46:40 +0000
@@ -61,6 +61,18 @@
     // Input & Output
     // -------------------------------------------------------------------------
 
+    private Integer orgUnitId;
+    
+    public Integer getOrgUnitId()
+    {
+        return orgUnitId;
+    }
+
+    public void setOrgUnitId( Integer orgUnitId )
+    {
+        this.orgUnitId = orgUnitId;
+    }
+
     private Set<OrganisationUnit> organisationUnits;
 
     public Set<OrganisationUnit> getOrganisationUnits()

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2012-09-19 04:37:21 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2012-09-19 09:46:40 +0000
@@ -114,4 +114,6 @@
 find_or_add_person=Find/Add Person
 search_by_phone_number=Search By Phone Number
 dead=Dead
-status=Status
\ No newline at end of file
+status=Status
+visit_schedule=Visit Schedule
+visit_schedule_type=Visit Schedule Type
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryList.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryList.vm	2012-05-24 14:51:18 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryList.vm	2012-09-19 09:46:40 +0000
@@ -17,7 +17,7 @@
 <div id="footer">
 <h2>$i18n.getString( "navigate_to" )</h2>
 <ul>
-	<li><a href="selectActivityType.action?orgUnitId=$organisationUnit.id">$i18n.getString("activity_type")</a></li>
+	<li><a href="selectActivityType.action?orgUnitId=$organisationUnit.id">$i18n.getString("visit_schedule_type")</a></li>
 	<li><a href="index.action">$i18n.getString("home")</a></li>
 </ul>
 </div>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm	2012-09-19 04:37:21 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm	2012-09-19 09:46:40 +0000
@@ -93,7 +93,7 @@
 <p>
 	<ul>
 		#foreach( $relationshipType in $relationshipTypes )
-			<li><a href="showFindRelatedPatientForm.action?originalPatientId=$patient.id&relationshipTypeId=$relationshipType.id">Add $relationshipType.getName()</a></li>
+			<li><a href="showFindRelatedPatientForm.action?originalPatientId=$patient.id&relationshipTypeId=$relationshipType.id$orgUnitId=$patient.getOrganisationUnit().getId()">Add $relationshipType.getName()</a></li>
 		#end
 	</ul>
 </p>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/findRelatedPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/findRelatedPatientForm.vm	2012-06-11 10:11:21 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/findRelatedPatientForm.vm	2012-09-19 09:46:40 +0000
@@ -18,8 +18,9 @@
            	<br /><span style="color: #990000;"> $i18n.getString($validationMap.get( "fullName" ))</span>
      	#end
 		<input type="text" name="keyword" value="$!previousValues.get("fullName")" />
+		<a href="registerBeneficiary.action?orgUnitId=$orgUnitId&originalPatientId=$originalPatientId&relationshipTypeId=$relationshipTypeId">or Register new Person</a>
 	</p>
-		<p style="text-align: left;">
+	<p style="text-align: left;">
 		<label>$i18n.getString( "select_orgunit" )</label>
 		<select name="organisationUnitId">
 			<option value="0">$i18n.getString( "all_orgunit" )</option>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/trackingMenu.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/trackingMenu.vm	2012-09-06 18:52:44 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/trackingMenu.vm	2012-09-19 09:46:40 +0000
@@ -20,7 +20,7 @@
 <p>
 <ul>
     <li><a href="showFindBeneficiaryForm.action">$i18n.getString( "find_or_add_person" )</a></li>
-    <li><a href="selectNamebasedOrganisationUnit.action">$i18n.getString( "activity_plan" )</a></li>
+    <li><a href="selectNamebasedOrganisationUnit.action">$i18n.getString( "visit_schedule" )</a></li>
     <li><a href="selectRegistrationOrganisationUnit.action">$i18n.getString( "beneficiary_registration" )</a></li>
     <li><a href="anonymous.action">Anonymous</a></li>
     <!-- <li><a href="showBeneficiarySearchingForm.action">$i18n.getString( "beneficiary_enrollment" )</a></li> -->
  Thread Previous • Date Previous • • Thread Next