Changeset 18180 for trunk

Timestamp:

10/06/08 14:16:01 (3 months ago)

Author:

avinash

Message:

blog:
- modified blog filter as per new screen shots on wiki page
- added start and end date selection fields to choose dates using calendar for filter

Files:

• trunk/core/src/net/project/view/components/BlogArchives.java (modified) (7 diffs)
• trunk/core/src/net/project/view/pages/assignments/MyAssignments.java (modified) (1 diff)
• trunk/core/src/net/project/view/pages/blog/AddWebLogEntry.java (modified) (1 diff)
• trunk/core/src/net/project/view/pages/blog/ViewBlog.java (modified) (4 diffs)
• trunk/core/web/css/blog.css (modified) (2 diffs)
• trunk/core/web/html/blog/ViewBlog.html (modified) (4 diffs)
• trunk/core/web/html/resource/management/components/BlogArchives.html (modified) (1 diff)
• trunk/core/web/html/resource/management/components/BlogLayout.html (modified) (2 diffs)
• trunk/core/web/src/blogit.js (modified) (1 diff)
• trunk/core/web/src/components/blogFilter.js (added)

trunk/core/src/net/project/view/components/BlogArchives.java

@@ -9 +9 @@
-import java.util.Date;
-import java.util.List;
+import java.util.StringTokenizer;
-
-import net.project.base.PnWebloggerException;
@@ -25 +26 @@
-import org.apache.tapestry.annotations.Inject;
-import org.apache.tapestry.annotations.InjectPage;
+import org.apache.tapestry.annotations.Persist;
-import org.apache.tapestry.annotations.SetupRender;
-import org.apache.tapestry.ioc.services.PropertyAccess;
@@ -68 +70 @@
-        private String jSPRootURL;
-        
-
+ForDaysAndPost
-        
-        private DateFormat userDateFormat;
-        
-        private String monthFormatPattern;
-
+
+
+
+
+
+
+
-        public BlogArchives() {
-                log = Logger.getLogger(BlogArchives.class);
@@ -118 +126 @@
-                setModuleId(viewBlog.getModuleId());
-                
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                } else {
-
+ForDaysAndPost
-                        blogArchive = new BlogArchives();
-                        blogArchive.setLinkDisplayName("No Blogs");
-                        blogArchive.setLinkHrefValue("0");
-
-
-
+
+
-        }
-        
@@ -137 +157 @@
-         * @param firstEntryDate
-         * @param lastEntryDate
-         * @param dateRange
-         * @param filterOptions
-         * @return
-         */
-(Date firstEntryDate, Date lastEntryDate, Integer dateRange, int filterOptions) 
+ForDaysAndPosts(Date firstEntryDate, Date lastEntryDate)
-                List<BlogArchives> filterList = new ArrayList<BlogArchives>();
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                
-                int daysInMonth = 0;
-                while(cal2.before(cal1)){
-                        daysInMonth ++;
-                        cal2.add(Calendar.DATE, 1);
-                }
-                if(daysInMonth < dateRange && filterOptions > 1){
-                        cal2.add(Calendar.DATE, -dateRange);
-                        if(isBlogEntriesExistBetween(cal2.getTime(), cal1.getTime())){
-                                Calendar lastDate = Calendar.getInstance();
-                                lastDate.setTime(cal2.getTime());
-                                Calendar now = Calendar.getInstance();
-                                now.setTime(cal1.getTime());
-                                now.add(Calendar.DATE, -1);
-                                if( filterList.size() == 0){
-                                        linkProperty = new BlogArchives();
-                                        linkProperty.setLinkDisplayName("Last 7 days");
-                                        linkProperty.setLinkHrefValue(simpleDateFormat.format(cal2.getTime())+"/"+simpleDateFormat.format(cal1.getTime()));
-                                } else {
-                                        linkProperty = getLinkProperty(cal2.getTime(), cal1.getTime());
-                                }
-                                filterList.add(linkProperty);
-                                filterOptions --;
-                                cal1.setTime(cal2.getTime());
-                        }                       
-                        
-                }else {
-                        while(daysInMonth >= dateRange && filterOptions > 1){
-                        cal2.add(Calendar.DATE, -dateRange);
-                                if(isBlogEntriesExistBetween(cal2.getTime(), cal1.getTime())){
-                                        Calendar lastDate = Calendar.getInstance();
-                                        lastDate.setTime(cal2.getTime());
-                                        Calendar now = Calendar.getInstance();
-                                        now.setTime(cal1.getTime());
-                                        now.add(Calendar.DATE, -1);
-                                        if(lastDate.get(Calendar.DATE) - now.get(Calendar.DATE) <= dateRange && filterList.size() == 0){
-                                                linkProperty = new BlogArchives();
-                                                linkProperty.setLinkDisplayName("Last 7 days");
-                                                linkProperty.setLinkHrefValue(simpleDateFormat.format(cal2.getTime())+"/"+simpleDateFormat.format(cal1.getTime()));
-                                        } else {
-                                                linkProperty = getLinkProperty(cal2.getTime(), cal1.getTime());
-                                        }
-                                        filterList.add(linkProperty);
-                                        filterOptions --;
-                                        cal1.setTime(cal2.getTime());
-                                }                       
-                                daysInMonth -= dateRange;                       
-                        }
-                }
-
-                SimpleDateFormat monthFormat = new SimpleDateFormat("MMMMM");
-                if(filterOptions > 0 && firstEntryDate.before(cal2.getTime())){
-                        cal1.setTime(firstEntryDate);
-                        cal2.add(Calendar.MONTH, -1);
-                        cal2.set(Calendar.DAY_OF_MONTH, cal2.getActualMaximum(Calendar.DAY_OF_MONTH));
-                        Calendar calTemp1 = Calendar.getInstance();
-                        Calendar calTemp2 = Calendar.getInstance();
-                        while(filterOptions > 0 && cal1.before(cal2)){                                                          
-                                calTemp1.setTime(cal2.getTime());
-                                calTemp2.setTime(cal2.getTime());
-                                calTemp1.set(Calendar.DAY_OF_MONTH, cal2.getActualMinimum(Calendar.DAY_OF_MONTH));
-                                //calTemp2.set(Calendar.DAY_OF_MONTH, cal2.getActualMaximum(Calendar.DAY_OF_MONTH));
-                                if(isBlogEntriesExistBetween(calTemp1.getTime(), calTemp2.getTime())){
-                                        linkProperty = new BlogArchives(); //= getLinkProperty(calTemp1.getTime(), calTemp2.getTime());
-                                        linkProperty.setLinkDisplayName(monthFormat.format(calTemp1.getTime()));
-                                        linkProperty.setLinkHrefValue(simpleDateFormat.format(calTemp1.getTime())+"/"+simpleDateFormat.format(calTemp2.getTime()));
-                                        filterList.add(linkProperty);
-                                        filterOptions --;
-                                }
-                                cal2.add(Calendar.MONTH, -1);
-                        }
-                        if(filterOptions == 0 && cal1.before(lastEntryDate)){
-                                if(isBlogEntriesExistBetween(cal1.getTime(), lastEntryDate)){
-                                        linkProperty = new BlogArchives();
-                                        linkProperty.setLinkDisplayName("<b>more</b>");
-                                        linkProperty.setLinkHrefValue("more");
-                                }
-                        }
-                }
-                // if one or more filter options generated then only show the filter
-                if(filterList != null && filterList.size() > 0){
-                        setIsArchivesLinks(true);
-                }
-                return filterList;
-        }
-        
-        /**
-         * Method for getting dropdown list values for archives filter
@@ -251 +221 @@
-        public GenericSelectModel<BlogArchives> getArchivesModel() {
-                return archiveBeans;
-        }
-
-        private void getArchivesLink(Date firstEntryDate, Date lastEntryDate, int dateInterval, int viewNLink) {
-                archivesLink = new ArrayList<BlogArchives>();
-                BlogArchives linkProperty = null;
-                if (firstEntryDate != null && lastEntryDate != null) {
-                        // setting year
-                        Calendar cal = Calendar.getInstance();
-                        cal.setTime(firstEntryDate);
-                        
-                        cal.set(Calendar.HOUR, 0);
-                        cal.set(Calendar.MINUTE, 0);
-                        cal.set(Calendar.SECOND, 0);
-                        cal.set(Calendar.MILLISECOND, 0);
-                        firstEntryDate = cal.getTime();
-                        
-                        int firstEntryYear = cal.get(Calendar.YEAR);
-                        
-                        cal.setTime(lastEntryDate);
-                        cal.set(Calendar.HOUR, 0);
-                        cal.set(Calendar.MINUTE, 0);
-                        cal.set(Calendar.SECOND, 0);
-                        cal.set(Calendar.MILLISECOND, 0);
-                        lastEntryDate = cal.getTime();
-                        
-                        if (firstEntryYear == cal.get(Calendar.YEAR)) {
-                                setArchivesYear("" + firstEntryYear);
-                        } else {
-                                setArchivesYear("" + firstEntryYear + " - " + ("" + cal.get(Calendar.YEAR)).substring(2, 4));
-                        }                       
-                        cal.add(Calendar.DATE, -(dateInterval));
-                        if(!firstEntryDate.equals(lastEntryDate)){                                                      
-                                lastEntryDate = cal.getTime();
-                        } else {
-                                firstEntryDate = cal.getTime();
-                                Calendar calTmp  = Calendar.getInstance();
-                                calTmp.setTime(lastEntryDate);
-                                calTmp.add(Calendar.DATE, 1);
-                                lastEntryDate = calTmp.getTime();
-                        }
-                        if (!lastEntryDate.before(firstEntryDate) && !firstEntryDate.equals(lastEntryDate)) {
-                                int nLink = 0;
-                                while (firstEntryDate.before(lastEntryDate)) {
-                                        cal.setTime(firstEntryDate);
-                                        cal.add(Calendar.DATE, dateInterval);
-                                        if (nLink < viewNLink) {
-                                                if (lastEntryDate.before(cal.getTime())) {
-                                                        if(isBlogEntriesExistBetween(firstEntryDate, lastEntryDate))
-                                                                linkProperty = getLinkProperty(firstEntryDate, lastEntryDate);
-                                                } else {
-                                                        if(isBlogEntriesExistBetween(firstEntryDate, cal.getTime()))
-                                                                linkProperty = getLinkProperty(firstEntryDate, cal.getTime());
-                                                }
-                                        } else {
-                                                setIsMore(true);
-                                                break;
-                                        }
-                                        firstEntryDate = cal.getTime();
-                                        if(linkProperty != null){
-                                                archivesLink.add(linkProperty);
-                                                nLink++;
-                                                linkProperty = null;
-                                        }
-                                }
-                        }
-                        // if one or more archives links generated then only show the archives
-                        if(archivesLink != null && archivesLink.size() > 0){
-                                setIsArchivesLinks(true);
-                        }
-                }
-        }
-
-        private BlogArchives getLinkProperty(Date startDate, Date endDate) {
-                blogArchive = new BlogArchives();       
-
-                Calendar calStart = Calendar.getInstance();
-                Calendar calEnd = Calendar.getInstance();
-                calStart.setTime(startDate);
-                calEnd.setTime(endDate);                
-                calEnd.set(Calendar.HOUR, 0);
-                calEnd.set(Calendar.MINUTE, 0);
-                calEnd.set(Calendar.SECOND, 0);
-                calEnd.set(Calendar.MILLISECOND, 0);
-                
-                /*if(calStart.getTime().compareTo(calEnd.getTime()) < 0) {
-                        calEnd.add(Calendar.DATE, -1);
-                }*/
-
-                if (calStart.get(Calendar.MONTH) == calEnd.get(Calendar.MONTH)) {
-                        blogArchive.setLinkDisplayName(userDateFormat.formatDate(startDate, monthFormatPattern) + " " + calStart.get(Calendar.DATE) + " - "
-                                        + calEnd.get(Calendar.DATE));
-                } else {
-                        blogArchive.setLinkDisplayName(userDateFormat.formatDate(endDate, monthFormatPattern) + " " + calStart.get(Calendar.DATE) + " - "
-                                        + userDateFormat.formatDate(endDate, monthFormatPattern) + " " + calEnd.get(Calendar.DATE));
-                }
-
-                //String dateFormatPattern = "dd-MM-yyyy";
-                SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy");
-                blogArchive.setLinkHrefValue(dateFormat.format(startDate) + "/" + dateFormat.format(endDate));
-                //blogArchive.setLinkHrefValue( SessionManager.getJSPRootURL() + "/blog/view/"
-                                //userDateFormat.formatDate(startDate, dateFormatPattern) + "/" + userDateFormat.formatDate(endDate, dateFormatPattern)); // + "/"
-                                //+ viewBlog.getUserId() + "?module=" + viewBlog.getModuleId());
-
-                return blogArchive;
-        }
-        
@@ -542 +408 @@
-                this.userWeblogEntries = userWeblogEntries;
-        }
-
-        /**
-         * @return the moduleId
-         */
+
+        public List<BlogArchives> getArchivesListForDaysAndPost() {
+                return archivesListForDaysAndPost;
+        }
+
+        public void setArchivesListForDaysAndPost(
+                        List<BlogArchives> archivesListForDaysAndPost) {
+                this.archivesListForDaysAndPost = archivesListForDaysAndPost;
+        }
+
+        public String getCommaSeparator() {
+                return commaSeparator;
+        }
+
+        public void setCommaSeparator(String commaSeparator) {
+                this.commaSeparator = commaSeparator;
+        }
-}

