[jboss-svn-commits] JBL Code SVN: r35814 - in labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main: java/org/jboss/community/sbs/plugin/reports/monthly and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 1 06:49:01 EDT 2010
Author: lkrzyzanek
Date: 2010-11-01 06:49:00 -0400 (Mon, 01 Nov 2010)
New Revision: 35814
Modified:
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbReportDAOImpl.java
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/ReportBean.java
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/monthly/MonthlyReportManagerImpl.java
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/monthly-reports.ftl
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/schema.xml
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties
Log:
Added "created" field to reports
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbReportDAOImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbReportDAOImpl.java 2010-11-01 09:23:07 UTC (rev 35813)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbReportDAOImpl.java 2010-11-01 10:49:00 UTC (rev 35814)
@@ -43,12 +43,12 @@
public static final int DB_REPORT_SEQ = 6000;
- private static final String SELECT_ALL_REPORTS = "SELECT id, fromDate, toDate, redHatUsersSnapshot, configurationId, status, statusMessage FROM reportsMonthly";
+ private static final String SELECT_ALL_REPORTS = "SELECT id, fromDate, toDate, redHatUsersSnapshot, configurationId, status, statusMessage, created FROM reportsMonthly";
private static final String SELECT_REPORT_BY_ID = SELECT_ALL_REPORTS + " WHERE id = ?";
- private static final String INSERT_REPORT = "INSERT INTO reportsMonthly (id, fromDate, toDate, redHatUsersSnapshot, configurationId, status, statusMessage) "
- + "VALUES (?, ?, ?, ?, ?, ?, ?)";
+ private static final String INSERT_REPORT = "INSERT INTO reportsMonthly (id, created, fromDate, toDate, redHatUsersSnapshot, configurationId, status, statusMessage) "
+ + "VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
private static final String UPDATE_REPORT_STATUS = "UPDATE reportsMonthly SET status = ?, statusMessage = ? WHERE id = ?";
@@ -59,7 +59,7 @@
public ReportBean createReport(ReportBean bean) {
bean.setId(SequenceManager.nextID(DB_REPORT_SEQ));
- getSimpleJdbcTemplate().update(INSERT_REPORT, bean.getId(), bean.getFrom(), bean.getTo(),
+ getSimpleJdbcTemplate().update(INSERT_REPORT, bean.getId(), bean.getCreated(), bean.getFrom(), bean.getTo(),
bean.getRedHatUsersSnapshot(), bean.getConfigurationId(), bean.getStatus(), bean.getStatusMessage());
return bean;
@@ -87,7 +87,7 @@
@Override
public List<ReportBean> getAllReports() {
- return getSimpleJdbcTemplate().query(SELECT_ALL_REPORTS, reportBeanMapper);
+ return getSimpleJdbcTemplate().query(SELECT_ALL_REPORTS + " ORDER BY created DESC", reportBeanMapper);
}
@Override
@@ -113,6 +113,7 @@
bean.setConfigurationId(rs.getLong(5));
bean.setStatus(rs.getInt(6));
bean.setStatusMessage(rs.getString(7));
+ bean.setCreated(rs.getLong(8));
return bean;
}
}
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/ReportBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/ReportBean.java 2010-11-01 09:23:07 UTC (rev 35813)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/ReportBean.java 2010-11-01 10:49:00 UTC (rev 35814)
@@ -48,6 +48,11 @@
private long id = -1;
/**
+ * Report created
+ */
+ private long created;
+
+ /**
* Report range - from
*/
private long from;
@@ -133,4 +138,12 @@
this.configurationId = configurationId;
}
+ public void setCreated(long created) {
+ this.created = created;
+ }
+
+ public long getCreated() {
+ return created;
+ }
+
}
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/monthly/MonthlyReportManagerImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/monthly/MonthlyReportManagerImpl.java 2010-11-01 09:23:07 UTC (rev 35813)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/monthly/MonthlyReportManagerImpl.java 2010-11-01 10:49:00 UTC (rev 35814)
@@ -101,6 +101,7 @@
}
ReportBean report = new ReportBean();
+ report.setCreated(System.currentTimeMillis());
report.setFrom(from.getTime());
report.setTo(to.getTime());
report.setRedHatUsersSnapshot(redHatUsersSnapshot.getTime());
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/monthly-reports.ftl
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/monthly-reports.ftl 2010-11-01 09:23:07 UTC (rev 35813)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/monthly-reports.ftl 2010-11-01 10:49:00 UTC (rev 35814)
@@ -44,6 +44,7 @@
<table style="border: 1px solid #BBBBBB">
<thead>
<tr>
+ <th><@s.text name="plugin.reports.admin.monthlyrep.created"/></th>
<th><@s.text name="plugin.reports.admin.monthlyrep.from"/></th>
<th><@s.text name="plugin.reports.admin.monthlyrep.to"/></th>
<th><@s.text name="plugin.reports.admin.monthlyrep.reports.column.snapshot"/></th>
@@ -55,6 +56,7 @@
<tbody>
<#list reports as report>
<tr>
+ <td>${statics['org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersSnapshotAction'].convertToDate(report.created)?string("yyyy-MM-dd HH:mm:ss")}</td>
<td>${statics['org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersSnapshotAction'].convertToDate(report.from)?string("yyyy-MM-dd HH:mm:ss")}</td>
<td>${statics['org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersSnapshotAction'].convertToDate(report.to)?string("yyyy-MM-dd HH:mm:ss")}</td>
<td><a href="/admin/redhat-users-snapshot.jspa?timestamp=${report.redHatUsersSnapshot?string("0")}">${statics['org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersSnapshotAction'].convertToDate(report.redHatUsersSnapshot)?string("yyyy-MM-dd HH:mm:ss")}</a></td>
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/schema.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/schema.xml 2010-11-01 09:23:07 UTC (rev 35813)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/schema.xml 2010-11-01 10:49:00 UTC (rev 35814)
@@ -8,7 +8,7 @@
<table name="reportsMonthly" description="Monthly reports agregated across ">
<column name="id" type="bigint" nullable="false" description="Primary key" />
-<!-- TODO: Add when report was created -->
+ <column name="created" type="bigint" nullable="false" description="Created" />
<column name="fromDate" type="bigint" nullable="false" description="Report from" />
<column name="toDate" type="bigint" nullable="false" description="Report to" />
<column name="redHatUsersSnapshot" type="bigint" nullable="false" description="Red Hat Users Snapshot" />
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties 2010-11-01 09:23:07 UTC (rev 35813)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties 2010-11-01 10:49:00 UTC (rev 35814)
@@ -22,6 +22,7 @@
plugin.reports.admin.monthlyrep.name=Monthly Reports
plugin.reports.admin.monthlyrep.description=View and create Monthly Reports
+plugin.reports.admin.monthlyrep.created=Created
plugin.reports.admin.monthlyrep.from=From
plugin.reports.admin.monthlyrep.from.desc=Format: yyyy-MM-dd
plugin.reports.admin.monthlyrep.to=To
More information about the jboss-svn-commits
mailing list