Author: obruce Date: 2014-05-27 10:21:57 +0200 (Tue, 27 May 2014) New Revision: 2989 Url: http://forge.chorem.org/projects/jtimer/repository/revisions/2989 Log: storage: correction suppression Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/storage/Storage.java branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TaskResource.java branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimeResource.java branches/ng-jtimer/src/main/webapp/js/controllers.js Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/storage/Storage.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/storage/Storage.java 2014-05-26 16:19:25 UTC (rev 2988) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/storage/Storage.java 2014-05-27 08:21:57 UTC (rev 2989) @@ -533,12 +533,12 @@ * Methode qui va modifier l'attribut removed d'un timertime a l'aide de son identifiant * @param timeId l'identifiant du temps */ - public void removeTimeWithId(String timeId) { + public void removeTimeWithId(String timeId,long time) { PreparedStatement statement = null; try { statement = connection.prepareStatement("UPDATE " + - TABLE_TIME + " SET removed = 1" + + TABLE_TIME + " SET removed = 1, modificationDate =" +time + " WHERE uuid = ?"); statement.setString(1, timeId); @@ -554,12 +554,13 @@ /** * Methode qui va va modifier l'attribut removed d'un timertask a l'aide de son identifiant * @param taskId l'identifiant de la tache + * @param time */ - public void removeTaskWithId(String taskId) { + public void removeTaskWithId(String taskId, long time) { PreparedStatement statement = null; try { statement = connection.prepareStatement("UPDATE " + - TABLE_TASK + " SET removed = 1" + + TABLE_TASK + " SET removed = 1, modificationDate =" +time + " WHERE taskId = '"+taskId +"'"); Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TaskResource.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TaskResource.java 2014-05-26 16:19:25 UTC (rev 2988) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TaskResource.java 2014-05-27 08:21:57 UTC (rev 2989) @@ -10,7 +10,9 @@ import org.restlet.representation.StringRepresentation; import org.restlet.resource.*; +import java.util.Date; + public class TaskResource extends ServerResource { private static final Log log = LogFactory.getLog(TaskResource.class); @@ -49,7 +51,7 @@ @Delete public void deleteTask() { String taskId = (String)getRequest().getAttributes().get("taskId"); - storage.removeTaskWithId(taskId); + storage.removeTaskWithId(taskId, new Date().getTime()); } Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimeResource.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimeResource.java 2014-05-26 16:19:25 UTC (rev 2988) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimeResource.java 2014-05-27 08:21:57 UTC (rev 2989) @@ -101,7 +101,7 @@ @Delete public void deleteTime() { String timeId = (String)getRequest().getAttributes().get("taskId"); - storage.removeTimeWithId(timeId); + storage.removeTimeWithId(timeId, new Date().getTime()); } /** Modified: branches/ng-jtimer/src/main/webapp/js/controllers.js =================================================================== --- branches/ng-jtimer/src/main/webapp/js/controllers.js 2014-05-26 16:19:25 UTC (rev 2988) +++ branches/ng-jtimer/src/main/webapp/js/controllers.js 2014-05-27 08:21:57 UTC (rev 2989) @@ -15,7 +15,7 @@ //interval de conec var interval = 20000; //TODO: obruce 05-05-14 decider d'un intervalle interessant // periode de delais = 3 periode +1msec - var delayAccess = 3 * interval +1; + var delayAccess = 2 * interval +1; // {TreeNode} l'arbre regenere automatiquement lorsque les donnees changent $scope.tree; @@ -181,6 +181,7 @@ angular.forEach(response, function (item) { + //La tache existe if(item.taskId in $scope.data.tasks){ console.log("Tache existe"); @@ -195,15 +196,12 @@ tmp.task.name = item.name; } - save(); - - }else if(!item.isremoved){ console.log("Nouvelle tache"); - //console.log(item); + console.log(item); var newTask = new Task( item.name, item.taskId, item.parent);