dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7505: Add help-content for patient module.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 04 Jul 2012 05:09:13 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 7505
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-07-04 06:06:10 +0100
message:
  Add help-content for patient module.
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content.xml
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlan.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/sortPatientAttributeGroupForm.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-services/dhis-service-core/src/main/resources/help_content.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content.xml	2012-07-04 03:31:26 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content.xml	2012-07-04 05:06:10 +0000
@@ -5715,9 +5715,8 @@
 <para>To check the duplicates or to avoid double registration, after providing name and demographic details, click the <emphasis role="italic">Check duplicate</emphasis> button ( arrow in BLUE color, fig. 2.3.6 ). Checking process bases on full name, gender and birthday of the registering person to look for the available persons with the similar information in the database. If the system finds out the same persons , the result list will be displayed. Now user can cancel the registration process and update the existing person or continue the process of registration.</para>
 </listitem>
 </orderedlist>
-</section>
-<section id="">
-<title>Person Enrolment</title>
+<para></para>
+<para><emphasis role="bold">Person Enrolment</emphasis></para>
 <para>After the person registration, person needs to be enrolled in any available program in the application and for which she/he has been registered. To enrol -</para>
 <orderedlist>
 <listitem>
@@ -5790,17 +5789,17 @@
 <para>We have two functionalities which support to input data in treatment stages for each person.</para>
 <orderedlist>
 <listitem>
-<para>Single data entry.</para>
+<para>Name-based data entry.</para>
 </listitem>
 <listitem>
 <para>Multiple data entry.</para>
 </listitem>
 </orderedlist>
-<section>
-<title>Single data entry</title>
+<section id='name_based_data_entry'>
+<title>Name-based Data Entry</title>
 <orderedlist>
 <listitem>
-<para>From the <emphasis role="italic">Services</emphasis> option, go to the <emphasis role="italic">Name Based Data Records</emphasis> option and click it. Select <emphasis role="italic">Data Entry</emphasis> option on left menu to proceed.</para>
+<para>From the <emphasis role="italic">Services</emphasis> option, go to the <emphasis role="italic">Name Based Data Records</emphasis> option and click it. Select <emphasis role="italic">Name-based</emphasis> option on left menu to proceed.</para>
 <screenshot>
 <screeninfo>Figure 2.3.12</screeninfo>
 <mediaobject>
@@ -5862,10 +5861,10 @@
 </listitem>
 </orderedlist>
 </section>
-<section>
-<title>Multiple Data Entry for persons</title>
-<para>This is an advanced function for data entry. On the same interface on above, many persons are listed for entering data by stages. </para>
-<para>To access the multiple person data entry module, from the <emphasis role="italic">Services</emphasis> menu, go to the <emphasis role="italic">Name Based Data Records</emphasis> option and click on it. Select <emphasis role="italic">Multiple Data Entry</emphasis> option on left menu to proceed.</para>
+<section id='multi_name_based_data_entry'>
+<title>Multiple Name-based Data Entry</title>
+<para>This is an advanced functionality for data entry. On the same interface on above, many persons are listed for entering data by stages. </para>
+<para>To access the multiple person data entry module, from the <emphasis role="italic">Services</emphasis> menu, go to the <emphasis role="italic">Name Based Data Records</emphasis> option and click on it. Select <emphasis role="italic">Multiple Name-based</emphasis> option on left menu to proceed.</para>
 <screenshot>
 <screeninfo>Figure 2.5.3.1</screeninfo>
 <mediaobject>
@@ -5898,10 +5897,43 @@
 <para><emphasis role="bold">Step 3 - Enter data</emphasis> ( arrow <emphasis role="italic">labelled 1</emphasis> in Fig. 2.5.3.3 ). After finishing the entering, close the pop-up ( arrow <emphasis role="italic">labelled 2</emphasis> in Fig. 2.5.3.3 )</para>
 <para>The benefits of this advanced function is to optimize the time-transition consuming when entering data for a long list persons by not switching the main window/interface.</para>
 </section>
