=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/TestCaseAggregationConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/TestCaseAggregationConditionAction.java	2012-01-11 05:31:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/TestCaseAggregationConditionAction.java	2012-10-26 03:26:57 +0000
@@ -87,7 +87,7 @@
         period.setStartDate( new Date() );
         period.setEndDate( new Date() );
 
-        Double value = aggregationConditionService.parseConditition( aggCondition, orgunit, period );
+        Integer value = aggregationConditionService.parseConditition( aggCondition, orgunit, period );
 
         if ( value == null )
         {

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/GetProgramStageSectionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/GetProgramStageSectionAction.java	2012-08-24 10:09:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/GetProgramStageSectionAction.java	2012-10-26 03:26:57 +0000
@@ -55,7 +55,7 @@
     {
         this.programStageService = programStageService;
     }
-    
+
     private ProgramStageSectionService programStageSectionService;
 
     public void setProgramStageSectionService( ProgramStageSectionService programStageSectionService )
@@ -76,16 +76,18 @@
 
     private Integer programStageId;
 
-    public Integer getProgramStageId()
-    {
-        return programStageId;
-    }
-
     public void setProgramStageId( Integer programStageId )
     {
         this.programStageId = programStageId;
     }
 
+    private ProgramStage programStage;
+
+    public ProgramStage getProgramStage()
+    {
+        return programStage;
+    }
+
     private ProgramStageSection section;
 
     public ProgramStageSection getSection()
@@ -109,10 +111,10 @@
         throws Exception
     {
         section = programStageSectionService.getProgramStageSection( id );
-        
+
         if ( programStageId != null )
         {
-            ProgramStage programStage = programStageService.getProgramStage( programStageId );
+            programStage = programStageService.getProgramStage( programStageId );
 
             availableDataElements = programStage.getProgramStageDataElements();
 
@@ -121,7 +123,7 @@
                 availableDataElements.removeAll( section.getProgramStageDataElements() );
             }
         }
-        
+
         return SUCCESS;
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/ShowAddProgramStageSectionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/ShowAddProgramStageSectionAction.java	2012-08-24 10:09:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/ShowAddProgramStageSectionAction.java	2012-10-26 03:26:57 +0000
@@ -60,16 +60,18 @@
     // -------------------------------------------------------------------------
 
     private Integer programStageId;
-
-    public Integer getProgramStageId()
-    {
-        return programStageId;
-    }
-
+    
     public void setProgramStageId( Integer programStageId )
     {
         this.programStageId = programStageId;
     }
+    
+    private ProgramStage programStage;
+
+    public ProgramStage getProgramStage()
+    {
+        return programStage;
+    }
 
     private ProgramStageSection section;
 
@@ -93,7 +95,7 @@
     public String execute()
         throws Exception
     {
-        ProgramStage programStage = programStageService.getProgramStage( programStageId );
+        programStage = programStageService.getProgramStage( programStageId );
 
         availableDataElements = programStage.getProgramStageDataElements();
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addMultiProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addMultiProgramValidationForm.vm	2012-10-23 04:48:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addMultiProgramValidationForm.vm	2012-10-26 03:26:57 +0000
@@ -1,5 +1,7 @@
 <h3>$i18n.getString( "add_multi_program_validation_rule" )</h3>
 
+<h4>$program.name</h4>
+
 <form id='programValidationForm' name='programValidationForm' method='post' action='addProgramValidation.action'>
 
 <input type='hidden' id='programId' name='programId' value='$program.id'>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2012-10-12 04:09:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2012-10-26 03:26:57 +0000
@@ -1,7 +1,9 @@
 <script type="text/javascript" src="javascript/addProgramStageForm.js"></script>
 
 <h3>$i18n.getString( "create_new_program_stage" )</h3>
-																		
+
+<h4>$program.name</h4>
+		
 <form id="addProgramStageForm" name="addProgramStageForm" action="addProgramStage.action" method="get">
 	<input type="hidden" id="id" name="id" value="$program.id"/>
 	<select id='daysAllowedSendMessages' name="daysAllowedSendMessages" multiple="multiple" class="hidden"></select>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageSectionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageSectionForm.vm	2012-08-24 10:09:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageSectionForm.vm	2012-10-26 03:26:57 +0000
@@ -10,9 +10,11 @@
 </script>
 
 <h3>$i18n.getString( "create_new_program_stage_section" )</h3>
+
+</h4>$programStage.name</h4>
 																		
 <form id="programStageSectionForm" name="programStageSectionForm" onsubmit="selectAllById('dataElementIds');" action="addProgramStageSection.action" method="post">
-	<input type="hidden" id="programStageId" name="programStageId" value="$programStageId"/>
+	<input type="hidden" id="programStageId" name="programStageId" value="$programStage.id"/>
 
 <table>
 	<thead>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm	2012-10-23 04:48:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm	2012-10-26 03:26:57 +0000
@@ -1,5 +1,7 @@
 <h3>$i18n.getString( "add_single_program_validation_rule" )</h3>
 
+<h4>$program.name</h4>
+
 <form id='programValidationForm' name='programValidationForm' method='post' action='addProgramValidation.action'>
 
 <input type='hidden' id='programId' name='programId' value='$program.id'>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm	2012-10-09 10:03:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm	2012-10-26 03:26:57 +0000
@@ -1,5 +1,6 @@
-<h3>$i18n.getString( "program_stage_management" ) $i18n.getString( "for" ) $program.name</h3>
-<h4></h4>
+<h3>$i18n.getString( "program_stage_management" )</h3>
+
+<h4>$program.name</h4>
 
 <input type='hidden' id='id' name='id' value='$program.id'>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSection.vm	2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSection.vm	2012-10-26 03:26:57 +0000
@@ -1,4 +1,6 @@
-<h3>$i18n.getString( "program_stage_section" ) $i18n.getString( "for" ) $programStage.name</h3>
+<h3>$i18n.getString( "program_stage_section" )</h3>
+
+<h4>$programStage.name</h4>
 
 <input type='hidden' id='id' name='id' value='$programStage.id'>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm	2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm	2012-10-26 03:26:57 +0000
@@ -1,4 +1,5 @@
 <h3>$i18n.getString( "program_validation_rule_management" )</h3>
+
 <h4>$program.name</h4>
 
 <table class="mainPageTable">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm	2012-10-23 04:48:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateMultiProgramValidationForm.vm	2012-10-26 03:26:57 +0000
@@ -1,5 +1,7 @@
 <h3>$i18n.getString( "edit_program_validation_rule" )</h3>
 
+<h4>$program.name</h4>
+
 <form id='programValidationForm' name='programValidationForm' method='post' action='updateProgramValidation.action'>
 
 <input type='hidden' id='id' name='id' value='$validation.id'>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2012-10-12 04:09:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2012-10-26 03:26:57 +0000
@@ -2,6 +2,8 @@
 
 <h3>$i18n.getString( "edit_program_stage" )</h3>
 
+<h4>$programStage.program.name</h4>
+
 <form id="updateProgramStageForm" name="updateProgramStageForm" action="updateProgramStage.action" method="post">
 	<input type="hidden" id="id" name="id" value="$programStage.id"/>
 	<select id='daysAllowedSendMessages' name="daysAllowedSendMessages" multiple="multiple" class="hidden"></select>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageSectionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageSectionForm.vm	2012-08-24 10:09:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageSectionForm.vm	2012-10-26 03:26:57 +0000
@@ -11,9 +11,11 @@
 </script>
 
 <h3>$i18n.getString( "update_program_stage_section" )</h3>
-																		
+			
+</h4>$programStage.name</h4>
+			
 <form id="programStageSectionForm" name="programStageSectionForm" onsubmit="selectAllById('dataElementIds');" action="updateProgramStageSection.action" method="post">
-	<input type="hidden" id="programStageId" name="programStageId" value="$programStageId"/>
+	<input type="hidden" id="programStageId" name="programStageId" value="$programStage.id"/>
 	<input type="hidden" id="id" name="id" value="$section.id"/>
 
 <table>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm	2012-10-23 04:48:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm	2012-10-26 03:26:57 +0000
@@ -1,5 +1,7 @@
 <h3>$i18n.getString( "edit_program_validation_rule" )</h3>
 
+<h4>$program.name</h4>
+
 <form id='programValidationForm' name='programValidationForm' method='post' action='updateProgramValidation.action'>
 
 <input type='hidden' id='id' name='id' value='$validation.id'>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm	2012-10-25 13:31:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm	2012-10-26 03:26:57 +0000
@@ -9,7 +9,7 @@
 	var i18n_execute_tasks_confirmation = '$encoder.jsEscape( $i18n.getString( "execute_tasks_confirmation" ), "'" )';
 </script>
 
-<h3>$i18n.getString( "scheduling_aggregation_query_builder" ) #openHelp( "scheduling_aggregation_query_builder" )</h3>
+<h3>$i18n.getString( "scheduling_person_aggregation" ) #openHelp( "scheduling_aggregation_query_builder" )</h3>
 
 <input id="isRunning" type="hidden" value="${running}">