← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #18328

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7684: Add availavle values for fixed attributes in Aggregation Query Builder.

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 7684
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-07-24 14:55:07 +0700
message:
  Add availavle values for fixed attributes in Aggregation Query Builder.
added:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm
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/javascript/caseaggregation.js
  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-07-12 01:50:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm	2012-07-24 07:55:07 +0000
@@ -79,137 +79,13 @@
     </tbody>
 </table>
 
-<div id="tabs">
-	<ul>
-		<li><a href="#tab-1">$i18n.getString("dataelements")</a></li>
-		<li><a href="#tab-2">$i18n.getString("patient_attributes")</a></li>
-		<li><a href="#tab-3">$i18n.getString("program")</a></li>
-	</ul>	
-	
-	<div id="tab-1">
-	  <table>
-        <tr>
-			<td><label for="dataelement">$i18n.getString( "dataelement" )</label></td>
-			<td>
-				<label for="availableValues">$i18n.getString( "available_values" )</label>&nbsp;
-				<button title="$i18n.getString( 'insert_selected_values' )" class='arrow-down' onClick="insertMultiValues('suggestedDEValues');" />			</td>
-        </tr>
-        
-        <tr>
-			<td>
-				<input type='text' id='txtSearchValue' name='txtSearchValue' onKeyUp="filterDE(event, this.value, 'dataElements');" style='width:270px'/>
-				<input type='button' value='$i18n.getString("clear")' onClick="setFieldValue('txtSearchValue', '');" style='width:50px'>			</td>
-            <td rowspan="4">
-				<select name="suggestedDEValues" size="10" multiple id='suggestedDEValues' ondblclick="insertSingleValue('suggestedDEValues');" >
-			    </select>			</td>
-        </tr>
-        <tr>
-			<td>
-				<select id="dataElements" name="dataElements" size="8" ondblclick="insertDataElement(this);" onclick="getSuggestedValues(this.id, 'suggestedDEValues' )"></select>			</td>
-		</tr>
-      </table>
-	</div>
-	
-	<div id="tab-2">
-		<table>
-			<tr>
-				<td><label>$i18n.getString( "patient_attributes" )</label></td>
-				<td>
-					<label>$i18n.getString( "available_values" )</label>
-					<button title="$i18n.getString( 'insert_selected_values' )" class='arrow-down' onClick="insertMultiValues('caSuggestedValues');" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<select id="caseProperty" name="caseProperty" size="10" ondblclick="insertInfo(this, false);" onclick="getSuggestedValues(this.id, 'caSuggestedValues' )" ></select>
-				</td>
-				<td>
-					<select multiple size="10" id='caSuggestedValues' ondblclick="insertSingleValue('caSuggestedValues');"></select>
-				</td>
-			</tr>
-		</table>
-	</div>
-	
-	<div id="tab-3">
-		<table>
-			<tr>
-				<td><label>$i18n.getString('program_properties')</label></td>
-				<td><label>$i18n.getString('program_stage_properties')</label></td>
-			</tr>
-			<tr>
-				<td>
-					<select id="programProperty" name="programProperty" size="10" ondblclick="insertInfo(this, false);" disabled >
-						<option value="[PG:*]">$i18n.getString( "program_enrollment" )</option>
-						<option value="[PG:*] AND [PP:DATE@enrollmentdate#-DATE@dateofincident#]">$i18n.getString( "date_of_enrollment" ) - $i18n.getString( "date_of_incident" )</option>
-					</select>
-				</td>
-				<td>
-					<select multiple id="programStageProperty" size="10"  name="programStageProperty" ondblclick="insertInfo(this, true);" disabled>
-						<option value="[PS:*]">$i18n.getString( "visit_program_stage" )</option>
-						<option value="[PS:*] AND [PSP:DATE@executionDate#-DATE@dueDate#]">$i18n.getString( "report_date" ) - $i18n.getString( "due_date" )</option>
-						<option value="[PS:*] AND [PC:DATE@executionDate#-DATE@birthDate#]">$i18n.getString( "report_date" ) - $i18n.getString( "birthDate" )</option>
-					</select>
-					</select>
-				</td>
-			</tr>
-		</table>
-	</div>
-	
-</div>
-
-<p></p>
-
-<table>
-	<tr>
-		<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;">
-			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( ">=" );' style="cursor:pointer;">
-			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "=" );' style="cursor:pointer;"/>
-			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "!=" );' style="cursor:pointer;"/>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "+" );' style="cursor:pointer;"/>
-			<img src="../images/left_parent.png" alt="$i18n.getString( 'left_parent' )" onclick='insertOperator( "(" );' style="cursor:pointer;"/>
-			<img src="../images/right_parent.png" alt="$i18n.getString( 'right_parent' )" onclick='insertOperator( ")" );' style="cursor:pointer;"/>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="images/yes.png" alt="$i18n.getString( 'yes' )" onclick='insertOperator( "true" );' style="cursor:pointer;"/>
-			<img src="images/no.png" alt="$i18n.getString( 'no' )" onclick='insertOperator( "false" );' style="cursor:pointer;"/>
-			<img src="../images/is_null.png" alt="$i18n.getString( 'is_null' )" onclick='insertOperator( "is null" );' style="cursor:pointer;"/>
-			<img src="../images/not_null.png" alt="$i18n.getString( 'not_null' )" onclick='insertOperator( "is not null" );' style="cursor:pointer;"/>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/and.png" alt="$i18n.getString( 'and' )" onclick='insertOperator( "AND" );' style="cursor:pointer;"/>
-			<img src="../images/or.png" alt="$i18n.getString( 'or' )" onclick='insertOperator( "OR" );' style="cursor:pointer;"/>
-			
-			<img src="../images/clear.png" align="right" alt="$i18n.getString( 'clear' )" onClick="byId('aggregationCondition').value='';" style="cursor:pointer;"/>
-		</td>
-	</tr>
-		
-	<tr>
-		<td>
-			<fieldset>
-				<legend>$i18n.getString( "condition" )</legend>
-				<textarea id="aggregationCondition" name="aggregationCondition" class="{validate:{required:true}}" onkeyup='getConditionDescription();'></textarea>
-			</fieldset>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<fieldset>
-				<legend>$i18n.getString( "description" )</legend>
-				<div id='aggregationDescription'></div>
-			</fieldset>
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<input type="submit" value="$i18n.getString( 'add' )" />
-			<input type="button" value="$i18n.getString( 'test_condition' )" onclick='testCaseAggregationCondition();'/>
-			<input type="button" value="$i18n.getString( 'cancel' )" onClick="window.location.href='caseAggregation.action?dataSetId=$!dataSetId'" />
-		</td>
-	</tr>
-</table>
+#parse( "/dhis-web-maintenance-patient/caseAggregationForm.vm" )
+
+<p>	
+	<input type="submit" value="$i18n.getString( 'add' )" />
+	<input type="button" value="$i18n.getString( 'test_condition' )" onclick='testCaseAggregationCondition();'/>
+	<input type="button" value="$i18n.getString( 'cancel' )" onClick="window.location.href='caseAggregation.action?dataSetId=$!dataSetId'" />
+</p>
 
 </form>
 

