Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv19500/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterStatisticAction.java
Log Message:
CMSC-990 modify the list messages jsp.
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-990
Index: NewsletterStatisticAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterStatisticAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- NewsletterStatisticAction.java 21 Jul 2008 13:09:00 -0000 1.7
+++ NewsletterStatisticAction.java 27 Jul 2008 07:54:10 -0000 1.8
@@ -1,11 +1,15 @@
package com.finalist.newsletter.forms;
+import com.finalist.cmsc.paging.PagingStatusHolder;
+import com.finalist.cmsc.paging.PagingUtils;
import com.finalist.cmsc.services.community.ApplicationContextFactory;
import com.finalist.newsletter.domain.Newsletter;
import com.finalist.newsletter.domain.StatisticResult;
import com.finalist.newsletter.services.*;
import com.finalist.newsletter.util.DateUtil;
+
+import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -28,7 +32,10 @@
addBlankNewsletter(newsletters);
request.setAttribute("newsletters", newsletters);
-
+ StatisticService service = (StatisticService)
ApplicationContextFactory.getBean("statisticService");
+ StatisticResult result = new StatisticResult();
+ result = service.statisticSummery();
+ request.setAttribute("result", result);
return mapping.findForward("result");
}
@@ -57,16 +64,16 @@
List<StatisticResult> records =
service.statisticAllByPeriod(
startDate, endDate);
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records", records);
+ request.setAttribute("records",
addPagingCondition(request,records));
} else if (isAll && !hasDate && isDetail) {
List<StatisticResult> records = service.statisticAll();
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records", records);
+ request.setAttribute("records",
addPagingCondition(request,records));
} else if (!isAll && !hasDate && isDetail) {
List<StatisticResult> records = service
.statisticByNewsletter(newsletterId);
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records", records);
+ request.setAttribute("records",
addPagingCondition(request,records));
} else if (!isAll && hasDate && !isDetail) {
result =
service.statisticByNewsletterPeriod(newsletterId,
startDate, endDate);
@@ -85,7 +92,7 @@
.StatisticDetailByNewsletterPeriod(newsletterId, startDate,
endDate);
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records", records);
+ request.setAttribute("records",
addPagingCondition(request,records));
}
return mapping.findForward("result");
}
@@ -107,4 +114,15 @@
}
}
+ private List<StatisticResult> addPagingCondition(HttpServletRequest
request,List<StatisticResult> records){
+ PagingStatusHolder holder =
PagingUtils.getStatusHolder(request);
+ 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++){
+ recordsForShow.add(records.get(i));
+ }
+ return recordsForShow;
+ }
}
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs