=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPatientAttribute.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPatientAttribute.vm	2012-07-30 04:48:17 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPatientAttribute.vm	2012-09-17 06:40:26 +0000
@@ -4,7 +4,6 @@
 	"name": "$!encoder.jsonEncode( ${patientAttribute.name} )",
 	"description": "$!encoder.jsonEncode( ${patientAttribute.description} )",
 	"mandatory":  "$!{patientAttribute.mandatory}",
-	"valueType": "$!encoder.jsonEncode( ${patientAttribute.valueType} )",
-	"program": "$!encoder.jsonEncode( ${patientAttribute.program.name} )"
+	"valueType": "$!encoder.jsonEncode( ${patientAttribute.valueType} )"
   }
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPatientIdentifierType.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPatientIdentifierType.vm	2012-03-26 06:36:24 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPatientIdentifierType.vm	2012-09-17 06:40:26 +0000
@@ -6,7 +6,6 @@
 	"mandatory": "$!{patientIdentifierType.mandatory}",
 	"related": "$!{patientIdentifierType.related}",
 	"noChars": "$!{patientIdentifierType.noChars}",
-	"type": "$!{patientIdentifierType.type}",
-	"program": "$!encoder.jsonEncode( ${patientIdentifierType.program.name} )"
+	"type": "$!{patientIdentifierType.type}"
   }
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm	2012-08-07 08:14:58 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm	2012-09-17 06:40:26 +0000
@@ -9,6 +9,8 @@
 	"dateOfEnrollmentDescription": "$!encoder.jsEncode( ${program.dateOfEnrollmentDescription} )",
 	"dateOfIncidentDescription": "$!encoder.jsEncode( ${program.dateOfIncidentDescription} )",
 	"programStageCount": "${program.programStages.size()}",
-	"maxDay": "$!program.maxDaysAllowedInputData"
+	"maxDay": "$!program.maxDaysAllowedInputData",
+	"noAttributes": "$!program.patientAttributes.size()",
+	"noIdentifierTypes": "$!program.patientIdentifierTypes.size()"
   }
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm	2012-09-10 02:46:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm	2012-09-17 06:40:26 +0000
@@ -7,9 +7,9 @@
 	"minDaysFromStart": "${programStage.minDaysFromStart}",
 	"dataElementCount": "${programStageDataElements.size()}",
 	"standardInterval": "$!programStage.standardInterval",
-	"reportDateDescription": "$!programStage.reportDateDescription",
+	"reportDateDescription": "$!encoder.jsonEncode( ${programStage.reportDateDescription} )",
 	"daysAllowedSendMessage": "$!programStage.daysAllowedSendMessage",
-	"templateMessage": "$!encoder.jsonEncode($!programStage.templateMessage)",
+	"templateMessage": "$!encoder.jsonEncode( ${programStage.templateMessage} )",
 	
 	#set( $size = ${programStageDataElements.size()} )
 	"dataElement": [

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStageSection.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStageSection.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStageSection.vm	2012-09-17 06:40:26 +0000
@@ -0,0 +1,7 @@
+{ "programStageSection":
+  {
+    "id": "$!{section.id}",
+    "name": "$!encoder.jsonEncode( ${section.name} )",
+    "dataElementCount": "$!{section.programStageDataElements.size()}"
+  }
+}
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-09-12 15:41:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-09-17 06:40:26 +0000
@@ -291,4 +291,6 @@
 negative_numbers = Negative numbers
 gateway_type = Gateway type
 execute = Execute
-time_for_sending_message = Time for sending message
\ No newline at end of file
+time_for_sending_message = Time for sending message
+number_of_attributes = The number of attributes
+number_of_identifier_types = The number of identifier types
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2012-09-17 03:32:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2012-09-17 06:40:26 +0000
@@ -346,14 +346,6 @@
 			<param name="javascripts">javascript/programStage.js</param>
 		</action>
 		
-		<action name="validateProgramStageSection"
-			class="org.hisp.dhis.patient.action.programstage.ValidateProgramStageSectionAction">
-			<result name="success" type="velocity-json">
-				../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-			<result name="error" type="velocity-json">
-				../dhis-web-commons/ajax/jsonResponseError.vm</result>
-		</action>
-		
 		<!-- Program stage section -->
 		
 		<action name="programStageSectionList"
@@ -430,6 +422,13 @@
 			<result name="success" type="redirect">programStageSectionList.action?id=${id}</result>
 		</action>
 		
+		<action name="validateProgramStageSection"
+			class="org.hisp.dhis.patient.action.programstage.ValidateProgramStageSectionAction">
+			<result name="success" type="velocity-json">
+				../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+			<result name="error" type="velocity-json">
+				../dhis-web-commons/ajax/jsonResponseError.vm</result>
+		</action>
 		
 		<!-- Data Entry Form -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js	2012-07-30 04:48:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js	2012-09-17 06:40:26 +0000
@@ -13,13 +13,6 @@
 			setInnerHTML( 'mandatoryField', mandatory );
 			
 			setInnerHTML( 'valueTypeField', json.patientAttribute.valueType );    
-	   
-			var programName = json.patientAttribute.program;
-			if( programName == '')
-			{
-				programName = i18n_all;
-			}
-			setInnerHTML( 'programField', programName );
 			
 			showDetails();
 	});

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js	2012-06-13 04:13:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js	2012-09-17 06:40:26 +0000
@@ -21,13 +21,6 @@
 			var valueType = json.patientIdentifierType.type;
 			setInnerHTML( 'typeField', valueTypeMap[valueType] );
 			
