dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3492
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-04-29 15:07:54 +0700
message:
  Add missing file for Patient module.
removed:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationDEAssociations.vm
added:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/validationResult.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

=== added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/validationResult.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/validationResult.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/validationResult.vm	2011-04-29 08:07:54 +0000
@@ -0,0 +1,23 @@
+<h3>$encoder.htmlEncode( $i18n.getString( "validation_result" ) )</h3>
+
+#if( $programValidations.size()==0 )  
+    <p><b>$encoder.htmlEncode( $i18n.getString( "successful_validation" ) )</b></p>
+#else
+    <p><b>$encoder.htmlEncode( $i18n.getString( "unsuccessful_validation" ) )</b></p>
+
+	<p><b>$encoder.htmlEncode( $i18n.getString( "the_following_dataelements_are_in_multi_stages" ) )</b></p>
+	<table class="listTable" style="width:100%">
+		<tr>
+			<th>$i18n.getString( "program_validation_description" )</th>
+		</tr>
+		#set( $mark = false )	    
+		#foreach( $programValidation in $programValidations ) 
+			<tr>	    
+				<td style="height:32px"#alternate( $mark )>$programValidation.description</td>	        
+			</tr>
+			#set( $mark = !$mark )
+		#end
+	</table>
+#end
+
+<p><input type="button" value="$encoder.htmlEncode( $i18n.getString( "close" ) )" style="width:10em" onclick="window.close();"></p>

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationDEAssociations.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationDEAssociations.vm	2011-04-26 09:00:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationDEAssociations.vm	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-
-<h3>$i18n.getString( "define_validationDE_associations" ) </h3>
-
-<form>
-<table>
-<input type='hidden' id='programId' name='programId' value='$program.id'>
-
-<tr>
-  <th colspan="3">$i18n.getString('programstage_dataelement_validation')</th>
-</tr>
-<tr>
-  <td><label>$i18n.getString('description')<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-  <td>&nbsp;</td>
-  <td>&nbsp;</td>
-</tr>
-<tr>
-  <td colspan="3"><input type="text" id="description" name="description" style="width:100% "></td> 
-</tr>
-<tr>
-  <th><label>$i18n.getString('left_side')</label></th>
-  <th><label>$i18n.getString('operator')</label></th>
-  <th><label>$i18n.getString('right_side')</label></th>
-</tr>
-<tr>
-  <td><select id="leftProgramStageId" name="leftProgramStageId" style="width:30em " onchange="getDataElementsFromStage(this.value, 'leftDataElementId');">
-		<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
-		#foreach($stage in $stages)
-		<option value="$stage.id">$stage.name</option> 
-		#end
-  	</select>
-  </td>
-  <td>&nbsp;</td>
-  <td><select id="rightProgramStageId" name="rightProgramStageId" style="width:30em " onchange="getDataElementsFromStage(this.value, 'rightDataElementId');">
-		<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
-		#foreach($stage in $stages)
-		<option value="$stage.id">$stage.name</option> 
-		#end
-  	</select>
-  </td>
-</tr>
-<tr>
-  <td><select id="leftDataElementId" name="leftDataElementId" style="width:30em "></select></td>
-  <td align='center'><select id='operator' name='operator' style='width: 4.5em'>
-          <option value='-1'>$i18n.getString('operator_less_then')</option>
-          <option value='0'>$i18n.getString('operator_equal_to')</option>
-          <option value='1'>$i18n.getString('operator_greater_then')</option>
-    </select></td>
-  <td><select id="rightDataElementId" name="rightDataElementId" style="width:30em "></select></td>
-</tr>
-<tr>
-  <td>
-  <input type="button" onClick="validateProgramStageDEValidation();" value="$i18n.getString('save')" style="width:10em">
-  <input type="button" onClick="window.location.href = 'program.action';" value="$i18n.getString('cancel')" style="width:10em">
-  </td>
-  <td>&nbsp;</td>
-  <td></td>
-</tr>
-</table>
-<br><br>
-<table class="listTable">
-	<thead>
-    <tr>
-      <th>$i18n.getString('description')</th>
-      <th>$i18n.getString('validation')</th>
-      <th style="width:5em ">$i18n.getString('operator')</th>
-    </tr>
-	</thead>	
-	<tbody id="list">
-		#foreach($validation in $validations)
-			#parse( "/dhis-web-maintenance-patient/loadValidationDEAssociation.vm" )
-		#end
-	</tbody>
-</table>	
-
-<span id='message'></span>
-
-<script>
-
-	byId('description').value = '';
-	byId('leftProgramStageId').selectedIndex = 0;
-	byId('rightProgramStageId').selectedIndex = 0;
-
-	var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_patient" ) , "'" )';
-	var i18n_fill_fields_in_programstage_dataelement_validation = '$encoder.jsEscape( $i18n.getString( "fill_fields_in_programstage_dataelement_validation" ) , "'" )';
-	
-</script>