-</section>
-</section>
-<section>
-<title>Report Generation</title>
+<section id='single_event_without_registration'>
+<title>Single event without registration</title>
+<para>The data to register is defined by a single event without registration program.</para>
+<para>In order to register an event, from the <emphasis role="italic">Services</emphasis> option, go to the <emphasis role="italic">Name Based Data Records</emphasis> option and click it. Select <emphasis role="italic">Single event without registration</emphasis> option on left menu to proceed.</para>
+<para>In order to list all events in the selected facility, click <emphasis role="italic">List All Events</emphasis> button.</para>
+<para>In order to remove empty events of the selected program, click <emphasis role="italic">Remove empty events</emphasis> button.</para>
+<para>In order to add new event, click <emphasis role="italic">Add new</emphasis> button.</para>
+<para>To update an event:</para>
+<orderedlist>
+<listitem>
+<para>Click <emphasis role="italic">Advanced search</emphasis> button. Then enter criterion for searching events. The list events are displayed below.</para>
+</listitem>
+<listitem>
+<para>Click on the first icon to update value for the event.</para>
+</listitem>
+</orderedlist>
+</section>
+<section id='single_event_with_registration'>
+<title>Single event with registration</title>
+<para>The data to register is defined by a single event with registration program. The functionality supports health providers to register person information and input data values for a program into one form.</para>
+<para>In order to register an event, from the <emphasis role="italic">Services</emphasis> option, go to the <emphasis role="italic">Name Based Data Records</emphasis> option and click it. Select <emphasis role="italic">Single event with registration</emphasis> option on left menu to proceed.</para>
+<para>In order to list all persons in the selected facility, click <emphasis role="italic">List All Persons</emphasis> button.</para>
+<para>In order to add new event, select a program in the combo box. And then click <emphasis role="italic">Add new</emphasis> button.</para>
+<para>To update event of a registered person:</para>
+<orderedlist>
+<listitem>
+<para>Click <emphasis role="italic">Advanced search</emphasis> button. Then enter criterion for searching available persons. The seach result is displayed below.</para>
+</listitem>
+<listitem>
+<para>Click on the first icon to update value for the event.</para>
+</listitem>
+</orderedlist>
+</section>
+</section>
+</section>
+<section id='program_summary_report'>
+<title>Program Summary Report</title>
 <para>This module provides two main functions, include NBITS Activity Plan report and NBITS Summary report.</para>
 <orderedlist>
 <listitem>
@@ -5958,7 +5990,7 @@
 <para><emphasis role="italic">Person Aggregation</emphasis> to used for generating routine data values from patient-data by month (or other interval if desired) and organization unit.</para>
 </listitem>
 </itemizedlist>
-<section>
+<section id='patient_aggregation_query_builder'>
 <title>Person Aggregation Query Builder</title>
 <para>To access <emphasis role="italic">Persons Aggregation Query Builder</emphasis> module, from the <emphasis role="italic">Maintenance</emphasis> menu, go to the <emphasis role="italic">Persons and Programs</emphasis> option. Select <emphasis role="italic">Person Aggregation Query Builder</emphasis> option on left menu to proceed.</para>
 <screenshot>
@@ -6003,7 +6035,7 @@
 <para>Includes the buttons of operands and a text box showing the conditions for the query.</para>
 <para>After finishing the area above (1, 2, 3 and 4), click on the <emphasis role="italic">Add</emphasis> button.</para>
 </section>
-<section>
+<section id='run_case_aggregation'>
 <title>Person Aggregation</title>
 <para>To access <emphasis role="italic">Persons Aggregation</emphasis> module, from the <emphasis role="italic">Services</emphasis> menu, go to the <emphasis role="italic">Name-Based Data Records</emphasis> option. Select <emphasis role="italic">Person Aggregation</emphasis> option on left menu to proceed. Here are the main screen shots:</para>
 <screenshot>
@@ -6041,9 +6073,8 @@
 </imageobject>
 </mediaobject>
 </screenshot>
-</section>
-<section>
-<title>A Sample for Person Aggregation</title>
+<para></para>
+<para><emphasis role="bold">A Sample for Person Aggregation</emphasis></para>
 <para>E.g. Find the number of the children vaccinated BCG by defining a linking rule between the data elements of aggregate dataset named <emphasis role="italic">Number of children - BCG</emphasis> and the data element of a program stage named <emphasis role="italic">BCG dose given date</emphasis>.<orderedlist>
 <listitem>
 <para>From <emphasis role="italic">Maintenance</emphasis> menu, go to <emphasis role="italic">Data Element and Indicators</emphasis> option and click on it. Select <emphasis role="italic">Data Element</emphasis> option to define two new data elements -</para>
