- Jtimer-commits - mailman.cloud.codelutin.com

r2935 - branches/ng-jtimer/jtimer-server/src/main/webapp/js
by echatellier＠users.chorem.org Sept. 11, 2013

Sept. 11, 2013

Author: echatellier Date: 2013-09-11 22:34:27 +0200 (Wed, 11 Sep 2013) New Revision: 2935 Url: http://chorem.org/projects/jtimer/repository/revisions/2935 Log: Send back idle status message to server. Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js 2013-09-11 20:18:35 UTC (rev 2934) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js 2013-09-11 20:34:27 UTC (rev 2935) @@ -346,6 +346,8 @@ * Called on idle detect. */ var idleDetected = function() { + // for systray to update rendering + wtWebsocket.send(JSON.stringify({idleStatus:true})); var modalInstance = $modal.open({ templateUrl: 'idleModalTemplate.html', windowClass: 'idleModal', @@ -371,6 +373,8 @@ case 'resume': break; } + // for systray to update rendering + wtWebsocket.send(JSON.stringify({idleStatus:false})); $scope.webSocketClientIdle = false; };

1 0

r2934 - in branches/ng-jtimer/jtimer-server/src/main/webapp: css js partials
by echatellier＠users.chorem.org Sept. 11, 2013

Sept. 11, 2013

Author: echatellier Date: 2013-09-11 22:18:35 +0200 (Wed, 11 Sep 2013) New Revision: 2934 Url: http://chorem.org/projects/jtimer/repository/revisions/2934 Log: Update ui bootstrap : fix idle modal dialog Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/css/app.css branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/css/app.css =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/css/app.css 2013-09-11 19:33:54 UTC (rev 2933) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/css/app.css 2013-09-11 20:18:35 UTC (rev 2934) @@ -251,4 +251,8 @@ .offline { color: red; +} + +.idleModal { + width: 400px; } \ No newline at end of file Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js 2013-09-11 19:33:54 UTC (rev 2933) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js 2013-09-11 20:18:35 UTC (rev 2934) @@ -1,4 +1,4 @@ -function TasksCtrl($scope, $timeout, $localStorage, $window, $document, wtWebsocket) { +function TasksCtrl($scope, $timeout, $localStorage, $window, $document, $modal, wtWebsocket) { /** * {Boolean} vrai si on est online @@ -33,15 +33,10 @@ // {boolean} boolean qui indique si la colonne TAGS doit etre affichee $scope.showTags = true; - // etat du client local (le serveur websocket) + // {boolean} etat du client local (le serveur websocket) $scope.webSocketClientOnline = false; - // le client est en état d'inactivité + // {boolean} boolean qui indique si une inactivité a été détectée $scope.webSocketClientIdle = false; - // idle modal dialog option - $scope.modalIdleOpts = { - backdropFade: true, - dialogFade:true - }; /** * Met a jour la tache selectionne, si la tache selectionnee est la courante @@ -324,9 +319,9 @@ return moment().format("HH:mm DD/MM/YYYY"); }; - // force the first tree creation - $scope.createTree(); - + /** + * Subscribe to websocket messages queue. + */ wtWebsocket.subscribe({ message: function(data) { var jsData = JSON.parse(data); @@ -334,10 +329,11 @@ //$scope.$apply(); //console.log(jsData); if (jsData.idle) { - if (jsData.idle > 30000) { //30s + if (jsData.idle > 30000 && !$scope.webSocketClientIdle) { //30s console.log("Idle detected"); + idleDetected(); + $scope.$apply(); $scope.webSocketClientIdle = true; - $scope.$apply(); } } }, @@ -345,9 +341,53 @@ $scope.webSocketClientOnline = status; } }); + + /** + * Called on idle detect. + */ + var idleDetected = function() { + var modalInstance = $modal.open({ + templateUrl: 'idleModalTemplate.html', + windowClass: 'idleModal', + controller: IdleModalCtrl, + backdropFade: true, + dialogFade: true, + keyboard: false // for cancel to not work + }); + modalInstance.result.then($scope.restartFromIdleness); + }; + + /** + * Called by modal dialog to resume from idle. + * + * @param {string} restart option ('stop', 'continue', 'resume') + */ + $scope.restartFromIdleness = function(restartOption) { + switch(restartOption) { + case 'stop': + break; + case 'continue': + break; + case 'resume': + break; + } + $scope.webSocketClientIdle = false; + }; + + // force the first tree creation + $scope.createTree(); + // connect to webscocket server (go client) wtWebsocket.connect(); - - $scope.restartFromIdleness = function() { - $scope.webSocketClientIdle = false; +} + +/** + * Controller de pour la modal d'inactivité. + * + * @param $scope + * @param $modalInstance + */ +function IdleModalCtrl($scope, $modalInstance) { + $scope.close = function(restartOption) { + $modalInstance.close(restartOption); }; -} +} \ No newline at end of file Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html 2013-09-11 19:33:54 UTC (rev 2933) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html 2013-09-11 20:18:35 UTC (rev 2934) @@ -91,17 +91,17 @@ </div> </div> -<div modal="webSocketClientIdle" options="modalIdleOpts"> +<script type="text/ng-template" id="idleModalTemplate.html"> <div class="modal-header"> - <h3>Inativité détectée</h3> + <h3>Inactivité détectée</h3> </div> <div class="modal-body"> Vous êtes inactif depuis 42 minutes. Choisissez une option pour reprendre ou arrêter la tâche. </div> <div class="modal-footer"> - <button class="btn btn-primary icon-remove-circle" ng-click="restartFromIdleness()"> Arrêter</button> - <button class="btn btn-primary icon-arrow-right" ng-click="restartFromIdleness()"> Continuer</button> - <button class="btn btn-primary icon-ok-circle" ng-click="restartFromIdleness()"> Reprendre</button> + <button class="btn btn-primary icon-remove-circle" ng-click="close('stop')"> Arrêter</button> + <button class="btn btn-primary icon-arrow-right" ng-click="close('continue')"> Continuer</button> + <button class="btn btn-primary icon-ok-circle" ng-click="close('resume')"> Reprendre</button> </div> -</div> +</script>

