← Back to team overview

dhis2-devs team mailing list archive

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

 

------------------------------------------------------------
revno: 8299
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-09-28 16:03:34 +0700
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/webapp/dhis-web-caseentry/activityPlanSelect.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.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-30 04:48:17 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content.xml	2012-09-28 09:03:34 +0000
@@ -5481,7 +5481,7 @@
 </section>
 </chapter>
 <chapter>
-  <title>DHIS Tracker Module</title>
+  <title>Persons and Programs</title>
   <section>
     <title>Introduction</title>
     <section>
@@ -5545,14 +5545,13 @@
       <section>
         <title>Information tracking process</title>
         <para>The process  starts with the person registration. Then she/he can be enrolled in the program for which registered. The application will guide the health provider  the services required for her/him through activity plan and the services  from time to time can be updated into his/her profile.  The working process is described in steps depicted in picture below - </para>
-        <para><screenshot>
-            <screeninfo>Figure 2.3.1</screeninfo>
-            <mediaobject>
-              <imageobject>
-                <imagedata width="70%" fileref="resources/images/patients_programs/Name based information tracking process.png" format="PNG"/>
-              </imageobject>
-            </mediaobject>
-          </screenshot></para>
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata width="70%" fileref="resources/images/patients_programs/name_based_information_tracking_process.png" format="PNG"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
       </section>
       <section>
         <title>Person registration</title>
@@ -5634,6 +5633,10 @@
           <para>Validation Criteria</para>
           <para>Create, modify and view validation criteria. A criteria is used for validation of Person data. </para>
         </listitem>
+        <listitem>
+          <para>Schedule sending message </para>
+          <para>Schedule sending message for persons automatically.</para>
+        </listitem>
       </itemizedlist>
       <section id="patient_attribute">
         <title>Person attribute</title>
@@ -5651,12 +5654,9 @@
           <listitem>
             <para><emphasis role="italic">Mandatory</emphasis>: Entering value for this attribute is required or not.</para>
           </listitem>
-         <listitem>
+          <listitem>
             <para><emphasis role="italic">Value Type</emphasis>: Data type of value inputed.</para>
           </listitem>
-          <listitem>
-            <para><emphasis role="italic">Program</emphasis>: Specify a program which this attribute belongs to.</para>
-          </listitem>
         </itemizedlist>
       </section>
       <section id="patient_attribute_group">
@@ -5682,7 +5682,7 @@
             <para><emphasis role="italic">Mandatory</emphasis>: Entering value for the identifier is required or not.</para>
           </listitem>
           <listitem>
-            <para><emphasis role="italic">Related</emphasis></para>
+            <para><emphasis role="italic">Related</emphasis>: Representative re-uses the  identifier of  person.</para>
           </listitem>
           <listitem>
             <para><emphasis role="italic">Number of characters</emphasis>: Maximum number of characters for value inputed. </para>
@@ -5690,24 +5690,22 @@
           <listitem>
             <para><emphasis role="italic">Type</emphasis>: Data type of value inputted.</para>
           </listitem>
-          <listitem>
-            <para><emphasis role="italic">Program</emphasis>: specify a program which the identyfier type belongs to.</para>
-          </listitem>
         </itemizedlist>
       </section>
       <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>Relationship type section provides a mechanism for defining  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>
         <para>To define a new relationship type, click <emphasis role="italic">Add</emphasis> button into <emphasis role="italic">Relationship Type Management </emphasis>window to go to <emphasis role="italic">Add new Relationship Type</emphasis> window.</para>
       </section>
       <section id="program">
         <title>Program and Program stage</title>
+        <para>The section provides a mechanism for defining programs and  program stages corresponding. </para>
         <section>
           <title>Program</title>
           <para>Program section provides a mechanism for defining a health programme.</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.</para>
-          <para>To define a new program, click the <emphasis role="italic">Add new</emphasis> button on the main page. Fill all fields with read asterisk, and then click the &quot;Add&quot; button.</para>
+          <para>To define a new program, click the <emphasis role="italic">Add new</emphasis> button on the main page. Fill all fields with read asterisk, and then click the <emphasis role="italic">Add</emphasis> button.</para>
           <para>Basic information -</para>
           <itemizedlist>
             <listitem>
@@ -5723,6 +5721,12 @@
               <para><emphasis role="italic">Show provided elsewhere</emphasis>: Set show/hide status of provided elsewhere column in data entry form.</para>
             </listitem>
             <listitem>
+              <para><emphasis role="italic">Show incident date</emphasis>: Set show/hide incident date field when a person enroll into this program.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="italic">Generated by enrollment date</emphasis>: Check on it for auto-generating due dates of events from program-stages of this program    based on the enrollment date. If not check it, the due dates are generated based on incident date.</para>
+            </listitem>
+            <listitem>
               <para><emphasis role="italic">Description of enrollment date</emphasis>: The date in which a person is registered to the system.
 For example: the date in which a person enrolls to the system.</para>
             </listitem>
@@ -5732,11 +5736,92 @@
             <listitem>
               <para><emphasis role="italic">Duration in days</emphasis>: System gets the days to calculate the activity plan of each person in mobile project ( refer mobile chapter ).</para>
             </listitem>