@@ -6143,9 +6174,10 @@
 <title>Advanced functions</title>
 <para>The content in this part is for the expert users or administrative users who are capable and responsible for development and change</para>
 <section>
-<title>Define a person attribute</title>
-<section>
-<title>Define a person attribute</title>
+<title>Person attribute and Person attribute group</title>
+<section id='patient_attribute'>
+<title>Person attribute</title>
+<para>Create, modify and view Person attributes. An attribute can be used to register extra information for a Person.</para>
 <para>From <emphasis role="italic">Maintenance</emphasis> menu, go to <emphasis role="italic">Persons and Programs</emphasis> option and click on it. Select <emphasis role="italic">Person Attribute</emphasis> option to create a new attribute for persons. </para>
 <screenshot>
 <screeninfo>Fig. 2.7.1.1.1</screeninfo>
@@ -6192,8 +6224,8 @@
 </listitem>
 </itemizedlist>
 </section>
-<section>
-<title>Define a person attribute group</title>
+<section id='patient_attribute_group'>
+<title>Person attribute group</title>
 <para>To access the person attribute group maintenance module, from <emphasis role="italic">Maintenance</emphasis> menu, go to <emphasis role="italic">Persons and Programs</emphasis> option and click on it. Select <emphasis role="italic">Person Attribute Group</emphasis> option to create a new an attribute group.</para>
 <screenshot>
 <screeninfo>Fig. 2.7.1.2.1</screeninfo>
@@ -6216,8 +6248,8 @@
 </screenshot>
 </section>
 </section>
-<section>
-<title>Define a person identifier type</title>
+<section id='patient_identifier_type'>
+<title>Person identifier type</title>
 <para>To access the person identifier type maintenance module, from <emphasis role="italic">Maintenance</emphasis> menu, go to <emphasis role="italic">Persons and Programs</emphasis> option and click on it. Select <emphasis role="italic">Person Identifier Type</emphasis> option to create a new identifier type.</para>
 <screenshot>
 <screeninfo>Fig. 2.7.2a</screeninfo>
@@ -6258,8 +6290,8 @@
 </listitem>
 </itemizedlist>
 </section>
-<section>
-<title>Define a relationship type</title>
+<section id='relationship_type'>
+<title>Relationship type</title>
 <para>Relationship type section provides a mechanism for defining any relationship types and link persons through these relationship types by creating specific relationships.</para>
 <para>To access the relationship type maintenance module, from <emphasis role="italic">Maintenance</emphasis> menu, go to <emphasis role="italic">Persons and Programs</emphasis> option and click on it. Select <emphasis role="italic">Relationship Type</emphasis> option to create a new relationship type.</para>
 <screenshot>
@@ -6280,29 +6312,10 @@
 </mediaobject>
 </screenshot>
 </section>
-<section>
-<title>Person Registration</title>
-<para>Person registration section provides a mechanism for managing facilities which allow to registry new persons or not.</para>
-<para>To access the person registration maintenance module, from <emphasis role="italic">Maintenance</emphasis> menu, go to <emphasis role="italic">Persons and Programs</emphasis> option and click on it. Select <emphasis role="italic">Person Registration</emphasis> option to select facilities. </para>
-<screenshot>
-<screeninfo>Fig. 2.7.4</screeninfo>
-<mediaobject>
-<imageobject>
-<imagedata width="80%" fileref="resources/images/patients_programs/Fig. 2.7.4.png" format="PNG"/>
-</imageobject>
-</mediaobject>
-</screenshot>
-<warning>
-<para>There are two process for registering facilities. The first one is where the administrator will say which facility can register. The second is when end user logs in and then select a facility, system will display a waring message if the selected facility cannot register persons; else, the system will display the functions to register persons.</para>
-</warning>
-</section>
-<section>
-<title>Define a new program</title>
-<section>
-<title>Define a new program</title>
-<para>Program section provides a mechanism for defining a health program. All name based case entry is organised through the use of programs.
-
-</para>
+<section id='program'>
+<section>
+<title>Program and Program stage</title>
+<para>Program section provides a mechanism for defining a health program. All name based case entry is organised through the use of programs.</para>
 <para>To access the program maintenance module, from <emphasis role="italic">Maintenance</emphasis> menu, go to <emphasis role="italic">Persons and Programs</emphasis> option and click on it. Select <emphasis role="italic">Program</emphasis> option to create a new program.</para>
 <para>To create a new program, click the <emphasis role="italic">Add new</emphasis> button. Fill all fields with read asterisk, and then click the &quot;Add&quot; button.</para>
 <para><screenshot>
