=== modified file 'dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml'
--- dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml	2011-07-27 08:12:52 +0000
+++ dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml	2011-07-28 02:46:09 +0000
@@ -2477,42 +2477,108 @@
     </para>
     <section id="patient">
 		<title>Beneficiary</title>
-        <para>Beneficiary provides a mechanism for admitting a beneficiary, includes register a new beneficiary, set relationships and enroll into a program. </para>
-		<para>In the registration process, the details - which are related to the personal information, identification, contact and location details &amp; health provider details, are entered in the application. In the registration itself, beneficiary is provided with the unique identification number. This number will be unique and will not match with the identification number of any person in the state jurisdiction. The issue of identification number will be the responsibility of facility where the beneficiary is registered first time.</para>
+        <para>Beneficiary provides a mechanism for admitting a beneficiary, includes register a new beneficiary, set relationships and enroll into a program.</para>
+        <para>To access the beneficiary maintenance module, choose Maintenance->Beneficiaries and Programs->Beneficiary.</para>
+		<para>In the registration process, the details - which are related to the personal information, identification, contact and location details, health provider details, are entered in the application. In the registration itself, beneficiary is provided with the unique identification number. This number will be unique and will not match with the identification number of any person in the state jurisdiction. The issue of identification number will be the responsibility of facility where the beneficiary is registered first time.</para>
 		<para>To show beneficiary list by the selected facility, click the "List All Beneficiaries" button.</para>
 		<para>To search beneficiaries by name,identifier or beneficiary attributes, enter key into the text field and click the "Search" button or type Enter key.</para>
 		<para>To add a new beneficiary, click the "Add new" button.</para>
-		<para>To update the private information of a beneficiary, click the "Edit Profile" icon.</para>
+		<para>To update the private information of a beneficiary, click the "Edit Profile" icon, the third icon under Operations, corresponding to the beneficiary you would like to modify.</para>
 		<para>After the beneficiary registration, beneficiary needs to be enrolled in any of the program available in the application and for which she/he has been registered by entering date of enrollment and date of incident. Date of enrollment is the date date of registration of beneficiary with a facility. Date of incidence is the date when he/she got the disease. For instance, when a person comes for treatment, i.e. pregnant woman. Then the system should automatically generate visit dates for the subsequent ANC visits. But to generate these visit schedules, we need to ask the mother when is the first time she got pregnant. The day she came for treatment might not necessarily be the day she got pregnant, therefore for a better treatment ( by having appropriate visit dates ), we need to know information about the date she got pregnant - that is what the Date of Incidence is all about.</para>
-		<para>To enrol a beneficary in a program, click the "Program Enrollment Management" icon.</para>
-		<para>To open relationship list of the beneficiary, click the "Relationship Management" icon.</para>
+		<para>To open relationship list of the beneficiary, click the "Relationship Management" icon, the fourth icon under Operations.</para>
 		<para>To add new a person who has relationship with the beneficiary, click the "Add dependent" icon.</para>
 		<para>To show details of a beneficiary, click the "Show details" icon.</para>
 	</section>
 	<section id="patient_attribute">
 		<title>Beneficiary attribute</title>
-        <para>Beneficiary attribute provides a mechanism for creating or updating a beneficiary attribute. The defined attributes will be used for registering a beneficiary.</para>
+        <para>Beneficiary attribute provides a mechanism for defining a beneficiary attribute. The defined attributes will be used for registering a beneficiary.</para>
+        <para>To access the beneficiary attribute maintenance module, choose Maintenance->Beneficiaries and Programs->Beneficiary Attribute.</para>
 		<para>To add a new beneficiary attribute, click the "Add new" button. Fill all fields with red asterisk, and click "Add" button.</para>
 	</section>
 	<section id="patient_attribute_group">
 		<title>Beneficiary Attribute Group</title>
         <para>Beneficiary attribute group provides a mechanism for classifying related to beneficiary attributes. For instance, two attributes "Register person Phone number" and "Register person Address" might be grouped together into a beneficiary attribute group "Details of Registered person".</para>
