dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1178
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2009-12-08 12:28:22 +0700
message:
  Mirror fix : Can't use button cancel of Category report item.
modified:
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitems.vm
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.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-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitems.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitems.vm	2009-12-04 07:40:29 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitems.vm	2009-12-08 05:28:22 +0000
@@ -118,8 +118,8 @@
 		</tr>	
 	</table>	
 	<p>
-	<input type="button" value="$i18n.getString('ok')" onclick="$('#expression').val($('#formula').val());$('#divExpression').hide();"/>
-	<input type="button" value="$i18n.getString('clean')" onclick="$('#formula').val('')"/></p>
+	<input type="button" value="$i18n.getString('ok')" onclick="byId('expression').value = byId('formula').value;$('#divExpression').hide();"/>
+	<input type="button" value="$i18n.getString('clean')" onclick="byId('formula').value = ''"/></p>
 </div>
 
 <span id="message" style="top:100px;right:5px;position:fixed;width:200px;z-index:10004" onclick="hideById(this.id);"></span>

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm	2009-12-04 09:37:23 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm	2009-12-08 05:28:22 +0000
@@ -204,7 +204,7 @@
 		
 	</table>	
 	<p>
-	<input type="button" value="$i18n.getString('ok')" onclick="$('#expression').val($('#formulaIndicator').html());$('#indicatorForm').hide();"/>
+	<input type="button" value="$i18n.getString('ok')" onclick="byId('expression').value = byId('formulaIndicator').value;$('#indicatorForm').hide();"/>
 	<input type="button" value="$i18n.getString('clean')" onclick="$('#formulaIndicator').html('')"/></p>
 </div>
 
@@ -220,7 +220,7 @@
 		<tr>
 		<tr valign="top">
 			<td>
-				<textarea id="categoryFormula" cols="15" rows="11" style="width:250px; height:180px" wrap="virtual">$encoder.htmlEncode( $formula )</textarea><br>
+				<textarea id="categoryFormula" name='categoryFormula' cols="15" rows="11" style="width:250px; height:180px" wrap="virtual">$encoder.htmlEncode( $formula )</textarea><br>
 				<a href="#" onclick="insertOperation( 'formula','(' )"><img src="images/left_parent.png" alt="$i18n.getString( 'left_brackets' )"></a>
 				<a href="#" onclick="insertOperation( 'formula',')' )"><img src="images/right_parent.png" alt="$i18n.getString( 'right_brackets' )"></a>
 				<a href="#" onclick="insertOperation( 'formula','*' )"><img src="images/multiply.png" alt="$i18n.getString( 'multiply' )"></a>
@@ -239,8 +239,8 @@
 		</tr>	
 	</table>	
 	<p>
-	<input type="button" value="$i18n.getString('ok')" onclick="$('#expression').val($('#categoryFormula').html());$('#category').hide();"/>
-	<input type="button" value="$i18n.getString('clean')" onclick="$('#categoryFormula').html('')"/></p>
+	<input type="button" value="$i18n.getString('ok')" onclick="byId('expression').value = byId('categoryFormula').value ;$('#category').hide();"/>
+	<input type="button" value="$i18n.getString('clean')" onclick="byId('categoryFormula').value = ''"/></p>
 </div>
 
 <span id="message" style="top:100px;right:5px;position:fixed;width:200px;z-index:10004" onclick="hideById(this.id);"></span>
@@ -344,7 +344,7 @@
     var i18n_copy_successful = '$encoder.jsEscape( $i18n.getString( "copy_successful" ) , "'")';
 	var i18n_copy_items_duplicated = '$encoder.jsEscape( $i18n.getString( "copy_items_duplicated" ) , "'")';
 	var i18n_copy_items = '$encoder.jsEscape( $i18n.getString( "copy_items" ) , "'")';
-	var i18n_input_sheet_no = '$encoder.jsEscape( $i18n.getString( "input_sheet_no" ) , "'")';
-	var i18n_choose_report = '$encoder.jsEscape( $i18n.getString( "choose_report" ) , "'")';
-	var i18n_choose_excel_group = '$encoder.jsEscape( $i18n.getString( "choose_excel_group" ) , "'")';
+	var input_sheet_no = '$encoder.jsEscape( $i18n.getString( "input_sheet_no" ) , "'")';
+	var choose_report = '$encoder.jsEscape( $i18n.getString( "choose_report" ) , "'")';
+	var choose_excel_group = '$encoder.jsEscape( $i18n.getString( "choose_excel_group" ) , "'")';
 </script>