dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7020
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-05-24 01:02:21 +0700
message:
  (patient) Can add/update program-stage without dataelements.
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/javascript/addProgramStageForm.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/updateProgramStageForm.js
  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	2012-05-23 16:19:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2012-05-23 18:02:21 +0000
@@ -28,12 +28,12 @@
 
 		<tr>
 			<td><label>$i18n.getString( "repeatable" )</label></td>
-			<td><input type="checkbox" id="irregular" name="irregular" value='true' onchange='repeatableOnChange();'/></td>
+			<td><input type="checkbox" id="irregular" name="irregular" value='true' onchange='repeatableOnChange();' /></td>
 		</tr>	
 		
 		<tr>
 			<td><label>$i18n.getString( "standard_interval" )</label></td>
-			<td><input type="text" id="standardInterval" name="standardInterval" class="{validate:{number:true}}" disabled/></td>
+			<td><input type="text" id="standardInterval" name="standardInterval" class="{validate:{required:true,number:true}}" disabled /></td>
 		</tr>
 		  
 		<tr><td>&nbsp;</td><td>&nbsp;</td></tr> 
@@ -46,7 +46,7 @@
         <th>$i18n.getString( "available_data_elements" )</th>
         <th></th>
         <th>$i18n.getString( "selected_data_elements" )							
-			<select id="selectedDataElementsValidator" name='selectedDataElementsValidator' multiple="multiple" class="{validate:{required:true}} hidden" ></select>
+			<select id="selectedDataElementsValidator" name='selectedDataElementsValidator' multiple="multiple" class="hidden" ></select>
 			<select id="compulsories" name='compulsories' multiple="multiple" class="hidden"></select>     
 		</th>
       </tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/addProgramStageForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/addProgramStageForm.js	2012-03-19 09:35:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/addProgramStageForm.js	2012-05-23 18:02:21 +0000
@@ -3,8 +3,6 @@
 	validation( 'addProgramStageForm', function( form ){ 
 		form.submit();
 	}, function(){
-		selectedDataElementsValidator = jQuery( "#selectedDataElementsValidator" );
-		selectedDataElementsValidator.empty();
 		
 		compulsories = jQuery( "#compulsories" );
 		compulsories.empty();

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/updateProgramStageForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/updateProgramStageForm.js	2012-03-28 09:46:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/updateProgramStageForm.js	2012-05-23 18:02:21 +0000
@@ -1,5 +1,6 @@
 jQuery( document ).ready( function()
-{validation( 'updateProgramStageForm', function( form ){ 
+{
+	validation( 'updateProgramStageForm', function( form ){ 
 		form.submit() ;
 	}, function(){
 		selectedDataElementsValidator = jQuery( "#selectedDataElementsValidator" );

=== 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-05-23 16:19:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2012-05-23 18:02:21 +0000
@@ -27,12 +27,12 @@
 
 			<tr>
 				<td><label>$i18n.getString( "repeatable" )</label></td>
-				<td><input type="checkbox" id="irregular" name="irregular" value='true' #if( $programStage.irregular=='true' ) checked #end /></td>
+				<td><input type="checkbox" id="irregular" name="irregular" value='true' #if( $programStage.irregular=='true' ) checked #end onchange='repeatableOnChange();' /></td>
 			</tr>	
 		  
 			<tr>
 				<td><label>$i18n.getString( "standard_interval" )</label></td>
-				<td><input type="text" id="standardInterval" name="standardInterval" value='$programStage.standardInterval' class="{validate:{number:true}}" #if( $programStage.irregular=='false' ) disabled #end /></td>
+				<td><input type="text" id="standardInterval" name="standardInterval" value='$!programStage.standardInterval' class="{validate:{required:true,number:true}}" #if( $programStage.irregular=='false' ) disabled #end /></td>
 			</tr>
 			<tr><td>&nbsp;</td></tr>       
 		  
@@ -45,7 +45,7 @@
 				<th>$i18n.getString( "available_data_elements" )</th>
 				<th></th>
 				<th>$i18n.getString( "selected_data_elements" )
-					<select id="selectedDataElementsValidator" name='selectedDataElementsValidator' multiple="multiple" class="{validate:{required:true}} hidden" > </select>
+					<select id="selectedDataElementsValidator" name='selectedDataElementsValidator' multiple="multiple" class="hidden" > </select>
 					<select id="compulsories" name='compulsories' multiple="multiple" class="hidden"></select>
 				</th>
 			</tr>