STAT-98: Merged STAT-98 branch into trunk

git-svn-id: https://source.sakaiproject.org/svn/sitestats/ufp/sitestats/trunk@71981 66ffb92e-73f9-0310-93c1-f5514f145a0a

sitestats/.settings/org.hibernate.eclipse.console.prefs

@@ -0,0 +1,4 @@
+#Wed Oct 08 09:31:07 BST 2008
+default.configuration=SiteStats
+eclipse.preferences.version=1
+hibernate3.enabled=true

sitestats/.wicketprops

@@ -0,0 +1,3 @@
+#Thu Sep 18 09:27:38 BST 2008
+web.contextRoot=sitestats-tool/src/webapp/html
+web.cssPaths=../css/sitestats.css

sitestats/pom.xml

@@ -4,7 +4,7 @@
   <name>Sakai SiteStats</name>
   <groupId>org.sakaiproject</groupId>
   <artifactId>sitestats-base</artifactId>
-  <version>1.3-SNAPSHOT</version><!-- sitestats.version --> 
+  <version>2.0-SNAPSHOT</version><!-- sitestats.version --> 
 
   <description>SiteStats is a tool for Sakai for showing site usage statistics.</description>
   <url>http://bugs.sakaiproject.org/confluence/display/STAT</url>
@@ -33,10 +33,9 @@
     <commons-digester.version>1.6</commons-digester.version>
     <fop.version>0.94</fop.version>
     <poi.version>2.0-final-20040126</poi.version>
-    <myfaces.version>1.1.5</myfaces.version>
-    <tomahawk.version>1.1.6</tomahawk.version>
-    <ajax4jsf.version>1.1.1</ajax4jsf.version>
     <jfreechart.version>1.0.5</jfreechart.version>
+    <sst.wicket.version>1.3.5</sst.wicket.version>
+    <sst.slf4j.version>1.4.3</sst.slf4j.version>
   </properties>
 
 
@@ -98,6 +97,11 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
+    <repository>
+      <id>org.wicketstuff</id>
+      <name>Wicket Stuff Repository</name>
+      <url>http://wicketstuff.org/maven/repository</url>
+    </repository>
   </repositories>
 
 
@@ -182,66 +186,50 @@
       <artifactId>poi</artifactId>
       <version>${poi.version}</version>
     </dependency>
-    
-    <!-- JSF -->
+
+    <!-- Apache Wicket -->
     <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-depend-jsf-widgets-myfaces</artifactId>
-      <version>${sakai.version}</version>
-      <type>pom</type>
-    </dependency>    
+      <groupId>org.apache.wicket</groupId>
+      <artifactId>wicket</artifactId>
+      <version>${sst.wicket.version}</version>
+    </dependency>
     <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-jsf-tool</artifactId>