1 0

r2933 - branches/ng-jtimer/jtimer-server/src/main/webapp
by echatellier＠users.chorem.org Sept. 11, 2013

Sept. 11, 2013

Author: echatellier Date: 2013-09-11 21:33:54 +0200 (Wed, 11 Sep 2013) New Revision: 2933 Url: http://chorem.org/projects/jtimer/repository/revisions/2933 Log: Update ui bootstrap Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/index.html Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/index.html =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/index.html 2013-09-11 18:51:10 UTC (rev 2932) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/index.html 2013-09-11 19:33:54 UTC (rev 2933) @@ -8,7 +8,7 @@ <link rel="stylesheet" href="css/jtimer.css"> <script src="js/jtimer.js"></script> - <script src="http://angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.5.0.js"></script> + <script src="http://angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.6.0.js"></script> <link rel="stylesheet" href="css/app.css"> <script src="js/app.js"></script>

1 0

r2932 - in branches/ng-jtimer: . jtimer-server
by echatellier＠users.chorem.org Sept. 11, 2013

Sept. 11, 2013

Author: echatellier Date: 2013-09-11 20:51:10 +0200 (Wed, 11 Sep 2013) New Revision: 2932 Url: http://chorem.org/projects/jtimer/repository/revisions/2932 Log: ddu Modified: branches/ng-jtimer/jtimer-server/pom.xml branches/ng-jtimer/pom.xml Modified: branches/ng-jtimer/jtimer-server/pom.xml =================================================================== --- branches/ng-jtimer/jtimer-server/pom.xml 2013-09-01 14:44:14 UTC (rev 2931) +++ branches/ng-jtimer/jtimer-server/pom.xml 2013-09-11 18:51:10 UTC (rev 2932) @@ -30,12 +30,12 @@ <dependency> <groupId>org.restlet.jee</groupId> <artifactId>org.restlet</artifactId> - <version>2.2-M4</version> + <version>2.2-M5</version> </dependency> <dependency> <groupId>org.restlet.jee</groupId> <artifactId>org.restlet.ext.servlet</artifactId> - <version>2.2-M4</version> + <version>2.2-M5</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> Modified: branches/ng-jtimer/pom.xml =================================================================== --- branches/ng-jtimer/pom.xml 2013-09-01 14:44:14 UTC (rev 2931) +++ branches/ng-jtimer/pom.xml 2013-09-11 18:51:10 UTC (rev 2932) @@ -53,7 +53,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angular</artifactId> - <version>1.2.0-rc1-1</version> + <version>1.2.0-rc2-1</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> @@ -80,11 +80,6 @@ <artifactId>wro4j-extensions</artifactId> <version>1.7.0</version> </dependency> - <dependency> - <groupId>com.google.javascript</groupId> - <artifactId>closure-compiler</artifactId> - <version>v20130823</version> - </dependency> </dependencies> </plugin> </plugins>

1 0

r2931 - in branches/ng-jtimer/jtimer-server/src/main: go webapp webapp/css webapp/js webapp/partials
by echatellier＠users.chorem.org Sept. 1, 2013

Sept. 1, 2013