trunk/core/src/net/project/view/pages/assignments/MyAssignments.java

@@ -399 +399 @@
-                                blogEntries.setJspRootURL(JSPRootURL);
-                                blogEntries.setUserWeblogEntries(blogViewProvider.getFormattedBlogEntries(entries, JSPRootURL, SpaceTypes.PERSONAL_SPACE));
-tru
+fals
-                                blogEntries.setShowEditLink(false);
-                                blogEntries.setShowExpandCollapseImage(false);

trunk/core/src/net/project/view/pages/blog/AddWebLogEntry.java

@@ -325 +325 @@
-                                                if (pnWeblogEntry == null) {
-                                                        saveBlogEntry();
-Entry Saved
+true
-                                                        //return getSavedBlogEntries();
-                                                } else {

trunk/core/src/net/project/view/pages/blog/ViewBlog.java

@@ -344 +344 @@
-                                String startDateString = request.getParameter("startDate");
-                                String endDateString = request.getParameter("endDate");
+                                int post = request.getParameter("posts") == null ? 0 : Integer.parseInt(request.getParameter("posts"));
-                                Date startDate = null;
-                                Date endDate = null;
-                                try {
-
-
+
+
+
+
-                                        setUserWeblogEntries(blogProvider.getFilteredWeblogEntries(userWeblog.getWeblogId(), 
-                                                        StringUtils.isNotEmpty(memberId) ? new Integer(memberId) : null,
-                                                        StringUtils.isNotEmpty(objectId) ? new Integer(objectId) : null, 
-0
+post
-                                        if (spaceType.equals(Space.PERSONAL_SPACE)) {
-                                                // get blog entries from project weblogs
@@ -358 +361 @@
-                                                        userWeblogEntries.addAll(blogProvider.getWeblogEntriesFromProjectBlogByPerson(userId,
-                                                                        StringUtils.isNotEmpty(objectId) ? new Integer(objectId) : null, startDate,
-0
+post
-                                                } else {
-                                                        userWeblogEntries = blogProvider.getWeblogEntriesFromProjectBlogByPerson(userId,
-                                                                        StringUtils.isNotEmpty(objectId) ? new Integer(objectId) : null, startDate,
-0
+post
-                                                }
-                                        }
@@ -380 +383 @@
-                                        setMessage("Blog entries not found");
-                                } else {
+                                        setUserWeblogEntries(blogProvider.getSortedBlogEntries(userWeblogEntries));
+                                        if(post > 0 && getUserWeblogEntries().size() >= post)
+                                                setUserWeblogEntries(userWeblogEntries.subList(0, post));
-                                        setMessage(getUserWeblogEntries().size() == 1 ? "1 blog entry found" : getUserWeblogEntries().size()+" blog entries found");
-                                        setUserWeblogEntries(blogProvider.getSortedBlogEntries(userWeblogEntries));
-                                }
-                                
@@ -410 +415 @@
-                                        }
-                                }
-                        }else if(action.equalsIgnoreCase(BlogAction.LOAD_BLOG_ENTRIES.toString())){
-                                blogEntriesLoadedForObject = request.getParameter("blogEntriesLoadedForObject") == null ? false
-                                                : Boolean.parseBoolean(request.getParameter("blogEntriesLoadedForObject")); 
-                                return loadBlogEntries();
-                        }
-                }
-                return null;
-        }
-        
-        /**
-         * To load blog entries after page load
-         * @return list of blog entries
-         */
-        Object loadBlogEntries() {
-                if (!isBlogEntriesLoadedForObject()) {
-                        getBlogEntries(userDateFormat.formatDate(previousDate, startEndDateFormatPattern), userDateFormat
-                                        .formatDate(currentDate, startEndDateFormatPattern), userId.toString());
-                } else if (userWeblogEntries != null) {
-                        setUserWeblogEntries(blogProvider.getSortedBlogEntries(userWeblogEntries));
-                        setBlogEntriesLoadedForObject(false);
-                }
-                blogEntries.setMessage(getMessage());
-                blogEntries.setUserWeblogEntries(blogViewProvider.getFormattedBlogEntries(userWeblogEntries, getJspRootURL(),
-                                getSpaceType()));
-                blogEntries.setLinkToPersonSpace(getLinkToPersonSpace());
-                blogEntries.setShowEditLink(true);
-                blogEntries.setShowExpandCollapseImage(true);
-                blogEntries.setShowPersonImage(true);
-                blogEntries.setBlogCommentDivClass("comment-entry");
-                blogEntries.setBlogPostDivClass("post-body");
-                return blogEntries;
-        }
-        