-			var programName = json.patientIdentifierType.program;
-			if( programName == '')
-			{
-				programName = i18n_all;
-			}
-			setInnerHTML( 'programField', programName );
-			
 			showDetails();
 	});
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js	2012-09-05 14:30:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js	2012-09-17 06:40:26 +0000
@@ -27,6 +27,8 @@
 		setInnerHTML( 'dateOfIncidentDescriptionField', json.program.dateOfIncidentDescription );   		
 		setInnerHTML( 'programStageCountField',  json.program.programStageCount );
 		setInnerHTML( 'durationInDaysField',  json.program.maxDay );
+		setInnerHTML( 'noAttributesField', json.program.noAttributes );
+		setInnerHTML( 'noIdentifierTypesField', json.program.noIdentifierTypes );
 		
 		showDetails();
 	});   

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js	2012-09-10 02:46:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js	2012-09-17 06:40:26 +0000
@@ -60,11 +60,11 @@
 		var irregular = (json.programStage.irregular=='true') ? i18n_yes : i18n_no;
 		setInnerHTML( 'irregularField', irregular );  
 		setInnerHTML( 'standardIntervalField', json.programStage.standardInterval );  
-		setInnerHTML( 'reportDateDescriptionField', json.programStage.reportDateDescription );  
 		setInnerHTML( 'dataElementCountField', json.programStage.dataElementCount );   
-		setInnerHTML( 'daysAllowedSendMessageField', json.programStage.daysAllowedSendMessage );   
-		setInnerHTML( 'templateMessageField', json.programStage.templateMessage );   
-	   
+		setInnerHTML( 'reportDateDescriptionField', json.programStage.reportDateDescription );
+		setInnerHTML( 'daysAllowedSendMessageField', json.programStage.daysAllowedSendMessage );
+		setInnerHTML( 'templateMessageField', json.programStage.templateMessage );
+		
 		showDetails();
 	});
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStageSection.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStageSection.js	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/javascript/programStageSection.js	2012-09-17 06:40:26 +0000
@@ -17,9 +17,9 @@
 	});
 }
 