Author: echatellier Date: 2013-09-01 16:44:14 +0200 (Sun, 01 Sep 2013) New Revision: 2931 Url: http://chorem.org/projects/jtimer/repository/revisions/2931 Log: Display idle dialog when detected Modified: branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go branches/ng-jtimer/jtimer-server/src/main/webapp/css/app.css branches/ng-jtimer/jtimer-server/src/main/webapp/index.html branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html Modified: branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go 2013-09-01 12:48:08 UTC (rev 2930) +++ branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go 2013-09-01 14:44:14 UTC (rev 2931) @@ -57,7 +57,7 @@ currentIdleTime := reply.MsSinceUserInput fmt.Println("Idle since", currentIdleTime) - msSinceUserInputString := fmt.Sprintf("{idle:%d}", currentIdleTime) + msSinceUserInputString := fmt.Sprintf("{\"idle\":%d}", currentIdleTime) h.broadcast <- msSinceUserInputString } } Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/css/app.css =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/css/app.css 2013-09-01 12:48:08 UTC (rev 2930) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/css/app.css 2013-09-01 14:44:14 UTC (rev 2931) @@ -14,6 +14,17 @@ background:black; color:graytext; } +div#alerts{ + position:absolute; + bottom:20px; + left:0; + width:100%; + z-index: 1000; +} +.alert { + margin-bottom: 0; +} + div#footer{ position:absolute; bottom:0; Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/index.html =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/index.html 2013-09-01 12:48:08 UTC (rev 2930) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/index.html 2013-09-01 14:44:14 UTC (rev 2931) @@ -4,14 +4,19 @@ <title>jTimer</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <link rel="stylesheet" href="css/jtimer.css"> <script src="js/jtimer.js"></script> + <script src="http://angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.5.0.js"></script> + <link rel="stylesheet" href="css/app.css"> <script src="js/app.js"></script> <script src="js/controllers.js"></script> <script src="js/filters.js"></script> <script src="js/entities.js"></script> + + </head> <body> Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js 2013-09-01 12:48:08 UTC (rev 2930) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js 2013-09-01 14:44:14 UTC (rev 2931) @@ -200,8 +200,47 @@ }; }]; +var wtWebSocketService = [function() { + var service = {}; -angular.module('webtimer', ['webtimerFilters', 'ngRoute', 'ngAnimate']) + service.connect = function() { + if(service.ws) { return; } + + var ws = new WebSocket("ws://localhost:12345/jtimer"); + + ws.onopen = function() { + console.log('Websocket open'); + service.callback.status(true); + }; + + ws.onerror = function() { + console.log('Websocket error'); + }; + + ws.onclose = function() { + service.callback.status(false); + }; + + ws.onmessage = function(message) { + service.callback.message(message.data); + }; + + service.ws = ws; + }; + + service.send = function(message) { + service.ws.send(message); + }; + + service.subscribe = function(callback) { + service.callback = callback; + }; + + return service; +}]; + + +angular.module('webtimer', ['webtimerFilters', 'ngRoute', 'ngAnimate', 'ui.bootstrap']) .config(['$routeProvider', function($routeProvider) { $routeProvider. when('/tasks', {templateUrl: 'partials/tasks.html', controller: TasksCtrl}). @@ -232,4 +271,5 @@ }; }) - .directive('wtTreeRepeat', wtTreeRepeatDirective); + .directive('wtTreeRepeat', wtTreeRepeatDirective) + .service('wtWebsocket', wtWebSocketService); Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js 2013-09-01 12:48:08 UTC (rev 2930) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js 2013-09-01 14:44:14 UTC (rev 2931) @@ -1,4 +1,4 @@ -function TasksCtrl($scope, $timeout, $localStorage, $window, $document) { +function TasksCtrl($scope, $timeout, $localStorage, $window, $document, wtWebsocket) { /** * {Boolean} vrai si on est online @@ -33,6 +33,16 @@ // {boolean} boolean qui indique si la colonne TAGS doit etre affichee $scope.showTags = true; + // etat du client local (le serveur websocket) + $scope.webSocketClientOnline = false; + // le client est en état d'inactivité + $scope.webSocketClientIdle = false; + // idle modal dialog option + $scope.modalIdleOpts = { + backdropFade: true, + dialogFade:true + }; + /** * Met a jour la tache selectionne, si la tache selectionnee est la courante * alors on met la selection a null @@ -82,8 +92,6 @@ $scope.online = true; }, false); - - /** * Force la sauvegarde des datas * @returns {undefined} @@ -122,7 +130,6 @@ if ($scope.tree) { $scope.tree.addChild($scope.createTreeNode(newTask)); } -// $scope.createTree(); }; /** @@ -136,7 +143,6 @@ node.$$open = true; save(); node.addChild($scope.createTreeNode(newTask)); -// $scope.createTree(); }; /** @@ -157,7 +163,6 @@ // remove node in tree node.remove(); save(); -// $scope.createTree(); }; /** @@ -322,11 +327,27 @@ // force the first tree creation $scope.createTree(); - var conn = conn = new WebSocket("ws://localhost:12345/jtimer"); - conn.onclose = function(evt) { - console.log("Connection closed."); + wtWebsocket.subscribe({ + message: function(data) { + var jsData = JSON.parse(data); + //$scope.messages.push(message); + //$scope.$apply(); + //console.log(jsData); + if (jsData.idle) { + if (jsData.idle > 30000) { //30s + console.log("Idle detected"); + $scope.webSocketClientIdle = true; + $scope.$apply(); + } + } + }, + status: function(status) { + $scope.webSocketClientOnline = status; + } + }); + wtWebsocket.connect(); + + $scope.restartFromIdleness = function() { + $scope.webSocketClientIdle = false; }; - conn.onmessage = function(evt) { - console.log("Message", evt.data); - }; } Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html 2013-09-01 12:48:08 UTC (rev 2930) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html 2013-09-01 14:44:14 UTC (rev 2931) @@ -19,6 +19,12 @@ <i class="icon-cloud" ng-class="{online: online, offline: !online}"></i> </span> </div> +<div id="alerts"> + <div class="alert alert-warning" ng-if="!webSocketClientOnline"> + <span class="icon-warning-sign"></span> Impossible de contacter le client local pour la gestion de l'inactivité. + <a href="#" target="_blank">Télécharger le client local</a>. + </div> +</div> <div id="footer"> <span class="left">{{currentDate()}}</span> <span class="center"><i class="icon-html5"></i> <a href="#">WebTimer</a></span> @@ -82,6 +88,20 @@ </div> </div> </div> + </div> +</div> +<div modal="webSocketClientIdle" options="modalIdleOpts"> + <div class="modal-header"> + <h3>Inativité détectée</h3> </div> + <div class="modal-body"> + Vous êtes inactif depuis 42 minutes. + Choisissez une option pour reprendre ou arrêter la tâche. + </div> + <div class="modal-footer"> + <button class="btn btn-primary icon-remove-circle" ng-click="restartFromIdleness()"> Arrêter</button> + <button class="btn btn-primary icon-arrow-right" ng-click="restartFromIdleness()"> Continuer</button> + <button class="btn btn-primary icon-ok-circle" ng-click="restartFromIdleness()"> Reprendre</button> + </div> </div>

1 0

r2930 - in branches/ng-jtimer/jtimer-server/src/main/webapp: js partials
by echatellier＠users.chorem.org Sept. 1, 2013

Sept. 1, 2013