-          </itemizedlist>
+            <listitem>
+              <para><emphasis role="italic">Identifiers / attributes section</emphasis>: Select identifier-types and person attributes which belong to the program. Check  <emphasis role="italic">Displayed in list</emphasis> checkboxes of identiders to display its value in person list instead of person&apos;s full-name.</para>
+            </listitem>
+          </itemizedlist>
+          <para>To assign a program for organisation units, click<emphasis role="italic"> Assign program to organisation units</emphasis> icon and select organisation units where provide the program.</para>
+          <para>To create validation for programs, click <emphasis role="italic">Program validation management</emphasis> icon. There are two type of  validation -  </para>
+          <itemizedlist>
+            <listitem>
+              <para><emphasis role="italic">Single validation</emphasis> is used for defining validation for only one condition. E.g Weight must be greater then zero, or the date of admission is before the date of  discharge. To define a validation, click <emphasis role="italic">Create new single validation</emphasis> button and enter values for the fields in form.</para>
+              <orderedlist>
+                <listitem>
+                  <para>Enter <emphasis role="italic">Descriptions</emphasis> for program validation. </para>
+                </listitem>
+                <listitem>
+                  <para>In <emphasis role="italic">Validation</emphasis> part, select a <emphasis role="italic">program-stage</emphasis> of the selected   program. The data elements which belong to the selected stage are shown into the field below. </para>
+                </listitem>
+                <listitem>
+                  <para>To create a formula with data elements in the list, double-click on a data element, a formula text of this data element is shown into the condition area. </para>
+                </listitem>
+                <listitem>
+                  <para>Click the comparing operations  (+, &lt;, &lt;=, &gt;, &gt;=, =, !=, !=NULL ) below to set operation for the formula. Then continue to double-click on the data element if you want to compare two data value of these data elements or type the value into the condition area directly. </para>
+                </listitem>
+                <listitem>
+                  <para>Click <emphasis role="italic">Add</emphasis> button.</para>
+                </listitem>
+              </orderedlist>
+              <screenshot>
+                <mediaobject>
+                  <imageobject>
+                    <imagedata width="50%" fileref="resources/images/patients_programs/single_program_validation.png" format="PNG"/>
+                  </imageobject>
+                </mediaobject>
+              </screenshot>
+            </listitem>
+            <listitem>
+              <para>Multiple validation is used for defining validation for two conditions. E.g in PMTCT program, if the blood test result of a pregnant is HIV positive, the pregnant must test WHO Stage/CD4. To define a validation, click <emphasis role="italic">Create new multi validation</emphasis> button. The form is have two part - left side and right side. Fill values for the fields in each part is the same <emphasis role="italic">Single validation</emphasis> function.</para>
+              <screenshot>
+                <mediaobject>
+                  <imageobject>
+                    <imagedata width="70%" fileref="resources/images/patients_programs/multi_program_validation.png" format="PNG"/>
+                  </imageobject>
+                </mediaobject>
+              </screenshot>
+            </listitem>
+          </itemizedlist>
+          <para>Besides, validation for DATE date elements is created for a program automatically. It&apos;s used for defining formulas related the DATE data elements of each program stage. To define this validation, click Edit icon of Validation for date date elements. Select a program stage, the DATE data elements will be shown with corresponding conditions as follows -</para>
+          <itemizedlist>
+            <listitem>
+              <para>Before current date</para>
+            </listitem>
+            <listitem>
+              <para>After current date</para>
+            </listitem>
+            <listitem>
+              <para>Before or equals to current date</para>
+            </listitem>
+            <listitem>
+              <para>After or equals to current date</para>
+            </listitem>
+            <listitem>
+              <para>Before due-date</para>
+            </listitem>
+            <listitem>
+              <para>After due-date</para>
+            </listitem>
+            <listitem>
+              <para>Before or equals to due-date</para>
+            </listitem>
+            <listitem>
+              <para>After or equals to due-date</para>
+            </listitem>
+            <listitem>
+              <para>In range due date</para>
+            </listitem>
+          </itemizedlist>
+          <screenshot>
+            <mediaobject>
+              <imageobject>
+                <imagedata width="70%" fileref="resources/images/patients_programs/program_validation_for_date.png" format="PNG"/>
+              </imageobject>
+            </mediaobject>
+          </screenshot>
         </section>
         <section>
           <title>Program stage</title>
-          <para>To define a program stage, click the <emphasis role="italic">Program Stage Management</emphasis> icon  and then <emphasis role="italic">Add new</emphasis> button. Fill in the Name and Description fields and then select the 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>To define a program stage, click the <emphasis role="italic">Program Stage Management</emphasis> icon  and then <emphasis role="italic">Add new</emphasis> button. 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</emphasis> 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 <emphasis role="italic">Add</emphasis> button to save changes, or the <emphasis role="italic">Cancel</emphasis> button to discard any changes.</para>
           <para>Basic information -</para>
           <itemizedlist>
             <listitem>
@@ -5746,15 +5831,45 @@
               <para><emphasis role="italic">Description</emphasis>: The description of the program stage</para>
             </listitem>
             <listitem>
+              <para><emphasis role="italic">Description of report date</emphasis>: The description for report date which is displayed in case entry form.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="italic">Auto-generate event:</emphasis> Un-check this to prevent for creating an event of this program stage  automatically when a person enroll into the program.</para>
+            </listitem>
+            <listitem>
               <para><emphasis role="italic">Scheduled days from start</emphasis>: The minimum number of days to wait for starting the program stage.</para>
             </listitem>
             <listitem>
               <para><emphasis role="italic">Repeatable</emphasis>: specify the program stage as repeatable or not.</para>
             </listitem>
             <listitem>
-              <para><emphasis role="italic">Standard interval days</emphasis>: specify the number of days to repeat the repeatable program stage.</para>
+              <para><emphasis role="italic">Standard interval days</emphasis>: Specify the number of days to repeat the repeatable program stage.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="italic">Data elements <emphasis role="italic">section</emphasis></emphasis>: Select person data elements which belong to the program stage</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="italic">Template reminder message<emphasis role="italic"> section</emphasis></emphasis>: Define  template reminder messages which are used for sending messages for person automatically. There are two params -</para>
+              <para><emphasis role="italic">1) Days before/after due date</emphasis>:  Enter a positive number of days if  sending process happens after due-date of events which are generated from this program stage. Enter a nagative number of days if  sending process happens before due-date of events.</para>
+              <para><emphasis role="italic">2) Parameters</emphasis>: Provide parameters  which are used for generating a message for each person. The parameters include person&apos;s first name, program&apos;s name, program stage&apos;s name, due date of event, interval between current date and due date and organisation unit&apos;s name. Double-click on an option to insert it into template message field below.</para>
+              <para><emphasis role="italic">3) Message</emphasis>: Content of template message. E.g Dear {patient-name}, please come to your appointment at {due-date}.</para>
+              <note>
+                <para>Click <emphasis role="italic">Add more... </emphasis>button to add many template reminder messages.</para>
+              </note>
             </listitem>
           </itemizedlist>