@@ -6334,7 +6347,7 @@
 </itemizedlist></para>
 </section>
 <section>
-<title>Define stages for a health program</title>
+<title>Program stage</title>
 <para>To define a program stage, click the <emphasis role="italic">Program Stage Management</emphasis> icon (Fig. 2.5.1.2a) and then <emphasis role="italic">Add new</emphasis> button (Fig. 2.5.1.2b). Fill in the <emphasis role="italic">Name</emphasis> and <emphasis role="italic">Description</emphasis> fields and then select the data elements that should belong to the group from the left panel. Click the <emphasis role="italic">Move selected</emphasis> button to add the selected data elements to the right panel. Click the <emphasis role="italic">Remove selected</emphasis> button to remove data elements that have been selected in the right panel. Finally, click the <emphasis role="italic">Add</emphasis> button to save changes, or the <emphasis role="italic">Cancel</emphasis> button to discard any changes.</para>
 <screenshot>
 <screeninfo>Figure 2.5.1.2a</screeninfo>
@@ -6422,15 +6435,11 @@
 For instance, TT1 is a patient data element. It exists into program stages as follows Checkup 1, Checkup 2, Checkup 3. If the data value of this data element into Checkup 1 is null, the data values into Checkup 2, Checkup 3 should be null.</para>
 </section>
 </section>
-<section>
-<title>Define validation criteria</title>
-<para>Validation criteria section provide a mechanism for defining criteria for persons when enrolling a program.
-
-</para>
+<section id='validation_criteria'>
+<title>Validation criteria</title>
+<para>Validation criteria section provide a mechanism for defining criteria for persons when enrolling a program.</para>
 <para>To access the validation criteria maintenance module, from <emphasis role="italic">Maintenance</emphasis> menu, go to <emphasis role="italic">Persons and Programs</emphasis> option and click on it. Select <emphasis role="italic">Validation Criteria</emphasis> option to create a new program</para>
-<para>To create a new validation criterion, click the <emphasis role="italic">Add new</emphasis> button. Fill all fields with read asterisk, and click <emphasis role="italic">Add</emphasis> button.
-
-</para>
+<para>To create a new validation criterion, click the <emphasis role="italic">Add new</emphasis> button. Fill all fields with read asterisk, and click <emphasis role="italic">Add</emphasis> button.</para>
 <screenshot>
 <screeninfo/>
 <mediaobject>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-07-04 03:26:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-07-04 05:06:10 +0000
@@ -3,7 +3,7 @@
 back_to_relationship=Back to relationship
 program_stages_history_plan=Program stages history/plan
 scheduled_for=Scheduled for
-list_all_patients=List all persons
+list_all_patients=List All Persons
 program_summary=Program summary
 data_entry=Data entry
 name_based=Name-based
@@ -58,7 +58,7 @@
 registering_unit=Registering Unit
 select=Select
 program_summary_report=Program Summary Report
-name_based_data_entry=Name-based data entry
+name_based_data_entry=Name-based Data Entry
 visit_plan=Visit Plans
 intro_name_based_data_entry=Enter data for persons and their respective programs and program stages.
 intro_program_summary=View the summary report to get an overview of the services provided for a program.
@@ -69,7 +69,7 @@
 complete=Complete
 case_aggregation_form=Person aggregation form
 dataset_list=Dataset List
-multiple_name_based=Multiple Name-based
+multiple_name_based=Multiple Name-based Data Entry
 intro_case_aggregation=Generate routine data values from patient data by month (or other intervals if desired) and organisation unit.
 from=From
 to=To

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm	2012-06-07 09:55:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm	2012-07-04 05:06:10 +0000
@@ -35,7 +35,7 @@
 	
 </script>
 