=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm	2012-07-24 07:55:07 +0000
@@ -0,0 +1,123 @@
+<div id="tabs">
+	<ul>
+		<li><a href="#tab-1">$i18n.getString("dataelements")</a></li>
+		<li><a href="#tab-2">$i18n.getString("patient_attributes")</a></li>
+		<li><a href="#tab-3">$i18n.getString("program")</a></li>
+	</ul>	
+	
+	<div id="tab-1">
+	  <table>
+        <tr>
+			<td><label for="dataelement">$i18n.getString( "dataelement" )</label></td>
+			<td>
+				<label for="availableValues">$i18n.getString( "available_values" )</label>&nbsp;
+				<button title="$i18n.getString( 'insert_selected_values' )" class='arrow-down' onClick="insertMultiValues('suggestedDEValues');" />			</td>
+        </tr>
+        
+        <tr>
+			<td>
+				<input type='text' id='txtSearchValue' name='txtSearchValue' onKeyUp="filterDE(event, this.value, 'dataElements');" style='width:270px'/>
+				<input type='button' value='$i18n.getString("clear")' onClick="setFieldValue('txtSearchValue', '');" style='width:50px'>			</td>
+            <td rowspan="4">
+				<select name="suggestedDEValues" size="10" multiple id='suggestedDEValues' ondblclick="insertSingleValue('suggestedDEValues');" >
+			    </select>			</td>
+        </tr>
+        <tr>
+			<td>
+				<select id="dataElements" name="dataElements" size="8" ondblclick="insertDataElement(this);" onclick="getSuggestedValues(this.id, 'suggestedDEValues' )"></select>			</td>
+		</tr>
+      </table>
+	</div>
+	
+	<div id="tab-2">
+		<table>
+			<tr>
+				<td><label>$i18n.getString( "patient_attributes" )</label></td>
+				<td>
+					<label>$i18n.getString( "available_values" )</label>
+					<button title="$i18n.getString( 'insert_selected_values' )" class='arrow-down' onClick="insertMultiValues('caSuggestedValues');" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<select id="caseProperty" name="caseProperty" size="10" ondblclick="insertInfo(this, false);" onclick="getSuggestedValues(this.id, 'caSuggestedValues' )"></select>
+				</td>
+				<td>
+					<select multiple size="10" id='caSuggestedValues' ondblclick="insertSingleValue('caSuggestedValues');"></select>
+				</td>
+			</tr>
+		</table>
+	</div>
+	
+	<div id="tab-3">
+		<table>
+			<tr>
+				<td><label>$i18n.getString('program_properties')</label></td>
+				<td><label>$i18n.getString('program_stage_properties')</label></td>
+			</tr>
+			<tr>
+				<td>
+					<select id="programProperty" name="programProperty" size="10" ondblclick="insertInfo(this, false);" disabled>
+						<option value="[PG:*]">$i18n.getString( "program_enrollment" )</option>
+						<option value="[PG:*] AND [PP:DATE@enrollmentdate#-DATE@dateofincident#]">$i18n.getString( "date_of_enrollment" ) - $i18n.getString( "date_of_incident" )</option>
+					</select>
+				</td>
+				<td>
+					<select multiple id="programStageProperty" size="10"  name="programStageProperty" ondblclick="insertInfo(this, true);" disabled >
+						<option value="[PS:*]">$i18n.getString( "visit_program_stage" )</option>
+						<option value="[PS:*] AND [PSP:DATE@executionDate#-DATE@dueDate#]">$i18n.getString( "report_date" ) - $i18n.getString( "due_date" )</option>
+						<option value="[PS:*] AND [PC:DATE@executionDate#-DATE@birthDate#]">$i18n.getString( "report_date" ) - $i18n.getString( "date_of_birth" )</option>
+					</select>
+					</select>
+				</td>
+			</tr>
+		</table>
+	</div>
+	
+</div>
+
+<p></p>
+<table>
+	<tr>
+		<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;">
+			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( ">=" );' style="cursor:pointer;">
+			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "=" );' style="cursor:pointer;">
+			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "!=" );' style="cursor:pointer;">
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "+" );' style="cursor:pointer;">
+			<img src="../images/left_parent.png" alt="$i18n.getString( 'left_parent' )" onclick='insertOperator( "(" );' style="cursor:pointer;"/>
+			<img src="../images/right_parent.png" alt="$i18n.getString( 'right_parent' )" onclick='insertOperator( ")" );' style="cursor:pointer;"/>
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<img src="images/yes.png" alt="$i18n.getString( 'yes' )" onclick='insertOperator( "true" );' style="cursor:pointer;"/>
+			<img src="images/no.png" alt="$i18n.getString( 'no' )" onclick='insertOperator( "false" );' style="cursor:pointer;"/>
+			<img src="../images/is_null.png" alt="$i18n.getString( 'is_null' )" onclick='insertOperator( "is null" );' style="cursor:pointer;">
+			<img src="../images/not_null.png" alt="$i18n.getString( 'not_null' )" onclick='insertOperator( "is not null" );' style="cursor:pointer;">
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<img src="../images/and.png" alt="$i18n.getString( 'and' )" onclick='insertOperator( "AND" );' style="cursor:pointer;">
+			<img src="../images/or.png" alt="$i18n.getString( 'or' )" onclick='insertOperator( "OR" );' style="cursor:pointer;">
+			
+			<img src="../images/clear.png" align="right" alt="$i18n.getString( 'clear' )" onclick="byId('aggregationCondition').value='';" style="cursor:pointer;">
+		</td>
+	
+    </tbody>
+	<tr>
+		<td>
+			<fieldset>
+				<legend>$i18n.getString( "condition" )</legend>
+				<textarea id="aggregationCondition" name="aggregationCondition" class="{validate:{required:true}}" onkeyup='getConditionDescription();'>$!caseAggregation.aggregationExpression</textarea>
+			</fieldset>
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
+			<fieldset>
+				<legend>$i18n.getString( "description" )</legend>
+				<div id='aggregationDescription'>$!description</div>
+			</fieldset>
+		</td>
+	</tr>
+</table>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js	2012-07-11 07:24:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js	2012-07-24 07:55:07 +0000
@@ -137,7 +137,7 @@
 					var id = json.fixedAttributes[i].id;
 					var name = json.fixedAttributes[i].name;
 					
