dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #16037
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5973: (patient) Minor fix for Add/Update Case Aggregation Patient form.
------------------------------------------------------------
revno: 5973
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-02-16 08:26:32 +0700
message:
(patient) Minor fix for Add/Update Case Aggregation Patient form.
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.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/addCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm 2012-02-14 03:37:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm 2012-02-16 01:26:32 +0000
@@ -15,19 +15,19 @@
<table>
<thead>
<tr>
- <th colspan="3">$i18n.getString( "case_aggregation_condition_detail" )</th>
+ <th colspan="2">$i18n.getString( "case_aggregation_condition_detail" )</th>
</tr>
</thead>
<tbody>
<tr>
- <td width="20em" ><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true,minlength:2}}"></td>
</tr>
<tr>
- <td width="20em"><label for="dataElementGroup">$i18n.getString( "dataelement_group" )</label></td>
+ <td><label for="dataElementGroup">$i18n.getString( "dataelement_group" )</label></td>
<td>
<select id="dataElementGroup" name="dataElementGroup" style="width:30.5em" onchange="getAggDataElements();">
<option value="">[$i18n.getString('please_select')]</option>
@@ -40,7 +40,7 @@
</tr>
<tr>
- <td width="20em"><label for="dataElement">$i18n.getString( "dataelement" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><label for="dataElement">$i18n.getString( "dataelement" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td>
<select id="aggregationDataElementId" name="aggregationDataElementId" style="width:30.5em" class="{validate:{required:true}}" >
</select>
@@ -48,7 +48,7 @@
</tr>
<tr>
- <td width="20em"><label for="operator">$i18n.getString( "operator" )</label></td>
+ <td><label for="operator">$i18n.getString( "operator" )</label></td>
<td>
<input type="radio" id="operator" name="operator" value="COUNT" checked >$i18n.getString('count')
<input type="radio" id="operator" name="operator" value="SUM"> $i18n.getString('sum')
@@ -58,14 +58,10 @@
<td colspan="2"><p></p></td>
</tr>
- <tr>
- <th colspan="4">$i18n.getString( "condition_detail" )</th>
- </tr>
-
</tbody>
</table>
-<div id="tabs" width="20em">
+<div id="tabs">
<ul>
<li><a href="#tab-1">$i18n.getString("dataelement")</a></li>
<li><a href="#tab-2">$i18n.getString("case_attributes")</a></li>
@@ -233,7 +229,7 @@
<table>
<tr>
- <td colspan='4'>
+ <td>
<img src="../images/less.png" alt="$i18n.getString( 'less' )" onclick='insertOperator( "<" );' style="cursor:pointer;">
<img src="../images/less_or_equal.png" alt="$i18n.getString( 'less_or_equal' )" onclick='insertOperator( "<=" );' style="cursor:pointer;">
<img src="../images/greater.png" alt="$i18n.getString( 'greater' )" onclick='insertOperator( ">" );' style="cursor:pointer;">
@@ -259,7 +255,7 @@
</tr>
<tr>
- <td colspan='4'>
+ <td>
<fieldset style="border: 1px solid #3f5d8e;">
<legend>$i18n.getString( "condition" )</legend>
<textarea id="aggregationCondition" name="aggregationCondition" style="width:80.5em; height:10em" class="{validate:{required:true}}" onkeyup='getConditionDescription();'></textarea>
@@ -267,7 +263,7 @@
</td>
</tr>
<tr>
- <td colspan='4'>
+ <td>
<fieldset style="border: 1px solid #3f5d8e; ">
<legend>$i18n.getString( "description" )</legend>
<div id='aggregationDescription'></div>
@@ -276,7 +272,7 @@
</tr>
<tr>
- <td colspan='4'>
+ <td>
<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
<input type="button" value="$i18n.getString( 'test_condition' )" style="width:10em" onclick='testCaseAggregationCondition();'/>
<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='caseAggregation.action'" style="width:10em"/>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm 2012-02-14 03:37:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm 2012-02-16 01:26:32 +0000
@@ -24,12 +24,12 @@
<tbody>
<tr>
- <td width="20em" ><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label>$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="description" name="description" style="width:30em" class="{validate:{required:true}}" value="$caseAggregation.description"></td>
</tr>
<tr>
- <td width="20em"><label for="dataElementGroup">$i18n.getString( "dataelement_group" )</label></td>
+ <td><label for="dataElementGroup">$i18n.getString( "dataelement_group" )</label></td>
<td>
<select id="dataElementGroup" name="dataElementGroup" style="width:30.5em" onchange="getAggDataElements();">
<option value="0">[$i18n.getString('please_select')]</option>
@@ -42,7 +42,7 @@
</tr>
<tr>
- <td width="20em"><label for="dataElement">$i18n.getString( "dataelement" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+ <td><label for="dataElement">$i18n.getString( "dataelement" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td>
<select id="aggregationDataElementId" name="aggregationDataElementId" style="width:30.5em" class="{validate:{required:true}}" >
<option value="$caseAggregation.aggregationDataElement.id.$caseAggregation.optionCombo.id">$caseAggregation.aggregationDataElement.name ($caseAggregation.optionCombo.name)</option>
@@ -50,7 +50,7 @@
</td>
</tr>
<tr>
- <td width="20em"><label for="operator">$i18n.getString( "operator" )</label></td>
+ <td><label for="operator">$i18n.getString( "operator" )</label></td>
<td>
<input type="radio" id="operator" name="operator" value="COUNT" #if($caseAggregation.operator=="COUNT") checked #end > $i18n.getString('count')
<input type="radio" id="operator" name="operator" value="SUM" #if($caseAggregation.operator=="SUM") checked #end > $i18n.getString('sum')
@@ -64,7 +64,7 @@
</table>
-<div id="tabs" width="20em">
+<div id="tabs">
<ul>
<li><a href="#tab-1">$i18n.getString("dataelement")</a></li>
<li><a href="#tab-2">$i18n.getString("case_attributes")</a></li>
@@ -232,7 +232,7 @@
<table>
<tr>
- <td colspan='4'>
+ <td>
<img src="../images/less.png" alt="$i18n.getString( 'less' )" onclick='insertOperator( "<" );' style="cursor:pointer;">
<img src="../images/less_or_equal.png" alt="$i18n.getString( 'less_or_equal' )" onclick='insertOperator( "<=" );' style="cursor:pointer;">
<img src="../images/greater.png" alt="$i18n.getString( 'greater' )" onclick='insertOperator( ">" );' style="cursor:pointer;">
@@ -258,31 +258,31 @@
</tbody>
<tr>
- <td colspan='4'>
+ <td>
<fieldset style="border: 1px solid #3f5d8e; ">
<legend>$i18n.getString( "condition" )</legend>
- <textarea id="aggregationCondition" name="aggregationCondition" style="width:62.5em; height:10em" class="{validate:{required:true}}" onkeyup='getConditionDescription();'>$caseAggregation.aggregationExpression</textarea>
+ <textarea id="aggregationCondition" name="aggregationCondition" style="width:80.5em; height:10em" class="{validate:{required:true}}" onkeyup='getConditionDescription();'>$caseAggregation.aggregationExpression</textarea>
</fieldset>
</td>
</tr>
<tr>
- <td colspan='4'>
+ <td>
<fieldset style="border: 1px solid #3f5d8e; ">
<legend>$i18n.getString( "description" )</legend>
<div id='aggregationDescription'>$!description</div>
</fieldset>
</td>
</tr>
-
+ <tr>
+ <td>
+ <input type="submit" value="$i18n.getString( 'update' )" style="width:10em">
+ <input type="button" value="$i18n.getString( 'test_condition' )" style="width:10em" onclick='testCaseAggregationCondition();'/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='caseAggregation.action'" style="width:10em">
+ </td>
+ <tr>
</table>
-<p>
- <input type="submit" value="$i18n.getString( "update" )" style="width:10em">
- <input type="button" value="$i18n.getString( 'test_condition' )" style="width:10em" onclick='testCaseAggregationCondition();'/>
- <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='caseAggregation.action'" style="width:10em">
-</p>
-
</form>
<script>
