Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1002 - in qa/jira-extensions: changelog-report/src/etc changelog-report/src/etc/templates/changelog-report changelog-report/src/java/pl/net/mamut/jira jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator multiselect/jira-3.3/edit-webapp/WEB-INF/lib releasenotes-affect-report/src/java/pl/net/mamut/jira releasenotes-report/src/java/pl/net/mamut roadmap-report/src/etc roadmap-report/src/etc/pl/net/mamut/jira roadmap-report/src/etc/templates/roadmap-report roadmap-report/src/java/pl/net/mamut/jira
Author: dam...@jb... Date: 2005-08-27 18:30:13 -0400 (Sat, 27 Aug 2005) New Revision: 1002 Modified: qa/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm qa/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp qa/jira-extensions/multiselect/jira-3.3/edit-webapp/WEB-INF/lib/atlassian-configurableobjects-0.4.11.jar qa/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java qa/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java qa/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml qa/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm qa/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java Log: MERGED: -r 993:999 https://svn.labs.jboss.com/trunk/jira-extensions into qa/jira-extensions. Modified: qa/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml =================================================================== --- qa/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml 2005-08-27 22:30:13 UTC (rev 1002) @@ -69,6 +69,10 @@ <description>report.changelog.style.description</description> <type>select</type> <values> + <value> + <key>none</key> + <value>None</value> + </value> <value> <key>html</key> <value>HTML</value> Modified: qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm =================================================================== --- qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm 2005-08-27 22:30:13 UTC (rev 1002) @@ -1,7 +1,7 @@ <h3>HTML Source</h3> <br /> -<h3>Released project versions report (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate))</h3> +<h3>Released project versions report (covering $covering)</h3> <br /> #foreach ($project in $prjVerIss.keySet()) <br /> @@ -17,7 +17,7 @@ <tr> <br /> <td colspan=4> <a href="$!appProps.getString("jira.baseurl")/secure/IssueNavigator.jspa?reset=true&pid=$project.getLong("id")&fixfor=$version.id"> - <b><u>$version.name</u></b></a> ($dateFormat.format($version.getReleaseDate())) + <b><u>$version.name</u></b></a> ($releasedDf.format($version.releaseDate)) </td> <br /> </tr> <br /> @@ -30,7 +30,7 @@ <td width="15%"> <b>$constantsManager.getStatus($issue.getString('status')).getString("name")</b> </td><br /> <td> - $issue.getString('summary') </td><br /> + $textUtils.htmlEncode($issue.getString('summary')) </td><br /> <td width="15%" align="right"> ($constantsManager.getPriority($issue.getString('priority')).getString("name")) </td><br /> </tr> <br /> Modified: qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm =================================================================== --- qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm 2005-08-27 22:30:13 UTC (rev 1002) @@ -1,7 +1,7 @@ <h3>Text source</h3> <br /> -Released project versions report (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate)) +Released project versions report (covering $covering) <br /><br /> @@ -12,13 +12,13 @@ #if ($prjVerIss.get($project).size() != 0) #foreach ($version in $prjVerIss.get($project).keySet()) - ** $version.name ($dateFormat.format($version.getReleaseDate())) + ** $version.name ($releasedDf.format($version.releaseDate)) <br /> #set ($issues = $prjVerIss.get($project).get($version)) #if ($issues.size() > 0) #foreach ($issue in $issues) * - [ $issue.getString('key') ] $issue.getString('summary') + [ $issue.getString('key') ] $textUtils.htmlEncode($issue.getString('summary')) ($constantsManager.getStatus($issue.getString('status')).getString("name"), $constantsManager.getPriority($issue.getString('priority')).getString("name")) <br /> Modified: qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm =================================================================== --- qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm 2005-08-27 22:30:13 UTC (rev 1002) @@ -2,7 +2,7 @@ <table border="0" cellpadding="3" cellspacing="1" width="100%"> <tr class=rowHeader><td valign=top bgcolor=f0f0f0> <h3 class="formtitle">Released project versions report - (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate))</h3> + (covering $covering)</h3> </td></tr></table> </td></tr></table> @@ -29,7 +29,7 @@ <font size=3><a href="$!appProps.getString("jira.baseurl")/secure/IssueNavigator.jspa?reset=true&pid=$project.getLong("id")&fixfor=$version.id" title="$action.getText("browseproject.getmoreinfo")"> <b><u>$version.name</u></b></a></font> (#if ($version.releaseDate) - #versionReleaseDate($action $version) + $releasedDf.format($version.releaseDate) #end) </td> </tr> Modified: qa/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java =================================================================== --- qa/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 22:30:13 UTC (rev 1002) @@ -29,9 +29,11 @@ import com.atlassian.jira.web.util.OutlookDate; import com.atlassian.jira.web.util.OutlookDateManager; import com.opensymphony.user.User; +import com.opensymphony.util.TextUtils; import java.sql.Timestamp; import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.*; import org.ofbiz.core.entity.GenericValue; @@ -65,7 +67,7 @@ this.versionManager = versionManager; this.issueManager = issueManager; this.subTaskManager = subTaskManager; - this.issueSecurityLevelManager = issueSecurityLevelManager; + this.issueSecurityLevelManager = issueSecurityLevelManager; } /** @@ -268,8 +270,18 @@ prjVerIss.put(project, verIss); } - DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.LONG); + DateFormat dateFormat = new SimpleDateFormat("MMMM yyyy"); + DateFormat releasedDf = DateFormat.getDateInstance(DateFormat.LONG); + String beginDateMonth = dateFormat.format(beginDate); + String endDateMonth = dateFormat.format(endDate); + + String covering; + if (beginDateMonth.equals(endDateMonth)) + covering = beginDateMonth; + else + covering = beginDateMonth + " - " + endDateMonth; + velocityParams.put("prjVerIss", prjVerIss); velocityParams.put("action", action); velocityParams.put("endDate", endDate); @@ -277,9 +289,16 @@ velocityParams.put("dateFormat", dateFormat); velocityParams.put("constantsManager", constantsManager); velocityParams.put("appProps", appProps); + velocityParams.put("releasedDf", releasedDf); + velocityParams.put("covering", covering); + velocityParams.put("textUtils", new TextUtils()); /* Generating reeport source in the format demanded by the user */ - velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams)); + String style = (String)params.get("style"); + if ("none".equals(style)) + velocityParams.put("generated", ""); + else + velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams)); return descriptor.getHtml("view", velocityParams); } Modified: qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp =================================================================== --- qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp 2005-08-27 22:30:13 UTC (rev 1002) @@ -90,7 +90,8 @@ List allIssueTypes = constantsManager.getAllIssueTypes(); for (iter = allIssueTypes.iterator(); iter.hasNext();) { GenericValue issueType = (GenericValue)iter.next(); - issuesNamesMap.put(issueType.getString("id"), issueType.getString("name")); + if (!("Sub-task".equals(issueType.getString("name")))) + issuesNamesMap.put(issueType.getString("id"), issueType.getString("name")); } /* Preparing issueMap */ @@ -107,7 +108,8 @@ /* Filling sets in issueMap */ for (iter = issues.iterator(); iter.hasNext();) { Issue issue = (Issue) iter.next(); - ((Set)issuesMap.get(issue.getIssueType().getString("id"))).add(issue); + Set toAdd = (Set)issuesMap.get(issue.getIssueType().getString("id")); + if (toAdd != null) toAdd.add(issue); } for (iter = issuesMap.keySet().iterator(); iter.hasNext();) { Modified: qa/jira-extensions/multiselect/jira-3.3/edit-webapp/WEB-INF/lib/atlassian-configurableobjects-0.4.11.jar =================================================================== (Binary files differ) Modified: qa/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java =================================================================== --- qa/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java 2005-08-27 22:30:13 UTC (rev 1002) @@ -191,12 +191,24 @@ Iterator iter; /* Map: issue type id -> (Set of issue) */ - Map issuesMap = new TreeMap(); + Map issuesMap = new TreeMap(new Comparator() { + // Sorting issue types by the "sequence" field. + public int compare(Object arg0, Object arg1) { + String id1 = (String) arg0; + String id2 = (String) arg1; + + GenericValue gv1 = constantsManager.getIssueType(id1); + GenericValue gv2 = constantsManager.getIssueType(id2); + + return gv1.getLong("sequence").compareTo( + gv2.getLong("sequence")); + } + }); /* Map: issue type id -> issue name */ Map issuesNamesMap = new HashMap(); CustomField affects = customFieldManager.getCustomFieldObjectByName("Affects"); - + Map affectsValues = new HashMap(); Iterator it = issues.iterator(); @@ -205,23 +217,26 @@ if (affects != null) while (it.hasNext()) { Object key = it.next(); - String issueId = ((GenericValue)key).getString("id"); + String issueKey = ((GenericValue)key).getString("key"); String str = String.valueOf(affects.getValue( - issueManager.getIssueObject(issueId))); + issueManager.getIssueObject(issueKey))); if (!(str.equals("null"))) affectsValues.put(key, str.substring(1,str.length() - 1)); } /* Preparing issueMap */ - for (iter = sections.iterator(); iter.hasNext();) - issuesMap.put(iter.next(), new TreeSet()); + for (iter = sections.iterator(); iter.hasNext();) { + String typeId = (String) iter.next(); + issuesMap.put(typeId, new TreeSet()); + } + + /* Filling sets in issueMap */ + for (iter = issues.iterator(); iter.hasNext();) { + GenericValue issue = (GenericValue) iter.next(); + Set toAdd = (Set)issuesMap.get(issue.getString("type")); + if (toAdd != null) toAdd.add(issue); + } - /* Filling sets in issueMap */ - for (iter = issues.iterator(); iter.hasNext();) { - GenericValue issue = (GenericValue) iter.next(); - ((Set)issuesMap.get(issue.getString("type"))).add(issue); - } - /* Setting the issues' names */ for (iter = sections.iterator(); iter.hasNext();) { String issueId = (String)iter.next(); Modified: qa/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java =================================================================== --- qa/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java 2005-08-27 22:30:13 UTC (rev 1002) @@ -207,13 +207,16 @@ Map issuesNamesMap = new HashMap(); /* Preparing issueMap */ - for (iter = sections.iterator(); iter.hasNext();) - issuesMap.put(iter.next(), new TreeSet()); + for (iter = sections.iterator(); iter.hasNext();) { + String typeId = (String) iter.next(); + issuesMap.put(typeId, new TreeSet()); + } /* Filling sets in issueMap */ for (iter = issues.iterator(); iter.hasNext();) { GenericValue issue = (GenericValue) iter.next(); - ((Set)issuesMap.get(issue.getString("type"))).add(issue); + Set toAdd = (Set)issuesMap.get(issue.getString("type")); + if (toAdd != null) toAdd.add(issue); } /* Setting the issues' names */ Modified: qa/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml =================================================================== --- qa/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml 2005-08-27 22:30:13 UTC (rev 1002) @@ -44,22 +44,6 @@ <type>date</type> </property> <property> - <key>datenow</key> - <name>report.roadmap.datenow.name</name> - <description>report.roadmap.datenow.description</description> - <type>select</type> - <values> - <value> - <key>no</key> - <value>No</value> - </value> - <value> - <key>yes</key> - <value>Yes</value> - </value> - </values> - </property> - <property> <key>period</key> <name>report.roadmap.period.name</name> <description>report.roadmap.period.description</description> @@ -86,6 +70,10 @@ <type>select</type> <values> <value> + <key>none</key> + <value>None</value> + </value> + <value> <key>html</key> <value>HTML</value> </value> Modified: qa/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties =================================================================== --- qa/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties 2005-08-27 22:30:13 UTC (rev 1002) @@ -14,11 +14,8 @@ report.roadmap.period.description = Select the span of time that this report will cover report.roadmap.period.error = Please select one period. report.roadmap.datebegin.name = Begin date -report.roadmap.datebegin.description = Select the date that begins the period of time you chose. +report.roadmap.datebegin.description = Select the date that begins the period of time you chose. Leave blank for rolling date, i.e. current date at the time when the report is requested. report.roadmap.datebegin.error = Please select a date. -report.roadmap.datenow.name = Today -report.roadmap.datenow.description = Check this box if you want the report's starting date to be today. -report.roadmap.datenow.error = Please select either yes or no. report.roadmap.style.name = Style report.roadmap.style.description = Select the style in which to generate the report source. report.roadmap.style.error = Please select one style. \ No newline at end of file Modified: qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm =================================================================== --- qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm 2005-08-27 22:30:13 UTC (rev 1002) @@ -1,7 +1,7 @@ <h3>HTML Source</h3> <br /> -<h3>Unreleased project versions report (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate))</h3> +<h3>Unreleased project versions report (covering $covering)</h3> <br /> #foreach ($project in $prjVerIss.keySet()) <br /> @@ -17,7 +17,7 @@ <tr> <br /> <td colspan=4> <a href="$!appProps.getString("jira.baseurl")/secure/IssueNavigator.jspa?reset=true&pid=$project.getLong("id")&fixfor=$version.id"> - <b><u>$version.name</u></b></a> ($dateFormat.format($version.getReleaseDate())) + <b><u>$version.name</u></b></a> ($dateFormat.format($version.releaseDate) - $nextMonths.get($dateFormat.format($version.releaseDate))) </td> <br /> </tr> <br /> @@ -30,7 +30,7 @@ <td width="15%"> <b>$constantsManager.getStatus($issue.getString('status')).getString("name")</b> </td><br /> <td> - $issue.getString('summary') </td><br /> + $textUtils.htmlEncode($issue.getString('summary')) </td><br /> <td width="15%" align="right"> ($constantsManager.getPriority($issue.getString('priority')).getString("name")) </td><br /> </tr> <br /> Modified: qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm =================================================================== --- qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm 2005-08-27 22:30:13 UTC (rev 1002) @@ -1,7 +1,7 @@ <h3>Text source</h3> <br /> -Unreleased project versions report (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate)) +Unreleased project versions report (covering $covering) <br /><br /> @@ -12,13 +12,13 @@ #if ($prjVerIss.get($project).size() != 0) #foreach ($version in $prjVerIss.get($project).keySet()) - ** $version.name ($dateFormat.format($version.getReleaseDate())) + ** $version.name ($dateFormat.format($version.releaseDate) - $nextMonths.get($dateFormat.format($version.releaseDate))) <br /> #set ($issues = $prjVerIss.get($project).get($version)) #if ($issues.size() > 0) #foreach ($issue in $issues) * - [ $issue.getString('key') ] $issue.getString('summary') + [ $issue.getString('key') ] $textUtils.htmlEncode($issue.getString('summary')) ($constantsManager.getStatus($issue.getString('status')).getString("name"), $constantsManager.getPriority($issue.getString('priority')).getString("name")) <br /> Modified: qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm =================================================================== --- qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm 2005-08-27 22:30:13 UTC (rev 1002) @@ -2,7 +2,7 @@ <table border="0" cellpadding="3" cellspacing="1" width="100%"> <tr class=rowHeader><td valign=top bgcolor=f0f0f0> <h3 class="formtitle">Unreleased project versions report - (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate))</h3> + (covering $covering)</h3> </td></tr></table> </td></tr></table> @@ -24,12 +24,12 @@ <table cellpadding=3 cellspacing=0 border=0 width=100% bgcolor="fffff0"> #foreach ($version in $prjVerIss.get($project).keySet()) <tr> - <td class="colHeaderLink" colspan=4> + <td class="colHeaderLink" colspan=7> #versionStatus($version 24) <font size=3><a href="$!appProps.getString("jira.baseurl")/secure/IssueNavigator.jspa?reset=true&pid=$project.getLong("id")&fixfor=$version.id" title="$action.getText("browseproject.getmoreinfo")"> <b><u>$version.name</u></b></a></font> (#if ($version.releaseDate) - #versionReleaseDate($action $version) + $dateFormat.format($version.releaseDate) - $nextMonths.get($dateFormat.format($version.releaseDate)) #end) </td> </tr> Modified: qa/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java =================================================================== --- qa/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java 2005-08-27 22:30:13 UTC (rev 1002) @@ -32,9 +32,11 @@ import com.atlassian.jira.web.util.OutlookDateManager; import com.atlassian.plugin.PluginManager; import com.opensymphony.user.User; +import com.opensymphony.util.TextUtils; import java.sql.Timestamp; import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.*; import org.ofbiz.core.entity.GenericValue; @@ -74,7 +76,7 @@ this.pluginManager = pluginManager; this.issueManager = issueManager; this.subTaskManager = subTaskManager; - this.issueSecurityLevelManager = issueSecurityLevelManager; + this.issueSecurityLevelManager = issueSecurityLevelManager; } /** @@ -191,8 +193,12 @@ /* Geting the dates */ I18nHelper i18nBean = new I18nBean(remoteUser); Date beginDate; - if (("yes".equals((String) params.get("datenow")))) - beginDate = Calendar.getInstance().getTime(); + + // Empty begin-date --> make the report from the current date. + String datebegin = (String) params.get("datebegin"); + if ((datebegin == null) || ("".equals(datebegin.trim()))) + beginDate = new Date( + (Calendar.getInstance().getTimeInMillis() / 86400000) * 86400000 - 1); else beginDate = ParameterUtils.getDateParam(params, "datebegin", i18nBean.getLocale()); Date endDate = getEndDate((String)params.get("period"), beginDate); @@ -239,8 +245,42 @@ prjVerIss.put(project, verIss); } - DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.LONG); + DateFormat dateFormat = new SimpleDateFormat("MMMM yyyy"); + + String beginDateMonth = dateFormat.format(beginDate); + String endDateMonth = dateFormat.format(endDate); + String covering; + if (beginDateMonth.equals(endDateMonth)) + covering = beginDateMonth; + else + covering = beginDateMonth + " - " + endDateMonth; + + Map nextMonths = new HashMap(); + Date current = new Date(beginDate.getTime()); + Calendar cal = Calendar.getInstance(); + + for (int i=0; i<12; i++) { + String currMonth = dateFormat.format(current); + + // Pushing the current date one month forward. + cal.setTime(current); + + int month = cal.get(Calendar.MONTH); + int year = cal.get(Calendar.YEAR); + month += 1; + if (month > 11) { + month = 0; + year += 1; + } + cal.set(Calendar.MONTH, month); + cal.set(Calendar.YEAR, year); + + current = cal.getTime(); + + nextMonths.put(currMonth, dateFormat.format(current)); + } + velocityParams.put("prjVerIss", prjVerIss); velocityParams.put("action", action); velocityParams.put("browser", new Browser(projectManager, constantsManager, searchProvider, @@ -250,9 +290,16 @@ velocityParams.put("dateFormat", dateFormat); velocityParams.put("constantsManager", constantsManager); velocityParams.put("appProps", appProps); + velocityParams.put("nextMonths", nextMonths); + velocityParams.put("covering", covering); + velocityParams.put("textUtils", new TextUtils()); /* Generating reeport source in the format demanded by the user */ - velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams)); + String style = (String)params.get("style"); + if ("none".equals(style)) + velocityParams.put("generated", ""); + else + velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams)); return descriptor.getHtml("view", velocityParams); } @@ -330,19 +377,20 @@ if (!validateMultivalue(action, params, "priorities")) return; if (!validateSinglevalue(action, params, "period")) return; if (!validateSinglevalue(action, params, "style")) return; - if (!validateSinglevalue(action, params, "datenow")) return; - String dateNow = (String) params.get("datenow"); - if (!("yes".equals(dateNow))) { - Date beginDate = ParameterUtils.getDateParam(params, "datebegin", i18nBean.getLocale()); - OutlookDate outlookDate = outlookDateManager.getOutlookDate(i18nBean.getLocale()); - if (beginDate == null || outlookDate.isDatePickerDate(outlookDate.formatDMY(beginDate))) - { - action.addError("datebegin", action.getText("report.roadmap.datebegin.error")); - return; - } + // Allowing an empty date-begin. + String datebegin = (String) params.get("datebegin"); + if ((datebegin == null) || ("".equals(datebegin.trim()))) + return; + + Date beginDate = ParameterUtils.getDateParam(params, "datebegin", i18nBean.getLocale()); + OutlookDate outlookDate = outlookDateManager.getOutlookDate(i18nBean.getLocale()); + if (beginDate == null || outlookDate.isDatePickerDate(outlookDate.formatDMY(beginDate))) + { + action.addError("datebegin", action.getText("report.roadmap.datebegin.error")); + return; } } - + public void init(ReportModuleDescriptor arg0) { } } \ No newline at end of file |