-<h3>$i18n.getString( "add_new_patient" )</h3>	
+<h4>$i18n.getString( "add_new_patient" )</h4>	
 
 <form id="patientForm" name="patientForm" method="post" >
 <input type="hidden" id="representativeId" name="representativeId"/> 
@@ -43,7 +43,6 @@
 
 <table>
 	#parse( "/dhis-web-caseentry/patientForm.vm" )
-	<tr><td><td><p></p></td></tr>
 	<tr>
 		<td></td>
 		<td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm	2012-06-07 09:55:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm	2012-07-04 05:06:10 +0000
@@ -10,7 +10,7 @@
 	});		
 </script>
 
-<h3>$i18n.getString( "adding_new_relationship_for" )</h3>
+<h4>$i18n.getString( "adding_new_relationship_for" ):  $encoder.htmlEncode( $patient.getFullName() )  </h4>
 
 <form id="relationshipSelectForm" name="relationshipSelectForm" method="post" action="showAddRelationshipForm.action">
 <input type="hidden" id="patientId" name="patientId" value="$patient.id"/>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm	2012-06-15 07:11:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm	2012-07-04 05:06:10 +0000
@@ -27,7 +27,7 @@
 	});		
 </script>
 
-<h3>$i18n.getString("add_new_relationship_for"):  $patient.getFullName()</h3>
+<h4>$i18n.getString("add_new_relationship_for"):  $patient.getFullName()</h4>
 																		
 <form id="addRelationshipPatientForm" action="addRelationshipPatient.action" method="get" >
 <input type="hidden" id="relationshipId"  name="relationshipId" value="$patient.id"/> 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-07-03 10:34:50 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-07-04 05:06:10 +0000
@@ -13,7 +13,7 @@
 	});		
 </script>
 				
-<h3>$i18n.getString( "anonymous_events" ) #openHelp( "patient" )</h3>
+<h3>$i18n.getString( "anonymous_events" ) #openHelp('single_event_without_registration')</h3>
 <input type='hidden' id='orgunitId' name='orgunitId' value='$orgunit.id'>
 <input type='hidden' id='programStageInstanceId' name='programStageInstanceIdrgunitId'>
 <input type='hidden' id='programStageId' name='programStageId'>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm	2012-06-21 02:36:52 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm	2012-07-04 05:06:10 +0000
@@ -1,5 +1,4 @@
-
-<h3>$i18n.getString( "migration_patient" )</h3>
+<h4>$i18n.getString( "migration_patient" )</h4>
 
 <form method='post'>
 	<table>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm	2012-06-18 08:38:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm	2012-07-04 05:06:10 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( "relationship_management" )</h3>
+<h5>$i18n.getString( "relationship_management" )</h5>
 
 <input type="hidden" id="id" name="id" value="$patient.id">
 <table class="mainPageTable information">                           

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm	2012-06-27 08:21:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm	2012-07-04 05:06:10 +0000
@@ -10,7 +10,7 @@
 	});	
 </script>
 
-<h3>$i18n.getString( "single_event_with_registration" )</h3>
+<h3>$i18n.getString( "single_event_with_registration" ) #openHelp('single_event_with_registration')</h3>
 <input type='hidden' id='isRegistration' name= 'isRegistration' value='true'>
 <input type='hidden' id='listAll' name= 'listAll' >
 <input type='hidden' id='patientId' name= 'patientId' >

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2012-06-25 09:39:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2012-07-04 05:06:10 +0000
@@ -52,7 +52,7 @@
 	
 </script>
 
-<h3>$i18n.getString( "update_patient" )</h3>
+<h4>$i18n.getString( "update_patient" )</h4>
 <p>
 <form id="patientForm" name="patientForm" action="updatePatient.action" method="post" >
 <input type="hidden" id="representativeId" name="representativeId" value='$!patient.representative.id' /> 
@@ -249,7 +249,6 @@
 			</tr>
 		#end
 	#end
-	<tr><td><td><p></p></td></tr>
 	<tr>
 		<td></td>
 		<td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlan.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlan.vm	2011-12-22 04:59:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlan.vm	2012-07-04 05:06:10 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( "visit_plan" ) #openHelp('patient_visit_plan')</h3>
+<h3>$i18n.getString( "visit_plan" )</h3>
 
 <table>
     <tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-06-13 08:22:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-07-04 05:06:10 +0000