-		<para>To add a new attribute group, click the "Add new" button. Fill in the "Name" field and then select all attributes that should belong to the group from the left panel. Click the "Move selected" button to add the selected attributes to the attribute group. Click the "Remove selected" button to remove all attributes from the group that have been selected in the right panel. Finally, click the "Add" button to save changes, or the "Cancel" button to discard any changes.</para>
+        <para>To access the beneficiary attribute group maintenance module, choose Maintenance->Beneficiaries and Programs->Beneficiary Attribute Group.</para>
+		<para>To add a new attribute group, click the "Add new" button. Fill in the "Name" and "Description" fields and then select attributes that should belong to the group from the left panel. Click the "Move selected items" button to add the selected attributes to the attribute group. Click the "Remove selected items" button to remove attributes from the group that have been selected in the right panel. Finally, click the "Add" button to save changes, or the "Cancel" button to discard any changes.</para>
 	</section>
 	<section id="patient_identifier_type">
 		<title>Beneficiary Identifier Type</title>
         <para>Beneficiary identifier type provides a mechanism for defining identifiers associated with the registration of a beneficiary, such as Passport number, PAN, driving license, health identifier... </para>
+		<para>To access the beneficiary identifier type maintenance module, choose Maintenance->Beneficiaries and Programs->Beneficiary Identifier Type.</para>
 		<para>To add a new identifier type, click the "Add new" button. Fill all fields with red asterisk, and click "Add" button.</para>
 	</section>
 	<section id="relationship_type">
 		<title>Relationship Type</title>
-        <para>Relationship type provides a mechanism for defining  any relationship types and link beneficiaries through these relationship types by creating specific relationships.</para> 
+        <para>Relationship type provides a mechanism for defining any relationship types and link beneficiaries through these relationship types by creating specific relationships.</para> 
+		<para>To access the relationship type maintenance module, choose Maintenance->Beneficiaries and Programs->Relationship Type.</para>
 		<para>To add a new relationship type, click the "Add new" button. Fill all fields in "Add new Relationship Type" form, and click "Add" button.</para>
 	</section>
 	<section id="patient_registration">
 		<title>Beneficiary Registration </title>
         <para>Beneficiary registration provides a mechanism for managing facilities which allow to registry new benificiaries or not.</para> 