-					caseProperty.append( "<option value='" + id + "' title='" + name + "'>" + name + "</option>" );
+					caseProperty.append( "<option value='" + id + "' title='" + name + "' suggested='" + json.fixedAttributes[i].suggested + "'>" + name + "</option>" );
 				}
 				
 				for ( i in json.patientAttributes )

=== 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-07-12 01:50:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm	2012-07-24 07:55:07 +0000
@@ -76,136 +76,13 @@
     </tbody>
 </table>
 
-<div id="tabs">
-	<ul>
-		<li><a href="#tab-1">$i18n.getString("dataelements")</a></li>
-		<li><a href="#tab-2">$i18n.getString("patient_attributes")</a></li>
-		<li><a href="#tab-3">$i18n.getString("program")</a></li>
-	</ul>	
-	
-	<div id="tab-1">
-	  <table>
-        <tr>
-			<td><label for="dataelement">$i18n.getString( "dataelement" )</label></td>
-			<td>
-				<label for="availableValues">$i18n.getString( "available_values" )</label>&nbsp;
-				<button title="$i18n.getString( 'insert_selected_values' )" class='arrow-down' onClick="insertMultiValues('suggestedDEValues');" />			</td>
-        </tr>
-        
-        <tr>
-			<td>
-				<input type='text' id='txtSearchValue' name='txtSearchValue' onKeyUp="filterDE(event, this.value, 'dataElements');" style='width:270px'/>
-				<input type='button' value='$i18n.getString("clear")' onClick="setFieldValue('txtSearchValue', '');" style='width:50px'>			</td>
-            <td rowspan="4">
-				<select name="suggestedDEValues" size="10" multiple id='suggestedDEValues' ondblclick="insertSingleValue('suggestedDEValues');" >
-			    </select>			</td>
-        </tr>
-        <tr>
-			<td>
-				<select id="dataElements" name="dataElements" size="8" ondblclick="insertDataElement(this);" onclick="getSuggestedValues(this.id, 'suggestedDEValues' )"></select>			</td>
-		</tr>
-      </table>
-	</div>
-	
-	<div id="tab-2">
-		<table>
-			<tr>
-				<td><label>$i18n.getString( "patient_attributes" )</label></td>
-				<td>
-					<label>$i18n.getString( "available_values" )</label>
-					<button title="$i18n.getString( 'insert_selected_values' )" class='arrow-down' onClick="insertMultiValues('caSuggestedValues');" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<select id="caseProperty" name="caseProperty" size="10" ondblclick="insertInfo(this, false);" onclick="getSuggestedValues(this.id, 'caSuggestedValues' )"></select>
-				</td>
-				<td>
-					<select multiple size="10" id='caSuggestedValues' ondblclick="insertSingleValue('caSuggestedValues');"></select>
-				</td>
-			</tr>
-		</table>
-	</div>
-	
-	<div id="tab-3">
-		<table>
-			<tr>
-				<td><label>$i18n.getString('program_properties')</label></td>
-				<td><label>$i18n.getString('program_stage_properties')</label></td>
-			</tr>
-			<tr>
-				<td>
-					<select id="programProperty" name="programProperty" size="10" ondblclick="insertInfo(this, false);" disabled>
-						<option value="[PG:*]">$i18n.getString( "program_enrollment" )</option>
-						<option value="[PG:*] AND [PP:DATE@enrollmentdate#-DATE@dateofincident#]">$i18n.getString( "date_of_enrollment" ) - $i18n.getString( "date_of_incident" )</option>
-					</select>
-				</td>
-				<td>
-					<select multiple id="programStageProperty" size="10"  name="programStageProperty" ondblclick="insertInfo(this, true);" disabled >
-						<option value="[PS:*]">$i18n.getString( "visit_program_stage" )</option>
-						<option value="[PS:*] AND [PSP:DATE@executionDate#-DATE@dueDate#]">$i18n.getString( "report_date" ) - $i18n.getString( "due_date" )</option>
-						<option value="[PS:*] AND [PC:DATE@executionDate#-DATE@birthDate#]">$i18n.getString( "report_date" ) - $i18n.getString( "date_of_birth" )</option>
-					</select>
-					</select>
-				</td>
-			</tr>
-		</table>
-	</div>
-	
-</div>
+#parse( "/dhis-web-maintenance-patient/caseAggregationForm.vm" )
 
