Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv909/portlets-newsletter/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterStatisticAction.java
Log Message:
CMSC-899(make the paging show normally)
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-899
Index: NewsletterStatisticAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterStatisticAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- NewsletterStatisticAction.java 11 Sep 2008 11:21:13 -0000 1.10
+++ NewsletterStatisticAction.java 18 Sep 2008 06:33:27 -0000 1.11
@@ -51,6 +51,9 @@
NewsLetterLogSearchForm searchForm = (NewsLetterLogSearchForm)
form;
StatisticResult result = new StatisticResult();
request.setAttribute("searchForm", searchForm);
+ PagingUtils.initStatusHolder(request);
+ PagingStatusHolder holder = PagingUtils.getStatusHolder();
+
boolean isAll = Integer.parseInt(searchForm.getNewsletters())
== 0;
boolean isDetail = searchForm.getDetailOrSum().equals("2");
@@ -64,23 +67,25 @@
List<StatisticResult> records =
service.statisticAllByPeriod(
startDate, endDate);
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records",
addPagingCondition(request,records));
+ request.setAttribute("records",
addPagingCondition(request,records,holder));
} else if (isAll && !hasDate && isDetail) {
List<StatisticResult> records = service.statisticAll();
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records",
addPagingCondition(request,records));
+ request.setAttribute("records",
addPagingCondition(request,records,holder));
} else if (!isAll && !hasDate && isDetail) {
List<StatisticResult> records = service
.statisticByNewsletter(newsletterId);
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records",
addPagingCondition(request,records));
+ request.setAttribute("records",
addPagingCondition(request,records,holder));
} else if (!isAll && hasDate && !isDetail) {
result =
service.statisticByNewsletterPeriod(newsletterId,
startDate, endDate);
+ request.setAttribute("newsletterName",
transToNewsName(request, newsletterService, newsletterId));
request.setAttribute("result", result);
} else if (!isAll && !hasDate && !isDetail) {
result =
service.StatisticSummaryByNewsletter(newsletterId);
request.setAttribute("result", result);
+ request.setAttribute("newsletterName",
transToNewsName(request, newsletterService, newsletterId));
} else if (isAll && !hasDate && !isDetail) {
result = service.statisticSummery();
request.setAttribute("result", result);
@@ -92,11 +97,17 @@
.StatisticDetailByNewsletterPeriod(newsletterId, startDate,
endDate);
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records",
addPagingCondition(request,records));
+ request.setAttribute("records",
addPagingCondition(request,records,holder));
}
return mapping.findForward("result");
}
+ private String transToNewsName(HttpServletRequest request,
+ NewsletterService newsletterService, int newsletterId) {
+ return newsletterService.getNewsletterName(newsletterId);
+
+ }
+
private void addBlankNewsletter(List<Newsletter> newsletters) {
Newsletter newsletter = new Newsletter();
@@ -114,10 +125,9 @@
}
}
- private List<StatisticResult> addPagingCondition(HttpServletRequest
request,List<StatisticResult> records){
- PagingStatusHolder holder = PagingUtils.getStatusHolder();
+ private List<StatisticResult> addPagingCondition(HttpServletRequest
request,List<StatisticResult> records ,PagingStatusHolder holder){
+
List<StatisticResult> recordsForShow = new
ArrayList<StatisticResult>();
- recordsForShow.clear();
int totalCount = records.size();
request.setAttribute("totalCount", totalCount);
for(int
i=holder.getOffset();i<holder.getPageSize()+holder.getOffset()&&i<totalCount;i++){
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
