← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12688: Hide Open data entry form after enrollment option for anonymous program.

 

------------------------------------------------------------
revno: 12688
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-15 23:46:54 +0700
message:
  Hide Open data entry form after enrollment option for anonymous program.
modified:
  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/updateProgramStageForm.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-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	2013-09-24 11:21:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2013-10-15 16:46:54 +0000
@@ -74,36 +74,38 @@
 		<td><input type="checkbox" id="autoGenerateEvent" name="autoGenerateEvent" value='true' checked onchange='autoGenerateEventOnChange("$openAfterEnrollment")' /></td>
 	</tr>
 	
+	#if($program.type!=3)
 	
-	#if($openAfterEnrollment!='' ) 
-	<tr>
-		<td colspan='2' style="color:grey;font-style:italic">$i18n.getString('the_properties_to_open_data_entry_form_after_enrolment_is_active_in_the_stage'): $openAfterEnrollment</td>
-		<td></td>
-	</tr>
+		#if($openAfterEnrollment!='' ) 
+		<tr>
+			<td colspan='2' style="color:grey;font-style:italic">$i18n.getString('the_properties_to_open_data_entry_form_after_enrolment_is_active_in_the_stage'): $openAfterEnrollment</td>
+			<td></td>
+		</tr>
+		#end
+		
+		<tr>
+			<td><label>$i18n.getString( "open_data_entry_form_after_enrolment" )</label></td>
+			<td><input type="checkbox" id="openAfterEnrollment" name="openAfterEnrollment" value='true' 
+				onchange="openAfterEnrollmentOnchange();" disabled >
+			</td>
+			<td></td>
+		</tr>
+		
+		<tr>
+			<td><label>$i18n.getString( "report_date_to_use" )</label></td>
+			<td>
+				<select id="reportDateToUse" name="reportDateToUse" disabled class="{validate:{required:true}}" >
+					<option value=''>[$i18n.getString('please_select')]</option>
+					<option value='registrationDate'>$i18n.getString("registration_date")</option>
+					<option value='dateOfIncident'>$i18n.getString("date_of_incident")</option>
+					<option value='enrollmentDate'>$i18n.getString("date_of_enrollment")</option>
+				</select>
+			</td>
+			<td></td>
+		</tr>
 	#end
 	
 	<tr>
-		<td><label>$i18n.getString( "open_data_entry_form_after_enrolment" )</label></td>
-		<td><input type="checkbox" id="openAfterEnrollment" name="openAfterEnrollment" value='true' 
-			onchange="openAfterEnrollmentOnchange();" disabled >
-		</td>
-		<td></td>
-	</tr>
-	
-	<tr>
-		<td><label>$i18n.getString( "report_date_to_use" )</label></td>
-		<td>
-			<select id="reportDateToUse" name="reportDateToUse" disabled class="{validate:{required:true}}" >
-				<option value=''>[$i18n.getString('please_select')]</option>
-				<option value='registrationDate'>$i18n.getString("registration_date")</option>
-				<option value='dateOfIncident'>$i18n.getString("date_of_incident")</option>
-				<option value='enrollmentDate'>$i18n.getString("date_of_enrollment")</option>
-			</select>
-		</td>
-		<td></td>
-	</tr>
-	
-	<tr>
 		<td><label>$i18n.getString( "block_entry_form_after_completed" )</label></td>
 		<td><input type="checkbox" id="blockEntryForm" name="blockEntryForm" value='true'></td>
 		<td></td>

=== 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	2013-09-24 11:21:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2013-10-15 16:46:54 +0000
@@ -76,37 +76,39 @@
 				<td><input type="checkbox" id="autoGenerateEvent" name="autoGenerateEvent" value='true' onchange='autoGenerateEventOnChange("$openAfterEnrollment")' #if( $programStage.autoGenerateEvent && $programStage.autoGenerateEvent=='true' ) checked #end /></td>
 			</tr>
 			