-		<para>There are two process for registering facilities, one is where the admininistrator will say which facility can register and second is when end user logs in and select a facility, system will display waring message if the selected facility cannot registry bebeficiaries; else, the system will display the functions to register beneficiaries.</para>
+		<para>To access the beneficiary registration maintenance module, choose Maintenance->Beneficiaries and Programs->Beneficiary Registration.</para>
+		<para>There are two process for registering facilities, one is where the administrator will say which facility can register and two is when end user logs in and select a facility, system will display waring message if the selected facility cannot register beneficiaries; else, the system will display the functions to register beneficiaries.</para>
+	</section>
+	<section id="program">
+		<title>Program</title>
+        <para>Program 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, choose Maintenance->Beneficiaries and Programs->Program.</para>
+		<para>A health program includes specific stages because of having multiple encounters for a given program. E.g. once a pregnant woman enroll to "ANC Program", she will be treated for her first trimester, second trimester and/or third trimester. These encounters in most cases are mandatory, and there will be dropouts in some cases, which a pregnant woman should go through once she is in the "ANC Program". So the specific stages of the health program is defined when creating a health program.</para> 
+		<para>To add a new program, click the "Add new" button. Fill all fields with read asterisk, and click "Add" button.</para>
+		<para>You can assign facilities to a program in the Program Management ( list of available programs are shown) by clicking on the blue folder icon, the first icon under Operations, corresponding to the program you would like to modify.</para>
+		<para>The function "Define Program Validation" is used for defining validation the program you would like to modify after entering patient data value for program stages. For instance, Parity, Previous live birth male, Previous live birth female, Previous still birth are patient data elements. They belong to many stages. And if data value of Parity is 0, then ( Previous live birth female + Previous still birth ) = 0. Besides, if a patient data element exists into many program stages, the system will check whether values of the patient data element in all program stages of the program or not. For instance, TT1 is a patient data element. It exists into program stages as following Checkup 1, Checkup 2, Checkup 3. If data value of this data element into Checkup 1 is null, the data values into Checkup 2, Checkup 3 should be null.</para>
+		<para>To define a program stage, click the "Program Stage Management" icon.</para>
+		<para>To add a new program stage, into "Program Stage Management" form, click the "Add new" button. Fill in the "Name" and "Description" fields and then select data elements that should belong to the group from the left panel. Click the "Move selected" button to add the selected data elements to the right panel. Click the "Remove selected" button to remove data elements that have been selected in the right panel. Finally, click the "Add" button to save changes, or the "Cancel" button to discard any changes.</para>
+		<para>Your program will then be ready to be used to enroll beneficiaries in Maintenance->Beneficiaries and Programs->Beneficiaries and enter data in Services->Name Based Data Records->Data Entry or Multiple Data Entry for the facilities that you have assigned.</para>
+	</section>
+	<section id="program_attribute">
+		<title>Program Attribute</title>
+        <para>Program attribute provides a mechanism for defining a program attribute. The defined program attributes will be used when a beneficiary unenroll from a program. You can add and edit program attributes in Maintenance->Beneficiaries and Programs->Progam Attribute.</para> 
+		<para>To access the program attribute maintenance module, choose Maintenance->Beneficiaries and Programs->Program Attribute.</para>
+		<para>To add a new program, click the "Add new" button. Fill all fields with read asterisk, and click "Add" button.</para>
+		<para>When starting server, two program attributes are created. They are Dead with Yes/No value type and Closed Date with Date value type. If a beneficiary unenrolls from program, they need to enter these necessary information.</para>
+	</section>
+	<section id="beneficiary_aggregation_query_builder">
+		<title>Beneficiary Aggregation Query Builder</title>
+        <para>Beneficiary aggregation query builder is the core functionality for linking data between name-based information tracking system – NBITS ( beneficiaries, programs, etc ) and aggregate management system ( dataset, report, charts, etc.) by defining the linking/aggregating rules.</para> 
+        <para>This provides two functions. One is "Beneficiaries Aggregation Query Builder", a tool for define formula, expression, rules for aggregation data from name based to aggregation system. Two is "Beneficiary Aggregation" which is to used for generating routine data values from patient data value by periods ( or other interval if desired ) and a facility.</para>
+        <para>To access "Beneficiaries Aggregation Query Builder" module, choose Maintenance->Beneficiaries and Programs->Beneficiary Aggregation Query Builder.</para>
+        <para>To add a new beneficiaries aggregation query builder, click the "Add new" button. Fill in "Description" field and select an aggregation "Data Element" from a data element group. Then select a program and a corresponding program stage, double click on the patient data element you need to create a condition, the equivalent code of it will be showed in the condition box. Besides, you can click the operator buttons to create operators for a condition.</para>
+        <para>To access "Beneficiary Aggregation" module, choose Services->Name Based Data Records->Beneficiary Aggregation.</para>
+        <para>For instance, find the number of the children vaccinated BCG by defining a linking rule between the data elements of aggregate dataset named "Number of children - BCG" and the data element of a program stage named "BCG dose given date".</para>
+        <para>1. Choose Maintenance->Data Element and Indicators->Data Element, define two new data elements. One is "Number of children - BCG" with "Aggregate" Domain Type. Two is "BCG dose give date" with "Patient" Domain Type.</para>
+        <para>2. Choose Maintenance->Data Element and Indicators->Data Element Group, create a new data element group named "BCG DataElement Group" and add "Number of children - BCG" data element into the group.</para>
+        <para>3. Choose Maintenance->Datasets->Dataset, create a new dataset named "BCG Report" and add "Number of children - BCG" data element into the dataset.</para>
+        <para>4. Choose Maintenance->Beneficiaries and Programs->Program, create a program named "Child Health Program" with a stage named "Birth Details" and add the "BCG dose give date" data element into this stage. Then assign it to "Ho Chi Minh city" facility.</para>
+        <para>5. Choose Maintenance->Beneficiaries and Program->Beneficiary, select "Ho Chi Minh city" and create three beneficiaries named "Micheal", "Alice" and "Tom" and enroll them into "Child Health Program".</para>
+        <para>6. Create a new beneficiary aggregation query builder named "Number of children - BCG Builder" to linking between the data elements.</para>
+        <para>6.1. Choose Maintenance->Beneficiaries and Programs->Beneficiary Aggregation Query Builder, click the "Add new" button</para>
+        <para>6.2. Fill in "The number of children - BCG Builder" for the description field.</para>
+        <para>6.3. In the Data Element Group combobox, select "BCG DataElement Group".</para>
+        <para>6.4. In the Data Element combobox, select "Number of children - BCG (default)"</para>
+        <para>6.5. In the Program combobox, select "Child Health Program".</para>
+        <para>6.7. In the Program Stage combobox, select "Birth Details".</para>
+        <para>6.8. In the Data Element list box, double click the "BCG dose give date".</para>
+        <para>6.9. Click the "is not null" operator button.</para>
+        <para>6.10. Click "Add" button.</para>
+        <para>7. Choose Services->Name-Based Data Records->Data Entry, click the "List All Beneficiaries" button.</para>
+        <para>7.1. Select beneficiary with name "Micheal" and open the "Birth Details" stage of "Child Health Program". Enter value "2011-02-18" for "BCG dose give date" data element.</para>
+        <para>7.2. Select beneficiary with name "Alice" and open the "Birth Details" stage of "Child Health Program". Enter value "2011-02-18" for "BCG dose give date" data element.</para>
+        <para>7.3. Select beneficiary with name "Tom" and open the "Birth Details" stage of "Child Health Program". No enter value for "Birth Details" stage.</para>
+        <para>Before entering patient data value of the beneficiaries for the stage, choose "Report Date" as "2011-02-28"</para>
+        <para>8. Choose Services->Name-Based Data Records->Case Aggregation</para>
+        <para>8.1. In Dataset list combo box, select "BCG Report".</para>
+        <para>8.2. In From combo box, select "January 2011"</para>
+        <para>8.2. In To combo box, select "February 2011"</para>
+        <para>8.3. In Organisation Unit Tree Section box, select "Ho Chi Minh city".</para>
+        <para>8.4. Click the "Aggregate" button. The result will be shown after running successfully.</para>
+	</section>
+	<section id="validation_criteria">
+		<title>Validation Criteria</title>
+        <para>Validation criteria provide a mechanism for defining criteria for beneficiaries when enrolling a program.</para>
+        <para>To access the validation criteria maintenance module, choose Maintenance->Beneficiaries and Programs->Validation Criteria.</para>
+		<para>To add a new validation criterion, click the "Add new" button. Fill all fields with read asterisk, and click "Add" button.</para>
+		<para>You can assign facilities to a validation criterion in the Validation Criteria Management ( list of available validation criteria are shown ) by clicking on the blue folder icon, the first icon under Operations, corresponding to the validation criterion you would like to assign. Click the "Move selected" button to add the selected programs to the validation criterion. Click the "Remove selected" button to remove programs from the group that have been selected in the right panel. Finally, click the "Save" button to save changes, or the "Cancel" button to discard any changes.</para>
 	</section>
    </chapter>
 </book>