-      <version>${sakai.version}</version>
+      <groupId>org.apache.wicket</groupId>
+      <artifactId>wicket-extensions</artifactId>
+      <version>${sst.wicket.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-jsf-app</artifactId>
-      <version>${sakai.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>jsf</groupId>
-          <artifactId>jsf-api</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.apache.wicket</groupId>
+      <artifactId>wicket-ioc</artifactId>
+      <version>${sst.wicket.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.myfaces.core</groupId>
-      <artifactId>myfaces-api</artifactId>
-      <version>${myfaces.version}</version>
+      <groupId>org.apache.wicket</groupId>
+      <artifactId>wicket-spring</artifactId>
+      <version>${sst.wicket.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.myfaces.core</groupId>
-      <artifactId>myfaces-impl</artifactId>
-      <version>${myfaces.version}</version>
+      <groupId>org.apache.wicket</groupId>
+      <artifactId>wicket-spring-annot</artifactId>
+      <version>${sst.wicket.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.myfaces.tomahawk</groupId>
-      <artifactId>tomahawk</artifactId>
-      <version>${tomahawk.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>antlr</groupId>
-          <artifactId>antlr</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.apache.wicket</groupId>
+      <artifactId>wicket-datetime</artifactId>
+      <version>${sst.wicket.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.ajax4jsf</groupId>
-      <artifactId>ajax4jsf</artifactId>
-      <version>${ajax4jsf.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-impl</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${sst.slf4j.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${sst.slf4j.version}</version>
+    </dependency>
+
+    <!-- JFreeChart -->
     <dependency>
       <groupId>jfree</groupId>
       <artifactId>jfreechart</artifactId>

sitestats/sitestats-api/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>sitestats-base</artifactId>
     <groupId>org.sakaiproject</groupId>
-    <version>1.3-SNAPSHOT</version><!-- sitestats.version --> 
+    <version>2.0-SNAPSHOT</version><!-- sitestats.version --> 
   </parent>
 
   <!-- Packaging -->

sitestats/sitestats-api/src/java/org/sakaiproject/sitestats/api/StatsManager.java

@@ -146,6 +146,54 @@ public interface StatsManager {
 	 */
 	public List<CommonStatGrpByDate> getEventStatsGrpByDate(String siteId, List<String> events, Date iDate, Date fDate, List<String> userIds, boolean inverseUserSelection, PagingPosition page);
 
+	/**
+	 * Get event statistics grouped by user, site, event and date
+	 * @param siteId The site ID
+	 * @param events List of events to get statistics for
+	 * @param iDate The initial date
+	 * @param fDate The final date 
+	 * @param userIds The list of user Ids
+	 * @param inverseUserSelection match users not in userIds list
+	 * @param page The PagePosition subset of items to return
+	 * @param sortBy Columns to sort by
+	 * @param sortAscending Sort ascending?
+	 * @return a list of CommonStatGrpByDate objects (date member contains last date for the given event)
+	 */
+	public List<CommonStatGrpByDate> getEventStats(
+			final String siteId,
+			final List<String> events, 
+			final Date iDate, final Date fDate,
+			final List<String> userIds,
+			final boolean inverseUserSelection,
+			final PagingPosition page, 
+			final String groupBy,
+			final String sortBy, 
+			final boolean sortAscending);
+
+	/**
+	 * Get row count for event statistics grouped by user, site, event and date
+	 * @param siteId The site ID
+	 * @param events List of events to get statistics for
+	 * @param iDate The initial date
+	 * @param fDate The final date 
+	 * @param userIds The list of user Ids
+	 * @param inverseUserSelection match users not in userIds list
+	 * @param page The PagePosition subset of items to return
+	 * @param sortBy Columns to sort by
+	 * @param sortAscending Sort ascending?
+	 * @return a list of CommonStatGrpByDate objects (date member contains last date for the given event)
+	 */
+	public int getEventStatsRowCount(
+			final String siteId,
+			final List<String> events, 
+			final Date iDate, final Date fDate,
+			final List<String> userIds,
+			final boolean inverseUserSelection,
+			final PagingPosition page, 
+			final String groupBy,
+			final String sortBy, 
+			final boolean sortAscending);
+
 	/**
 	 * Count event statistics grouped by user, site, event and date
 	 * @param siteId The site ID
@@ -190,14 +238,54 @@ public interface StatsManager {
 	public List<CommonStatGrpByDate> getResourceStatsGrpByDateAndAction(String siteId, String resourceAction, List<String> resourceIds, Date iDate, final Date fDate, List<String> userIds, boolean inverseUserSelection, PagingPosition page);
 
 	/**
-	 * Count resource statistics grouped by user, site, resource and date
+	 * Get event statistics grouped by user, site, event and date
 	 * @param siteId The site ID
-	 * @param searchKey An user ID, first or last name
+	 * @param resourceAction A specific resource action to limit to.
+	 * @param resourceIds A list of specific resources to limit to.
 	 * @param iDate The initial date
-	 * @param fDate The final date
-	 * @return a list of CommonStatGrpByDate objects (date member contains last date for the given resource access)
+	 * @param fDate The final date 
+	 * @param userIds The list of user Ids
+	 * @param inverseUserSelection match users not in userIds list
+	 * @param page The PagePosition subset of items to return
+	 * @param sortBy Columns to sort by
+	 * @param sortAscending Sort ascending?
+	 * @return a list of CommonStatGrpByDate objects (date member contains last date for the given event)
+	 */
+	public List<CommonStatGrpByDate> getResourceStats(
+			final String siteId,
+			final String resourceAction, final List<String> resourceIds,
+			final Date iDate, final Date fDate,
+			final List<String> userIds,
+			final boolean inverseUserSelection,
+			final PagingPosition page, 
+			final String groupBy,
+			final String sortBy, 
+			final boolean sortAscending);
+
+	/**
+	 * Get row count for event statistics grouped by user, site, event and date
+	 * @param siteId The site ID
+	 * @param resourceAction A specific resource action to limit to.
+	 * @param resourceIds A list of specific resources to limit to.
+	 * @param iDate The initial date
+	 * @param fDate The final date 
+	 * @param userIds The list of user Ids
+	 * @param inverseUserSelection match users not in userIds list
+	 * @param page The PagePosition subset of items to return
+	 * @param sortBy Columns to sort by
+	 * @param sortAscending Sort ascending?
+	 * @return a list of CommonStatGrpByDate objects (date member contains last date for the given event)
 	 */
-	//public int countResourceStatsGrpByDateAndAction(String siteId, String searchKey, Date iDate, Date fDate);
+	public int getResourceStatsRowCount(
+			final String siteId,
+			final String resourceAction, final List<String> resourceIds,
+			final Date iDate, final Date fDate,
+			final List<String> userIds,
+			final boolean inverseUserSelection,
+			final PagingPosition page, 
+			final String groupBy,
+			final String sortBy, 
+			final boolean sortAscending);
 
 
 	// ################################################################

sitestats/sitestats-api/src/java/org/sakaiproject/sitestats/api/event/EventRegistryService.java

@@ -15,6 +15,12 @@ public interface EventRegistryService {
 	 */
 	public List<String> getEventIds();
 
+	/**
+	 * Get all anonymous tool events.
+	 * @return A list of anonymous event ids.
+	 */
+	public List<String> getAnonymousEventIds();
+
 	/**
 	 * Get the statisticable event registry.
 	 * Moved from StatsManager.getAllToolEventsDefinition().

sitestats/sitestats-api/src/java/org/sakaiproject/sitestats/api/report/ReportManager.java

@@ -1,5 +1,6 @@
 package org.sakaiproject.sitestats.api.report;
 
+import org.sakaiproject.javax.PagingPosition;
 import org.sakaiproject.sitestats.api.PrefsData;
 
 public interface ReportManager {
@@ -27,6 +28,11 @@ public interface ReportManager {
 	/** Produce a report based on the parameters passed. */
 	public Report getReport(String siteId, PrefsData prefsdata, ReportParams params);
 
+	/** Produce a report based on the parameters passed (page results). */
+	public Report getReport(String siteId, PrefsData prefsdata, ReportParams params, PagingPosition page, String groupBy, String sortBy, boolean sortAscending);
+
+	public int getReportRowCount(String siteId, PrefsData prefsdata, ReportParams params, PagingPosition page, String groupBy, String sortBy, boolean sortAscending);
+
 	/** Return utility class to retrieve formatted report parameters. */
 	public ReportFormattedParams getReportFormattedParams();
 

sitestats/sitestats-api/src/java/org/sakaiproject/sitestats/api/report/ReportParams.java

@@ -5,6 +5,10 @@
 
 
 public interface ReportParams {
+
+	public String getSiteId();
+
+	public void setSiteId(String siteId);
 
 	public String getWhat();
 

sitestats/sitestats-bundles/Messages.properties

@@ -4,7 +4,7 @@ all=All
 unauthorized=You are not authorized to use this tool.
 
 # Menu/Title
-menu_sitelist=Sites List
+menu_sitelist=All sites
 menu_serverwide=Server-wide Reports
 menu_overview=Overview
 menu_reports=Reports
@@ -133,6 +133,11 @@ report_err_noevents=No events selected. Please select at least one event.
 report_err_notools=No tools selected. Please select at least one tool.
 report_err_noresources=No resources selected. Please select at least one resource.
 report_err_nocustomdates=Custom time period not defined. Please specify 'from' and 'to' dates.
+date.IConverter.Date=Invalid value specified in custom date period fields.
+hours.NumberValidator.range=Hour value in custom time period fields is outside the valid range.
+minutes.NumberValidator.range=Minutes value in custom time period fields is outside the valid range.
+hours.IConverter.Integer=Invalid hour specified in custom time period fields.
+minutes.IConverter.Integer=Invalid minutes specified in custom time period fields.
 report_err_emptyrole=Selected role has no users. Please select other role.
 report_err_nogroup=No group selected. Please select a group.
 report_err_emptygroup=Selected group has no users. Please select other group.

sitestats/sitestats-bundles/Messages_pt_PT.properties

@@ -7,7 +7,7 @@ unauthorized=N\u00e3o est\u00e1 autorizado a usar esta ferramenta
 menu_overview=Resumo
 menu_prefs=Prefer\u00eancias
 menu_reports=Relat\u00f3rios
-menu_sitelist=Lista de \u00e1reas
+menu_sitelist=Todas as \u00e1reas
 
 # Sites List
 site_published=Publicado
@@ -69,6 +69,11 @@ report_back=Voltar
 report_err_emptygroup=O grupo seleccionado n\u00e3o tem utilizadores. Por favor seleccione outro grupo.
 report_err_emptyrole=N\u00e3o existem utilizadores com o perfil seleccionado. Por favor seleccione outro perfil.
 report_err_nocustomdates=Datas  definidas incorrectamente. Por favor especifique as datas 'De' e 'At\u00e9'.
+date.IConverter.Date=Data inv\u00e1lida. Por favor especifique correctamente as datas 'De' e 'At\u00e9'.
+hours.IConverter.Integer=Horas inv\u00e1lidas. Por favor especifique correctamente as datas 'De' e 'At\u00e9'.
+minutes.IConverter.Integer=Minutos inv\u00e1lido. Por favor especifique correctamente as datas 'De' e 'At\u00e9'.
+hours.NumberValidator.range=Horas fora de intervalo v\u00e1lido. Por favor especifique correctamente as datas 'De' e 'At\u00e9'.
+minutes.NumberValidator.range=Minutos fora de intervalo v\u00e1lido. Por favor especifique correctamente as datas 'De' e 'At\u00e9'.
 report_err_noevents=N\u00e3o foram seleccionados eventos. Seleccione pelo menos um evento.
 report_err_nogroup=N\u00e3o foi seleccionado nenhum grupo. Por favor seleccione um grupo.
 report_err_noresources=N\u00e3o foi seleccionado nenhum recurso. Seleccione pelo menos um recurso.

sitestats/sitestats-bundles/Navigator.properties

@@ -0,0 +1,21 @@
+# pager widget
+pager_textFirst=|<
+pager_textPrev=<
+pager_textNext=>
+pager_textLast=>|
+pager_textStatus=Viewing {0} to {1} of {2} {3}
+pager_textStatusZeroItems=Viewing 0 {3}
+pager_textPageSize=Show {0}
+pager_textPageSizeAll=all
+pager_textItem=items
+pager_pageSize=20
+pager_accesskeys=false
+pager_renderFirst=true
+pager_renderPrev=true
+pager_renderNext=true
+pager_renderLast=true
+
+pager_titleFirst=First {0} {1}
+pager_titlePrev=Previous {0} {1}
+pager_titleNext=Next {0} {1}
+pager_titleLast=Last {0} {1}

sitestats/sitestats-bundles/Navigator_ca.properties

@@ -0,0 +1,21 @@
+# pager widget
+pager_textFirst=|<
+pager_textPrev=<
+pager_textNext=>
+pager_textLast=>|
+pager_textStatus=Veient {0} a {1} de {2} {3}
+pager_textStatusZeroItems=Veient 0 {3}
+pager_textPageSize=Mostrar {0}
+pager_textPageSizeAll=tots
+pager_textItem=elements
+pager_pageSize=20
+pager_accesskeys=false
+pager_renderFirst=true
+pager_renderPrev=true
+pager_renderNext=true
+pager_renderLast=true
+
+pager_titleFirst=Primer {0} {1}
+pager_titlePrev=Anterior {0} {1}
+pager_titleNext=Següent {0} {1}
+pager_titleLast=Últim {0} {1}

sitestats/sitestats-bundles/Navigator_es.properties

@@ -0,0 +1,4 @@
+pager_textStatus=Mostrando {0} a {1} de {2} {3}
+pager_textStatusZeroItems=Mostrando 0 {3}
+pager_textPageSize=Mostrar {0}
+pager_textPageSizeAll=todos