=== modified file 'local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/GetReportsAction.java' --- local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/GetReportsAction.java 2010-08-17 08:35:20 +0000 +++ local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/GetReportsAction.java 2010-09-23 08:27:50 +0000 @@ -127,6 +127,7 @@ ouName = orgUnit.getShortName(); System.out.println( ouName ); getSelectedReportList( reportListFileName ); + //System.out.println("\n\n Report File Name:" + reportListFileName ); } catch ( Exception e ) { === modified file 'local/in/dhis-web-excelimport/src/main/resources/struts.xml' --- local/in/dhis-web-excelimport/src/main/resources/struts.xml 2010-09-08 12:56:29 +0000 +++ local/in/dhis-web-excelimport/src/main/resources/struts.xml 2010-09-23 08:27:50 +0000 @@ -64,8 +64,7 @@ class="org.hisp.dhis.excelimport.action.GetReportsAction"> /dhis-web-excelimport/responseImportReport.vm - - ../dhis-web-commons/ouwt/ouwt.js,javascript/reports.js,../dhis-web-commons/lists/lists.js,javascript/hashtable.js + ../dhis-web-commons/ouwt/ouwt.js,javascript/reports.js,../dhis-web-commons/lists/lists.js,javascript/hashtable.js plainTextError === modified file 'local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/excelImportForm.vm' --- local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/excelImportForm.vm 2010-09-08 12:56:29 +0000 +++ local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/excelImportForm.vm 2010-09-23 08:27:50 +0000 @@ -46,7 +46,7 @@ } ); - +/* function orgUnitHasBeenSelected( orgUnitIds ) { if(orgUnitIds == null || orgUnitIds == "" ) @@ -57,8 +57,8 @@ if(orgUnitIds != null) getOUDetails(orgUnitIds); } - -selection.setListenerFunction( orgUnitHasBeenSelected ); +*/ +//selection.setListenerFunction( orgUnitHasBeenSelected ); @@ -101,6 +101,7 @@ Reports :
=== modified file 'local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/javascript/reports.js' --- local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/javascript/reports.js 2010-09-10 11:35:58 +0000 +++ local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/javascript/reports.js 2010-09-23 08:27:50 +0000 @@ -104,6 +104,7 @@ var ouId = document.reportForm.ouIDTB.value; var reportListFileName = document.reportForm.reportListFileNameTB.value; + getReports(ouId, reportListFileName); } @@ -111,11 +112,13 @@ { var periodTypeList = document.getElementById( "periodTypeId" ); var periodType = periodTypeList.options[ periodTypeList.selectedIndex ].value; + //var reportListFileName = document.reportForm.reportListFileNameTB.value; var autogenvalue = document.getElementById( "autogen" ).value; + // alert("file:" +reportListFileName + ", periodType :" + periodType + ", ouid:" + ouId); if ( periodType != "NA" && ouId != null && ouId != "" ) { - $.post("getReports.action", + $.post("getReports.action", { periodType : periodType, ouId : ouId, @@ -127,6 +130,7 @@ getReportsReceived(data); },'xml'); } + } function getReportsReceived( xmlObject ) @@ -156,7 +160,8 @@ option.value = id; option.text = name; reportsList.add( option, null ); - + + //$("#reportList").append(""); reportModels.put( id, model ); reportFileNames.put( id, fileName ); checkerFileNames.put( id, checkerFileName );