=== 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	2011-07-27 08:12:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2011-07-28 02:46:09 +0000
@@ -418,15 +418,15 @@
 excel_file = Excel file.
 upload_file_null = Upload file is missing
 file_type_not_supported = File type is not supported
-dataelement_group = DataElement Group
+dataelement_group = Data Element Group
 option_combo = Option Combo
-case_aggregation_condition = Beneficiary Aggregation QueryBuilder
-case_aggregation_condition_detail = Beneficiary Aggregation QueryBuilder details
-add_case_aggregation_condition = Add Beneficiary Aggregation QueryBuilder
+case_aggregation_condition = Beneficiary Aggregation Query Builder
+case_aggregation_condition_detail = Beneficiary Aggregation Query Builder details
+add_case_aggregation_condition = Add Beneficiary Aggregation Query Builder
 case_attributes_and_properties = Case Attributes and Properties
 condition = Condition
 condition_detail = Condition details
-update_case_aggregation_condition = Update Beneficiary Aggregation QueryBuilder
+update_case_aggregation_condition = Update Beneficiary Aggregation Query Builder
 enrolldate_minus_incidentdate = Date of Enrollment - Date of Incident 
 program_properties = Program properties
 not_enough_mandatory_identifier = Not enough data for the mandatory identifier(s)