+          <para>The system support three type of  data entry forms - </para>
+          <orderedlist>
+            <listitem>
+              <para><emphasis role="italic">Custom data entry form</emphasis>: Define a data entry form as HTML page. Click<emphasis role="italic"> fifth icon</emphasis> under <emphasis role="italic">Operations</emphasis>, corresponding to the program stage you would like to define custom data entry form. The system supports to define a custom entry form with multi stages. So this form can be re-used in other stages of the same program.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="italic">Section data entry form</emphasis>: Group some data elements which belong to the program stage as sections and display data elements by sections. Click<emphasis role="italic"> forth icon</emphasis> under <emphasis role="italic">Operations</emphasis>, corresponding to the program stage you would like to define section data entry form.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="italic">Default data entry</emphasis>: List all data elements which belong to the program stage</para>
+            </listitem>
+          </orderedlist>
         </section>
       </section>
       <section id="patient_aggregation_query_builder">
@@ -5772,12 +5887,11 @@
         <section>
           <title>Person Aggregation Query Builder</title>
           <para>To access <emphasis role="italic">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">Aggregation Query Builder</emphasis> option on left menu to proceed.</para>
-          <para>After click the <emphasis role="italic">Add new</emphasis> button, the following will appear:</para>
+          <para>To define a formula, click the <emphasis role="italic">Add new</emphasis> button.</para>
           <screenshot>
-            <screeninfo>Figure 2.5.4.3</screeninfo>
             <mediaobject>
               <imageobject>
-                <imagedata width="70%" fileref="resources/images/patients_programs/create_new_person_aggregate_query_builder.png" format="PNG"/>
+                <imagedata width="70%" fileref="resources/images/patients_programs/example_query.png" format="PNG"/>
               </imageobject>
             </mediaobject>
           </screenshot>
@@ -5847,14 +5961,6 @@
               <emphasis role="underline">Description :</emphasis>
             </emphasis> Show description for the condition above. </para>
           <para>E.g To get number of <emphasis role="italic">girls</emphasis> who got <emphasis role="italic">Vitamin A dose 6</emphasis> enrolled <emphasis role="italic">Child Health program</emphasis> on <emphasis role="italic">January 2012</emphasis>. Then query is created as in the figure below. Note that January 2012 is period parameter which user will select when generate report. It is not set in the query.</para>
-          <screenshot>
-            <screeninfo>Fig. example_query</screeninfo>
-            <mediaobject>
-              <imageobject>
-                <imagedata width="70%" fileref="resources/images/patients_programs/example_query.png" format="PNG"/>
-              </imageobject>
-            </mediaobject>
-          </screenshot>
         </section>
         <section>
           <title>Sample of person aggregation</title>
@@ -5874,7 +5980,7 @@
               <screenshot>
                 <mediaobject>
                   <imageobject>
-                    <imagedata width="70%" fileref="resources/images/patients_programs/example agg query builder.png" format="PNG"/>
+                    <imagedata width="70%" fileref="resources/images/patients_programs/example_agg_query_builder.png" format="PNG"/>
                   </imageobject>
                 </mediaobject>
               </screenshot>
@@ -5893,7 +5999,7 @@
               <screenshot>
                 <mediaobject>
                   <imageobject>
-                    <imagedata width="70%" fileref="resources/images/patients_programs/example person aggregation.png" format="PNG"/>
+                    <imagedata width="70%" fileref="resources/images/patients_programs/example_person_aggregation.png" format="PNG"/>
                   </imageobject>
                 </mediaobject>
               </screenshot>
@@ -5918,17 +6024,30 @@
         <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>You can assign facilities to a validation criterion in the <emphasis role="italic">Validation Criteria Management </emphasis>(list of available validation criteria are shown) by clicking the blue folder icon, the first icon under Operations, corresponding to the validation criterion you would like to assign. Click the <emphasis role="italic">Move selected</emphasis> button to add the selected programs to the validation criterion. Click the <emphasis role="italic">Remove selected</emphasis> button to remove programs from the group that have been selected in the right panel. Finally, click the <emphasis role="italic">Save</emphasis> button to save changes, or the <emphasis role="italic">Cancel</emphasis> button to discard any changes.</para>
       </section>
+      <section id="schedule_sending_message">
+        <title>Schedule sending message</title>
+        <para>This function is used for scheduling auto-send messages on the time defined. When the schedule is started, messages for each person are generated at midnight. On the time, the scheduled messages are sent.</para>
+        <para>Click <emphasis role="italic">Execute</emphasis> button to generate and send each message for each  person at the time the button clicked.</para>
+      </section>
     </section>
     <section>
       <title>Individual records module</title>
       <para>Each of the options for the services will be described in the following section -</para>
       <itemizedlist>
         <listitem>
-          <para>Person</para>
+          <para>Find/Add Person</para>
           <para>Create, modify and search for persons. Any type of data can be registered for a person by including attributes.
     </para>
         </listitem>
         <listitem>
+          <para>Visit Schedule</para>
+          <para>Visit Schedule provides for the user at a facility or in an area a list of upcoming visits to better plan for daily/weekly activities.</para>
+        </listitem>
+        <listitem>
+          <para>Program Tracking</para>
+          <para>Support the work practices around tracking persons within a health program that have not shown up for a scheduled visit (stage), e.g. that are lost to follow-up. </para>
+        </listitem>
+        <listitem>
           <para>Multiple Individual records</para>
           <para>Enter data for multiple program stages and persons for a program. The entry screen gives an overview of the stage status.
     </para>
@@ -5974,57 +6093,117 @@
             <para>To register a person, go to the <emphasis role="italic">Services</emphasis> menu, select option <emphasis role="italic">Individual Records</emphasis>.</para>
           </listitem>
           <listitem>
-            <para>Click the <emphasis>Person</emphasis> option below <emphasis role="italic">Registration</emphasis> header to go to <emphasis>Person Registration</emphasis> window.</para>
+            <para>Click the <emphasis role="italic">
+                <emphasis>
+                  <emphasis role="italic">Find/Add person</emphasis>
+                </emphasis>
+              </emphasis> option below <emphasis role="italic">Person</emphasis> header to go to <emphasis>Person management</emphasis> window.</para>
           </listitem>
           <listitem>
             <para>Select  a  facility from the facilities hierarchy displayed on the left side of the screen. Then click the <emphasis role="italic">Add new</emphasis> button on the right side.</para>
-            <para><graphic fileref="resources/images/patients_programs/Add new Person.PNG" align="center"/></para>
           </listitem>
           <listitem>
