pvollenweider 2005/04/12 11:14:48 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/view/jsp blog_listing.jsp
Log:
Add calendar filter on blog listing
Revision Changes Path
1.1.2.11 +45 -0 corporate_portal_templates/src/view/jsp/blog_listing.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/blog_listing.jsp.diff?r1=1.1.2.10&r2=1.1.2.11&f=h
Index: blog_listing.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/Attic/blog_listing.jsp,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- blog_listing.jsp 8 Apr 2005 13:47:39 -0000 1.1.2.10
+++ blog_listing.jsp 12 Apr 2005 09:14:47 -0000 1.1.2.11
@@ -51,6 +51,51 @@
blogSearchString = "";
}
+ if (request.getParameter("t") != null) {
+ // add filter on field date
+ // Adding equality comparison with selected values
+ Calendar cal = Calendar.getInstance();
+ cal.setTimeZone(TimeZone.getTimeZone("UTC"));
+ cal.setTime(new Date(t));
+
+ cal.set( Calendar.HOUR_OF_DAY, 0 );
+ cal.set( Calendar.MINUTE, 0);
+ cal.set( Calendar.SECOND, -1);
+
+ if ("week".equals(range)){
+ cal.set( Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+ }
+ if ("month".equals(range)){
+ cal.set( Calendar.DAY_OF_MONTH, 1);
+ }
+ if ("year".equals(range)){
+ cal.set( Calendar.DAY_OF_YEAR, 1);
+ }
+ Date lowerVal = cal.getTime();
+ cal.add( Calendar.HOUR_OF_DAY, 24 );
+ if ("week".equals(range)){
+ cal.add( Calendar.HOUR_OF_DAY, 24*6 );
+ }
+ if ("month".equals(range)){
+ cal.add( Calendar.MONTH, 1 );
+ }
+ if ("year".equals(range)){
+ cal.add( Calendar.YEAR, 1 );
+ }
+ Date upperVal = cal.getTime();
+
+ logger.debug("Filter from " + sdf.format( (new
Date(lowerVal.getTime())) ) + " to " +
+ sdf.format( (new Date(upperVal.getTime())) ));
+
+ ContainerFilterBean dateFilter = new
ContainerFilterBean("date",true,jParams.getEntryLoadRequest());
+ dateFilter.addClause(ContainerFilterBean.COMP_SMALLER,
String.valueOf(upperVal.getTime()) );
+ containerFilterVector.add(dateFilter);
+
+ dateFilter = new
ContainerFilterBean("date",true,jParams.getEntryLoadRequest());
+ dateFilter.addClause(ContainerFilterBean.COMP_BIGGER,
String.valueOf(lowerVal.getTime()) );
+ containerFilterVector.add(dateFilter);
+ }
+
if ( containerFilterVector.size()>0 ) {
ContainerFilters containerFilters =