dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1299
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-01-08 12:43:53 +0700
message:
  Mirror fix : Cann't add or update dataelements for dataElementGroupOrder - Excel reporting.
modified:
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/dataElementGroup.js
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.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/javascript/dataElementGroup.js'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/dataElementGroup.js	2009-12-16 03:37:57 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/dataElementGroup.js	2010-01-08 05:43:53 +0000
@@ -61,7 +61,7 @@
     }
 	
 	var availableDataElements = document.getElementById('availableDataElements');
-	var selectedDataElements = document.getElementById('selectedDataElements');
+	var selectedDataElements = document.getElementById('dataElementIds');
 	for(var i=0;i<availableDataElements.options.length;i++){
 		for(var j=0;j<selectedDataElements.options.length;j++){				
 			if(availableDataElements.options[i].value==selectedDataElements.options[j].value){					
@@ -78,7 +78,7 @@
 function submitDataElementGroupOrder(){
 	if(byId("name").value =='') setMessage(i18n_name_is_null);	
 	else{
-		selectAllById('selectedDataElements');
+		selectAllById('dataElementIds');
 		document.forms['dataElementGroups'].submit();
 	}
 }
@@ -120,7 +120,7 @@
 
 function openUpdateDataElementOrderReceived(xmlObject)
 {
-		var listDataElement = document.getElementById('selectedDataElements');
+		var listDataElement = document.getElementById('dataElementIds');
 		listDataElement.options.length = 0;
 		byId("name").value = xmlObject.getElementsByTagName('name')[0].firstChild.nodeValue;
 		byId("code").value = xmlObject.getElementsByTagName('code')[0].firstChild.nodeValue;

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm	2009-12-16 03:37:57 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm	2010-01-08 05:43:53 +0000
@@ -63,16 +63,16 @@
 		</tr>
 		<tr>
 		  <td width="23%">
-			<select id="availableDataElements" name="availableDataElements" multiple size=13 style="width:300px" ondblclick="moveSelectedById('availableDataElements','selectedDataElements');showText('selectedDataElements')" onMouseOut="javascript: hideToolTip();"></select>
+			<select id="availableDataElements" name="availableDataElements" multiple size=13 style="width:300px" ondblclick="moveSelectedById('availableDataElements','dataElementIds');showText('dataElementIds')" onMouseOut="javascript: hideToolTip();"></select>
 			</td>
 			<td width="17%" align="center">
-				<input type="button" value=">" onclick="moveSelectedById('availableDataElements','selectedDataElements');" style="width:50px"/><br>
-				<input type="button" value="<" onclick="moveSelectedById('selectedDataElements' , 'availableDataElements' );" style="width:50px"/><br>
-				<input type="button" value=">>" onclick="moveAllById('availableDataElements' , 'selectedDataElements' );" style="width:50px"/><br>
-				<input type="button" value="<<" onclick="moveAllById('selectedDataElements' , 'availableDataElements' );" style="width:50px"/>
+				<input type="button" value=">" onclick="moveSelectedById('availableDataElements','dataElementIds');" style="width:50px"/><br>
+				<input type="button" value="<" onclick="moveSelectedById('dataElementIds' , 'availableDataElements' );" style="width:50px"/><br>
+				<input type="button" value=">>" onclick="moveAllById('availableDataElements' , 'dataElementIds' );" style="width:50px"/><br>
+				<input type="button" value="<<" onclick="moveAllById('dataElementIds' , 'availableDataElements' );" style="width:50px"/>
 			</td>
 			<td width="60%">
-				<select id="selectedDataElements" name="selectedDataElements" multiple size=13 style="width:300px" ondblclick="moveSelectedById('selectedDataElements' , 'availableDataElements' ); showText('availableDataElements');" onMouseOut="javascript: hideToolTip();"></select>
+				<select id="dataElementIds" name="dataElementIds" multiple size=13 style="width:300px" ondblclick="moveSelectedById('dataElementIds' , 'availableDataElements' ); showText('availableDataElements');" onMouseOut="javascript: hideToolTip();"></select>
 			</td>
 		</tr>
 	</table>