Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r998 - in trunk/jira-extensions: changelog-report/src/etc/templates/changelog-report changelog-report/src/java/pl/net/mamut/jira 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
|
From: <jbo...@li...> - 2005-08-27 21:53:19
|
Author: adamw
Date: 2005-08-27 17:53:06 -0400 (Sat, 27 Aug 2005)
New Revision: 998
Modified:
trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm
trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm
trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm
trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java
trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml
trunk/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties
trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm
trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm
trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm
trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java
Log:
Months in reports instead of full dates
Modified: trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm
===================================================================
--- trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm 2005-08-27 20:07:47 UTC (rev 997)
+++ trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm 2005-08-27 21:53:06 UTC (rev 998)
@@ -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 />
Modified: trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm
===================================================================
--- trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm 2005-08-27 20:07:47 UTC (rev 997)
+++ trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm 2005-08-27 21:53:06 UTC (rev 998)
@@ -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,7 +12,7 @@
#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)
Modified: trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm
===================================================================
--- trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm 2005-08-27 20:07:47 UTC (rev 997)
+++ trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm 2005-08-27 21:53:06 UTC (rev 998)
@@ -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: trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java
===================================================================
--- trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 20:07:47 UTC (rev 997)
+++ trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 21:53:06 UTC (rev 998)
@@ -33,6 +33,7 @@
import java.sql.Timestamp;
import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.*;
import org.ofbiz.core.entity.GenericValue;
@@ -66,7 +67,7 @@
this.versionManager = versionManager;
this.issueManager = issueManager;
this.subTaskManager = subTaskManager;
- this.issueSecurityLevelManager = issueSecurityLevelManager;
+ this.issueSecurityLevelManager = issueSecurityLevelManager;
}
/**
@@ -269,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);
@@ -278,6 +289,8 @@
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 */
Modified: trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml
===================================================================
--- trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml 2005-08-27 20:07:47 UTC (rev 997)
+++ trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml 2005-08-27 21:53:06 UTC (rev 998)
@@ -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>
Modified: trunk/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties
===================================================================
--- trunk/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties 2005-08-27 20:07:47 UTC (rev 997)
+++ trunk/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties 2005-08-27 21:53:06 UTC (rev 998)
@@ -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: trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm
===================================================================
--- trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm 2005-08-27 20:07:47 UTC (rev 997)
+++ trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm 2005-08-27 21:53:06 UTC (rev 998)
@@ -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 />
Modified: trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm
===================================================================
--- trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm 2005-08-27 20:07:47 UTC (rev 997)
+++ trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm 2005-08-27 21:53:06 UTC (rev 998)
@@ -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,7 +12,7 @@
#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)
Modified: trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm
===================================================================
--- trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm 2005-08-27 20:07:47 UTC (rev 997)
+++ trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm 2005-08-27 21:53:06 UTC (rev 998)
@@ -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: trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java
===================================================================
--- trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java 2005-08-27 20:07:47 UTC (rev 997)
+++ trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java 2005-08-27 21:53:06 UTC (rev 998)
@@ -36,6 +36,7 @@
import java.sql.Timestamp;
import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.*;
import org.ofbiz.core.entity.GenericValue;
@@ -75,7 +76,7 @@
this.pluginManager = pluginManager;
this.issueManager = issueManager;
this.subTaskManager = subTaskManager;
- this.issueSecurityLevelManager = issueSecurityLevelManager;
+ this.issueSecurityLevelManager = issueSecurityLevelManager;
}
/**
@@ -192,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);
@@ -240,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,
@@ -251,6 +290,8 @@
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 */
@@ -336,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
|