-            <para>Start process of registration by providing name, location details, identification details, contact details and other details like <emphasis role="italic">child contact name</emphasis> and <emphasis role="italic">child contact type</emphasis>.  The  click the <emphasis role="italic">Add</emphasis> button  to complete to process of registration or click the <emphasis>Back to registration</emphasis>  to navigate to previous page.</para>
-            <para><graphic fileref="resources/images/patients_programs/Person Management Page.PNG" align="center"/></para>
+            <para>Start process of registration by providing name, location details, identification details, contact details and other details like <emphasis role="italic">child contact name</emphasis> and <emphasis role="italic">child contact type</emphasis>.  The  click the <emphasis role="italic">Add</emphasis> button  to complete to process of registration or click the <emphasis role="italic">Person management</emphasis>  to navigate to previous page.</para>
+            <screenshot>
+              <mediaobject>
+                <imageobject>
+                  <imagedata width="70%" fileref="resources/images/patients_programs/register_person_page.PNG" format="PNG"/>
+                </imageobject>
+              </mediaobject>
+            </screenshot>
             <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. 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. The result list will be displayed if the system finds out the same persons. Now health providers can cancel the registration process and update the existing person or continue the process of registration.</para>
+            <para>To register representative for the registering person, check on the <emphasis role="italic">Has guardian/caretaker</emphasis> checkbox in <emphasis role="italic">Register new person</emphasis> form. The sub-function has two tab -</para>
+            <itemizedlist>
+              <listitem>
+                <para><emphasis role="italic">Search existing person</emphasis> tab is used for searching  available persons and users can select one person in the result list to set relationship. The criteria to search is based on  identifier, attribute and name of persons.</para>
+              </listitem>
+              <listitem>
+                <para><emphasis role="italic">Add new person</emphasis> tab is used for  registering a new person for relationship. The  form shown is the similar register form. When adding a person in this form, you need to select one user-defined relationship type in the list. Finally, click <emphasis role="italic">Add</emphasis> button.</para>
+              </listitem>
+            </itemizedlist>
+            <screenshot>
+              <mediaobject>
+                <imageobject>
+                  <imagedata width="70%" fileref="resources/images/patients_programs/representative.png" format="PNG"/>
+                </imageobject>
+              </mediaobject>
+            </screenshot>
           </listitem>
         </orderedlist>
         <section>
+          <title>Person dashboard</title>
+          <para>The function is intended to provide quick access to individual data of person. Dashboards consist of several sections, some of which provide links to activity programs or relationships of the person . Other sections of the dashboard allow users to enter data values for data entry form, reschedule and set status for each events of activity plan; show messages and report of the program.</para>
+          <para>The dashboard of the person is opened after register successfully or click the <emphasis role="italic">first icon</emphasis> under <emphasis role="italic">Operations</emphasis>, corresponding to the person who you would like.</para>
+          <screenshot>
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="resources/images/patients_programs/person_dashboard.png" format="PNG" width="80%"/>
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+          <para>The <emphasis role="italic">Demographics</emphasis> section provides links for editing profile  and changing other location of the person. Click on <emphasis role="italic">Edit profile</emphasis> link to update individual information of person. Click on <emphasis role="italic">Change location</emphasis> link to change other location for the person</para>
+          <para>The <emphasis role="italic">Active programs</emphasis> section provides links for  activity program and the next visit of person for this program. </para>
+          <para>Click on <emphasis role="italic">Enroll into program </emphasis>link to open the Enrollment form.</para>
+          <para>Click on a program link to open the data entry form for the next visit of the selected program. A form is open below with five tab - </para>
+          <orderedlist>
+            <listitem>
+              <para><emphasis role="italic">Data entry screen </emphasis>tab is where data is manually registered for each person. Click on a event box in  tab. Then   fill  a report date to open data entry form of the selected event. </para>
+              <para>After entering data values into the data entry form, user should click on <emphasis role="italic">Run validation </emphasis> button before clicking on <emphasis role="italic">Complete</emphasis> button to check reality of data. The event is  only  completed successfully if all validation is valid.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="italic">Identifier / Attribute</emphasis> tab - Load identifier-types and person-attributes which belong to the selected program for users to enter values for this program.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="italic">Reschedule and set status</emphasis> tab provides function for re-scheduling, setting status and sending messages/comments or deleting for each events.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="italic">Comments and messages</emphasis> tab displays a message/comment list of the program</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="italic">Program report </emphasis>tab is summary report for the program</para>
+            </listitem>
+          </orderedlist>
+          <para>The <emphasis role="italic">Completed programs</emphasis> section consists of completed program list. Select a program to show detail information below.</para>
+          <para>The <emphasis role="italic">Relationship</emphasis> section consists of relationships of the person. Click on a person in list to open his/her dashboard.</para>
+          <para>Besides, the system audits user&apos;s information who accessed on the dashboard. Click on the <emphasis role="italic">History</emphasis> link in the header to  display this information.</para>
+        </section>
+        <section>
           <title>Person enrollment</title>
           <para>After the  registration, the person needs to be enrolled in any available program. To enroll:</para>
           <orderedlist>
             <listitem>
-              <para>Click  the <emphasis role="italic">Program management </emphasis>icon, the first icon under Operations, corresponding to the person you would like to enroll.</para>
+              <para>Click on <emphasis role="italic">Enroll into program</emphasis> link from Dashboard of person to open the Enrollment form.</para>
             </listitem>
             <listitem>
               <para>Select a program from the list  ( i.e., Death,  Child Health Program... )</para>
               <screenshot>
                 <mediaobject>
                   <imageobject>
-                    <imagedata width="70%" fileref="resources/images/patients_programs/Select Program for person.PNG" format="PNG"/>
+                    <imagedata width="70%" fileref="resources/images/patients_programs/select_program_for_person.PNG" format="PNG"/>
                   </imageobject>
                 </mediaobject>
               </screenshot>
-              <warning>
-                <para>This task can be executed after registration successfully, a  form like the form above is  showed up for enrollment.
-</para>
-              </warning>
             </listitem>
             <listitem>
               <para>After the selection of program, you need to provide two dates:</para>
               <para>1) <emphasis role="italic">Date of enrollment:</emphasis> The date when person enrolls into the selected program.</para>
               <para>2) <emphasis role="italic">Date of incident</emphasis>: The date when the person got the disease or he/she has just been committed to an equivalent program for being followed-up.</para>