-function removePatientAttribute( programStageId, sectionId, name )
+function removeSection( programStageId, sectionId, name )
 {
-	var result = window.confirm( i18n_confirm_delete );
+	var result = window.confirm( i18n_confirm_delete + "\n" + name );
     if ( result )
     {
 		jQuery.getJSON( "removeProgramStageSection.action",

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/jsonProgramStageSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/jsonProgramStageSection.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/jsonProgramStageSection.vm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-{ "programStageSection":
-  {
-    "id": "$!{section.id}",
-    "name": "$!encoder.jsonEncode( ${section.name} )",
-    "dataElementCount": "$!{section.programStageDataElements.size()}"
-  }
-}
\ 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/listPatientIdentifierType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm	2012-06-13 04:13:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm	2012-09-17 06:40:26 +0000
@@ -55,7 +55,6 @@
 				<p><label class="bold">$i18n.getString( "related" ):</label><br><span id="relatedField"></span></p>
 				<p><label class="bold">$i18n.getString( "no_of_char" ):</label><br><span id="noCharsField"></span></p>
 				<p><label class="bold">$i18n.getString( "type" ):</label><br><span id="typeField"></span></p>
-				<p><label class="bold">$i18n.getString( "program" ):</label><br><span id="programField"></span></p>
 			</div>
 		</td>
   </tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm	2012-07-30 04:48:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm	2012-09-17 06:40:26 +0000
@@ -59,7 +59,6 @@
                 <p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
                 <p><label class="bold">$i18n.getString( "mandatory" ):</label><br><span id="mandatoryField"></span></p>
                 <p><label class="bold">$i18n.getString( "value_type" ):</label><br><span id="valueTypeField"></span></p>
-				<p><label class="bold">$i18n.getString( "program" ):</label><br><span id="programField"></span></p>
 			</div>
 
 		</td>

=== 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	2012-08-07 08:14:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm	2012-09-17 06:40:26 +0000
@@ -56,6 +56,8 @@
 				<p><label class="bold">$i18n.getString( "date_of_incident_description" ):</label><br><span id="dateOfIncidentDescriptionField"></span></p>				
 				<p><label class="bold">$i18n.getString( "stage_in_program" ):</label><br><span id="programStageCountField"></span></p>
 				<p><label class="bold">$i18n.getString( "duration_in_days" ):</label><br><span id="durationInDaysField"></span></p>
+				<p><label class="bold">$i18n.getString( "number_of_attributes" ):</label><br><span id="noAttributesField"></span></p>
+				<p><label class="bold">$i18n.getString( "number_of_identifier_types" ):</label><br><span id="noIdentifierTypesField"></span></p>
 			</div>
 
 		</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm	2012-09-11 03:54:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm	2012-09-17 06:40:26 +0000
@@ -49,9 +49,8 @@
 				<p><label class="bold">$i18n.getString( "standard_interval_days" ):</label><br><span id="standardIntervalField"></span></p>
 				<p><label class="bold">$i18n.getString( "report_date_description" ):</label><br><span id="reportDateDescriptionField"></span></p>
 				<p><label class="bold">$i18n.getString( "no_of_dataelements" ):</label><br><span id="dataElementCountField"></span></p>		
-				<p><label class="bold">$i18n.getString( "days_after_due_date" ):</label><br><span id="daysAllowedSendMessageField"></span></p>	  		
+				<p><label class="bold">$i18n.getString( "days_before_due_date" ):</label><br><span id="daysAllowedSendMessageField"></span></p>
 				<p><label class="bold">$i18n.getString( "template_message" ):</label><br><span id="templateMessageField"></span></p>
-				
 			</div>
 		</td>
 	</tr>

=== 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-08-24 10:09:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSection.vm	2012-09-17 06:40:26 +0000
@@ -26,10 +26,10 @@
 					#set( $mark = false )
 					#foreach( $section in $programStage.programStageSections )
 						<tr id="tr${section.id}" #alternate( $mark )>			  
-							<td onclick="showProgramStageDetails( $section.id )">$encoder.htmlEncode( $section.name )</td>							
+							<td onclick="showSectionDetails( $section.id )">$encoder.htmlEncode( $section.name )</td>							
 							<td style="text-align:center"#alternate( $mark )>
 							  <a href="showUpdateProgramStageSectionForm.action?programStageId=$programStage.id&id=$section.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
-							  <a href="javascript:removePatientAttribute( '$programStage.id', '$section.id', '$encoder.jsEncode( $section.name )', i18n_confirm_delete , 'removeProgramStage.action' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
+							  <a href="javascript:removeSection( '$programStage.id', '$section.id', '$encoder.jsEncode( $section.name )', i18n_confirm_delete , 'removeProgramStage.action' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
 							  <a href="javascript:showSectionDetails( $section.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>
 							</td>
 						</tr>