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

r2940 - trunk/src/main/java/org/chorem/jtimer/data
by tchemit＠users.chorem.org Sept. 26, 2013

Sept. 26, 2013

Author: tchemit Date: 2013-09-26 10:03:59 +0200 (Thu, 26 Sep 2013) New Revision: 2940 Url: http://chorem.org/projects/jtimer/repository/revisions/2940 Log: fix javadoc typo + improve code Modified: trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java Modified: trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2013-09-24 07:37:24 UTC (rev 2939) +++ trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2013-09-26 08:03:59 UTC (rev 2940) @@ -40,7 +40,6 @@ import org.chorem.jtimer.entities.TimerAlert; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; -import org.nuiton.util.ArrayUtil; /** * Gere les donnees. Des objets peuvent s'enregistrer pour etre notifies des @@ -201,7 +200,7 @@ vetoableDataEventListener.checkSetTaskTime(task, date, value); } - task.setTime(date, Long.valueOf(value)); + task.setTime(date, value); // send notification for (DataEventListener dataEventListener : dataEventListeners) { @@ -249,9 +248,8 @@ task.getParent().getSubTasks().remove(task); // send notification - Iterator<DataEventListener> itDataEventListener = dataEventListeners.iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().deleteTask(task); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.deleteTask(task); } } @@ -270,9 +268,8 @@ projectList.remove(project); // send notification - Iterator<DataEventListener> itDataEventListener = dataEventListeners.iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().deleteProject(project); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.deleteProject(project); } } @@ -324,9 +321,8 @@ task.setClosed(!task.isClosed()); // send notification - Iterator<DataEventListener> itDataEventListener = dataEventListeners.iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().changeClosedState(task); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.changeClosedState(task); } } @@ -565,17 +561,17 @@ } /** - * Find corresponding task for path. + * Return the corresponding task for path. * - * @param taskPath - * @return + * @param taskPath task path to find + * @return corresponding task for path */ public TimerTask getTaskForPath(String taskPath) { String[] paths = taskPath.split("/"); // make sure can't select only project - if (paths == null || paths.length <= 1) { + if (paths.length <= 1) { throw new IllegalArgumentException("Can't parse argument '" + taskPath + "' as task"); }

1 0

r2939 - trunk/src
by tchemit＠users.chorem.org Sept. 24, 2013

Sept. 24, 2013

Author: tchemit Date: 2013-09-24 09:37:24 +0200 (Tue, 24 Sep 2013) New Revision: 2939 Url: http://chorem.org/projects/jtimer/repository/revisions/2939 Log: no more need of third-party file : all license are fine :) Removed: trunk/src/license/

1 0

r2938 - trunk/src/main/java/org/chorem/jtimer/ui/treetable
by tchemit＠users.chorem.org Sept. 24, 2013

Sept. 24, 2013

Author: tchemit Date: 2013-09-24 09:36:39 +0200 (Tue, 24 Sep 2013) New Revision: 2938 Url: http://chorem.org/projects/jtimer/repository/revisions/2938 Log: fixes Evolution #948: Add shortcuts to navigate (expand/collapse) in the task's tree Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java 2013-09-24 06:54:44 UTC (rev 2937) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java 2013-09-24 07:36:39 UTC (rev 2938) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric, Chemit Tony * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,9 +26,14 @@ package org.chorem.jtimer.ui.treetable; import java.awt.Color; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; import java.util.ArrayList; import java.util.List; +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.KeyStroke; import javax.swing.tree.TreePath; import org.chorem.jtimer.data.TimerCore; @@ -104,6 +109,43 @@ // enable drag n drop setDragEnabled(true); setTransferHandler(new TimerTaskTransferHandler(application, core.getData())); + + { // add action to collapse (left arrow) selected node + Action action = new AbstractAction("collapseSelectedNode") { + private static final long serialVersionUID = 1L; + + @Override + public void actionPerformed(ActionEvent e) { + int selectedRow = getSelectedRow(); + if (selectedRow != -1) { + collapseRow(selectedRow); + } + } + }; + + getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( + KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0), + action.getValue(Action.NAME)); + getActionMap().put(action.getValue(Action.NAME), action); + } + { // add action to expand (right arrow) selected node + Action action = new AbstractAction("expandSelectedNode") { + private static final long serialVersionUID = 1L; + + @Override + public void actionPerformed(ActionEvent e) { + int selectedRow = getSelectedRow(); + if (selectedRow != -1) { + expandRow(selectedRow); + } + } + }; + + getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( + KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0), + action.getValue(Action.NAME)); + getActionMap().put(action.getValue(Action.NAME), action); + } } /**

1 0

r2937 - in trunk: . src/main/java/org/chorem/jtimer
by tchemit＠users.chorem.org Sept. 24, 2013

Sept. 24, 2013