trunk/core/web/css/blog.css

@@ -417 +417 @@
-}
-#loadBlogEntries {
-margin-left: 42px;
+/*margin-left: 42px;*/
-}
-#uploadScreen {
@@ -454 +454 @@
-        margin-top: 0px;
-}
+#showDaysAndPostsDiv {
+        color: #000000;
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 12px;
+}
+#showDaysAndPostsDiv a {
+        color: #4259cb;
+}
+.fieldSetCls { 
+        border: 0px solid #B5B8C8;
+        padding-bottom: 5px;
+}
+.x-date-middle {
+    padding-top: 2px; 
+    padding-bottom: 2px;
+    width: 130px; /* FF3 */
+}
+

trunk/core/web/html/blog/ViewBlog.html

@@ -134 +134 @@
-                                                        <td>                                                            
-                                                                <div id="loadBlogEntries">
-
+padding-left:42px
-                                                                         <img src="${jspRootURL}/images/default/grid/loading.gif" align="absmiddle" />
-                                                                </div>
@@ -164 +164 @@
-var blogEntriesLoadedForObject = '${BlogEntriesLoadedForObject}';
-var openBlogEntries = blogEntryIds.split(',').length-1;
-
+
-// initializing content panel with html editor
+
+<!-- //
-function initializeContentPanel(){
-    Ext.QuickTips.init();
@@ -184 +186 @@
-
-initializeContentPanel();
-
-var datesCombo = new Ext.form.ComboBox({
-                           fieldLabel: 'Dates',
-               typeAhead: true,
-               triggerAction: 'all',
-               transform: 'archives',
-               lazyRender: true,
-               listClass: 'x-combo-list-small',
-               editable: false,
-                           width: 120,
-                           listWidth : 120
-        });
-        
-var projectsCombo = null;        
-var viewCombo = null;
-var teamCombo = null;
-var taskCombo = null;
-var filterForm;
-
-if(spaceType == 'project'){
-        viewCombo = new Ext.form.ComboBox({
-                           fieldLabel: 'View',
-               typeAhead: true,
-               triggerAction: 'all',
-               transform: 'assignmentFilter',
-               lazyRender: true,
-               listClass: 'x-combo-list-small',
-               editable : false,
-                           width: 100,
-                           listWidth : 100
-    });
-        teamCombo = new Ext.form.ComboBox({
-               fieldLabel: 'Team',
-               typeAhead: true,
-               triggerAction: 'all',
-               transform: 'team',
-               lazyRender: true,
-               listClass: 'x-combo-list-small',
-               editable : false,
-                           width: 130,
-                           listWidth : 130
-    });
-        taskCombo = new Ext.form.ComboBox({
-                           fieldLabel: 'Task',
-               typeAhead: true,
-               triggerAction: 'all',
-               transform: 'task',
-               lazyRender: true,
-               listClass: 'x-combo-list-small',
-               editable : false,
-                           width: 180,
-                           listWidth : 180
-    });
-} else {
-        projectsCombo = new Ext.form.ComboBox({
-                                 fieldLabel: 'Projects:',
-                                 labelAlign     : 'left',
-                         typeAhead: true,
-                         triggerAction: 'all',
-                         transform: 'projectFilter',
-                         lazyRender: true,
-                         listClass: 'x-combo-list-small',
-                         editable: false,
-                                 width: 160,
-                                 listWidth : 160
-         });
-}
-
-Ext.onReady(function(){
-
-    Ext.QuickTips.init();
-    
-    var personFilters = [{
-                    layout: 'column',
-                    items:[{
-                                        columnWidth:.4,
-                                        layout: 'form',
-                                        items: [
-                                                        datesCombo
-                                                ]
-                                    },{
-                                        columnWidth:.6,
-                                        layout: 'form',
-                                        items: [
-                                                        projectsCombo
-                                                ]
-                                    }]
-                }];
-        
-        var projectFilters = [{
-                    layout: 'column',
-                    items:[{
-                                        columnWidth:.3,
-                                        layout: 'form',
-                                        items: [
-                                                viewCombo
-                                                ]
-                                    },{
-                                        columnWidth:.4,
-                                        layout: 'form',
-                                        items: [        
-                                                        datesCombo
-                                                ]
-                                    },{
-                                        columnWidth:.3,
-                                        layout: 'form',
-                                        items: [        
-                                                                teamCombo
-                                                ]
-                                    }]
-                }, taskCombo
-                ];
-
-                filterForm = new Ext.FormPanel({
-        labelWidth: 60,
-        frame: true,
-                collapsible: true,
-                collapsed: true,
-        title: 'Filters',
-        bodyStyle: 'padding:1px 1px 0',
-        width: '650px',
-        monitorResize : true,
-        items: spaceType == 'person' ? personFilte