[jboss-svn-commits] JBL Code SVN: r35569 - in labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main: java/org/jboss/community/sbs/plugin/reports/struts and 3 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Oct 19 10:12:41 EDT 2010 

Author: lkrzyzanek
Date: 2010-10-19 10:12:40 -0400 (Tue, 19 Oct 2010)
New Revision: 35569

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbRedHatUsersDAOImpl.java
   labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/AdminRHUsersAction.java
   labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/rhusers.ftl
   labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/struts.xml
   labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties
Log:
Improved RH Users page

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbRedHatUsersDAOImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbRedHatUsersDAOImpl.java	2010-10-19 13:14:25 UTC (rev 35568)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbRedHatUsersDAOImpl.java	2010-10-19 14:12:40 UTC (rev 35569)
@@ -41,7 +41,7 @@
 
   private static final String SELECT_REDHAT_USERS_BY_DATE = "SELECT userID FROM reportsRedHatUsers WHERE created = ?";
 
-  private static final String SELECT_REDHAT_USERS_COUNTS = "SELECT created, count(userID) FROM reportsRedHatUsers GROUP BY created";
+  private static final String SELECT_REDHAT_USERS_COUNTS = "SELECT created, count(userID) FROM reportsRedHatUsers GROUP BY created ORDER BY created DESC";
 
   private static final String CREATE_SNAPSHOT = "INSERT reportsRedHatUsers SELECT DISTINCT u.userId, ? "
       + "FROM jiveUser u LEFT JOIN jiveUserProfile uphd ON u.userID=uphd.userID LEFT JOIN jiveUserProfile upld ON u.userID=upld.userID and upld.fieldID=5005 "
@@ -88,8 +88,8 @@
     @Override
     public Object[] mapRow(ResultSet rs, int rowNum) throws SQLException {
       Object[] row = new Object[2];
-      row[0] = rs.getDate(0);
-      row[1] = rs.getLong(1);
+      row[0] = new Date(rs.getLong(1));
+      row[1] = rs.getLong(2);
       return row;
     }
   }

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/AdminRHUsersAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/AdminRHUsersAction.java	2010-10-19 13:14:25 UTC (rev 35568)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/AdminRHUsersAction.java	2010-10-19 14:12:40 UTC (rev 35569)
@@ -51,7 +51,7 @@
 
     addActionMessage(getText("plugin.reports.admin.rhusers.text.created"));
 
-    return INPUT;
+    return SUCCESS;
   }
 
   public Map<Date, Long> getSnapshots() {

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/rhusers.ftl
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/rhusers.ftl	2010-10-19 13:14:25 UTC (rev 35568)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/rhusers.ftl	2010-10-19 14:12:40 UTC (rev 35569)
@@ -7,12 +7,23 @@
   </head>
   <body>
     <@s.form  theme="simple" action="redhat-users-create-snapshot">
-    Create Snapshot: <@s.submit value="${action.getText('plugin.reports.admin.rhusers.submit')}"/>
+    <@s.text name="plugin.reports.admin.rhusers.createsnapshot"/>:&nbsp;<@s.submit value="${action.getText('plugin.reports.admin.rhusers.submit')}"/>
     </@s.form>
 
-    <p>Created Snapshots</p>
-    <@s.iterator value="snapshots">
-      snapshot: <@s.property />
-    </@s.iterator>
+    <h3><@s.text name="plugin.reports.admin.rhusers.snapshots.caption"/></h3>
+    <div class="jive-table">
+    <table style="border: 1px solid #BBBBBB">
+      <tr>
+        <th><@s.text name="plugin.reports.admin.rhusers.snapshots.column.created"/></th>
+        <th><@s.text name="plugin.reports.admin.rhusers.snapshots.column.count"/></th>
+      </tr>
+    <#list snapshots.keySet() as key>
+      <tr>
+        <td>${key?datetime}</td>
+        <td>${snapshots.get(key)}</td>
+      </tr>
+    </#list>
+    </table>
+    </div>
   </body>
-</html>
\ No newline at end of file
+</html>

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/struts.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/struts.xml	2010-10-19 13:14:25 UTC (rev 35568)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/struts.xml	2010-10-19 14:12:40 UTC (rev 35569)
@@ -13,6 +13,9 @@
       <result name="input" type="freemarker">
         /plugins/reports/resources/templates/admin/rhusers.ftl
       </result>
+      <result name="success" type="redirect-action">
+        redhat-users
+      </result>
     </action>
 
   </package>

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-10-19 13:14:25 UTC (rev 35568)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties	2010-10-19 14:12:40 UTC (rev 35569)
@@ -3,5 +3,9 @@
 
 plugin.reports.admin.rhusers.name=Red Hat Users
 plugin.reports.admin.rhusers.description=List of Red Hat Users snapshots
+plugin.reports.admin.rhusers.createsnapshot=Create new snaphost of Red Hat users from current users
+plugin.reports.admin.rhusers.snapshots.caption=Created Snapshots
+plugin.reports.admin.rhusers.snapshots.column.created=Created
+plugin.reports.admin.rhusers.snapshots.column.count=Count
 plugin.reports.admin.rhusers.submit=Create Snapshot
 plugin.reports.admin.rhusers.text.created=Snapshot successfuly created
\ No newline at end of file

More information about the jboss-svn-commits mailing list