Author: tchemit Date: 2013-09-24 08:54:44 +0200 (Tue, 24 Sep 2013) New Revision: 2937 Url: http://chorem.org/projects/jtimer/repository/revisions/2937 Log: fixes #946: Updates mavenpom to 4.1 fixes #947: Migrates to nuiton-config Modified: trunk/pom.xml trunk/src/main/java/org/chorem/jtimer/JTimerActions.java trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-24 06:54:02 UTC (rev 2936) +++ trunk/pom.xml 2013-09-24 06:54:44 UTC (rev 2937) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>4.1</version> </parent> <groupId>org.chorem</groupId> @@ -34,7 +34,7 @@ <email>chatellier(a)codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -42,10 +42,10 @@ <developer> <name>Tony Chemit</name> <id>tchemit</id> - <email>chemit(a)codelutin.com</email> + <email>chemit at codelutin dot com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -99,6 +99,9 @@ target/${project.artifactId}-${project.version}-src.zip, </redmine.releaseFiles> +  + <skipPostRelease>false</skipPostRelease> + </properties> <build> @@ -182,7 +185,7 @@ <plugin> <artifactId>maven-changelog-plugin</artifactId> - <version>2.2</version> + <version>${changelogPluginVersion}</version> <configuration> <type>range</type> <range>365</range> @@ -192,7 +195,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> - <version>2.5.2</version> + <version>${coberturaPluginVersion}</version> </plugin>  @@ -207,8 +210,8 @@ <dependencies> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>2.6.12</version> + <artifactId>nuiton-config</artifactId> + <version>3.0-alpha-1</version> <scope>compile</scope> <exclusions> <exclusion> Modified: trunk/src/main/java/org/chorem/jtimer/JTimerActions.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimerActions.java 2013-09-24 06:54:02 UTC (rev 2936) +++ trunk/src/main/java/org/chorem/jtimer/JTimerActions.java 2013-09-24 06:54:44 UTC (rev 2937) @@ -26,8 +26,8 @@ package org.chorem.jtimer; import org.chorem.jtimer.JTimerConfig.JTimerAction; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ApplicationConfig.Action.Step; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ApplicationConfig.Action.Step; /** * JTimer actions class run from command line. Modified: trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java 2013-09-24 06:54:02 UTC (rev 2936) +++ trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java 2013-09-24 06:54:44 UTC (rev 2937) @@ -25,8 +25,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ArgumentsParserException; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; /** * JTimer configuration.

1 0

r2936 - trunk/src/main/resources/org/chorem/jtimer/resources
by tchemit＠users.chorem.org Sept. 24, 2013

Sept. 24, 2013

Author: tchemit Date: 2013-09-24 08:54:02 +0200 (Tue, 24 Sep 2013) New Revision: 2936 Url: http://chorem.org/projects/jtimer/repository/revisions/2936 Log: fixes #945: Add more shortcuts Modified: trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties Modified: trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties 2013-09-11 20:34:27 UTC (rev 2935) +++ trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties 2013-09-24 06:54:02 UTC (rev 2936) @@ -40,20 +40,25 @@ # Resources for @Actions defined in jTimer newProject.Action.text = New Project newProject.Action.icon = bookmark-new.png +newProject.Action.accelerator = shift control N newProject.Action.shortDescription = Create new project editProject.Action.text = Edit project +editProject.Action.accelerator = shift F2 editProject.Action.shortDescription = Edit project deleteProject.Action.text = Delete Project deleteProject.Action.icon = process-stop.png +deleteProject.Action.accelerator = shift control DELETE deleteProject.Action.shortDescription = Delete project closeProject.Action.text = Open/Close Project +closeProject.Action.accelerator = shift control O closeProject.Action.shortDescription = Open or close project newTask.Action.text = New Task newTask.Action.icon = document-new.png +newTask.Action.accelerator = control N newTask.Action.shortDescription = Create new task editTask.Action.text = Edit Task @@ -61,6 +66,7 @@ editTask.Action.shortDescription = Edit task closeTask.Action.text = Open/Close Task +closeTask.Action.accelerator = control O closeTask.Action.shortDescription = Open or close task deleteTask.Action.text = Delete Task @@ -75,10 +81,12 @@ stopTask.Action.text = St&op stopTask.Action.icon = process-stop.png +stopTask.Action.accelerator = alt shift S stopTask.Action.shortDescription = Stop selected task addAnnotation.Action.text = Add annotation addAnnotation.Action.icon = notes.png +addAnnotation.Action.accelerator = control A addAnnotation.Action.shortDescription = Add an annotation editAlert.Action.text = Edit alerts Modified: trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties 2013-09-11 20:34:27 UTC (rev 2935) +++ trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties 2013-09-24 06:54:02 UTC (rev 2936) @@ -49,12 +49,10 @@ deleteTask.Action.text = Suppression de la t\u00E2che deleteTask.Action.icon = process-stop.png -deleteTask.Action.accelerator = DELETE deleteTask.Action.shortDescription = Suppression de la t\u00E2che startTask.Action.text = D\u00E9marrer startTask.Action.icon = go-next.png -startTask.Action.accelerator = alt S startTask.Action.shortDescription = D\u00E9marre la t\u00E2che s\u00E9lectionn\u00E9e stopTask.Action.text = Arr\u00EAter @@ -74,19 +72,15 @@ decrement1Task.Action.shortDescription = Retire 1 minute au temps de la t\u00E2che increment5Task.Action.text = Ajouter 5 minutes -increment5Task.Action.accelerator = control I increment5Task.Action.shortDescription = Ajoute 5 minutes au temps de la t\u00E2che decrement5Task.Action.text = Enlever 5 minutes -decrement5Task.Action.accelerator = control D decrement5Task.Action.shortDescription = Retire 5 minutes au temps de la t\u00E2che increment30Task.Action.text = Ajouter 30 minutes -increment30Task.Action.accelerator = control shift I increment30Task.Action.shortDescription = Ajoute 30 minute au temps de la t\u00E2che decrement30Task.Action.text = Enlever 30 minutes -decrement30Task.Action.accelerator = control shift D decrement30Task.Action.shortDescription = Retire 30 minutes au temps de la t\u00E2che setToZero.Action.text = Remettre \u00E0 Zero

1 0

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