-<p></p>
-<table>
-	<tr>
-		<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;">
-			<img src="../images/greater_or_equal.png" alt="$i18n.getString( 'greater_or_equal' )" onclick='insertOperator( ">=" );' style="cursor:pointer;">
-			<img src="../images/equal.png" alt="$i18n.getString( 'equal' )" onclick='insertOperator( "=" );' style="cursor:pointer;">
-			<img src="../images/diff.png" alt="$i18n.getString( 'diff' )" onclick='insertOperator( "!=" );' style="cursor:pointer;">
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/plus.png" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "+" );' style="cursor:pointer;">
-			<img src="../images/left_parent.png" alt="$i18n.getString( 'left_parent' )" onclick='insertOperator( "(" );' style="cursor:pointer;"/>
-			<img src="../images/right_parent.png" alt="$i18n.getString( 'right_parent' )" onclick='insertOperator( ")" );' style="cursor:pointer;"/>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="images/yes.png" alt="$i18n.getString( 'yes' )" onclick='insertOperator( "true" );' style="cursor:pointer;"/>
-			<img src="images/no.png" alt="$i18n.getString( 'no' )" onclick='insertOperator( "false" );' style="cursor:pointer;"/>
-			<img src="../images/is_null.png" alt="$i18n.getString( 'is_null' )" onclick='insertOperator( "is null" );' style="cursor:pointer;">
-			<img src="../images/not_null.png" alt="$i18n.getString( 'not_null' )" onclick='insertOperator( "is not null" );' style="cursor:pointer;">
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<img src="../images/and.png" alt="$i18n.getString( 'and' )" onclick='insertOperator( "AND" );' style="cursor:pointer;">
-			<img src="../images/or.png" alt="$i18n.getString( 'or' )" onclick='insertOperator( "OR" );' style="cursor:pointer;">
-			
-			<img src="../images/clear.png" align="right" alt="$i18n.getString( 'clear' )" onclick="byId('aggregationCondition').value='';" style="cursor:pointer;">
-		</td>
-	
-    </tbody>
-	<tr>
-		<td>
-			<fieldset>
-				<legend>$i18n.getString( "condition" )</legend>
-				<textarea id="aggregationCondition" name="aggregationCondition" class="{validate:{required:true}}" onkeyup='getConditionDescription();'>$caseAggregation.aggregationExpression</textarea>
-			</fieldset>
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fieldset>
-				<legend>$i18n.getString( "description" )</legend>
-				<div id='aggregationDescription'>$!description</div>
-			</fieldset>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<input type="submit" value="$i18n.getString( 'update' )" >
-			<input type="button" value="$i18n.getString( 'test_condition' )" onclick='testCaseAggregationCondition();'/>
-			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='caseAggregation.action?dataSetId=$!dataSetId'" >
-		</td>
-	<tr>
-</table>
+<p>
+	<input type="submit" value="$i18n.getString( 'update' )" >
+	<input type="button" value="$i18n.getString( 'test_condition' )" onclick='testCaseAggregationCondition();'/>
+	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='caseAggregation.action?dataSetId=$!dataSetId'" >
+</p>
 
 </form>
  Thread Previous • Date Previous • • Thread Next