Author: obruce Date: 2014-07-03 17:52:17 +0200 (Thu, 03 Jul 2014) New Revision: 3013 Url: http://forge.chorem.org/projects/jtimer/repository/revisions/3013 Log: controller, alarmpartial : changement correction delete Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/AlarmResource.java branches/ng-jtimer/src/main/resources/jtimer-default.properties branches/ng-jtimer/src/main/webapp/js/controllers.js branches/ng-jtimer/src/main/webapp/partials/alertModal.html Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/AlarmResource.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/AlarmResource.java 2014-07-03 14:41:29 UTC (rev 3012) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/AlarmResource.java 2014-07-03 15:52:17 UTC (rev 3013) @@ -71,7 +71,6 @@ @Delete public void deleteAlarm() { - String alarmId = (String)getRequest().getAttributes().get("alarmId"); storage.removeAlarmWithId(alarmId, new Date().getTime()); Modified: branches/ng-jtimer/src/main/resources/jtimer-default.properties =================================================================== --- branches/ng-jtimer/src/main/resources/jtimer-default.properties 2014-07-03 14:41:29 UTC (rev 3012) +++ branches/ng-jtimer/src/main/resources/jtimer-default.properties 2014-07-03 15:52:17 UTC (rev 3013) @@ -119,5 +119,5 @@ WHERE taskId = ? jtimer.storage.update.time.forremove=UPDATE tasktime SET removed = ?, modificationDate = ? \ WHERE uuid = ? -jtimer.storage.update.alarm.forremove=UPDATE tasktime SET removed = ?, modificationDate = ? \ +jtimer.storage.update.alarm.forremove=UPDATE taskalarm SET removed = ?, modificationDate = ? \ WHERE alarmid = ? \ No newline at end of file Modified: branches/ng-jtimer/src/main/webapp/js/controllers.js =================================================================== --- branches/ng-jtimer/src/main/webapp/js/controllers.js 2014-07-03 14:41:29 UTC (rev 3012) +++ branches/ng-jtimer/src/main/webapp/js/controllers.js 2014-07-03 15:52:17 UTC (rev 3013) @@ -221,7 +221,7 @@ serverTaskAccess.query({date : 0}, function (response) { angular.forEach(response, function (item) { - + console.log(response); if((!(item.taskId in $scope.data.tasks)) && item.removed == 0){ console.log( "Un element non present " + item.name + item.modificationDate); @@ -407,7 +407,7 @@ //Recuperer un element dans un array avec son id - var getObjectInArrayWithId= function(array, id){ + var getTimeInArrayWithId= function(array, id){ var res; angular.forEach(array, function(time){ if(time.timeId == id){ @@ -439,7 +439,40 @@ return (object[pos]) && (item in object[pos]); }; + /** + * Methode qui recupere les alarmes pour une tache + */ + var getAlarmsFromServerWithTask = function(task){ + + //Recuperer un element dans un array avec son id + var getAlarmInArrayWithId= function(array, id){ + var res; + angular.forEach(array, function(alarm){ + if(alarm.alarmId == id){ + res = alarm; + } + }); + return res; + } + + serverAlarmAccess.query({taskId : task.taskId, date : $scope.timeAccess}, function (response) { + + angular.forEach(response, function (item) { + + if(getAlarmInArrayWithId(task.alarms, item.alarmId) == undefined && !item.removed){ + //On cree le tasktime + taskAlarm = new TaskAlarm(task, item.alarmId, item.name, item.type, item.modificationDate); //TODO + task.alarms.push(taskAlarm); + save(); + } + }); + + }); + } + + + /** * Methode qui pousse la todolist vers le serveur pour ssauvegarde les changements * Sauve les changements dans le localStorage */ @@ -1134,8 +1167,10 @@ /** * Methode qui supprime un element du tableau d'alerte */ - $scope.removeAlert = function(index,a){ + $scope.removeAlarm = function(index,a){ + serverAlarmAccess.deleteAlarm({alarmId: a.alarmId}); $scope.alarms.splice(index, 1); + } /** Modified: branches/ng-jtimer/src/main/webapp/partials/alertModal.html =================================================================== --- branches/ng-jtimer/src/main/webapp/partials/alertModal.html 2014-07-03 14:41:29 UTC (rev 3012) +++ branches/ng-jtimer/src/main/webapp/partials/alertModal.html 2014-07-03 15:52:17 UTC (rev 3013) @@ -22,7 +22,7 @@ <!--Portion d'ajout --> <tr ng-repeat="(index,alarm) in alarms"> - <td><i class="glyphicon glyphicon-minus-sign" ng-click="removeAlert(index,alarm)"></i></td> + <td><i class="glyphicon glyphicon-minus-sign" ng-click="removeAlarm(index,alarm)"></i></td> <td >{{alarm.name}}</td> <td>{{alarm.type}}</td> @@ -54,10 +54,6 @@ <i class="glyphicon glyphicon-check color_green"ng-show="alarm.type!='Type'"> </i> </td> <td> - <!--<timepicker ng-model="alarm.date" ng-change="changed()" - hour-step="1" minute-step="1" show-meridian="ismeridian"> - - </timepicker>--> <div ng-if="alarm.type=='Type'"> </div>