+              <para>Besides, if the selected program has any identifier-types and person-attributes, they are displayed below. Users can enter these values at this time.</para>
               <warning>
-                <para>The date of incident are very important to generate the activity plan for  each person. Health provider  needs to ensure  recording and reporting date of incidence with each case of multi events with registration. However,  the date is ignored with single event programs.</para>
+                <para>The date of incident are very important to generate the activity plan for  each person. Health provider  needs to ensure  recording and reporting date of incidence with each case of multi events with registration. However,  the date is ignored with single event programs. </para>
+                <para>In addition, when to define a program, you can set <emphasis role="italic">Generated by enrollment date</emphasis> property as true to generate the activity plan based on the enrollment date, not incident date. </para>
               </warning>
             </listitem>
             <listitem>
               <para>Click  the <emphasis role="italic">Enroll</emphasis> button to complete the enrollment process.</para>
-              <para>The system will automatically calculate  due-date for each the program stage  and will show same the below enrollment. In  health programme, a person  registered and enrolled, needs to be checked from time to time by health providers.
+              <para>The system will automatically calculate  due-date for each event of program and will show it in the <emphasis role="italic">Schedule and set status</emphasis> tab below. In  health programme, a person  registered and enrolled, needs to be checked from time to time by health providers.
 The case update  is designed in the same manner so that services which are received by the persons can be updated from time to time  when they visit the facility  or  whenever the health providers need to <emphasis role="italic">track</emphasis>.</para>
               <para>The system will automatically calculate  due-date for each the program stage  and will show same the below enrollment. In  health program, a person  registered and enrolled, needs to be checked from time to time by health providers.
 The case update  is designed in the same manner so that services which are received by the persons can be updated from time to time  when they visit the facility  or  whenever the health providers need to track.</para>
               <screenshot>
                 <mediaobject>
                   <imageobject>
-                    <imagedata width="70%" fileref="resources/images/patients_programs/Complete.PNG" format="PNG"/>
+                    <imagedata width="70%" fileref="resources/images/patients_programs/program_management.PNG" format="PNG"/>
                   </imageobject>
                 </mediaobject>
               </screenshot>
@@ -6033,40 +6212,98 @@
         </section>
         <section>
           <title>Editing person profile</title>
-          <para>After enrolling a person to any program, you can edit profile for that person.</para>
+          <para>After enrolling a person to a certain program, you can edit profile for that person.</para>
           <orderedlist>
             <listitem>
-              <para>Click the <emphasis>Edit profile</emphasis> icon, the second icon under <emphasis>Operations</emphasis>, corresponding to the person you would like to edit.</para>
-            </listitem>
-            <listitem>
-              <para>When you click on <emphasis>Edit profile</emphasis> icon, a dialog box may appear to require you verify the date of birth if it is not verified. You just simply click <emphasis>OK</emphasis> to go to the edit page.</para>
+              <para>Click the second icon under <emphasis>Operations</emphasis>, corresponding to the person you would like to edit. Or click the <emphasis>Edit profile</emphasis> link in Dashboard of person.</para>
+            </listitem>
+            <listitem>
+              <para>Then a dialog box may appear to require you verify the date of birth if it is not verified. You just simply click <emphasis>OK</emphasis> to go to the edit page.</para>
+            </listitem>
+            <listitem>
+              <para>Click Update button to update data and go to his/her dashboard.</para>
             </listitem>
           </orderedlist>
         </section>
         <section>
           <title>Adding relationship</title>
-          <para>Now you can add relationship for person. To do that, you have to click on the <emphasis>Relationship management</emphasis> icon under <emphasis>Operations</emphasis>. Then, the management page appears...</para>
+          <para>Now you can add relationships for person. To do that, you have to click on the <emphasis>Relationship management</emphasis> icon under <emphasis>Operations</emphasis> Or click on the Management link on Relationships section in Dashboard. Then, the management page appears...</para>
           <screenshot>
             <mediaobject>
               <imageobject>
-                <imagedata width="70" fileref="resources/images/patients_programs/management page.PNG" format="PNG"/>
+                <imagedata width="70" fileref="resources/images/patients_programs/management_page.PNG" format="PNG"/>
               </imageobject>
             </mediaobject>
           </screenshot>
-          <para>To add relationship for a person, you have to click on <emphasis>Search available person</emphasis> button to navigate to <emphasis>adding relationship page.</emphasis></para>
-          <para>To register a new person and create relationship with the selected person, click <emphasis role="italic">Register new person</emphasis> button.</para>
+          <para>To add relationship for a person, you have to click on <emphasis>Search available person</emphasis> link to navigate to <emphasis>search page.</emphasis></para>
+          <para>To register a new person and create relationship with the selected person, click <emphasis role="italic">Register new person</emphasis> link.</para>
         </section>
         <section>
           <title>Change person location and View person details and history</title>