Author: echatellier Date: 2013-09-01 14:48:08 +0200 (Sun, 01 Sep 2013) New Revision: 2930 Url: http://chorem.org/projects/jtimer/repository/revisions/2930 Log: Fix first level update (hack) Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js 2013-09-01 12:47:05 UTC (rev 2929) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js 2013-09-01 12:48:08 UTC (rev 2930) @@ -185,6 +185,13 @@ } }); }); + // FIXME echatellier 20130901 for root children not being updated + $scope.$watchCollection("tree.children", function(newValue, oldValue, scope){ + if (newValue !== oldValue) { + var tree = treeGetter($scope); + update(tree); + } + }); // on force un premier appel pour que l'arbre s'affiche update(treeGetter($scope)); Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html 2013-09-01 12:47:05 UTC (rev 2929) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html 2013-09-01 12:48:08 UTC (rev 2930) @@ -22,7 +22,7 @@ <div id="footer"> <span class="left">{{currentDate()}}</span> <span class="center"><i class="icon-html5"></i> <a href="#">WebTimer</a></span> - <span class="right">{{tree.getTime().today |time}} | {{tree.getTime().global | time}}</a> + <span class="right">{{tree.getTime().today |time}} | {{tree.getTime().global | time}}</span> </div> <div>

1 0

r2929 - in branches/ng-jtimer: . jtimer-server
by echatellier＠users.chorem.org Sept. 1, 2013

Sept. 1, 2013

Author: echatellier Date: 2013-09-01 14:47:05 +0200 (Sun, 01 Sep 2013) New Revision: 2929 Url: http://chorem.org/projects/jtimer/repository/revisions/2929 Log: Yet another versions update Modified: branches/ng-jtimer/jtimer-server/pom.xml branches/ng-jtimer/pom.xml Modified: branches/ng-jtimer/jtimer-server/pom.xml =================================================================== --- branches/ng-jtimer/jtimer-server/pom.xml 2013-08-22 20:45:33 UTC (rev 2928) +++ branches/ng-jtimer/jtimer-server/pom.xml 2013-09-01 12:47:05 UTC (rev 2929) @@ -30,12 +30,12 @@ <dependency> <groupId>org.restlet.jee</groupId> <artifactId>org.restlet</artifactId> - <version>2.2-M3</version> + <version>2.2-M4</version> </dependency> <dependency> <groupId>org.restlet.jee</groupId> <artifactId>org.restlet.ext.servlet</artifactId> - <version>2.2-M3</version> + <version>2.2-M4</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> Modified: branches/ng-jtimer/pom.xml =================================================================== --- branches/ng-jtimer/pom.xml 2013-08-22 20:45:33 UTC (rev 2928) +++ branches/ng-jtimer/pom.xml 2013-09-01 12:47:05 UTC (rev 2929) @@ -53,7 +53,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angular</artifactId> - <version>1.2.0-rc1-1-SNAPSHOT</version> + <version>1.2.0-rc1-1</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> @@ -83,7 +83,7 @@ <dependency> <groupId>com.google.javascript</groupId> <artifactId>closure-compiler</artifactId> - <version>v20130722</version> + <version>v20130823</version> </dependency> </dependencies> </plugin>

1 0

r2928 - branches/ng-jtimer/jtimer-server
by echatellier＠users.chorem.org Aug. 22, 2013

Aug. 22, 2013

Author: echatellier Date: 2013-08-22 22:45:33 +0200 (Thu, 22 Aug 2013) New Revision: 2928 Url: http://chorem.org/projects/jtimer/repository/revisions/2928 Log: Ajout de services restlet pour la syncho app html <> serveur Modified: branches/ng-jtimer/jtimer-server/pom.xml Modified: branches/ng-jtimer/jtimer-server/pom.xml =================================================================== --- branches/ng-jtimer/jtimer-server/pom.xml 2013-08-22 20:44:57 UTC (rev 2927) +++ branches/ng-jtimer/jtimer-server/pom.xml 2013-08-22 20:45:33 UTC (rev 2928) @@ -38,11 +38,6 @@ <version>2.2-M3</version> </dependency> <dependency> - <groupId>org.restlet.jee</groupId> - <artifactId>org.restlet.ext.jackson</artifactId> - <version>2.2-M3</version> - </dependency> - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-runner</artifactId> <version>9.0.5.v20130815</version>

1 0

r2927 - in branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer: . entities storage web
by echatellier＠users.chorem.org Aug. 22, 2013

Aug. 22, 2013