@@ -66,9 +66,9 @@
 everything_is_ok=Everything is OK
 patient_attribute=Person Attribute
 program=Program
-beneficiary_aggregation=Person Aggregation
-beneficiary_aggregation_query_builder=Person Aggregation Query Builder
-beneficiary_aggregation_query_builder_management=Person aggregation query builder management
+patient_aggregation=Person Aggregation
+patient_aggregation_query_builder=Person Aggregation Query Builder
+patient_aggregation_query_builder_management=Person aggregation query builder management
 dataelement_group=Data Element Group
 dataelements=Data elements
 patient_attributes=Person attributes
@@ -95,7 +95,7 @@
 create_new_patient_identifier_type=Create new person identifier type
 edit_patient_identifier_type=Edit person identifier type
 delete_successfull=Deleted successfully
-warning_delete_patient_attribute_option=This option has relationship with BeneficiaryAttributeValue. You must not delete it.
+warning_delete_patient_attribute_option=This option has relationship with Person Attribute Value. You must not delete it.
 success_delete_patient_attribute_option=Delete person attribute option successfully.
 error_delete_patient_attribute_option=Can not find Person attribute option to delete.
 attribute_combo_type=Predefined value
@@ -111,7 +111,7 @@
 intro_patient_identifier_type=Create, modify and view Person identifier types. Any type and multiple identifiers can be registered.
 intro_relationship_type=Create, modify and view relationship types. A relationship is typically wife and husband or mother and child.
 intro_program=Create, modify and view programs. A program has program stages and defines which actions should be taken at each stage.
-intro_beneficiary_aggregation_query_builder=Set up aggregation rules for the process of aggregating Person data to statistical data.
+intro_person_aggregation_query_builder=Set up aggregation rules for the process of aggregating Person data to statistical data.
 intro_validation_criteria=Create, modify and view validation criteria. A criteria is used for validation of Person data.
 intro_program_attribute=Create, modify and view Program attributes. A program can have any number of attributes.
 intro_import_data=Import information of patients automatically from an Excel template file into the person database.
@@ -173,7 +173,7 @@
 program_validation_management=Program validation managenent
 create_new_single_validation=Create new single validation
 create_new_multi_validation=Create new multi validation
-beneficiary_attribute_group_sort_order=Person attribute group sort order
+person_attribute_group_sort_order=Person attribute group sort order
 scheduled_days_from_start=Scheduled days from start
 success_delete_program_attribute_option=Delete program attribute option successfully.
 validation_criteria_management=Validation criteria management

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm	2012-06-04 04:06:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm	2012-07-04 05:06:10 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( 'beneficiary_aggregation_query_builder_management' ) #openHelp( "beneficiary_aggregation_query_builder" )</h3>
+<h3>$i18n.getString( 'patient_aggregation_query_builder_management' ) #openHelp( "patient_aggregation_query_builder" )</h3>
 
 <table class="mainPageTable">
   <tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm	2012-05-24 05:13:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm	2012-07-04 05:06:10 +0000
@@ -13,6 +13,6 @@
     #introListImgItem( "patientIdentifierType.action" "patient_identifier_type" "patient" )
     #introListImgItem( "relationshipType.action" "relationship_type" "patient" )
     #introListImgItem( "program.action" "program" "program" )
-    #introListImgItem( "caseAggregation.action" "beneficiary_aggregation_query_builder" "caseaggregationmapping" )
+    #introListImgItem( "caseAggregation.action" "patient_aggregation_query_builder" "caseaggregationmapping" )
 	#introListImgItem( "validationCriteria.action" "validation_criteria" "validationcriteria" )
 </ul>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/sortPatientAttributeGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/sortPatientAttributeGroupForm.vm	2012-03-30 05:33:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/sortPatientAttributeGroupForm.vm	2012-07-04 05:06:10 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( "beneficiary_attribute_group_sort_order" )</h3>
+<h3>$i18n.getString( "patient_attribute_group_sort_order" )</h3>
 																		
 <form id="savePatientAttributeGroupSortOrder" name="savePatientAttributeGroupSortOrder" action="savePatientAttributeGroupSortOrder.action" method="post" onsubmit="selectAllById('patientAttributeGroupIds');">