-          <para>You can change person location by clicking the <emphasis>Change person location</emphasis> icon under <emphasis>Operations</emphasis>. In addition, you can view all person details and history by click on <emphasis>Person details and history</emphasis>  icon under <emphasis>Operations</emphasis>.</para>
-          <para>Furthermore, you can download all person details and history in the format of <emphasis role="italic"> XLS</emphasis> or <emphasis role="italic">PDF</emphasis> by clicking <emphasis>Download as Excel</emphasis> or <emphasis>Download as PDF </emphasis> button.</para>
-          <screenshot>
-            <mediaobject>
-              <imageobject>
-                <imagedata width="70" fileref="resources/images/patients_programs/Change person location and view details.PNG" format="PNG"/>
-              </imageobject>
-            </mediaobject>
-          </screenshot>
+          <para>You can change person location by clicking the <emphasis>Change person location</emphasis> icon under <emphasis>Operations</emphasis> or click on <emphasis role="italic">Change location</emphasis> link on <emphasis role="italic">Demographics</emphasis> section in Dashboard. </para>
+          <para>In addition, you can view all person details and history by click on <emphasis>Person details and history</emphasis>  icon under <emphasis>Operations</emphasis>.</para>
+          <para>Furthermore, you can download all person details and history in the format of <emphasis role="italic"> XLS</emphasis> or <emphasis role="italic">PDF</emphasis> by clicking <emphasis>Download as Excel</emphasis> or <emphasis>Download as PDF </emphasis>button.</para>
+          <screenshot>
+            <mediaobject>
+              <imageobject>
+                <imagedata width="70" fileref="resources/images/patients_programs/change_person_location_and_view_details.PNG" format="PNG"/>
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </section>
+        <section>
+          <title>Search persons</title>
+          <para>The <emphasis>Search</emphasis> function is used for searching persons based on  full-name, identifiers and person attributes.</para>
+          <para>To access <emphasis role="italic">Search</emphasis> function, from the <emphasis>Services</emphasis> menu, go the the <emphasis>Individual Records </emphasis>option and click on it. Select <emphasis>Find/Add Person</emphasis> option on the left menu to proceed. Then, after selecting organisation unit,  click on the <emphasis>Search</emphasis> button on the right side.</para>
+          <para> A search form is appeared after clicking. User  has to select  criteria and input values into the function.</para>
+          <screenshot>
+            <mediaobject>
+              <imageobject>
+                <imagedata width="70" fileref="resources/images/patients_programs/search_guide.PNG" format="PNG"/>
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+          <para>After selecting search type, entering keyword and clicking on <emphasis role="italic">Search</emphasis> button. The search result will display on the screen, and then user can interact with these persons.</para>
+          <screenshot>
+            <mediaobject>
+              <imageobject>
+                <imagedata width="70" fileref="resources/images/patients_programs/search_result.PNG" format="PNG"/>
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </section>
+      </section>
+      <section>
+        <title>Tracking</title>
+        <para>This function supports the work practices around tracking persons within a health program that have not shown up for a scheduled visit (stage), e.g. that are lost to follow-up. </para>
+        <section id="visit_schedule">
+          <title>Visit Schedule</title>
+          <para>This will be used to provide the user at a facility or in an area with a list of upcoming visits to better plan for daily/weekly activities. This can also be used as quick navigation to the data entry screen when using the system as a live/real-time data entry system.
+</para>
+          <para> Clicking on an event to open the data entry screen, and plan is updated when closing data entry form.
+
+The plan (expected visits for the upcoming period) will typically be a mix of recently overdue stages and stages that are non-completed and scheduled for the coming days/week.</para>
+          <para>After selecting organisation unit on the left panel, select a program in list. Then status which you would like. Select show events since ( if any) and Show events up to ( if any ). Finally, click Show Event List button to get events which are satisfied with searching criteria.</para>
+          <para>Click Export XLS button to export the result to excel file.<screenshot>
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="resources/images/patients_programs/visit_schedule.PNG" format="PNG" width="70%"/>
+                </imageobject>
+              </mediaobject>
+            </screenshot></para>
+        </section>
+        <section id="program_tracking">
+          <title>Program Tracking</title>
+          <para>This function supports the work practices around tracking persons within a health program that have not shown up for a scheduled visit (stage), e.g. that are lost to follow-up.</para>
+          <para>After selecting organisation unit on the left panel,  select a program in list. And click on List All Person button to load all over-due events of persons.</para>
+          <para>Click on person&apos;s name to open his/her dashboard.</para>
+          <para>Click on an event to re-schedule and set status for the selected event or see all tracking history for this event.<screenshot>
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="resources/images/patients_programs/tracking_program.png" depth="" format="PNG" width="70%"/>
+                </imageobject>
+              </mediaobject>
+            </screenshot></para>
         </section>
       </section>
       <section>
@@ -6075,50 +6312,65 @@
           <title>Multiple individual records</title>
           <para>The multiple individual records function is where individual data is manually registered in the DHIS database. A list events for each person who enrolled into the selected program after clicking a multi events with registration.</para>
           <para>To access the multiple individual records function, from the <emphasis role="italic">Services</emphasis> menu, go to the <emphasis role="italic">Individual Records</emphasis> option and click on it. Select <emphasis role="italic">Multiple individual records</emphasis> option on left menu to proceed.</para>
-          <para>To start enter data, the first step is to open a list events of person who enrolled a certain program by clicking a program in the list on the main page. Follow these steps:</para>
+          <para>To start enter data, the first step is to open a list events of person who enrolled a certain program by selecting a program in the list on the main page. Follow these steps:</para>
           <orderedlist>
             <listitem>
               <para>Locate the organisation unit you want to register data for in the tree menu to the left. Expand and close branches by clicking on the +/- symbols. A quick way to find an organisation unit is to use the search box just above the tree (the green symbol), but you need to write in the full name to get a match.</para>
               <para>The system loads multi events with registration which belong to the selected organisation unit.</para>
             </listitem>
             <listitem>
-              <para>Select a program in the list. A list events of persons who enrolled into the selected program is shown.</para>
+              <para>Select a program in the list and click on <emphasis role="italic">List All Person </emphasis> button. An event list  of persons who enrolled into the selected program is shown.</para>
+              <screenshot>
+                <mediaobject>
+                  <imageobject>
+                    <imagedata width="70" fileref="resources/images/patients_programs/choose_org_unit_and_program.PNG" format="PNG"/>
+                  </imageobject>
+                </mediaobject>
+              </screenshot>
             </listitem>
             <listitem>
               <para>Click an event to open data entry form.</para>
+              <para>After filling and selecting data for a form. You have to click on <emphasis>Run validation</emphasis> button to check whether your inputs are valid. Then, click on <emphasis>Complete</emphasis> button to finish the entry.</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>In order to register an event, from the <emphasis role="italic">Services</emphasis> option, go to the <emphasis role="italic">Individual Records</emphasis> option and click it. Then select <emphasis role="italic">Single event with registration</emphasis> option on left menu to proceed.</para>
+          <para>To list all persons in the selected facility, click <emphasis role="italic">List All Persons</emphasis> button.</para>
+          <para>To add new event, select a program in the combo box. And then click <emphasis role="italic">Add new</emphasis> button.</para>
+          <screenshot>
+            <mediaobject>
+              <imageobject>
+                <imagedata width="70" fileref="resources/images/patients_programs/create_new_person_single_event_with_registration.PNG" format="PNG"/>
+              </imageobject>
+            </mediaobject>
+          </screenshot>
           <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>