Author: echatellier Date: 2013-08-22 22:44:57 +0200 (Thu, 22 Aug 2013) New Revision: 2927 Url: http://chorem.org/projects/jtimer/repository/revisions/2927 Log: Ajout de services restlet pour la syncho app html <> serveur Removed: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerProject.java branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/services/ Modified: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerTask.java branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/storage/Storage.java branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestApplication.java branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TaskResource.java branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TasksResource.java Deleted: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerProject.java =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerProject.java 2013-08-22 19:16:31 UTC (rev 2926) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerProject.java 2013-08-22 20:44:57 UTC (rev 2927) @@ -1,56 +0,0 @@ -/* - * #%L - * jTimer - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2013 CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.jtimer.entities; - -/** - * Represent a project. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class TimerProject extends TimerTask { - - /** serialVersionUID. */ - private static final long serialVersionUID = -8953488997256237790L; - - /** - * Constructor. - */ - public TimerProject() { - } - - /** - * Constructor with name. - * - * @param name project name - */ - public TimerProject(String name) { - super(name); - } -} Modified: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerTask.java =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2013-08-22 19:16:31 UTC (rev 2926) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2013-08-22 20:44:57 UTC (rev 2927) @@ -57,6 +57,12 @@ /** Closed task. */ protected boolean closed; + /** Today time. */ + protected long todayTime; + + /** Total time. */ + protected long totalTime; + /** * Constructor. */ @@ -70,8 +76,9 @@ * * @param name task name */ - public TimerTask(String name) { + public TimerTask(long number, String name) { this(); + this.number = number; this.name = name; } @@ -154,4 +161,20 @@ public void setClosed(boolean closed) { this.closed = closed; } + + public long getTodayTime() { + return todayTime; + } + + public void setTodayTime(long todayTime) { + this.todayTime = todayTime; + } + + public long getTotalTime() { + return totalTime; + } + + public void setTotalTime(long totalTime) { + this.totalTime = totalTime; + } } \ No newline at end of file Modified: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/storage/Storage.java =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/storage/Storage.java 2013-08-22 19:16:31 UTC (rev 2926) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/storage/Storage.java 2013-08-22 20:44:57 UTC (rev 2927) @@ -12,7 +12,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; /** @@ -146,8 +145,9 @@ statement.executeUpdate("CREATE TABLE " + TABLE_TIME + "(taskid LONG NOT NULL REFERENCES " + TABLE_TASK + "(id)," + " date DATE," + + " uuid varchar(255) unique," + " duration LONG," + - " PRIMARY KEY (taskid, date))"); + " PRIMARY KEY (taskid, date, uuid))"); } catch (SQLException ex) { throw new StorageException("Can't create schema", ex); } finally { @@ -161,90 +161,13 @@ * * @return all projects */ - public int getProjectsCount() { + public int getTasksCount() { int result = 0; - Statement statement = null; - try { - statement = connection.createStatement(); - ResultSet rs = statement.executeQuery("SELECT count(*) FROM " + TABLE_TASK + - " WHERE parent = 0"); - if (rs.next()) { - result = rs.getInt(1); - } - } catch (SQLException ex) { - throw new StorageException("Can't get project count", ex); - } finally { - closeStatement(statement); - } - return result; - } - - /** - * Find all project. (task with no parent, parent = 0). - * - * @return all projects - */ - public List<TimerProject> getProjects() { - List<TimerProject> projects = new ArrayList<TimerProject>(); PreparedStatement statement = null; try { - statement = connection.prepareStatement("SELECT * FROM " + TABLE_TASK + - " WHERE parent = 0 ORDER BY id"); + statement = connection.prepareStatement("SELECT count(*) FROM " + TABLE_TASK); ResultSet rs = statement.executeQuery(); - while (rs.next()) { - TimerProject project = new TimerProject(); - project.setNumber(rs.getInt("id")); - project.setName(rs.getString("name")); - projects.add(project); - } - } catch (SQLException ex) { - throw new StorageException("Can't get project", ex); - } finally { - closeStatement(statement); - } - return projects; - } - - /** - * Find all project. (task with no parent, parent = 0). - * - * @return all projects - */ - public TimerProject getProject(int offset) { - TimerProject project = null; - PreparedStatement statement = null; - try { - statement = connection.prepareStatement("SELECT * FROM " + TABLE_TASK + - " WHERE parent = 0 ORDER BY id LIMIT 1 OFFSET ?"); - statement.setInt(1, offset); - ResultSet rs = statement.executeQuery(); if (rs.next()) { - project = new TimerProject(); - project.setNumber(rs.getInt("id")); - project.setName(rs.getString("name")); - } - } catch (SQLException ex) { - throw new StorageException("Can't get project", ex); - } finally { - closeStatement(statement); - } - return project; - } - - /** - * Find all project. (task with no parent, parent = 0). - * - * @return all projects - */ - public int getTasksCount(TimerTask parent) { - int result = 0; - PreparedStatement statement = null; - try { - statement = connection.prepareStatement("SELECT count(*) FROM " + TABLE_TASK + - " WHERE parent = ?"); - statement.setLong(1, parent.getNumber()); - ResultSet rs = statement.executeQuery(); - if (rs.next()) { result = rs.getInt(1); } } catch (SQLException ex) { @@ -254,81 +177,47 @@ } return result; } - - public TimerTask getTasks(TimerTask parent, int offset) { - TimerTask task = null; + + public List<TimerTask> getTasks() { + List<TimerTask> tasks = new ArrayList<>(); PreparedStatement statement = null; + PreparedStatement statement2 = null; try { - statement = connection.prepareStatement("SELECT * FROM " + TABLE_TASK + - " WHERE parent = ? ORDER BY id LIMIT 1 OFFSET ?"); - statement.setLong(1, parent.getNumber()); - statement.setLong(2, offset); + statement = connection.prepareStatement("SELECT TA.*, sum(TI.duration) AS totalduration FROM " + + TABLE_TASK + " TA, " + TABLE_TIME + " TI" + + " WHERE TA.id = TI.taskid" + + " GROUP BY TA.id"); ResultSet rs = statement.executeQuery(); while (rs.next()) { - task = new TimerTask(); + TimerTask task = new TimerTask(); task.setNumber(rs.getInt("id")); task.setName(rs.getString("name")); + task.setTodayTime(0); + task.setTotalTime(rs.getLong("totalduration")); + tasks.add(task); } - } catch (SQLException ex) { - throw new StorageException("Can't get task", ex); - } finally { - closeStatement(statement); - } - return task; - } - - /** - * Find sub tasks.. - * - * @param parent parent task - * @return all sub tasks - */ - public List<TimerTask> getTasks(TimerTask parent) { - List<TimerTask> tasks = new ArrayList<TimerTask>(); - PreparedStatement statement = null; - try { - statement = connection.prepareStatement("SELECT * FROM " + TABLE_TASK + - " WHERE parent = ? ORDER BY id"); - statement.setLong(1, parent.getNumber()); - ResultSet rs = statement.executeQuery(); + + // not timed tasks + statement2 = connection.prepareStatement("SELECT * FROM " + TABLE_TASK + + " WHERE id not in (SELECT taskid FROM " + TABLE_TIME + ")"); + rs = statement2.executeQuery(); while (rs.next()) { TimerTask task = new TimerTask(); task.setNumber(rs.getInt("id")); task.setName(rs.getString("name")); + task.setTodayTime(0); + task.setTotalTime(0); tasks.add(task); } } catch (SQLException ex) { throw new StorageException("Can't get task", ex); } finally { closeStatement(statement); + closeStatement(statement2); } return tasks; } - public void addProject(TimerProject project) { - PreparedStatement statement = null; - try { - statement = connection.prepareStatement("INSERT INTO " + - TABLE_TASK + "(name, parent, hidden, note)" + - " VALUES (?, ?, ?, ?)", Statement.RETURN_GENERATED_KEYS); - statement.setString(1, project.getName()); - statement.setLong(2, 0); - statement.setBoolean(3, project.isClosed()); - statement.setString(4, null /*project.getNote()*/); - statement.executeUpdate(); - - // get generated id - ResultSet rs = statement.getGeneratedKeys(); - if (rs.next()) { - project.setNumber(rs.getInt(1)); - } - } catch (SQLException ex) { - throw new StorageException("Can't add project", ex); - } finally { - closeStatement(statement); - } - } - public void addTask(TimerTask task) { PreparedStatement statement = null; try { @@ -353,10 +242,6 @@ } } - public void modifyProject(TimerProject project) { - modifyTask(project); - } - public void modifyTask(TimerTask task) { PreparedStatement statement = null; try { @@ -380,39 +265,23 @@ } } - /*protected void saveTaskTimes(TimerTask task) throws SQLException { - - // delete all + public void addTaskTime(TimerTask task, Date date, String uuid, long duration) { PreparedStatement statement = null; try { - statement = connection.prepareStatement("DELETE " + TABLE_TIME + - " WHERE TASKID = ?"); + statement = connection.prepareStatement("INSERT INTO " + TABLE_TIME + + "(taskid, date, uuid, duration)" + + " VALUES(?, ?, ?, ?)"); + statement.setLong(1, task.getNumber()); + statement.setDate(2, new java.sql.Date(date.getTime())); + statement.setString(3, uuid); + statement.setLong(4, duration); statement.executeUpdate(); + } catch (SQLException ex) { + throw new StorageException("Can't add task time", ex); } finally { closeStatement(statement); } - - // add new - try { - statement = connection.prepareStatement("INSERT INTO " + TABLE_TIME + - "(taskid, date, duration)" + - " VALUES(?, ?, ?)"); - SortedMap<Date, Long> taskTimes = task.getAllDaysAndTimes(); - for (Map.Entry<Date, Long> taskTime : taskTimes.entrySet()) { - statement.setLong(1, task.getNumber()); - statement.setDate(2, new java.sql.Date(taskTime.getKey().getTime())); - statement.setLong(3, taskTime.getValue()); - - statement.executeUpdate(); - } - } finally { - closeStatement(statement); - } - }*/ - - public void deleteProject(TimerProject project) { - deleteTask(project); } public void deleteTask(TimerTask task) { @@ -432,13 +301,4 @@ public void setAnnotation(TimerTask task, Date date, String annotation) { } - - /*public void setTaskTime(TimerTask task, Date date, Long time) { - try { - saveTaskTimes(task); - } catch (SQLException ex) { - throw new StorageException("Can't set task time", ex); - } - }*/ - } \ No newline at end of file Modified: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestApplication.java =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestApplication.java 2013-08-22 19:16:31 UTC (rev 2926) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestApplication.java 2013-08-22 20:44:57 UTC (rev 2927) @@ -1,6 +1,12 @@ package org.chorem.jtimer.web; +import java.util.Date; +import java.util.UUID; + +import org.chorem.jtimer.entities.TimerTask; +import org.chorem.jtimer.storage.Storage; import org.restlet.Application; +import org.restlet.Context; import org.restlet.Restlet; import org.restlet.routing.Router; @@ -13,14 +19,39 @@ public synchronized Restlet createInboundRoot() { // Create a router Restlet that routes each call to a // new instance of ProjectsResource. - Router router = new Router(getContext()); + Context context = getContext(); + initContext(context); + Router router = new Router(context); // Defines only one route router.attach("/tasks", TasksResource.class); - router.attach("/task/{task}", TaskResource.class); - router.attach("/task/{task}/time", TimeResource.class); + router.attach("/tasks/{taskId}", TaskResource.class); + router.attach("/tasks/{taskId}/time", TimeResource.class); return router; } + protected void initContext(Context context) { + Storage storage = new Storage(); + + if (storage.getTasksCount() == 0) { + + TimerTask jTimerProject = new TimerTask(1, "jTimer"); + jTimerProject.setNumber(1); + TimerTask jTimerTask1 = new TimerTask(2, "WebService"); + jTimerTask1.setParent(jTimerProject.getNumber()); + storage.addTask(jTimerProject); + storage.addTask(jTimerTask1); + storage.addTaskTime(jTimerTask1, new Date(), UUID.randomUUID().toString(), 4567); + storage.addTaskTime(jTimerTask1, new Date(), UUID.randomUUID().toString(), 20); + + storage.addTask(new TimerTask(3, "Chorem")); + storage.addTask(new TimerTask(4, "Wikitty")); + storage.addTask(new TimerTask(5, "Nuiton-js")); + storage.addTask(new TimerTask(6, "Angular")); + storage.addTask(new TimerTask(7, "Isis-Fish")); + } + + context.getAttributes().put(Storage.class.getName(), storage); + } } \ No newline at end of file Modified: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TaskResource.java =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TaskResource.java 2013-08-22 19:16:31 UTC (rev 2926) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TaskResource.java 2013-08-22 20:44:57 UTC (rev 2927) @@ -1,5 +1,6 @@ package org.chorem.jtimer.web; +import org.chorem.jtimer.storage.Storage; import org.restlet.data.MediaType; import org.restlet.representation.Representation; import org.restlet.representation.StringRepresentation; @@ -9,13 +10,16 @@ public class TaskResource extends ServerResource { + protected Storage storage; + @Override protected void doInit() throws ResourceException { - + storage = (Storage)getContext().getAttributes().get(Storage.class.getName()); } @Get("json") public Representation getTask() { - return new StringRepresentation("{}", MediaType.APPLICATION_JSON); + String taskId = (String)getRequest().getAttributes().get("taskId"); + return new StringRepresentation("{args:" + taskId + "}", MediaType.APPLICATION_JSON); } } Modified: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TasksResource.java =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TasksResource.java 2013-08-22 19:16:31 UTC (rev 2926) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TasksResource.java 2013-08-22 20:44:57 UTC (rev 2927) @@ -1,32 +1,28 @@ package org.chorem.jtimer.web; -import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.storage.Storage; -import org.restlet.ext.jackson.JacksonRepresentation; +import org.restlet.data.MediaType; import org.restlet.representation.Representation; +import org.restlet.representation.StringRepresentation; import org.restlet.resource.Get; +import org.restlet.resource.ResourceException; import org.restlet.resource.ServerResource; +import com.google.gson.Gson; + public class TasksResource extends ServerResource { protected Storage storage; - public TasksResource() { - storage = new Storage(); - - if (storage.getProjectsCount() == 0) { - storage.addProject(new TimerProject("jTimer")); - storage.addProject(new TimerProject("Chorem")); - storage.addProject(new TimerProject("Wikitty")); - storage.addProject(new TimerProject("Nuiton-js")); - storage.addProject(new TimerProject("Angular")); - storage.addProject(new TimerProject("Isis-Fish")); - } + @Override + protected void doInit() throws ResourceException { + storage = (Storage)getContext().getAttributes().get(Storage.class.getName()); } @Get("json") public Representation getTasks() { - Representation jsonRep = new JacksonRepresentation<>(storage.getProjects()); - return jsonRep; + Gson gson = new Gson(); + String json = gson.toJson(storage.getTasks()); + return new StringRepresentation(json, MediaType.APPLICATION_JSON); } }