@@ -471,4 +471,5 @@
 beneficiary_attribute_group_sort_order = Beneficiary Attribute Group Sort Order
 min_days_from_start = Mininum number of days from start
 warning_delete_program_attribute_option = This option has relationship with ProgramAttributeValue. You must not delete it.
-success_delete_program_attribute_option = Delete program attribute option successfully.
\ No newline at end of file
+success_delete_program_attribute_option = Delete program attribute option successfully.
+validation_criteria_management = Validation criteria management
\ 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/caseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm	2011-05-19 08:12:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm	2011-07-28 02:46:09 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( 'beneficiary_aggregation_query_builder' )</h3>
+<h3>$i18n.getString( 'beneficiary_aggregation_query_builder' ) #openHelp( "beneficiary_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/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2011-04-29 07:41:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2011-07-28 02:46:09 +0000
@@ -8,7 +8,7 @@
 	<li><a href="defineOrgunitRegistrationForm.action">$i18n.getString( "patient_registration" )</a></li>
 	<li><a href="program.action">$i18n.getString( "program" )</a></li>
 	<li><a href="programAttribute.action">$i18n.getString( "program_attribute" )</a></li>
-	<li><a href="caseAggregation.action">$i18n.getString( "beneficiary_aggregation" )</a></li>
+	<li><a href="caseAggregation.action">$i18n.getString( "beneficiary_aggregation_query_builder" )</a></li>
 	<li><a href="validationCriteria.action">$i18n.getString( "validation_criteria" )</a></li>
 	<li><a href="patientMobileSetting.action">$i18n.getString( "patient_mobile_setting" )</a></li>
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm	2011-05-02 18:40:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm	2011-07-28 02:46:09 +0000
@@ -8,7 +8,7 @@
 	<li><a href="defineOrgunitRegistrationForm.action">$i18n.getString( "patient_registration" )</a></li>
 	<li><a href="program.action">$i18n.getString( "program" )</a></li>
 	<li><a href="programAttribute.action">$i18n.getString( "program_attribute" )</a></li>
-	<li><a href="caseAggregation.action">$i18n.getString( "beneficiary_aggregation" )</a></li>
+	<li><a href="caseAggregation.action">$i18n.getString( "beneficiary_aggregation_query_builder" )</a></li>
 	<li><a href="validationCriteria.action">$i18n.getString( "validation_criteria" )</a></li>
 	<li><a href="patientMobileSetting.action">$i18n.getString( "patient_mobile_setting" )</a></li>
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm	2011-07-21 06:26:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm	2011-07-28 02:46:09 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( "program_attribute_management" )</h3>
+<h3>$i18n.getString( "program_attribute_management" ) #openHelp( "program_attribute" )</h3>
 <table class="mainPageTable">
 	<tr>
 		<td style="vertical-align:top">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm	2011-07-07 08:40:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm	2011-07-28 02:46:09 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( "program_management" )</h3>
+<h3>$i18n.getString( "program_management" ) #openHelp( "program" )</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/validationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm	2011-05-19 08:12:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm	2011-07-28 02:46:09 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( "validation_criteria" )</h3>
+<h3>$i18n.getString( "validation_criteria_management" ) #openHelp( "validation_criteria" )</h3>
 
 <table class="mainPageTable">
 	<tr>