+              <para>Click <emphasis role="italic">Advanced search</emphasis> button. Then enter criterion for searching available persons. The search result is displayed below. User can read the user guide for <emphasis>Advanced search</emphasis> function in <emphasis>Person registration</emphasis> section.</para>
             </listitem>
             <listitem>
-              <para>Click on the first icon to update value for the event.</para>
+              <para>Click on <emphasis role="italic">Data entry</emphasis> icon - the first icon  under <emphasis>Operations</emphasis>, corresponding to the person you would like to edit, to update data values for the event.</para>
             </listitem>
           </orderedlist>
         </section>
         <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>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>To register an event, from the <emphasis role="italic">Services</emphasis> option, go to the <emphasis role="italic">Individual Records</emphasis> option and click it. Then select <emphasis role="italic">Single event without registration</emphasis> option on left menu to proceed.</para>
           <para>To list all events in the selected facility, click <emphasis role="italic">List All Events</emphasis> button.</para>
           <para>To remove empty events of the selected program, click <emphasis role="italic">Remove empty events</emphasis> button.</para>
           <para>To add new event, click <emphasis role="italic">Add new</emphasis> button.</para>
-          <para>To update an event:</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>
+              <para>Click on <emphasis role="italic">Data entry</emphasis> icon - the first icon, to update value for the event.</para>
             </listitem>
           </orderedlist>
         </section>
@@ -6127,17 +6379,17 @@
         <title>Reports</title>
         <para>The sub module provides two functions for individual reports -<itemizedlist>
             <listitem>
-              <para>Program summary - view the summary report to get an overview of the services provided for a program.</para>
+              <para><emphasis role="italic">Program summary</emphasis> - view the summary report to get an overview of the services provided for a program.</para>
             </listitem>
             <listitem>
-              <para>Tabular report  - an interactive reporting tool for tracker-data using tabular presentation with dynamic filters for each person attribute and data element. </para>
+              <para><emphasis role="italic">Tabular report</emphasis>  - an interactive reporting tool for tracker-data using tabular presentation with dynamic filters for each person attribute and data element. </para>
             </listitem>
           </itemizedlist></para>
         <section id="program_summary_report">
           <title>Program summary</title>
           <para><emphasis role="bold">Program summary</emphasis> provides a tool for   generating summary list of individual information with  color shown on program stages to identify status of receiving services in each stage.</para>
-          <para>To access the program summary report, choose  <emphasis role="italic">Services</emphasis> -&gt; <emphasis role="italic">Name-based Data Records</emphasis> &gt;  <emphasis role="italic">Program summary</emphasis>.</para>
-          <para>Select a <emphasis role="italic">organisation unit</emphasis>  which provides services on the left menu. Then on the main page, select <emphasis role="italic">Program</emphasis>, <emphasis role="italic">Start date</emphasis>, <emphasis role="italic">End date </emphasis>to get period. Finally, click <emphasis role="italic">Generate</emphasis> button. </para>
+          <para>To access the program summary report, choose  <emphasis role="italic">Services</emphasis> -&gt; <emphasis role="italic">Individual Records</emphasis> &gt;  <emphasis role="italic">Program summary</emphasis>.</para>
+          <para>Select a <emphasis role="italic">organisation unit</emphasis>  which provides services on the left menu. Then on the main page, select <emphasis role="italic">Program</emphasis>, <emphasis role="italic">Start date</emphasis>, <emphasis role="italic">End date </emphasis>to get period. After, select Use data from level(s). There are three levels <emphasis role="italic">Selected</emphasis>, <emphasis role="italic">Children Only</emphasis> and <emphasis role="italic">All</emphasis>. Finally, click <emphasis role="italic">Generate</emphasis> button. </para>
           <para>The result is get based on the date of enrollment of each person who registered the selected organisation unit and enrolled in the selected program in the interval from start-date and end-date what health provider entered.</para>
           <screenshot>
             <mediaobject>
@@ -6158,7 +6410,10 @@
               <para>YELLOW: Coming stages.</para>
             </listitem>
             <listitem>
-              <para>GREEN: Completed stages.</para>
+              <para>GREEN: Compete stages.</para>
+            </listitem>
+            <listitem>
+              <para>GREY: Skipped stages.</para>
             </listitem>
           </itemizedlist>
         </section>
@@ -6167,13 +6422,69 @@
           <para>This is  an interactive reporting tool for tracker-data using tabular presentation with dynamic filters for each person attribute/data element.</para>
           <para>To access the tabular report function, from the <emphasis role="italic">Services</emphasis> menu, go to the <emphasis role="italic">Individual Records</emphasis> option and click on it. Select <emphasis role="italic">Tabular report</emphasis> option below Reports header on left menu to proceed. </para>
           <para>To start, the first step is to select a program in the list. Follow these steps:</para>
