Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv12235/portlets-newsletter/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterStatisticAction.java
Log Message:
CMSC-725(modify the part of getAllNewsletters,add the calendar)
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-725
Index: NewsletterStatisticAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterStatisticAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewsletterStatisticAction.java 21 Apr 2008 09:51:03 -0000 1.2
+++ NewsletterStatisticAction.java 24 Apr 2008 09:21:02 -0000 1.3
@@ -16,25 +16,29 @@
}
- public ActionForward show (ActionMapping mapping, ActionForm form,
+ public ActionForward show(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse
response)
- throws Exception{
+ throws Exception {
NewsletterService newsletterService = NewsletterServiceFactory
.getNewsletterService();
List<Newsletter> newsletters =
newsletterService.getAllNewsletter();
+
addBlankNewsletter(newsletters);
+
request.setAttribute("newsletters", newsletters);
+
return mapping.findForward("result");
}
- public ActionForward search (ActionMapping mapping, ActionForm form,
+ public ActionForward search(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse
response)
- throws Exception{
+ throws Exception {
NewsletterService newsletterService = NewsletterServiceFactory
.getNewsletterService();
- StatisticService service =
NewsletterServiceFactory.getStatisticService();
+ StatisticService service = NewsletterServiceFactory
+ .getStatisticService();
List<Newsletter> newsletters =
newsletterService.getAllNewsletter();
addBlankNewsletter(newsletters);
request.setAttribute("newsletters", newsletters);
@@ -55,36 +59,29 @@
startDate, endDate);
transferShowingFromDB(records, newsletterService);
request.setAttribute("records", records);
- }
- else if (isAll && !hasDate && isDetail) {
+ } else if (isAll && !hasDate && isDetail) {
List<StatisticResult> records = service.statisticAll();
transferShowingFromDB(records, newsletterService);
request.setAttribute("records", records);
- }
- else if (!isAll && !hasDate && isDetail) {
+ } else if (!isAll && !hasDate && isDetail) {
List<StatisticResult> records = service
.statisticByNewsletter(newsletterId);
transferShowingFromDB(records, newsletterService);
request.setAttribute("records", records);
- }
- else if (!isAll && hasDate && !isDetail) {
- result =
service.statisticByNewsletterPeriod(newsletterId, startDate,
- endDate);
+ } else if (!isAll && hasDate && !isDetail) {
+ result =
service.statisticByNewsletterPeriod(newsletterId,
+ startDate, endDate);
request.setAttribute("result", result);
- }
- else if (!isAll && !hasDate && !isDetail) {
+ } else if (!isAll && !hasDate && !isDetail) {
result =
service.StatisticSummaryByNewsletter(newsletterId);
request.setAttribute("result", result);
- }
- else if (isAll && !hasDate && !isDetail) {
+ } else if (isAll && !hasDate && !isDetail) {
result = service.statisticSummery();
request.setAttribute("result", result);
- }
- else if (isAll && hasDate && !isDetail) {
+ } else if (isAll && hasDate && !isDetail) {
result = service.statisticSummeryPeriod(startDate,
endDate);
request.setAttribute("result", result);
- }
- else if (!isAll && hasDate && isDetail) {
+ } else if (!isAll && hasDate && isDetail) {
List<StatisticResult> records = service
.StatisticDetailByNewsletterPeriod(newsletterId, startDate,
endDate);
@@ -94,16 +91,16 @@
return mapping.findForward("result");
}
- private void addBlankNewsletter (List<Newsletter> newsletters){
+ private void addBlankNewsletter(List<Newsletter> newsletters) {
Newsletter newsletter = new Newsletter();
newsletter.setTitle("ALL");
- newsletter.setNumber(0);
+ newsletter.setId(0);
newsletters.add(newsletter);
}
- private void transferShowingFromDB (List<StatisticResult> records,
- NewsletterService newsletterService){
+ private void transferShowingFromDB(List<StatisticResult> records,
+ NewsletterService newsletterService) {
for (StatisticResult s : records) {
s.setShowingdate(DateUtil.parser(s.getLogdate()));
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
