[jboss-svn-commits] JBL Code SVN: r6604 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: plugins/math service/impl service/impl/protocol/db tools

[jboss-svn-commits at lists.jboss.org]

Author: wrzep
Date: 2006-10-04 14:56:47 -0400 (Wed, 04 Oct 2006)
New Revision: 6604

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/LastNDaysStatusPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/db/PluginsValuesEntity.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java
Log:
jblab-599
pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/LastNDaysStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/LastNDaysStatusPlugin.java	2006-10-04 18:52:28 UTC (rev 6603)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/math/LastNDaysStatusPlugin.java	2006-10-04 18:56:47 UTC (rev 6604)
@@ -94,7 +94,7 @@
 			return 0;
 		}
 		
-		//return Math.max(currentValue - prevValue, 0);
-		return (currentValue - prevValue); //debug
+		//TODO add an option if score could be below 0
+		return Math.max(currentValue - prevValue, 0);
 	}
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java	2006-10-04 18:52:28 UTC (rev 6603)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java	2006-10-04 18:56:47 UTC (rev 6604)
@@ -58,6 +58,8 @@
 	@TransactionAttribute(TransactionAttributeType.REQUIRED)
 	public void save(PluginsValues toSave) {
 				
+		System.out.println("save: " + toSave.getDate());
+		
 		PluginsValues pv = get(toSave.getDate());
 		
 		if ((pv != null) && 
@@ -72,6 +74,7 @@
 	public PluginsValues get(Calendar date) {
 		
 		Tools.truncate(date);
+		Calendar nextDay = Tools.nextDay(date);
 	
 		List list = null;
 		
@@ -79,9 +82,10 @@
 				" SELECT c FROM PluginsValuesEntity c " +
 				" LEFT JOIN FETCH c.values cv " +
 				" LEFT JOIN FETCH cv.values " +
-				" WHERE c.date = :date ");
+				" WHERE (:date <= c.date) AND (c.date < :nextDay)");
 		
 		query.setParameter("date", date, TemporalType.DATE);
+		query.setParameter("nextDay", nextDay, TemporalType.DATE);
 
 		list = query.getResultList();
 		
@@ -90,15 +94,20 @@
 
 	public long getValue(String pluginId, String projectId, Calendar date) {
 		
+		Tools.truncate(date);
+		Calendar nextDay = Tools.nextDay(date);
+		
 		Query query = em.createQuery(
 				" SELECT c.value FROM ValueEntity c " +
 				" WHERE c.projectId = :projectId " +
 				  " AND c.pluginValues.pluginId = :pluginId " +
-				  " AND c.pluginValues.pluginsValues.date = :date ");
+				  " AND (:date <= c.pluginValues.pluginsValues.date)" +
+				  " AND (c.pluginValues.pluginsValues.date < :nextDay) ");
 		
 		query.setParameter("projectId", projectId);
 		query.setParameter("pluginId", pluginId);
 		query.setParameter("date", date, TemporalType.DATE);
+		query.setParameter("nextDay", nextDay, TemporalType.DATE);
 		
 		return (Long) query.getSingleResult();
 	}
@@ -116,13 +125,18 @@
 
 	public PluginValues getPluginValues(String pluginId, Calendar date) {
 		
+		Tools.truncate(date);
+		Calendar nextDay = Tools.nextDay(date);
+		
 		Query query = em.createQuery(
 				" SELECT c.value FROM PluginValuesEntity c " +
 				" WHERE c.pluginId = :pluginId " +
-				  " AND c.pluginsValues.date = :date ");
+				  " AND (:date <= c.pluginsValues.date)" +
+				  " AND (c.pluginsValues.date < :nextDay) ");
 		
 		query.setParameter("pluginId", pluginId);
 		query.setParameter("date", date, TemporalType.DATE);
+		query.setParameter("nextDay", nextDay, TemporalType.DATE);
 		
 		return (PluginValues) query.getSingleResult();
 	}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/db/PluginsValuesEntity.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/db/PluginsValuesEntity.java	2006-10-04 18:52:28 UTC (rev 6603)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/db/PluginsValuesEntity.java	2006-10-04 18:56:47 UTC (rev 6604)
@@ -45,7 +45,6 @@
 import org.jboss.forge.status.service.protocol.PluginValues;
 import org.jboss.forge.status.service.protocol.PluginsValues;
 import org.jboss.forge.status.tools.Plugins;
-import org.jboss.forge.status.tools.Tools;
 
 /**
  *
@@ -81,7 +80,6 @@
 	public PluginsValuesEntity(Projects projects, Plugins plugins) {
 		
 		date = Calendar.getInstance();
-		Tools.truncate(date);
 		
 		values = new HashMap<String,PluginValuesEntity>();
 		

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java	2006-10-04 18:52:28 UTC (rev 6603)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java	2006-10-04 18:56:47 UTC (rev 6604)
@@ -110,9 +110,17 @@
 		
 		Date date = cal.getTime();
 		
-		DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy"); 
+		DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy hh:mm:ss"); 
 		String dateString = dateFormat.format(date) + " GMT";
 		
 		return dateString;
 	}
+
+	public static Calendar nextDay(Calendar date) {
+		
+		Calendar nextDay = (Calendar) date.clone();
+		nextDay.add(Calendar.DAY_OF_MONTH, 1);
+		
+		return nextDay;
+	}
 }