dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12762: Minor fix for program-stage form.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 17 Oct 2013 06:09:32 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 12762
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-10-17 13:06:44 +0700
message:
  Minor fix for program-stage form.
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-10-15 16:46:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2013-10-17 06:06:44 +0000
@@ -84,9 +84,9 @@
 		#end
 		
 		<tr>
-			<td><label>$i18n.getString( "open_data_entry_form_after_enrolment" )</label></td>
+			<td><label>$i18n.getString( "open_data_entry_form_after_enrolment" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 			<td><input type="checkbox" id="openAfterEnrollment" name="openAfterEnrollment" value='true' 
-				onchange="openAfterEnrollmentOnchange();" disabled >
+				onchange="openAfterEnrollmentOnchange();" >
 			</td>
 			<td></td>
 		</tr>
@@ -94,7 +94,7 @@
 		<tr>
 			<td><label>$i18n.getString( "report_date_to_use" )</label></td>
 			<td>
-				<select id="reportDateToUse" name="reportDateToUse" disabled class="{validate:{required:true}}" >
+				<select id="reportDateToUse" name="reportDateToUse" 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>

=== 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-10-15 16:46:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2013-10-17 06:06:44 +0000
@@ -94,7 +94,7 @@
 				</tr>
 			
 				<tr>
-					<td><label>$i18n.getString( "report_date_to_use" )</label></td>
+					<td><label>$i18n.getString( "report_date_to_use" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 					<td>
 						<select id="reportDateToUse" name="reportDateToUse" class="{validate:{required:true}}" 
 							#if($openAfterEnrollment!='' || $programStage.autoGenerateEvent=='false' ) disabled #elseif($programStage.openAfterEnrollment=='false') disabled #end >