+          <orderedlist>
+            <listitem>
+              <para>Select a program from list in the left panel. The system will be load person attributes and identifiers which belongs to the selected program and not belong to any program.</para>
+            </listitem>
+            <listitem>
+              <para>Choose start-date and end-date. The event list is loaded with report-date between the two dates.</para>
+            </listitem>
+            <listitem>
+              <para>Select one or many <emphasis role="italic">organisation units</emphasis>.</para>
+            </listitem>
+            <listitem>
+              <para>In <emphasis role="italic">Identifiers and Attribute</emphasis>s tab, select options  to show it into the result.</para>
+            </listitem>
+            <listitem>
+              <para>In <emphasis role="italic">Data element </emphasis>tab, Select a <emphasis role="italic">program stage</emphasis>. Double-click data elements which you need to show into the result to move it from <emphasis role="italic">Available</emphasis>field to the <emphasis role="italic">Selected</emphasis> field</para>
+              <note>
+                <para>If the selected program has only one stage, this field is hidden and data element list of the stage is shown in the <emphasis role="italic">Available</emphasis> field.</para>
+              </note>
+            </listitem>
+            <listitem>
+              <para>In the Options tab, there are two options - </para>
+            </listitem>
+          </orderedlist>
+          <itemizedlist>
+            <listitem>
+              <para><emphasis role="italic">Use data from level(s)</emphasis>: Specify the level which you need to get events -</para>
+              <para>1)<emphasis role="italic"> Children only</emphasis>: Individual data from the children of the selected organisation unit will be aggregated.</para>
+              <para>2) <emphasis role="italic">Selected</emphasis>: Individual data from the selected organisation unit will be aggregated. </para>
+              <para>3) <emphasis role="italic">All</emphasis>: Individual data from both selected organisation unit and its children will be aggregated.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="italic">Show hierarchy from level:</emphasis> The level of  organisation units which you want to show. E.g. If an event  belongs to an organisation unit  in district level and this option is selected as province level, the result is shown with the name of province.</para>
+            </listitem>
+          </itemizedlist>
+          <orderedlist continuation="continues">
+            <listitem>
+              <para>Click <emphasis role="italic">Update</emphasis> button on toolbar. The result is shown on the main page.</para>
+              <screenshot>
+                <mediaobject>
+                  <imageobject>
+                    <imagedata width="60%" fileref="resources/images/patients_programs/tabular_report_result.png" format="PNG"/>
+                  </imageobject>
+                </mediaobject>
+              </screenshot>
+            </listitem>
+          </orderedlist>
+          <para>To filter data by person attributes, identifiers or data elements, click on the DOWN button on the column corresponding to field which you want to filter. Click <emphasis role="italic">Filter</emphasis> button and enter value in the field shown.</para>
+          <screenshot>
+            <mediaobject>
+              <imageobject>
+                <imagedata width="70%" fileref="resources/images/patients_programs/tabular_report_filter.png" format="PNG"/>
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+          <para>To clear filter values, click <emphasis role="italic">Clear filter</emphasis> button on toolbar.</para>
+          <para>To save parameters on the left panel, click <emphasis role="italic">Favorites</emphasis> button on toolbar. The select <emphasis role="italic">Manage favorites</emphasis> option. A form is shown to enter name for favorite and click <emphasis role="italic">Save</emphasis> button.</para>
+          <para>To export the result to excel file, click <emphasis role="italic">Download</emphasis> button, select  XLS option.</para>
         </section>
       </section>
       <section id="run_case_aggregation">
         <title>Person aggregation</title>
-        <para><emphasis role="italic">Person Aggregation</emphasis> module is used for aggregating individual data and import into aggregated data element. To open <emphasis>Person Aggregation</emphasis> module, from the <emphasis role="italic">Services</emphasis> menu, go to the <emphasis role="italic">Individual Records</emphasis> option. Select <emphasis role="italic">Person Aggregation</emphasis> option on left menu.  <emphasis>Person Aggregation form</emphasis> is opened as below -</para>
+        <para>The <emphasis role="italic">Person Aggregation</emphasis> module is used for aggregating individual data and import into aggregated data element. To open <emphasis>Person Aggregation</emphasis> module, from the <emphasis role="italic">Services</emphasis> menu, go to the <emphasis role="italic">Individual Records</emphasis> option. Select <emphasis role="italic">Person Aggregation</emphasis> option on left menu.  <emphasis>Person Aggregation form</emphasis> is opened as below -</para>
         <screenshot>
-          <screeninfo>Figure 2.5.4.4</screeninfo>
           <mediaobject>
             <imageobject>
               <imagedata width="70%" fileref="resources/images/patients_programs/person_aggregation_form.png" format="PNG"/>
@@ -6190,13 +6501,13 @@
           </listitem>
           <listitem>
             <para>Select <emphasis role="italic">organisation unit level</emphasis> where person data will be select to aggregate. There are 3 options - </para>
+            <para>- <emphasis role="italic">All</emphasis>: Individual data from both selected organisation unit and its children will be aggregated.</para>
             <para>- <emphasis role="italic">Children only</emphasis>: Individual data from the children of  the selected organisation unit will be aggregated.</para>
             <para>- <emphasis role="italic"> Selected</emphasis>: Individual  data from the selected organisation unit will be aggregated. </para>
-            <para>- <emphasis role="italic">All</emphasis>: Individual data from both selected organisation unit and its children will be aggregated.</para>
           </listitem>
           <listitem>
             <para>Click on the 
-<emphasis role="italic">Aggregate</emphasis> button to execute aggregate function. The <emphasis>Person aggregation result</emphasis>page is opened as below figure -</para>
+<emphasis role="italic">Aggregate</emphasis> button to execute aggregate function. The <emphasis>Person aggregation result</emphasis>page is shown after running successfully.</para>
           </listitem>
         </orderedlist>
         <screenshot>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm	2012-09-27 08:00:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm	2012-09-28 09:03:34 +0000
@@ -9,7 +9,7 @@
 	});	
 </script>
 
-<h3>$i18n.getString( "activity_plan" )</h3>
+<h3>$i18n.getString( "activity_plan" ) #openHelp('visit_schedule')</h3>
 <form id='activityPlanForm' name='activityPlanForm'>
 	<input type='hidden' id='isRegistration' name= 'isRegistration' value='false'>
 	<input type='hidden' id='listAll' name='listAll'>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-09-27 09:35:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-09-28 09:03:34 +0000
@@ -1522,6 +1522,7 @@
 			{
 				loadDataEntry( activeProgramStageInstanceId );
 			}
+			jQuery('#completedList').val('');
 			jQuery('#loaderDiv').hide();
 		});
 }

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2012-09-25 10:10:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2012-09-28 09:03:34 +0000
@@ -94,6 +94,11 @@
 	</td>
 </tr>
 
+<tr>
+	<td></td>
+	<td><input type="button" class='button' id='checkDuplicateBtn' name='checkDuplicateBtn' value="$i18n.getString('check_duplicate')" /></td>
+</tr>
+
 <tr id='deathDateTR' #if($!patient.isDead) #else class="hidden" #end>
 	<td class='text-column'><label for="deathDate">$i18n.getString("death_date")</label></td>
 	<td class="input-column">

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm	2012-09-24 05:50:08 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm	2012-09-28 09:03:34 +0000
@@ -21,7 +21,7 @@
 	});	
 </script>
 
-<h3 id='mainLinkLbl'>$i18n.getString( "program_tracking" )</h3>
+<h3 id='mainLinkLbl'>$i18n.getString( "program_tracking" ) #openHelp('program_tracking')</h3>
 <form>
 	<input type='hidden' id='isRegistration' name= 'isRegistration' value='false'>
 	<input type='hidden' id='listAll' name='listAll'>