dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #09687
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2619: Minor bug fixed in dhis-web-excelimport
------------------------------------------------------------
revno: 2619
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2011-01-18 17:31:24 +0530
message:
Minor bug fixed in dhis-web-excelimport
modified:
local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/ExcelImportFormAction.java
local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/GetOrgUnitsAction.java
local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/GetReportsAction.java
local/in/dhis-web-excelimport/src/main/resources/META-INF/dhis/beans.xml
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/menuWithTree.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-excelimport/src/main/java/org/hisp/dhis/excelimport/action/ExcelImportFormAction.java'
--- local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/ExcelImportFormAction.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/ExcelImportFormAction.java 2011-01-18 12:01:24 +0000
@@ -4,17 +4,16 @@
import java.util.Collection;
import java.util.Iterator;
-import org.hisp.dhis.excelimport.util.ReportService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
-import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Action;
public class ExcelImportFormAction
- extends ActionSupport
+ implements Action
{
// -------------------------------------------------------------------------
@@ -39,14 +38,14 @@
{
return organisationUnitService;
}
-
+/*
private ReportService reportService;
public void setReportService( ReportService reportService )
{
this.reportService = reportService;
}
-
+*/
// -------------------------------------------------------------------------
// Constants
// -------------------------------------------------------------------------
@@ -58,7 +57,7 @@
return ALL;
}
- private String raFolderName;
+ // private String raFolderName;
// -------------------------------------------------------------------------
// Properties
@@ -99,7 +98,7 @@
public String execute()
throws Exception
{
- raFolderName = reportService.getRAFolderName();
+ //raFolderName = reportService.getRAFolderName();
/* Period Info */
periodTypes = periodService.getAllPeriodTypes();
=== modified file 'local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/GetOrgUnitsAction.java'
--- local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/GetOrgUnitsAction.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/GetOrgUnitsAction.java 2011-01-18 12:01:24 +0000
@@ -3,10 +3,10 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Action;
public class GetOrgUnitsAction
- extends ActionSupport
+ implements Action
{
// -------------------------------------------------------------------------
// Dependencies
=== 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-09-23 08:27:50 +0000
+++ local/in/dhis-web-excelimport/src/main/java/org/hisp/dhis/excelimport/action/GetReportsAction.java 2011-01-18 12:01:24 +0000
@@ -20,10 +20,10 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Action;
public class GetReportsAction
- extends ActionSupport
+ implements Action
{
// -------------------------------------------------------------------------
@@ -97,7 +97,7 @@
this.autogenrep = autogenrep;
}
- private String orgUnitLevel;
+ // private String orgUnitLevel;
private String raFolderName;
@@ -123,7 +123,7 @@
if ( autogenrep.equalsIgnoreCase( "1" ) )
ouLevel++;
- orgUnitLevel = "" + ouLevel;
+ //orgUnitLevel = "" + ouLevel;
ouName = orgUnit.getShortName();
System.out.println( ouName );
getSelectedReportList( reportListFileName );
=== modified file 'local/in/dhis-web-excelimport/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-excelimport/src/main/resources/META-INF/dhis/beans.xml 2010-08-17 08:35:20 +0000
+++ local/in/dhis-web-excelimport/src/main/resources/META-INF/dhis/beans.xml 2011-01-18 12:01:24 +0000
@@ -15,9 +15,9 @@
<property name="organisationUnitService">
<ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
</property>
- <property name="reportService">
+<!-- <property name="reportService">
<ref bean="org.hisp.dhis.excelimport.util.ReportService"/>
- </property>
+ </property>-->
</bean>
<!-- Import Result -->
=== 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-23 08:27:50 +0000
+++ local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/javascript/reports.js 2011-01-18 12:01:24 +0000
@@ -4,7 +4,7 @@
{
$.post("getOrgUnitDetails.action",
{
- orgUnitId : orgUnitIds
+ orgUnitId : orgUnitIds[0]
},
function (data)
{
@@ -121,7 +121,7 @@
$.post("getReports.action",
{
periodType : periodType,
- ouId : ouId,
+ ouId : ouId[0],
reportListFileName : reportListFileName,
autogenrep : autogenvalue
},
=== modified file 'local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/menuWithTree.vm'
--- local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/menuWithTree.vm 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-excelimport/src/main/webapp/dhis-web-excelimport/menuWithTree.vm 2011-01-18 12:01:24 +0000
@@ -8,8 +8,8 @@
</ul>
</ul>
<br>
-#parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
-
+##parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
+#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
<!-- The script that registeres selctions in the orgunit tree -->
<script type="text/javascript">