-			#if($openAfterEnrollment!='' ) 
-			<tr>
-				<td colspan='2' style="color:grey;font-style:italic">$i18n.getString('the_properties_to_open_data_entry_form_after_enrolment_is_active_in_the_stage'): $openAfterEnrollment</td>
-				<td></td>
-			</tr>
+			#if($programStage.program.type!=3)
+				#if($openAfterEnrollment!='' ) 
+				<tr>
+					<td colspan='2' style="color:grey;font-style:italic">$i18n.getString('the_properties_to_open_data_entry_form_after_enrolment_is_active_in_the_stage'): $openAfterEnrollment</td>
+					<td></td>
+				</tr>
+				#end
+				
+				<tr>
+					<td><label>$i18n.getString( "open_data_entry_form_after_enrolment" )</label></td>
+					<td><input type="checkbox" id="openAfterEnrollment" name="openAfterEnrollment" value='true' 
+						#if($programStage.openAfterEnrollment=='true') checked #end
+						#if($openAfterEnrollment!='' || $programStage.autoGenerateEvent=='false' ) disabled #end
+						onchange="openAfterEnrollmentOnchange()" ></td>
+					<td></td>
+				</tr>
+			
+				<tr>
+					<td><label>$i18n.getString( "report_date_to_use" )</label></td>
+					<td>
+						<select id="reportDateToUse" name="reportDateToUse" class="{validate:{required:true}}" 
+							#if($openAfterEnrollment!='' || $programStage.autoGenerateEvent=='false' ) disabled #elseif($programStage.openAfterEnrollment=='false') disabled #end >
+							<option value=''>[$i18n.getString('please_select')]</option>
+							<option value='registrationDate' #if($programStage.reportDateToUse=='registrationDate') selected #end >$i18n.getString("registration_date")</option>
+							<option value='dateOfIncident' #if($programStage.reportDateToUse=='dateOfIncident') selected #end >$i18n.getString("date_of_incident")</option>
+							<option value='enrollmentDate' #if($programStage.reportDateToUse=='enrollmentDate') selected #end >$i18n.getString("date_of_enrollment")</option>
+						</select>
+					</td>
+					<td></td>
+				</tr>
 			#end
 			
 			<tr>
-				<td><label>$i18n.getString( "open_data_entry_form_after_enrolment" )</label></td>
-				<td><input type="checkbox" id="openAfterEnrollment" name="openAfterEnrollment" value='true' 
-					#if($programStage.openAfterEnrollment=='true') checked #end
-					#if($openAfterEnrollment!='' || $programStage.autoGenerateEvent=='false' ) disabled #end
-					onchange="openAfterEnrollmentOnchange()" ></td>
-				<td></td>
-			</tr>
-			
-			<tr>
-				<td><label>$i18n.getString( "report_date_to_use" )</label></td>
-				<td>
-					<select id="reportDateToUse" name="reportDateToUse" class="{validate:{required:true}}" 
-						#if($openAfterEnrollment!='' || $programStage.autoGenerateEvent=='false' ) disabled #elseif($programStage.openAfterEnrollment=='false') disabled #end >
-						<option value=''>[$i18n.getString('please_select')]</option>
-						<option value='registrationDate' #if($programStage.reportDateToUse=='registrationDate') selected #end >$i18n.getString("registration_date")</option>
-						<option value='dateOfIncident' #if($programStage.reportDateToUse=='dateOfIncident') selected #end >$i18n.getString("date_of_incident")</option>
-						<option value='enrollmentDate' #if($programStage.reportDateToUse=='enrollmentDate') selected #end >$i18n.getString("date_of_enrollment")</option>
-					</select>
-				</td>
-				<td></td>
-			</tr>
-			
-			<tr>
 				<td><label>$i18n.getString( "block_entry_form_after_completed" )</label></td>
 				<td><input type="checkbox" id="blockEntryForm" name="blockEntryForm" value='true' #if( $programStage.blockEntryForm=='true' ) checked #end ></td>
 				<td></td>