dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #07342
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2081: Fix bug: Cannot run dhis-web-dashboard (in local/in) on Internet Explorer.
------------------------------------------------------------
revno: 2081
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-09-08 15:13:41 +0700
message:
Fix bug: Cannot run dhis-web-dashboard (in local/in) on Internet Explorer.
modified:
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ta/action/GenerateTabularAnalysisResultAction.java
local/in/dhis-web-dashboard/src/main/resources/struts.xml
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ds.js
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/mc.js
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/nr.js
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.js
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/tta.js
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGA.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 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ta/action/GenerateTabularAnalysisResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ta/action/GenerateTabularAnalysisResultAction.java 2010-09-04 13:07:00 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ta/action/GenerateTabularAnalysisResultAction.java 2010-09-08 08:13:41 +0000
@@ -288,7 +288,7 @@
int startCol = 0;
int headerRow = 1;
int headerCol = 0;
-
+
String raFolderName = configurationService.getConfigurationByKey( Configuration_IN.KEY_REPORTFOLDER ).getValue();
String outputReportPath = System.getenv( "DHIS2_HOME" ) + File.separator + raFolderName + File.separator + "output" + File.separator + UUID.randomUUID().toString() + ".xls";
WritableWorkbook outputReportWorkbook = Workbook.createWorkbook( new File( outputReportPath ) );
=== modified file 'local/in/dhis-web-dashboard/src/main/resources/struts.xml'
--- local/in/dhis-web-dashboard/src/main/resources/struts.xml 2010-08-31 11:27:36 +0000
+++ local/in/dhis-web-dashboard/src/main/resources/struts.xml 2010-09-08 08:13:41 +0000
@@ -61,7 +61,7 @@
<action name="getSortedData"
class="org.hisp.dhis.dashboard.action.GetSortedDataAction">
- <result name="success" type="velocity">
+ <result name="success" type="velocity-xml">
/dhis-web-dashboard/responseSortedData.vm</result>
<!--<interceptor-ref name="transactionStack"/>-->
<param name="onExceptionReturn">plainTextError</param>
@@ -423,7 +423,7 @@
<action name="getDataElements"
class="org.hisp.dhis.dashboard.action.GetDataElementsAction">
- <result name="success" type="velocity">
+ <result name="success" type="velocity-xml">
/dhis-web-dashboard/responseDataElement.vm</result>
<!--<interceptor-ref name="transactionStack"/>-->
<param name="onExceptionReturn">plainTextError</param>
@@ -431,13 +431,13 @@
<action name="getDataElementsForTA"
class="org.hisp.dhis.dashboard.action.GetDataElementsForTabularAnalysisAction">
- <result name="success" type="velocity">/dhis-web-dashboard/responseDataElement.vm</result>
+ <result name="success" type="velocity-xml">/dhis-web-dashboard/responseDataElement.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
<action name="getOrgUnitDetails"
class="org.hisp.dhis.dashboard.action.GetOrgUnitsAction">
- <result name="success" type="velocity">
+ <result name="success" type="velocity-xml">
/dhis-web-dashboard/responseOrgUnit.vm</result>
<!--<interceptor-ref name="transactionStack"/>-->
<param name="onExceptionReturn">plainTextError</param>
@@ -445,7 +445,7 @@
<action name="getIndicators"
class="org.hisp.dhis.dashboard.action.GetIndicatorsAction">
- <result name="success" type="velocity">
+ <result name="success" type="velocity-xml">
/dhis-web-dashboard/responseIndicator.vm</result>
<!--<interceptor-ref name="transactionStack"/>-->
<param name="onExceptionReturn">plainTextError</param>
@@ -453,7 +453,7 @@
<action name="getOrgUnitGroups"
class="org.hisp.dhis.dashboard.action.GetOrgUnitGroupsAction">
- <result name="success" type="velocity">
+ <result name="success" type="velocity-xml">
/dhis-web-dashboard/responseOrgUnitGroup.vm</result>
<!--<interceptor-ref name="transactionStack"/>-->
<param name="onExceptionReturn">plainTextError</param>
@@ -461,7 +461,7 @@
<action name="getPeriods"
class="org.hisp.dhis.dashboard.action.GetPeriodsAction">
- <result name="success" type="velocity">
+ <result name="success" type="velocity-xml">
/dhis-web-dashboard/responsePeriod.vm</result>
<!--<interceptor-ref name="transactionStack"/>-->
<param name="onExceptionReturn">plainTextError</param>
@@ -469,7 +469,7 @@
<action name="getDataSetPeriods"
class="org.hisp.dhis.dashboard.action.GetDataSetPeriodsAction">
- <result name="success" type="velocity">
+ <result name="success" type="velocity-xml">
/dhis-web-dashboard/dSetResponsePeriod.vm</result>
<!--<interceptor-ref name="transactionStack"/>-->
<param name="onExceptionReturn">plainTextError</param>
@@ -498,7 +498,7 @@
<action name="getOptionCombos"
class="org.hisp.dhis.dashboard.topten.action.GetOptionCombosAction">
- <result name="success" type="velocity">
+ <result name="success" type="velocity-xml">
/dhis-web-dashboard/responseOptionCombo.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js 2010-09-04 13:07:00 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js 2010-09-08 08:13:41 +0000
@@ -1,16 +1,14 @@
function getOUDeatilsForAA(orgUnitIds)
{
- //var url = "getOrgUnitDetails.action?orgUnitId=" + orgUnitIds;
- var request = new Request();
- request.setResponseTypeXML( 'orgunit' );
- request.setCallbackSuccess( getOUDetailsForAARecevied );
- //request.send( url );
-
- var requestString = "getOrgUnitDetails.action";
- var params = "orgUnitId=" + orgUnitIds;
- request.sendAsPost( params );
- request.send( requestString );
+ $.post("getOrgUnitDetails.action",
+ {
+ orgUnitId:orgUnitIds
+ },
+ function (data)
+ {
+ getOUDetailsForAARecevied(data);
+ },'xml');
}
/*
@@ -55,17 +53,14 @@
function getOUDeatilsForGA(orgUnitIds)
{
- //var url = "getOrgUnitDetails.action?orgUnitId=" + orgUnitIds;
-
- var request = new Request();
- request.setResponseTypeXML( 'orgunit' );
- request.setCallbackSuccess( getOUDetailsForGARecevied );
- //request.send( url );
-
- var requestString = "getOrgUnitDetails.action";
- var params = "orgUnitId=" + orgUnitIds;
- request.sendAsPost( params );
- request.send( requestString );
+ $.post("getOrgUnitDetails.action",
+ {
+ orgUnitId:orgUnitIds
+ },
+ function (data)
+ {
+ getOUDetailsForGARecevied(data);
+ },'xml');
}
function getOUDetailsForGARecevied(xmlObject)
@@ -107,18 +102,14 @@
function getOUDetails(orgUnitIds)
{
- //var url = "getOrgUnitDetails.action?orgUnitId=" + orgUnitIds;
-
- var request = new Request();
- request.setResponseTypeXML( 'orgunit' );
- request.setCallbackSuccess( getOUDetailsRecevied );
- //request.send( url );
-
- var requestString = "getOrgUnitDetails.action";
- var params = "orgUnitId=" + orgUnitIds;
- request.sendAsPost( params );
- request.send( requestString );
-
+ $.post("getOrgUnitDetails.action",
+ {
+ orgUnitId:orgUnitIds
+ },
+ function (data)
+ {
+ getOUDetailsRecevied(data);
+ },'xml');
}
function getOUDetailsRecevied(xmlObject)
@@ -168,15 +159,14 @@
if ( orgUnitGroupSetId != null )
{
- var request = new Request();
- request.setResponseTypeXML( 'orgunitgroup' );
- request.setCallbackSuccess( getOrgUnitGroupsReceived );
- //request.send( url );
-
- var requestString = "getOrgUnitGroups.action";
- var params = "orgUnitGroupSetId=" + orgUnitGroupSetId;
- request.sendAsPost( params );
- request.send( requestString );
+ $.post("getOrgUnitGroups.action",
+ {
+ orgUnitGroupSetId:orgUnitGroupSetId
+ },
+ function (data)
+ {
+ getOrgUnitGroupsReceived(data);
+ },'xml');
}
}
function groupChangeFunction(evt)
@@ -215,19 +205,17 @@
var deSelectionList = document.getElementById("deSelection");
var deOptionValue = deSelectionList.options[ deSelectionList.selectedIndex ].value;
-
if ( dataElementGroupId != null )
{
- //var url = "getDataElements.action?id=" + dataElementGroupId + "&deOptionValue=" + deOptionValue;
- var request = new Request();
- request.setResponseTypeXML('dataElement');
- request.setCallbackSuccess(getDataElementsReceived);
- //request.send(url);
-
- var requestString = "getDataElements.action";
- var params = "id=" + dataElementGroupId + "&deOptionValue=" + deOptionValue;
- request.sendAsPost( params );
- request.send( requestString );
+ $.post("getDataElements.action",
+ {
+ id:dataElementGroupId,
+ deOptionValue:deOptionValue
+ },
+ function (data)
+ {
+ getDataElementsReceived(data);
+ },'xml');
}
}// getDataElements end
@@ -241,16 +229,14 @@
if ( dataElementGroupId != null )
{
- //var url = "getDataElements.action?id=" + dataElementGroupId;
- var request = new Request();
- request.setResponseTypeXML('dataElement');
- request.setCallbackSuccess(getDataElementsReceived);
- //request.send(url);
-
- var requestString = "getDataElements.action";
- var params = "id=" + dataElementGroupId;
- request.sendAsPost( params );
- request.send( requestString );
+ $.post("getDataElements.action",
+ {
+ id:dataElementGroupId
+ },
+ function (data)
+ {
+ getDataElementsReceived(data);
+ },'xml');
}
}// getDataElements end
@@ -264,17 +250,17 @@
if ( dataSetId != null )
{
- //var url = "getDataElementsGroupAndDataSetAction.action?id=" + dataSetId;
- var request = new Request();
- request.setResponseTypeXML('dataElementGroup');
- request.setCallbackSuccess(getDataElementsGroupsReceived);
- //request.send(url);
-
- var requestString = "getDataElementsGroupAndDataSetAction.action";
- var params = "id=" + dataSetId;
- request.sendAsPost( params );
- request.send( requestString );
-
+ if ( dataElementGroupId != null )
+ {
+ $.post("getDataElementsGroupAndDataSetAction.action",
+ {
+ id:dataSetId
+ },
+ function (data)
+ {
+ getDataElementsGroupsReceived(data);
+ },'xml');
+ }
}
}// getDataElementGroups end
@@ -342,17 +328,14 @@
if ( indicatorGroupId != null )
{
- //var url = "getIndicators.action?id=" + indicatorGroupId;
-
- var request = new Request();
- request.setResponseTypeXML( 'indicator' );
- request.setCallbackSuccess( getIndicatorsReceived );
- //request.send( url );
-
- var requestString = "getIndicators.action";
- var params = "id=" + indicatorGroupId;
- request.sendAsPost( params );
- request.send( requestString );
+ $.post("getIndicators.action",
+ {
+ id:indicatorGroupId
+ },
+ function (data)
+ {
+ getIndicatorsReceived(data);
+ },'xml');
}
}
@@ -363,17 +346,15 @@
if ( indicatorGroupId != null )
{
- //var url = "getIndicators.action?id=" + indicatorGroupId+"&surveyflag=yes";
-
- var request = new Request();
- request.setResponseTypeXML( 'indicator' );
- request.setCallbackSuccess( getIndicatorsReceived );
- //request.send( url );
-
- var requestString = "getIndicators.action";
- var params = "id=" + indicatorGroupId+"&surveyflag=yes";
- request.sendAsPost( params );
- request.send( requestString );
+ $.post("getIndicators.action",
+ {
+ id:indicatorGroupId
+ },
+ function (data)
+ {
+ getIndicatorsReceived(data);
+ },'xml');
+
}
}
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ds.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ds.js 2010-09-04 13:07:00 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ds.js 2010-09-08 08:13:41 +0000
@@ -220,7 +220,7 @@
var dataSetId = dataSetList.options[ dataSetList.selectedIndex].value;
- //var url = "getDataSetPeriods.action?id=" + dataSetId;
+ /* //var url = "getDataSetPeriods.action?id=" + dataSetId;
var request = new Request();
request.setResponseTypeXML( 'period' );
@@ -230,11 +230,18 @@
var requestString = "getDataSetPeriods.action";
var params = "id=" + dataSetId;
request.sendAsPost( params );
- request.send( requestString );
+ request.send( requestString ); */
+
+ $.post("getDataSetPeriods.action",
+ {
+ id:dataSetId
+ },
+ function (data)
+ {
+ getdSetPeriodsReceived(data);
+ },'xml');
-}
-
-
+}
function getdSetPeriodsReceived( xmlObject )
{
@@ -280,7 +287,7 @@
function getOrgUDetails(orgUnitIds)
{
- //var url = "getOrgUnitDetails.action?orgUnitId=" + orgUnitIds;
+ /* //var url = "getOrgUnitDetails.action?orgUnitId=" + orgUnitIds;
var request = new Request();
request.setResponseTypeXML( 'orgunit' );
@@ -290,9 +297,20 @@
var requestString = "getOrgUnitDetails.action";
var params = "orgUnitId=" + orgUnitIds;
request.sendAsPost( params );
- request.send( requestString );
-
-//getReports();
+ request.send( requestString ); */
+
+ $.post("getOrgUnitDetails.action",
+ {
+ orgUnitId:orgUnitIds
+ },
+ function (data)
+ {
+ getOrgUDetailsRecevied(data);
+ },'xml');
+
+//getReports();
+
+
}
function getOrgUDetailsRecevied(xmlObject)
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/mc.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/mc.js 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/mc.js 2010-09-08 08:13:41 +0000
@@ -7,17 +7,14 @@
if ( indicatorGroupId != null )
{
- //var url = "getIndicators.action?id=" + indicatorGroupId;
-
- var request = new Request();
- request.setResponseTypeXML( 'indicator' );
- request.setCallbackSuccess( getXAxisIndicatorsReceived );
- //request.send( url );
-
- var requestString = "getIndicators.action";
- var params = "id=" + indicatorGroupId;
- request.sendAsPost( params );
- request.send( requestString );
+ $.post("getIndicators.action",
+ {
+ id:indicatorGroupId
+ },
+ function (data)
+ {
+ getXAxisIndicatorsReceived(data);
+ },'xml');
}
}
@@ -50,17 +47,15 @@
if ( indicatorGroupId != null )
{
- //var url = "getIndicators.action?id=" + indicatorGroupId;
-
- var request = new Request();
- request.setResponseTypeXML( 'indicator' );
- request.setCallbackSuccess( getYAxisIndicatorsReceived );
- //request.send( url );
+ $.post("getIndicators.action",
+ {
+ id:indicatorGroupId
+ },
+ function (data)
+ {
+ getYAxisIndicatorsReceived(data);
+ },'xml');
- var requestString = "getIndicators.action";
- var params = "id=" + indicatorGroupId;
- request.sendAsPost( params );
- request.send( requestString );
}
}
@@ -93,16 +88,15 @@
if ( dataElementGroupId != null )
{
- //var url = "getDataElements.action?id=" + dataElementGroupId;
- var request = new Request();
- request.setResponseTypeXML('dataElement');
- request.setCallbackSuccess(getDataElementsReceived);
- //request.send(url);
+ $.post("getDataElements.action",
+ {
+ id:dataElementGroupId
+ },
+ function (data)
+ {
+ getDataElementsReceived(data);
+ },'xml');
- var requestString = "getDataElements.action";
- var params = "id=" + dataElementGroupId;
- request.sendAsPost( params );
- request.send( requestString );
}
}// getDataElements end
@@ -111,7 +105,6 @@
{
var zaxisDataelements = document.getElementById("zaxisDataelements");
-
clearList(zaxisDataelements);
var dataElements = xmlObject.getElementsByTagName("dataElement");
@@ -134,17 +127,14 @@
function getOUDeatilsForMC(orgUnitIds)
{
- //var url = "getOrgUnitDetails.action?orgUnitId=" + orgUnitIds;
-
- var request = new Request();
- request.setResponseTypeXML( 'orgunit' );
- request.setCallbackSuccess( getOUDetailsForMARecevied );
- //request.send( url );
-
- var requestString = "getOrgUnitDetails.action";
- var params = "orgUnitId=" + orgUnitIds;
- request.sendAsPost( params );
- request.send( requestString );
+ $.post("getOrgUnitDetails.action",
+ {
+ orgUnitId:orgUnitIds
+ },
+ function (data)
+ {
+ getOUDetailsForMARecevied(data);
+ },'xml');
}
function getOUDetailsForMARecevied(xmlObject)
@@ -190,17 +180,14 @@
if ( orgUnitGroupSetId != null )
{
- //var url = "getOrgUnitGroups.action?orgUnitGroupSetId=" + orgUnitGroupSetId;
-
- var request = new Request();
- request.setResponseTypeXML( 'orgunitgroup' );
- request.setCallbackSuccess( getOrgUnitGroupsReceived );
- //request.send( url );
-
- var requestString = "getOrgUnitGroups.action";
- var params = "orgUnitGroupSetId=" + orgUnitGroupSetId;
- request.sendAsPost( params );
- request.send( requestString );
+ $.post("getOrgUnitGroups.action",
+ {
+ orgUnitGroupSetId:orgUnitGroupSetId
+ },
+ function (data)
+ {
+ getOrgUnitGroupsReceived(data);
+ },'xml');
}
}
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/nr.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/nr.js 2010-09-04 13:07:00 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/nr.js 2010-09-08 08:13:41 +0000
@@ -26,17 +26,15 @@
function getOUDeatilsForNR( orgUnitIds )
{
- //var url = "getOrgUnitDetails.action?orgUnitId=" + orgUnitIds+"&type=ta";
-
- var request = new Request();
- request.setResponseTypeXML( 'orgunit' );
- request.setCallbackSuccess( getOUDetailsForNRRecevied );
- //request.send( url );
-
- var requestString = "getOrgUnitDetails.action";
- var params = "orgUnitId=" + orgUnitIds+"&type=ta";
- request.sendAsPost( params );
- request.send( requestString );
+ $.post("getOrgUnitDetails.action",
+ {
+ orgUnitId:orgUnitIds,
+ type:"ta"
+ },
+ function (data)
+ {
+ getOUDetailsForNRRecevied(data);
+ },'xml');
}
function getOUDetailsForNRRecevied(xmlObject)
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.js 2010-09-04 13:07:00 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ta.js 2010-09-08 08:13:41 +0000
@@ -17,19 +17,17 @@
function ouradioSelection( evt )
{
- var selouRadioButton = evt.target.value;
-
var ouSelCBId = document.getElementById( "ouSelCB" );
if( ouSelCBId.checked )
{
return;
}
- if( selouRadioButton == "orgUnitGroupRadio" )
- {
+
+ var excelItems = byId('ouRadio');
+ if(excelItems.checked && excelItems.getAttribute('value') == "orgUnitGroupRadio"){
getOrgUnitGroups();
- }
- else
+ }else
{
ouSelCBChange();
}
@@ -215,7 +213,7 @@
if ( dataElementGroupId != null )
{
- //var url = "getDataElementsForTA.action?id=" + dataElementGroupId + "&deOptionValue=" + deOptionValue;
+ /* //var url = "getDataElementsForTA.action?id=" + dataElementGroupId + "&deOptionValue=" + deOptionValue;
var request = new Request();
request.setResponseTypeXML('dataElement');
request.setCallbackSuccess(getDataElementsReceived);
@@ -224,7 +222,17 @@
var requestString = "getDataElementsForTA.action";
var params = "id=" + dataElementGroupId + "&deOptionValue=" + deOptionValue;
request.sendAsPost( params );
- request.send( requestString );
+ request.send( requestString ); */
+
+ $.post("getDataElementsForTA.action",
+ {
+ id:dataElementGroupId,
+ deOptionValue:deOptionValue
+ },
+ function (data)
+ {
+ getDataElementsReceived(data);
+ },'xml');
}
}// getDataElements end
@@ -260,7 +268,7 @@
if ( indicatorGroupId != null )
{
- //var url = "getIndicators.action?id=" + indicatorGroupId;
+ /* //var url = "getIndicators.action?id=" + indicatorGroupId;
var request = new Request();
request.setResponseTypeXML( 'indicator' );
@@ -270,7 +278,16 @@
var requestString = "getIndicators.action";
var params = "id=" + indicatorGroupId;
request.sendAsPost( params );
- request.send( requestString );
+ request.send( requestString ); */
+
+ $.post("getIndicators.action",
+ {
+ id:indicatorGroupId
+ },
+ function (data)
+ {
+ getIndicatorsReceived(data);
+ },'xml');
}
}
@@ -396,7 +413,7 @@
function getOUDeatilsForTA( orgUnitIds )
{
- //var url = "getOrgUnitDetails.action?orgUnitId=" + orgUnitIds+"&type=ta";
+ /* //var url = "getOrgUnitDetails.action?orgUnitId=" + orgUnitIds+"&type=ta";
var request = new Request();
request.setResponseTypeXML( 'orgunit' );
@@ -406,7 +423,17 @@
var requestString = "getOrgUnitDetails.action";
var params = "orgUnitId=" + orgUnitIds+"&type=ta";
request.sendAsPost( params );
- request.send( requestString );
+ request.send( requestString ); */
+
+ $.post("getOrgUnitDetails.action",
+ {
+ orgUnitId:orgUnitIds,
+ type:"ta"
+ },
+ function (data)
+ {
+ getOUDetailsForTARecevied(data);
+ },'xml');
}
function getOUDetailsForTARecevied(xmlObject)
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/tta.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/tta.js 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/tta.js 2010-09-08 08:13:41 +0000
@@ -3,23 +3,22 @@
// Get OptionCombos of a selected DataSet
// -----------------------------------------------------------------------------
function getOptionCombos()
-{
- var request = new Request();
- request.setResponseTypeXML( 'optionCombo' );
- request.setCallbackSuccess( getOptionCombosCompleted );
-
- var dataSetSelector = document.getElementById( 'availableDataSets' );
- var dataSetId = dataSetSelector.options[dataSetSelector.selectedIndex].value;
-
- // Clear the OptionCombo list
- var optionComboList = document.getElementById( 'availableOptionCombos' );
- optionComboList.options.length = 0;
-
- var requestString = 'getOptionCombos.action';
- var params = 'dataSetId=' + dataSetId;
-
- request.sendAsPost( params );
- request.send( requestString );
+{
+ var dataSetSelector = document.getElementById( 'availableDataSets' );
+ var dataSetId = dataSetSelector.options[dataSetSelector.selectedIndex].value;
+
+ // Clear the OptionCombo list
+ var optionComboList = document.getElementById( 'availableOptionCombos' );
+ optionComboList.options.length = 0;
+
+ $.post("getOptionCombos.action",
+ {
+ dataSetId:dataSetId
+ },
+ function (data)
+ {
+ getOptionCombosCompleted(data);
+ },'xml');
return false;
}
=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGA.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGA.vm 2010-09-04 13:07:00 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGA.vm 2010-09-08 08:13:41 +0000
@@ -19,7 +19,6 @@
function orgUnitHasBeenSelected( orgUnitIds )
{
-alert("inside orgUnitHasBeenSelected orgUnitIds = "+orgUnitIds + " document.getElementById( 'ougSetCB' ).checked = "+document.getElementById( 'ougSetCB' ).checked);
if(document.getElementById( 'ougSetCB' ).checked)
{
return;
