dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8673
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-10-23 22:14:18 +0700
message:
  Minor fix.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java


--
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-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java	2012-10-23 13:15:16 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java	2012-10-23 15:14:18 +0000
@@ -157,13 +157,6 @@
         return values;
     }
 
-    private Integer currentPage;
-
-    public void setCurrentPage( Integer currentPage )
-    {
-        this.currentPage = currentPage;
-    }
-
     private List<String> searchingValues = new ArrayList<String>();
 
     public void setSearchingValues( List<String> searchingValues )
@@ -371,7 +364,7 @@
                 // total = paging.getTotal(); //TODO
 
                 grid = programStageInstanceService.getTabularReport( programStage, columns, organisationUnits, level,
-                    startValue, endValue, !orderByOrgunitAsc, getStartPos(), getEndPos() );
+                    startValue, endValue, !orderByOrgunitAsc, getStartPos(), paging.getPageSize() );
             }
             else
             // Download as Excel
@@ -408,18 +401,7 @@
         startPos = (startPos > total) ? total : startPos;
         return startPos;
     }
-
-    public int getEndPos()
-    {
-        if ( currentPage == null )
-        {
-            return paging.getEndPos();
-        }
-        int endPos = getStartPos() + paging.getPageSize();
-        endPos = (endPos > total) ? total : endPos;
-        return endPos;
-    }
-
+    
     private List<TabularReportColumn> getTableColumns()
     {
         List<TabularReportColumn> columns = new ArrayList<TabularReportColumn>();