1 0

r2926 - in branches/ng-jtimer: . jtimer-server/src/main/config jtimer-server/src/main/webapp/js jtimer-server/src/main/webapp/partials
by echatellier＠users.chorem.org Aug. 22, 2013

Aug. 22, 2013

Author: echatellier Date: 2013-08-22 21:16:31 +0200 (Thu, 22 Aug 2013) New Revision: 2926 Url: http://chorem.org/projects/jtimer/repository/revisions/2926 Log: Update to angular 1.2.0-rc1 Modified: branches/ng-jtimer/jtimer-server/src/main/config/wro.xml branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html branches/ng-jtimer/pom.xml Modified: branches/ng-jtimer/jtimer-server/src/main/config/wro.xml =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/config/wro.xml 2013-08-22 19:08:36 UTC (rev 2925) +++ branches/ng-jtimer/jtimer-server/src/main/config/wro.xml 2013-08-22 19:16:31 UTC (rev 2926) @@ -1,7 +1,9 @@ <groups xmlns="http://www.isdc.ro/wro"> <group name='jtimer'> + <group-ref>jquery</group-ref> <group-ref>angular</group-ref> - <group-ref>jquery</group-ref> + <group-ref>angular-route</group-ref> + <group-ref>angular-animate</group-ref> <group-ref>bootstrap</group-ref> <group-ref>font-awesome</group-ref> <group-ref>moment</group-ref> Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js 2013-08-22 19:08:36 UTC (rev 2925) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js 2013-08-22 19:16:31 UTC (rev 2926) @@ -18,25 +18,24 @@ * - $toggleState une fonction qui permet de changer l'etat d'un noeud ('open' <-> 'close') * - * @param {ngAnimator} $animator permet l'ajout, suppression des noeuds dans le DOM + * @param {ngAnimate} $animator permet l'ajout, suppression des noeuds dans le DOM * @param {ngFilter} $filter permet de filtrer les elements de l'arbre a afficher (filtre, tri, ...) * @param {ngParse} $parse permet de parser des expressions qui doivent etre evaluer regulierement sur une scope */ -var wtTreeRepeatDirective = ['$animator', '$filter', '$parse', function($animator, $filter, $parse) { +var wtTreeRepeatDirective = ['$animate', '$filter', '$parse', function($animate, $filter, $parse) { return { transclude: 'element', priority: 1000, terminal: true, compile: function(element, attr, linker) { return function($scope, $element, $attr){ - var animate = $animator($scope, $attr); // use to add/remove element // sert a surveiller les changements sur la donnee ou les filtres // qui engendrerait un besoin de rafraichissement. // (ce tableau contient les fonctions permettant leur desenregistrement) var watchers = []; // element genere HTML et scope du dernier arbre represente - var cache = new Cache(animate); + var cache = new Cache($animate); // indique si l'element root doit etre affiche ou non (faux par defaut) var displayRoot = $parse($attr.wtDisplayRoot || 'false'); // indique si l'arbre doit etre ouvert de facon forcee ou non (faux par defaut) @@ -80,7 +79,7 @@ var update = function(tree) { // les objets HTML et scope utilise durant cette mise a jour // qui pourront etre reutilise durant la mis a jour suivante - var newCache = new Cache(animate); + var newCache = new Cache($animate); // l'index de parcours du noeud, on met dans un tableau // pour avoir une reference lors du passage en argument @@ -141,12 +140,12 @@ }); if (!isNewElement) { - animate.move(cacheEntry.element, null, lastElement); + $animate.move(cacheEntry.element, null, lastElement); lastElement = cacheEntry.element; newCache.put(node, cacheEntry.element, cacheEntry.scope); } else { linker(childScope, function(clone) { - animate.enter(clone, null, lastElement); + $animate.enter(clone, null, lastElement); lastElement = clone; newCache.put(node, clone, childScope); }); @@ -195,7 +194,7 @@ }]; -angular.module('webtimer', ['webtimerFilters']) +angular.module('webtimer', ['webtimerFilters', 'ngRoute', 'ngAnimate']) .config(['$routeProvider', function($routeProvider) { $routeProvider. when('/tasks', {templateUrl: 'partials/tasks.html', controller: TasksCtrl}). Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html 2013-08-22 19:08:36 UTC (rev 2925) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html 2013-08-22 19:16:31 UTC (rev 2926) @@ -1,49 +1,3 @@ -<script type="text/ng-template" id="tree_item_renderer_details.html"> - <div class="tr" ng-class="{'current-row' : ($node.task === currentTask), 'selected-row' : ($node.task === selectedTask)}" - ng-click="setSelectedTask($node.task)" - ng-dblclick="timeTask($node.task)" - ng-keydown="keyPressed($event)"> - <div class="td" ng-show="showName"> - <span class="spacer level{{$level}}"></span> - <i class="icon-ban-circle" ng-show="$state=='empty'"></i> - <i class="icon-plus-sign" ng-click="$toggleState()" ng-show="$state=='close'"></i> - <i class="icon-minus-sign" ng-click="$toggleState()" ng-show="$state=='open'"></i> - - <form ng-submit="saveTask($node)" ng-show="$node.edit == 'name'"> - <input ng-model="$node.task.name"> - </form> - - <span ng-click="editTask($node, 'name')" ng-show="$node.edit != 'name'">{{$node.task.name}} </span> - - <span class="btn-group action"> - <a class="btn btn-mini" href="" ng-click="timeTask($node.task)"> - <i ng-class="{'icon-play' : ($node.task != currentTask), 'icon-stop' : ($node.task == currentTask)}"></i> - </a> - <a class="btn btn-mini" href="" ng-click="addSubTask($node)"><i class="icon-plus"></i></a> - <a class="btn btn-mini" href="" ng-click="removeTask($node)"><i class="icon-minus"></i></a> - </span> - </div> - - <div class="td today" ng-show="showToday"> - {{$node.getTime().today | time}} - </div> - - <div class="td global" ng-show="showGlobal">{{$node.getTime().global | time}}</div> - - <div class="td tags" ng-show="showTags" ng-click="editTask($node, 'tags')"> - <form ng-submit="saveTask($node)" ng-show="$node.edit == 'tags'"> - <input ng-model="$node.task.tags" ng-list> - </form> - - <span class="label label-info" ng-repeat="tag in $node.task.tags" style="margin-right: 10px;" ng-show="$node.edit != 'tags'"> - {{tag}} - </span> - - <span ng-show="$node.task.tags.length == 0 && $node.edit != 'tags'">No tag</span> - </div> - </div> -</script> - <div id="header"> <span class='left'> <input class='search-query input-small' ng-model="query" placeholder="Search"> @@ -79,10 +33,55 @@ <div class='th global' ng-show="showGlobal">Total</div> <div class='th tags' ng-show="showTags">Tags</div> </div> + <div class="tbody" wt-tree-repeat="tree | filter:query | orderBy:'task.name'" - wt-force-open="query || forceExpanded" - ng-include="'tree_item_renderer_details.html'"></div> + wt-force-open="query || forceExpanded"> + <div class="tr" ng-class="{'current-row' : ($node.task === currentTask), 'selected-row' : ($node.task === selectedTask)}" + ng-click="setSelectedTask($node.task)" + ng-dblclick="timeTask($node.task)" + ng-keydown="keyPressed($event)"> + <div class="td" ng-show="showName"> + <span class="spacer level{{$level}}"></span> + <i class="icon-ban-circle" ng-show="$state=='empty'"></i> + <i class="icon-plus-sign" ng-click="$toggleState()" ng-show="$state=='close'"></i> + <i class="icon-minus-sign" ng-click="$toggleState()" ng-show="$state=='open'"></i> + + <form ng-submit="saveTask($node)" ng-show="$node.edit == 'name'"> + <input ng-model="$node.task.name"> + </form> + + <span ng-click="editTask($node, 'name')" ng-show="$node.edit != 'name'">{{$node.task.name}} </span> + + <span class="btn-group action"> + <a class="btn btn-mini" href="" ng-click="timeTask($node.task)"> + <i ng-class="{'icon-play' : ($node.task != currentTask), 'icon-stop' : ($node.task == currentTask)}"></i> + </a> + <a class="btn btn-mini" href="" ng-click="addSubTask($node)"><i class="icon-plus"></i></a> + <a class="btn btn-mini" href="" ng-click="removeTask($node)"><i class="icon-minus"></i></a> + </span> + </div> + + <div class="td today" ng-show="showToday"> + {{$node.getTime().today | time}} + </div> + + <div class="td global" ng-show="showGlobal">{{$node.getTime().global | time}}</div> + + <div class="td tags" ng-show="showTags" ng-click="editTask($node, 'tags')"> + <form ng-submit="saveTask($node)" ng-show="$node.edit == 'tags'"> + <input ng-model="$node.task.tags" ng-list> + </form> + + <span class="label label-info" ng-repeat="tag in $node.task.tags" style="margin-right: 10px;" ng-show="$node.edit != 'tags'"> + {{tag}} + </span> + + <span ng-show="$node.task.tags.length == 0 && $node.edit != 'tags'">No tag</span> + </div> + </div> + </div> + </div> </div> Modified: branches/ng-jtimer/pom.xml =================================================================== --- branches/ng-jtimer/pom.xml 2013-08-22 19:08:36 UTC (rev 2925) +++ branches/ng-jtimer/pom.xml 2013-08-22 19:16:31 UTC (rev 2926) @@ -53,7 +53,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angular</artifactId> - <version>1.1.5-1</version> + <version>1.2.0-rc1-1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId>

1 0