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

r2917 - branches/ng-jtimer/jtimer-server/src/main/go
by echatellier＠users.chorem.org July 26, 2013

July 26, 2013

Author: echatellier Date: 2013-07-26 23:09:49 +0200 (Fri, 26 Jul 2013) New Revision: 2917 Url: http://chorem.org/projects/jtimer/repository/revisions/2917 Log: Start chromium and add systray menu Added: branches/ng-jtimer/jtimer-server/src/main/go/systray.go branches/ng-jtimer/jtimer-server/src/main/go/ui.go Modified: branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go branches/ng-jtimer/jtimer-server/src/main/go/readme.txt Modified: branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go 2013-07-26 20:04:45 UTC (rev 2916) +++ branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go 2013-07-26 21:09:49 UTC (rev 2917) @@ -27,13 +27,14 @@ import ( "fmt" + "log" + "time" + "os" "net/http" - "time" "github.com/BurntSushi/xgb" "github.com/BurntSushi/xgb/xproto" "github.com/BurntSushi/xgb/screensaver" "code.google.com/p/go.net/websocket" - "log" ) func RunIdleReporting() { @@ -74,5 +75,9 @@ func main() { go StartWebsocketServer() - RunIdleReporting() + go RunIdleReporting() + cmd := RunClient() + cmd.Start() + InstallSystray(&os.Args) + cmd.Process.Kill() } Modified: branches/ng-jtimer/jtimer-server/src/main/go/readme.txt =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/readme.txt 2013-07-26 20:04:45 UTC (rev 2916) +++ branches/ng-jtimer/jtimer-server/src/main/go/readme.txt 2013-07-26 21:09:49 UTC (rev 2917) @@ -5,12 +5,13 @@ -------------------- go get github.com/BurntSushi/xgb/screensaver go get code.google.com/p/go.net/websocket +go get github.com/mattn/go-gtk/gtk Lancement --------- -go run *.go +go run [^j]*.go jtimer.go Compilation ----------- -go build -o jtimer *.go +go build -o jtimer [^j]*.go jtimer.go Added: branches/ng-jtimer/jtimer-server/src/main/go/systray.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/systray.go (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/go/systray.go 2013-07-26 21:09:49 UTC (rev 2917) @@ -0,0 +1,48 @@ +package main + +import ( + "github.com/mattn/go-gtk/gtk" + "github.com/mattn/go-gtk/glib" +) + +func InstallSystray(args *[]string) { + gtk.Init(args) + + glib.SetApplicationName("go-gtk-statusicon-example") + + // Popup menu + popupMenu := gtk.NewMenu() + + // Hide menu item + miHide := gtk.NewMenuItemWithLabel("Cacher") + miHide.Connect("activate", func() { + + }) + popupMenu.Append(miHide) + + // Stop all task + popupMenu.Append(gtk.NewSeparatorMenuItem()) + miStop := gtk.NewMenuItemWithLabel("Arrêter toutes les tâches") + miStop.Connect("activate", func() { + + }) + popupMenu.Append(miStop) + + // Quit + miQuit := gtk.NewMenuItemWithLabel("Quitter") + miQuit.Connect("activate", func() { + gtk.MainQuit() + }) + popupMenu.Append(miQuit) + + // install systray with popup menu + popupMenu.ShowAll() + si := gtk.NewStatusIconFromFile("jtimer-40-green.png") + si.SetTitle("jTimer") + si.SetTooltipMarkup("jTimer 2.0") + si.Connect("popup-menu", func(cbx *glib.CallbackContext) { + popupMenu.Popup(nil, nil, gtk.StatusIconPositionMenu, si, uint(cbx.Args(0)), uint32(cbx.Args(1))) + }) + + gtk.Main() +} \ No newline at end of file Added: branches/ng-jtimer/jtimer-server/src/main/go/ui.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/ui.go (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/go/ui.go 2013-07-26 21:09:49 UTC (rev 2917) @@ -0,0 +1,11 @@ +package main + +import ( + "os/exec" +) + +func RunClient() *exec.Cmd { + binary, _ := exec.LookPath("chromium") + return exec.Command(binary, "--app=http://localhost:8080", + "--user-data-dir=/tmp/jtimer") +}

1 0

r2916 - in branches/ng-jtimer/jtimer-server/src/main: go webapp/js
by echatellier＠users.chorem.org July 26, 2013

July 26, 2013

Author: echatellier Date: 2013-07-26 22:04:45 +0200 (Fri, 26 Jul 2013) New Revision: 2916 Url: http://chorem.org/projects/jtimer/repository/revisions/2916 Log: Add go websocket server and js client Added: branches/ng-jtimer/jtimer-server/src/main/go/conn.go branches/ng-jtimer/jtimer-server/src/main/go/hub.go branches/ng-jtimer/jtimer-server/src/main/go/readme.txt Modified: branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js Added: branches/ng-jtimer/jtimer-server/src/main/go/conn.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/conn.go (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/go/conn.go 2013-07-26 20:04:45 UTC (rev 2916) @@ -0,0 +1,43 @@ +package main + +import ( + "code.google.com/p/go.net/websocket" +) + +type connection struct { + // The websocket connection. + ws *websocket.Conn + + // Buffered channel of outbound messages. + send chan string +} + +func (c *connection) reader() { + for { + var message string + err := websocket.Message.Receive(c.ws, &message) + if err != nil { + break + } + h.broadcast <- message + } + c.ws.Close() +} + +func (c *connection) writer() { + for message := range c.send { + err := websocket.Message.Send(c.ws, message) + if err != nil { + break + } + } + c.ws.Close() +} + +func wsHandler(ws *websocket.Conn) { + c := &connection{send: make(chan string, 256), ws: ws} + h.register <- c + defer func() { h.unregister <- c }() + go c.writer() + c.reader() +} \ No newline at end of file Added: branches/ng-jtimer/jtimer-server/src/main/go/hub.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/hub.go (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/go/hub.go 2013-07-26 20:04:45 UTC (rev 2916) @@ -0,0 +1,44 @@ +package main + +type hub struct { + // Registered connections. + connections map[*connection]bool + + // Inbound messages from the connections. + broadcast chan string + + // Register requests from the connections. + register chan *connection + + // Unregister requests from connections. + unregister chan *connection +} + +var h = hub{ + broadcast: make(chan string), + register: make(chan *connection), + unregister: make(chan *connection), + connections: make(map[*connection]bool), +} + +func (h *hub) run() { + for { + select { + case c := <-h.register: + h.connections[c] = true + case c := <-h.unregister: + delete(h.connections, c) + close(c.send) + case m := <-h.broadcast: + for c := range h.connections { + select { + case c.send <- m: + default: + delete(h.connections, c) + close(c.send) + go c.ws.Close() + } + } + } + } +} Modified: branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go 2013-07-26 17:24:01 UTC (rev 2915) +++ branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go 2013-07-26 20:04:45 UTC (rev 2916) @@ -1,35 +1,42 @@ +/* + * 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>. + */ + package main +/** + * Start a web socket server on port 12345. + * Notify idleness on ws://localhost:12345/jtimer + * + * jTimer ui can connect to ws://localhost:12345/jtimer to receive idle activity + */ + import ( "fmt" "net/http" "time" - //"log" - //"strconv" "github.com/BurntSushi/xgb" "github.com/BurntSushi/xgb/xproto" "github.com/BurntSushi/xgb/screensaver" "code.google.com/p/go.net/websocket" + "log" ) - -// echo back the websocket. -func EchoServer(ws *websocket.Conn) { - var message string - websocket.Message.Receive(ws, &message) - fmt.Println("[Received] ", message) -} - -func WebSocketServer() { - http.Handle("/echo", websocket.Handler(EchoServer)); - err := http.ListenAndServe(":12345", nil); - if err != nil { - //panic("ListenAndServe: ", err.String()) - fmt.Println("[Debug] "); - } -} - -func RunTimer() { +func RunIdleReporting() { X, err := xgb.NewConn() if err != nil { fmt.Println(err) @@ -42,8 +49,8 @@ screensaver.Init(X) // connect to webscocket server - origin := "http://localhost:12345/" - url := "ws://localhost:12345/echo" + origin := "http://localhost:8080/" + url := "ws://localhost:12345/jtimer" for { time.Sleep(1 * time.Second) @@ -53,14 +60,19 @@ ws, _ := websocket.Dial(url, "", origin) msSinceUserInputString := fmt.Sprintf("{idle:%d}", reply.MsSinceUserInput) - /*if _, err := ws.Write([]byte(msSinceUserInputString)); err != nil { - log.Fatal(err) - }*/ websocket.Message.Send(ws, msSinceUserInputString) } } +func StartWebsocketServer() { + go h.run() + http.Handle("/jtimer", websocket.Handler(wsHandler)) + if err := http.ListenAndServe(":12345", nil); err != nil { + log.Fatal("ListenAndServe:", err) + } +} + func main() { - go WebSocketServer() - RunTimer() + go StartWebsocketServer() + RunIdleReporting() } Added: branches/ng-jtimer/jtimer-server/src/main/go/readme.txt =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/readme.txt (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/go/readme.txt 2013-07-26 20:04:45 UTC (rev 2916) @@ -0,0 +1,16 @@ +Compilation do client go +======================== + +Packages necessaires +-------------------- +go get github.com/BurntSushi/xgb/screensaver +go get code.google.com/p/go.net/websocket + +Lancement +--------- +go run *.go + + +Compilation +----------- +go build -o jtimer *.go Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js 2013-07-26 17:24:01 UTC (rev 2915) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js 2013-07-26 20:04:45 UTC (rev 2916) @@ -321,4 +321,12 @@ // force the first tree creation $scope.createTree(); + + var conn = conn = new WebSocket("ws://localhost:12345/jtimer"); + conn.onclose = function(evt) { + console.log("Connection closed."); + }; + conn.onmessage = function(evt) { + console.log("Message", evt.data); + }; }

1 0

r2915 - in branches/ng-jtimer/jtimer-server/src/main/webapp: . js partials
by bpoussin＠users.chorem.org July 26, 2013

July 26, 2013

Author: bpoussin Date: 2013-07-26 19:24:01 +0200 (Fri, 26 Jul 2013) New Revision: 2915 Url: http://chorem.org/projects/jtimer/repository/revisions/2915 Log: fix bug refresh in add/remove task Modified: 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/js/entities.js branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html branches/ng-jtimer/jtimer-server/src/main/webapp/webtimer.appcache Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js 2013-07-26 17:23:14 UTC (rev 2914) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js 2013-07-26 17:24:01 UTC (rev 2915) @@ -134,6 +134,11 @@ update(tree); } }); + isNewElement && childScope.$watch("$node.children.length", function (newValue, oldValue, scope) { + if (newValue !== oldValue) { + update(tree); + } + }); if (!isNewElement) { animate.move(cacheEntry.element, null, lastElement); Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js 2013-07-26 17:23:14 UTC (rev 2914) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js 2013-07-26 17:24:01 UTC (rev 2915) @@ -115,10 +115,14 @@ * Ajoute une tache root */ $scope.addTask = function() { - $scope.data.tasks.push(new Task($scope.name)); + var newTask = new Task($scope.name); + $scope.data.tasks.push(newTask); $scope.name = ""; save(); - $scope.createTree(); + if (tree) { + tree.addChild($scope.createTreeNode(newTask)); + } +// $scope.createTree(); }; /** @@ -127,28 +131,33 @@ */ $scope.addSubTask = function(node) { var task = node.task; - $scope.data.tasks.push(new Task("New task", task.taskId)); + var newTask = new Task("New task", task.taskId); + $scope.data.tasks.push(newTask); node.$$open = true; save(); - $scope.createTree(); + node.addChild($scope.createTreeNode(newTask)); +// $scope.createTree(); }; /** * Supprime une tache (et ces sous taches recursivement) * @param {type} task */ - $scope.removeTask = function(task) { + $scope.removeTask = function(node) { // methode pour faire la suppression recursivement var removeRecurse = function(tasks) { - angular.forEach(tasks, function() { + angular.forEach(tasks, function(task) { task.remove(); var children = $scope.getChildren(task); removeRecurse(children); }); }; - removeRecurse([task]); + // mark all task as removed + removeRecurse([node.task]); + // remove node in tree + node.remove(); save(); - $scope.createTree(); +// $scope.createTree(); }; /** Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/entities.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/entities.js 2013-07-26 17:23:14 UTC (rev 2914) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/entities.js 2013-07-26 17:24:01 UTC (rev 2915) @@ -150,11 +150,32 @@ this.localTimes = localTimes || []; children = angular.forEach(children, function(child) { child.parent = this; - }); + }, this); this.children = children || []; }; /** + * Ce retire de l'arbre + * @returns {undefined} + */ +TreeNode.prototype.remove = function() { + if (this.parent) { + var brothers = this.parent.children; + var match = brothers.indexOf(this); + + if (match > -1 ) { + brothers.splice(match, 1); + delete this.parent; + } + } +}; + +TreeNode.prototype.addChild = function(node) { + node.parent = this; + this.children.push(node); +}; + +/** * Copie toutes les donnees d'etat d'une noeud * @param {TreeNode} node * @returns {undefined} Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html 2013-07-26 17:23:14 UTC (rev 2914) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html 2013-07-26 17:24:01 UTC (rev 2915) @@ -20,7 +20,7 @@ <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.task)"><i class="icon-minus"></i></a> + <a class="btn btn-mini" href="" ng-click="removeTask($node)"><i class="icon-minus"></i></a> </span> </div> @@ -67,7 +67,7 @@ </div> <div id="footer"> <span class="left">{{currentDate()}}</span> - <span class="center"><a href="#">WebTimer</a><i class="icon-html5"></i></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> </div> Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/webtimer.appcache =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/webtimer.appcache 2013-07-26 17:23:14 UTC (rev 2914) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/webtimer.appcache 2013-07-26 17:24:01 UTC (rev 2915) @@ -1,5 +1,5 @@ CACHE MANIFEST -# version 11 +# version 12 CACHE: index.html

1 0

r2914 - branches/ng-jtimer/jtimer-server/src/main/webapp
by bpoussin＠users.chorem.org July 26, 2013

July 26, 2013

Author: bpoussin Date: 2013-07-26 19:23:14 +0200 (Fri, 26 Jul 2013) New Revision: 2914 Url: http://chorem.org/projects/jtimer/repository/revisions/2914 Log: disable web app during devel 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-07-26 16:11:03 UTC (rev 2913) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/index.html 2013-07-26 17:23:14 UTC (rev 2914) @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="en" ng-app="webtimer" manifest="webtimer.appcache"> +<html lang="en" ng-app="webtimer" zmanifest="webtimer.appcache"> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

1 0

r2913 - in branches/ng-jtimer: . jtimer-server jtimer-server/src/main/config
by bpoussin＠users.chorem.org July 26, 2013

July 26, 2013

Author: bpoussin Date: 2013-07-26 18:11:03 +0200 (Fri, 26 Jul 2013) New Revision: 2913 Url: http://chorem.org/projects/jtimer/repository/revisions/2913 Log: change wro generation during devel time Modified: branches/ng-jtimer/jtimer-server/pom.xml branches/ng-jtimer/jtimer-server/src/main/config/wro.xml branches/ng-jtimer/pom.xml Modified: branches/ng-jtimer/jtimer-server/pom.xml =================================================================== --- branches/ng-jtimer/jtimer-server/pom.xml 2013-07-26 16:06:59 UTC (rev 2912) +++ branches/ng-jtimer/jtimer-server/pom.xml 2013-07-26 16:11:03 UTC (rev 2913) @@ -53,6 +53,7 @@ <plugin> <groupId>ro.isdc.wro4j</groupId> <artifactId>wro4j-maven-plugin</artifactId> + <executions> <execution> <phase>generate-resources</phase> @@ -65,8 +66,13 @@ <configuration> <targetGroups>jtimer</targetGroups> <contextFolder>${basedir}/src/main/webapp/web/</contextFolder> - <cssDestinationFolder>${basedir}/target/classes/web/css</cssDestinationFolder> - <jsDestinationFolder>${basedir}/target/classes/web/js</jsDestinationFolder> + + <cssDestinationFolder>${basedir}/src/main/webapp/css</cssDestinationFolder> + <jsDestinationFolder>${basedir}/src/main/webapp/js</jsDestinationFolder> +  <wroManagerFactory>org.nuiton.js.wro.NuitonJsMavenWroManagerFactory</wroManagerFactory> <wroFile>${basedir}/src/main/config/wro.xml</wroFile> <extraConfigFile>${basedir}/src/main/config/wro.properties</extraConfigFile> Modified: branches/ng-jtimer/jtimer-server/src/main/config/wro.xml =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/config/wro.xml 2013-07-26 16:06:59 UTC (rev 2912) +++ branches/ng-jtimer/jtimer-server/src/main/config/wro.xml 2013-07-26 16:11:03 UTC (rev 2913) @@ -3,7 +3,11 @@ <group-ref>angular</group-ref> <group-ref>jquery</group-ref> <group-ref>bootstrap</group-ref> - <css>/styles/*.css</css> - <js>/scripts/*.js</js> + <group-ref>font-awesome</group-ref> + <group-ref>moment</group-ref> +  </group> </groups> Modified: branches/ng-jtimer/pom.xml =================================================================== --- branches/ng-jtimer/pom.xml 2013-07-26 16:06:59 UTC (rev 2912) +++ branches/ng-jtimer/pom.xml 2013-07-26 16:11:03 UTC (rev 2913) @@ -66,6 +66,16 @@ <version>2.3.2-1</version> </dependency> <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-moment</artifactId> + <version>2.0.0-1</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-font-awesome</artifactId> + <version>3.2.1-1-SNAPSHOT</version> + </dependency> + <dependency> <groupId>ro.isdc.wro4j</groupId> <artifactId>wro4j-extensions</artifactId> <version>1.7.0</version>

1 0

r2912 - in branches/ng-jtimer/jtimer-server/src/main/webapp: . css js partials
by bpoussin＠users.chorem.org July 26, 2013

July 26, 2013

Author: bpoussin Date: 2013-07-26 18:06:59 +0200 (Fri, 26 Jul 2013) New Revision: 2912 Url: http://chorem.org/projects/jtimer/repository/revisions/2912 Log: first version of web ui (webtimer) - remove old web directory Added: branches/ng-jtimer/jtimer-server/src/main/webapp/css/ 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/ 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/js/entities.js branches/ng-jtimer/jtimer-server/src/main/webapp/js/filters.js branches/ng-jtimer/jtimer-server/src/main/webapp/partials/ branches/ng-jtimer/jtimer-server/src/main/webapp/partials/about.html branches/ng-jtimer/jtimer-server/src/main/webapp/partials/contact.html branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html branches/ng-jtimer/jtimer-server/src/main/webapp/webtimer.appcache Removed: branches/ng-jtimer/jtimer-server/src/main/webapp/web/ Added: branches/ng-jtimer/jtimer-server/src/main/webapp/css/app.css =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/css/app.css (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/css/app.css 2013-07-26 16:06:59 UTC (rev 2912) @@ -0,0 +1,243 @@ + +body{ + margin:0; + padding: 60px 0 20px 0; +} +div#header { + position:absolute; + top:0; + left:0; + width:100%; + height: 35px; + z-index: 1000; + + background:black; + color:graytext; +} +div#footer{ + position:absolute; + bottom:0; + left:0; + width:100%; + height:20px; + z-index: 1000; + + background:black; + color:graytext; +} +#footer>.left, #header>.left { + text-align: left; + position: absolute; + left: 0px; + top: 0px; + z-index: 10; +} +#footer>.center, #header>.center { + width: 100%; + height: 100%; + text-align: center; + display: block; + z-index: 5; +} +#footer>.right, #header>.right { + text-align: right; + position: absolute; + right: 0px; + top: 0px; + z-index: 10; +} + +.menu-show { + display: block; + left: -170px +} + +@media screen{ + body div#header{ + position:fixed; + } + body div#subheader{ + position:fixed; + } + body div#footer{ + position:fixed; + } +} +* html body{ + overflow:hidden; +} +* html div#content{ + height:100%; + overflow:auto; +} + +.table { + display: table; +} + +.table .tbody { + display: table-row-group; +} + +.table .tr { + display: table-row; +} + +.table .th { + display: table-cell; + font-weight: bold; + text-align: center; +} + +.table .td { + display: table-cell; + position: relative; + overflow: hidden; + white-space: nowrap; + text-wrap: none; +} + +.spacer.level1 {padding-left: 10px;} +.spacer.level2 {padding-left: 20px;} +.spacer.level3 {padding-left: 30px;} +.spacer.level4 {padding-left: 40px;} +.spacer.level5 {padding-left: 50px;} +.spacer.level6 {padding-left: 60px;} +.spacer.level7 {padding-left: 70px;} +.spacer.level8 {padding-left: 80px;} +.spacer.level9 {padding-left: 90px;} + +.th.name { + +} + +.th.today, .td.today, .th.global, .td.global { + width: 4em; + border-right: 1px #0088cc solid; +} + +.td.today, .td.global { + text-align: right; +} + +.th.tags { + +} + + + +/* +body { + position: relative; + padding-top: 60px; +} +*/ + +ul.tasks { + display : block; + width : 100%; + list-style: none; +} + +li.task { + display : block; + width : 100%; + height: 32px; +} + +li.task.title { + font-weight: bold; + font-size: medium; +} + +li.task div { + width : 25%; + height: 32px; + float: left; +} + +.names li.task div { + width : 100%; +} + +.details li.task div { + width : 30%; +} + +.names ul.tasks { + margin: 0 0 0 15px; +} + +.details ul.tasks { + margin: 0 0 0 0; +} + +form { + display : inline-block; + margin : 0px; +} + +.filtering-enter { + -webkit-transition : all linear 0.2s; + -moz-transition : all linear 0.2s; + -o-transition : all linear 0.2s; + transition : all linear 0.2s; + + /* The animation preparation code */ + opacity : 0; + height : 0; +} + +.filtering-enter.filtering-enter-active { + /* The animation code itself */ + opacity : 1; + height : 42px; +} + +.filtering-leave { + -webkit-transition : all linear 0.2s; + -moz-transition : all linear 0.2s; + -o-transition : all linear 0.2s; + transition : all linear 0.2s; + + /* The animation preparation code */ + opacity : 1; + height : 42px; +} + +.filtering-leave.filtering-leave-active { + /* The animation code itself */ + opacity : 0; + height : 0; +} + +.btn-group.action { + display: none; + position: absolute; + right: 0; +} + +div:hover > .btn-group.action { + display: inline; +} + +.current-row { + background-color: #3a87ad; + color: white; +} + +.selected-row { + background-color: #5ca9cf; +} + +.tr:hover { + background-color: #7ecbef; +} + +.online { + color: greenyellow; +} + +.offline { + color: red; +} \ No newline at end of file Added: branches/ng-jtimer/jtimer-server/src/main/webapp/index.html =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/index.html (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/index.html 2013-07-26 16:06:59 UTC (rev 2912) @@ -0,0 +1,21 @@ +<!DOCTYPE html> +<html lang="en" ng-app="webtimer" manifest="webtimer.appcache"> + <head> + <title></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> + + <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> + + <div id='content' ng-view></div> + + </body> +</html> Property changes on: branches/ng-jtimer/jtimer-server/src/main/webapp/index.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js 2013-07-26 16:06:59 UTC (rev 2912) @@ -0,0 +1,224 @@ +/** + * Cette directive permet de parcourir un Arbre, pour chaque noeud de l'arbre + * un l'element DOM est duplique. + * Il est possible + * - de filtrer les noeuds lors de la definition de l'arbre (wtTreeRepeat) + * (ex: wt-tree-repeat="tree | filter:query | orderBy:'task.name'") + * - d'afficher le noeud root ou non (wtDisplayRoot) + * - de forcer l'ouverture de tout les noeuds (wtForceOpen) + * + * Lors du parcours pour chaque noeud un nouveau scope est cree permettant + * d'utilise les variables: + * - $node le noeud courant de l'arbre + * - $index l'index de parcours de ce noeud (0 pour le root) + * - $level la profondeur de ce noeud (0 pour le root) + * - $state l'etat de ce noeud ('empty', 'open', 'close') + * - $path le chemin pour arriver a ce noeud (tous ces noeuds parents) + * - $pathIndex le chemin pour arriver a ce noeud par index dans le tableau children du pere + * - $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 {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) { + 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); + // 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) + var forceOpen = $parse($attr.wtForceOpen || 'false'); + // l'expression permettant de recuperer l'arbre et les filtres + var expression = $attr.wtTreeRepeat; + + // les differents filtres a applique aux noeuds enfants + var filters = []; + var filterStrings = expression.split('|'); + // l'expression pour la recuperation de arbre + var tree = filterStrings.shift(); + // add tree as watcher + watchers.push(tree); + // add forceOpen as watcher + watchers.push($attr.wtForceOpen||'false'); + + // Recuperation des filtres et preparation pour etre pret + // a l'utilisation + angular.forEach(filterStrings, function(filterString) { + var argStrings = filterString.split(":"); + var filterName = argStrings.shift().trim(); + var argGetters = argStrings.map(function(e) { + // add all args as watcher + watchers.push(e); + var result = $parse(e); + return result; + }); + var filter = function(children) { + var f = $filter(filterName); + var args = argGetters.map(function(a) { + return a($scope); + }); + var result = f.apply(null, [children].concat(args)); + return result; + }; + filters.push(filter); + }); + + // met a jour l'affichage de l'arbre + 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); + + // l'index de parcours du noeud, on met dans un tableau + // pour avoir une reference lors du passage en argument + // et non pas une valeur lors des appels recursifs + var index = [0]; + // le niveau du noeud + var level = 0; + var path = []; + var pathIndex = []; + // le dernier element HTML ajoute (il faut mettre le suivant apres celui-ci) + var lastElement = $element; + + /** + * Genere un noeud et appel la fonction pour chaque noeud + * fils a affiche + */ + var generate = function(node, index, level, path, pathIndex) { + var state = 'open'; // init to open, if root is not display + + // on affiche le root que si demande + if (index[0] !== 0 || displayRoot($scope)) { + // try to find already created element + var cacheEntry = cache.get(node) || {node: node, scope:$scope.$new()}; + node.copyState(cacheEntry.node); // copy les etats, les noeuds ouvert doivent rester ouvert + var isNewElement = !cacheEntry.element; + + // new item which we don't know about + var childScope = cacheEntry.scope; + + if (node.children.length === 0) { + state = 'empty'; + } else { + if (node.$$open || forceOpen($scope)) { + state = 'open'; + } else { + state = 'close'; + } + } + + childScope.$node = node; + childScope.$index = index[0]; + childScope.$level = level; + childScope.$state = state; + childScope.$path = path; + childScope.$pathIndex = pathIndex; + childScope.$toggleState = function() { + node.$$open = !node.$$open; + }; + isNewElement && childScope.$watch("$node.$$open", function (newValue, oldValue, scope) { + if (newValue !== oldValue) { + update(tree); + } + }); + + if (!isNewElement) { + 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); + lastElement = clone; + newCache.put(node, clone, childScope); + }); + } + } + index[0]++; + + if (state == 'open') { + var children = node.children; + filters.forEach(function(e) { + children = e(children); + }); + for (var i = 0, length = children.length; i < length; i++) { + var child = children[i]; + generate(child, index, level+1, path.concat([child]), pathIndex.concat([i])); + } + } + }; + + generate(tree, index, level, path, pathIndex); + + // on nettoie les anciens noeud non reutilise + cache.clear(); + // on met les nouveaux noeuds dans le cache pour la prochaine maj + cache = newCache; + }; + + // expression permettant de recupere facilement l'arbre + var treeGetter = $parse(tree); + + // on enregistre chaque watcher sur le scope + angular.forEach(watchers, function (watcher) { + $scope.$watch(watcher, 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)); + }; + } + }; +}]; + + +angular.module('webtimer', ['webtimerFilters']) + .config(['$routeProvider', function($routeProvider) { + $routeProvider. + when('/tasks', {templateUrl: 'partials/tasks.html', controller: TasksCtrl}). + when('/about', {templateUrl: 'partials/about.html'}). + when('/contact', {templateUrl: 'partials/contact.html'}). + otherwise({redirectTo: '/tasks'}); + }]) + + .factory("$localStorage", function() { + // Encapsule l'acces au localStorage pour + // - ajouter un prefix au variable sauvee pour les differencier des autres ("WebTimer-") + var webtimerPrefix = "WebTimer-"; + return { + set: function(key, value) { + key = webtimerPrefix + key; + // add version, to check version during read (get) + var item = value.toJson(); + window.localStorage.setItem(key, item); + }, + get: function(key) { + key = webtimerPrefix + key; + var item = window.localStorage.getItem(key); + var result = new WebTimerData(); + result.fromJson(item); + + return result; + } + }; + }) + + .directive('wtTreeRepeat', wtTreeRepeatDirective); Added: branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js 2013-07-26 16:06:59 UTC (rev 2912) @@ -0,0 +1,315 @@ +function TasksCtrl($scope, $timeout, $localStorage, $window, $document) { + + /** + * {Boolean} vrai si on est online + */ + $scope.online = $window.navigator.onLine; + + // {WebTimerData} toutes les donnees + $scope.data = $localStorage.get("data"); + // {TreeNode} l'arbre regenere automatiquement lorsque les donnees changent + $scope.tree; + // {Array of Function} les listeners qui surveille l'ajout de nouveau temps, et qui les ajoutes dans l'arbre + $scope.treeWatcher = []; + // {String} le nom de la nouvelle tache a creer + $scope.name = ""; + // {Task} la derniere tache selectionnee + $scope.selectedTask = null; + // {Task} la tache en cours de timing + $scope.currentTask = null; + // {Date in millis} le temps pour la tache en cours de timing + $scope.currentTaskDate = null; + // {String} le filtre d'affichage des noeuds (permet la recherche d'un noeud) + $scope.query = ""; + // {boolean} boolean qui permet de force le depliage complet de l'arbre s'il est vrai + $scope.forceExpanded = false; + + // {boolean} boolean qui indique si la colonne NAME doit etre affichee + $scope.showName = true; + // {boolean} boolean qui indique si la colonne TODAY doit etre affichee + $scope.showToday = true; + // {boolean} boolean qui indique si la colonne TOTAL doit etre affichee + $scope.showGlobal = true; + // {boolean} boolean qui indique si la colonne TAGS doit etre affichee + $scope.showTags = true; + + /** + * Met a jour la tache selectionne, si la tache selectionnee est la courante + * alors on met la selection a null + * @param {Task} task + */ + $scope.setSelectedTask = function(task) { + if ($scope.selectedTask === task) { + $scope.selectedTask = null; + } else { + $scope.selectedTask = task; + } + }; + + /** + * Permet de faire des actions sur la tache selectionne en fonction + * des touches pressees + * @param {type} e + * @returns {undefined} + */ + $document[0].onkeydown = function(e){ + console.log(e); + // i = 73; d = 68; F2 = 113 + if ($scope.selectedTask) { + var taskTime = $scope.getTodayTaskTime($scope.selectedTask); + if (e.keyCode === 113) { + // edit task, time, note + } else if (e.keyCode === 73 && e.ctrlKey && e.shiftKey) { + // increment by 30min + taskTime.addTime(30*60*1000); + } else if (e.keyCode === 68 && e.ctrlKey && e.shiftKey) { + // decrement by 30min + taskTime.addTime(-30*60*1000); + } else if (e.keyCode === 73 && e.ctrlKey) { + // increment by 5min + taskTime.addTime(5*60*1000); + } else if (e.keyCode === 68 && e.ctrlKey) { + // decrement by 5min + taskTime.addTime(-5*60*1000); + } + } + }; + + $window.addEventListener("offline", function(e) { + $scope.online = false; + }, false); + $window.addEventListener("online", function(e) { + $scope.online = true; + }, false); + + + + /** + * Force la sauvegarde des datas + * @returns {undefined} + */ + var save = function() { + $localStorage.set("data", $scope.data); + }; + + /** + * Timer qui mais les temps a jour toutes les secondes si une tache est + * active + * @returns {undefined} + */ + var refresh = function() { + $timeout(function() { + if ($scope.currentTask) { + var now = Date.now(); + var taskTime = $scope.getTodayTaskTime($scope.currentTask); + taskTime.addTime(now - $scope.currentTaskDate); + $scope.currentTaskDate = now; + save(); + } + refresh(); + }, 1000); + }; + refresh(); + + /** + * Ajoute une tache root + */ + $scope.addTask = function() { + $scope.data.tasks.push(new Task($scope.name)); + $scope.name = ""; + save(); + $scope.createTree(); + }; + + /** + * Ajoute une sous tache a la tache du noeud passe en parametre + * @param {type} node + */ + $scope.addSubTask = function(node) { + var task = node.task; + $scope.data.tasks.push(new Task("New task", task.taskId)); + node.$$open = true; + save(); + $scope.createTree(); + }; + + /** + * Supprime une tache (et ces sous taches recursivement) + * @param {type} task + */ + $scope.removeTask = function(task) { + // methode pour faire la suppression recursivement + var removeRecurse = function(tasks) { + angular.forEach(tasks, function() { + task.remove(); + var children = $scope.getChildren(task); + removeRecurse(children); + }); + }; + removeRecurse([task]); + save(); + $scope.createTree(); + }; + + /** + * met a jour la variable $scope.tree par recreation de l'arbre + * Tous les listeners de l'ancien arbre sont enleves + */ + $scope.createTree = function() { + // on supprime tous les watchers de l'arbre courant + angular.forEach($scope.treeWatcher, function(deregisterFuntion) { + // la methode stocker dans treeWatcher permet de desenregistrer le watcher + deregisterFuntion(); + }); + $scope.treeWatcher = []; + + var nodes = []; + angular.forEach($scope.getRootTask(), function(t) { + var node = $scope.createTreeNode(t); + nodes.push(node); + }); + + var result = new TreeNode(new Task("root"), null, null, nodes); + $scope.tree = result; + }; + + /** + * Retourne la liste des enfants non supprime d'un noeud. Les sous taches + * retourne peuvent etre modifiee via encapsulationFuntion si elle existe + * @param {Task} task la tache dont on recherche les enfants + * @param {Funciton} encapsulationFuntion une methode appelee pour chaque enfant, + * qui peut retourner un autre objet que l'enfant + * @returns {Array of Task or other if encapsulationFuntion used} + */ + $scope.getChildren = function (task, encapsulationFuntion) { + var result = []; + angular.forEach($scope.data.tasks, function (t) { + if (!t.isRemoved() && task.isParentOf(t)) { + var node = t; + if (encapsulationFuntion) { + node = encapsulationFuntion(node); + } + result.push(node); + } + }); + + return result; + }; + + /** + * Encapsule une tache dans un TreeNode. On ajoute un watcher sur les temps + * pour cette tache qui pousse les nouvelles donnes dans le noeud lorsqu'ils + * sont modifies + * + * @param {Task} task + * @returns {TreeNode} + */ + $scope.createTreeNode = function(task) { + var globalTime = $scope.data.globalTimes[task.taskId] || new GlobalTime(); + var localTimes = $scope.data.times[task.taskId] || []; + var children = $scope.getChildren(task, $scope.createTreeNode); + var node = new TreeNode(task, globalTime, localTimes, children); + + var watcher = $scope.$watch("data.times['"+task.taskId+"']", function(localtimes) { + node.setTaskTimes(localtimes); + }, true); + $scope.treeWatcher.push(watcher); + + return node; + }; + + /** + * Retourne la liste des taches root actif (non supprime) + * @returns {result} + */ + $scope.getRootTask = function () { + var result = []; + angular.forEach($scope.data.tasks, function (t) { + if (t.isRoot() && !t.isRemoved()) { + result.push(t); + } + }); + return result; + }; + + /** + * Retourne l'objet TaskTime d'aujourd'hui pour la tache demandee + * Si cet objet n'existait pas, il est cree et ajouter a la liste + * des objets temps existant + * @param {type} task + * @returns {nodes} + */ + $scope.getTodayTaskTime = function(task) { + var times = $scope.data.times[task.taskId]; + if (!times) { + times = []; + $scope.data.times[task.taskId]= times; + } + + var result; + angular.forEach(times, function (t) { + if (!result && t.isToday()) { + result = t; + } + }); + + if (!result) { + result = new TaskTime(task); + times.push(result); + } + + return result; + }; + + /** + * Lance l'edition du nom d'une tache + * @param {TreeNode} node + * @param {String} type le type d'action + */ + $scope.editTask = function(node, type) { + node.edit = type; + save(); + }; + + /** + * Sauve la modification de la tache + * @param {TreeNode} node + */ + $scope.saveTask = function(node) { + node.edit = null; + save(); + }; + + /** + * Active/desactive le comptage de temps pour une tache + * @param {type} task + * @param {type} element + */ + $scope.timeTask = function(task, element) { + var now = Date.now(); + if ($scope.currentTask) { + var taskTime = $scope.getTodayTaskTime($scope.currentTask); + taskTime.addTime(now - $scope.currentTaskDate); + } + + if ($scope.currentTask !== task) { + $scope.currentTask = task; + $scope.currentTaskDate = now; + } else { + $scope.currentTask = null; + $scope.currentTaskDate = null; + } + save(); + }; + + /** + * Retourne la date et heure courant + * @returns {String} + */ + $scope.currentDate = function() { + return moment().format("HH:mm DD/MM/YYYY"); + }; + + // force the first tree creation + $scope.createTree(); +} Added: branches/ng-jtimer/jtimer-server/src/main/webapp/js/entities.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/entities.js (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/entities.js 2013-07-26 16:06:59 UTC (rev 2912) @@ -0,0 +1,347 @@ +/** + * Genere un UUID + * @returns {String} + */ +function generateUUID(){ + var d = Date.now(); + var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) { + var r = (d + Math.random()*16)%16 | 0; + d = Math.floor(d/16); + return (c==='x' ? r : (r&0x7|0x8)).toString(16); + }); + return uuid; +}; + +/** + * Retourne la date d'aujourd'hui sous la forme "2013-O7-25" + * @returns {String} + */ +function today() { + var result = moment().format("YYYY-MM-DD"); + return result; +} + +/** + * permet de gerer les elements HTML et scope creer pour chaque + * noeud et les reutilisers plutot que de les recreer a chaque mise a jour + * + * @param {ngAnimator} animate l'objet permettant de supprimer un noeud dans le DOM + * @returns {Cache} + */ +var Cache = function(animate) { + this.animate = animate; +}; +Cache.prototype.put = function(node, element, scope) { + var id = node.task.taskId; + this[id] = {node: node, element: element, scope: scope}; +}; +Cache.prototype.get = function(nodeOrId) { + var id = nodeOrId; + if (!angular.isString(nodeOrId)) { + id = nodeOrId.task.taskId; + } + var result = this[id]; + delete this[id]; + return result; +}; + +Cache.prototype.clear = function() { + for (var key in this) { + if (this.hasOwnProperty(key) && key !== "animate") { + var entry = this[key]; + this.animate.leave(entry.element); + entry.scope.$destroy(); + } + } +}; + + +/** + * Toutes les donnees qui sont a stocker entre 2 sessions + * @returns {WebTimerData} + */ +var WebTimerData = function() { + // la version des donnees + this.dataVersion = 1; + + this.tasks = []; // Array of Task + this.globalTimes = {}; // key: taskId, value: GlobalTime + this.times = {}; // key: taskId, value: Array of TaskTime + this.notes = {}; // key: taskId, value: Array of TaskNote +}; + +/** + * Migre les donnees d'une version a une autre + * @param {Number} oldVersion + * @param {Number} newVersion + * @param {JSON} data + * @returns {JSON} + */ +WebTimerData.prototype.migrate = function(oldVersion, newVersion, data) { + return data; +}; + +/** + * Converti l'objet WebTimerData en Json en ajoutant + * @returns {JSON} + */ +WebTimerData.prototype.toJson = function() { + var result = angular.toJson(this); + return result; +}; + +/** + * Charge des donnees au format JSON les convertit dans le bon type d'objet, + * fait la migration des data si necessaire + * @param {JSON or JsonString} json + * @returns {WebTimerData} retourne lui meme + */ +WebTimerData.prototype.fromJson = function(json) { + if (angular.isString(json)) { + json = angular.fromJson(json); + } + if (json) { + if (json.dataVersion !== this.dataVersion) { + json = this.migrate(json.dataVersion, this.dataVersion, json); + } + if (json) { + angular.forEach(json.tasks, function (t) { + t = jQuery.extend(new Task(), t); + this.tasks.push(t); + }, this); + + angular.forEach(json.globalTimes, function (t, k) { + t = jQuery.extend(new GlobalTime(), t); + this.globalTimes[k] = t; + }, this); + + angular.forEach(json.times, function (times, k) { + this.times[k] = []; + angular.forEach(times, function (t) { + t = jQuery.extend(new TaskTime(), t); + this.times[k].push(t); + }, this); + }, this); + + angular.forEach(json.notes, function (notes, k) { + this.notes[k] = []; + angular.forEach(notes, function (n, k) { + n = jQuery.extend(new TaskNote(), n); + this.notes[k].push(n); + }, this); + }, this); + } + } + return this; +}; + +/** + * Un noeud de l'arbre. + * + * @param {Task} task la tache a encapsuler + * @param {GlobalTime} globalTime les temps totaux provenant du serveur + * @param {Array of TaskTime} localTimes les temps crees localement + * @param {Array of TreeNode} children les enfants de ce noeud + * @returns {TreeNode} + */ +var TreeNode = function (task, globalTime, localTimes, children) { + this.task = task || new Task("root"); + this.globalTime = globalTime || new GlobalTime(); + this.localTimes = localTimes || []; + children = angular.forEach(children, function(child) { + child.parent = this; + }); + this.children = children || []; +}; + +/** + * Copie toutes les donnees d'etat d'une noeud + * @param {TreeNode} node + * @returns {undefined} + */ +TreeNode.prototype.copyState = function(node) { + this.$$open = node.$$open; +}; + +/** + * Met a jour les temps locaux + * + * @param {Array of TaskTime} taskTimes + * @returns {undefined} + */ +TreeNode.prototype.setTaskTimes = function(taskTimes) { + this.localTimes = taskTimes; +}; + +/** + * Retourne le temps consolide pour ce noeud (temps glocal + locaux + enfant) + * @returns {GlobalTime} + */ +TreeNode.prototype.getTime = function() { + var result = new GlobalTime(); + result.addGlobalTime(this.globalTime); + result.addTaskTimes(this.localTimes); + angular.forEach(this.children, function(node) { + var nodeTime = node.getTime(); + result.addGlobalTime(nodeTime); + }); + return result; +}; + +/** + * Objet permettant de stocke le temps total et le temps de la journee actuelle + * + * @param {Task} task + * @returns {GlobalTime} + */ +var GlobalTime = function (task) { + this.taskId = task && task.taskId; + this.today = 0; + this.global = 0; +}; + +/** + * Fait une copie de l'objet + * @returns {GlobalTime} + */ +GlobalTime.prototype.clone = function() { + var result = new GlobalTime(); + result.add(this); + return result; +}; + +/** + * Ajoute les temps d'un GlobalTime + * @param {GlobalTime} globalTime + * @returns {GlobalTime} this + */ +GlobalTime.prototype.addGlobalTime = function(globalTime) { + this.global += globalTime.global; + this.today += globalTime.today; + return this; +}; + +/** + * Ajoute les temps d'un tableau de TaskTime au temps global et a today si + * la TaskTime est pour today + * @param {Array of TaskTime} taskTimes + * @returns {GlobalTime} this + */ +GlobalTime.prototype.addTaskTimes = function(taskTimes) { + angular.forEach(taskTimes, function(taskTime) { + this.global += taskTime.time; + if (taskTime.isToday()) { + this.today += taskTime.time; + } + }, this); + return this; +}; + +/** + * Represente une tache + * @param {type} name le nom de la tache + * @param {type} parentTaskId l'identifiant de la tache parente + * @returns {Task} + */ +var Task = function (name, parentTaskId) { + this.taskId = generateUUID(); + this.creationDate = Date.now(); + this.modificationDate = this.creationDate; + this.removed = 0; + this.parentTaskId = parentTaskId; + this.name = name; + this.description = ""; + this.tags = []; + this.syncOptions = {}; +}; + +/** + * Marque la tache comme supprimee + * @returns {undefined} + */ +Task.prototype.remove = function() { + this.removed = Date.now(); +}; + +/** + * return vrai si la tache est supprimee + * @returns {boolean} + */ +Task.prototype.isRemoved = function() { + return !!this.removed; +}; + +/** + * Retourne vrai si la tache est parent de la sous tache passee en parametre + * @param {Task} subtask + * @returns {Boolean} + */ +Task.prototype.isParentOf = function(subtask) { + var result = subtask.parentTaskId === this.taskId; + return result; +}; + +/** + * Indique si la tache est une tache root (pas de parent) + * @returns {unresolved} + */ +Task.prototype.isRoot = function() { + var result = !this.parentTaskId; + return result; +}; + +/** + * Permet de conserve une temps cree localement + * @param {Task} task + * @returns {TaskTime} + */ +var TaskTime = function (task) { + this.taskId = task && task.taskId; + this.timeId = generateUUID(); + this.date = today(); + this.time = 0; +}; + +/** + * Retourne vrai si ce temps est pour aujourd'hui + * @returns {Boolean} + */ +TaskTime.prototype.isToday = function() { + var result = this.date === today(); + return result; +}; + +/** + * ajoute du temps + * @param {Number} t + * @returns {TaskTime} this + */ +TaskTime.prototype.addTime = function(t) { + this.time += t; + if (this.time < 0) { + this.time = 0; + } + return this; +}; + +/** + * Represente une note pour une tache + * @param {Task} task + * @returns {TaskNote} + */ +var TaskNote = function (task) { + this.taskId = task && task.taskId; + this.noteId = generateUUID(); + this.date = today(); + this.text = ""; +}; + +/** + * Retourne vrai si cette note est pour aujourd'hui + * @returns {Boolean} + */ +TaskNote.prototype.isToday = function() { + var result = this.date === today(); + return result; +}; + Added: branches/ng-jtimer/jtimer-server/src/main/webapp/js/filters.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/filters.js (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/filters.js 2013-07-26 16:06:59 UTC (rev 2912) @@ -0,0 +1,8 @@ +var wtFilter = function(input) { + var date = moment(input).utc(); + return date.diff(moment(0), 'hours') + ":" +date.format("mm:ss"); +}; + +angular.module('webtimerFilters', []).filter('time', function() { + return wtFilter; +}); Added: branches/ng-jtimer/jtimer-server/src/main/webapp/partials/about.html =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/partials/about.html (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/partials/about.html 2013-07-26 16:06:59 UTC (rev 2912) @@ -0,0 +1 @@ +WebTimer 1.0 Property changes on: branches/ng-jtimer/jtimer-server/src/main/webapp/partials/about.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/ng-jtimer/jtimer-server/src/main/webapp/partials/contact.html =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/partials/contact.html (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/partials/contact.html 2013-07-26 16:06:59 UTC (rev 2912) @@ -0,0 +1 @@ +jtimer-users(a)listes.chorem.org Property changes on: branches/ng-jtimer/jtimer-server/src/main/webapp/partials/contact.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html 2013-07-26 16:06:59 UTC (rev 2912) @@ -0,0 +1,88 @@ +<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.task)"><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"> + <form ng-submit="addTask()"> + <input class='search-query input-small' ng-model="name" placeholder="New Task"> + </form> + </span> + <span class="right"> + <a class="icon-plus-sign" ng-click="showMenu = !showMenu"> + <b class="caret"></b> + </a> + <ul class="dropdown-menu" ng-class="{'menu-show': showMenu}"> + <li>Keep Tree opened <input type='checkbox' ng-model="forceExpanded"></li> + <li>Name <input type='checkbox' ng-model='showName'/></li> + <li>Today <input type='checkbox' ng-model='showToday'/></li> + <li>Total <input type='checkbox' ng-model='showGlobal'/></li> + <li>Tags <input type='checkbox' ng-model='showTags'/></li> + </ul> + <i class="icon-cloud" ng-class="{online: online, offline: !online}"></i> + </span> +</div> +<div id="footer"> + <span class="left">{{currentDate()}}</span> + <span class="center"><a href="#">WebTimer</a><i class="icon-html5"></i></span> + <span class="right">{{tree.getTime().today |time}} | {{tree.getTime().global | time}}</a> +</div> + +<div> + <div class='table'> + <div class='tr'> + <div class='th name' ng-show="showName">Name</div> + <div class='th today' ng-show="showToday">Today</div> + <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> + + </div> +</div> Property changes on: branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/ng-jtimer/jtimer-server/src/main/webapp/webtimer.appcache =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/webtimer.appcache (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/webtimer.appcache 2013-07-26 16:06:59 UTC (rev 2912) @@ -0,0 +1,18 @@ +CACHE MANIFEST +# version 11 + +CACHE: +index.html +partials/about.html +partials/contact.html +partials/tasks.html +css/app.css +css/jtimer.css +js/app.js +js/controllers.js +js/entities.js +js/filters.js +js/jtimer.js + +NETWORK: +http://localhost:33678/*

1 0

r2911 - branches/ng-jtimer/jtimer-server/src/main/go
by echatellier＠users.chorem.org July 24, 2013

July 24, 2013

Author: echatellier Date: 2013-07-24 23:08:10 +0200 (Wed, 24 Jul 2013) New Revision: 2911 Url: http://chorem.org/projects/jtimer/repository/revisions/2911 Log: Send idle time into sockets Modified: branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go Modified: branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go 2013-07-23 21:15:26 UTC (rev 2910) +++ branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go 2013-07-24 21:08:10 UTC (rev 2911) @@ -4,6 +4,8 @@ "fmt" "net/http" "time" + //"log" + //"strconv" "github.com/BurntSushi/xgb" "github.com/BurntSushi/xgb/xproto" "github.com/BurntSushi/xgb/screensaver" @@ -13,13 +15,19 @@ // echo back the websocket. func EchoServer(ws *websocket.Conn) { - fmt.Println("Allo ?"); - //var message string - //websocket.Message.Receive(ws, &message) - //fmt.Println("[Debug] ", message); - websocket.Message.Send(ws, "Hello") + var message string + websocket.Message.Receive(ws, &message) + fmt.Println("[Received] ", message) } +func WebSocketServer() { + http.Handle("/echo", websocket.Handler(EchoServer)); + err := http.ListenAndServe(":12345", nil); + if err != nil { + //panic("ListenAndServe: ", err.String()) + fmt.Println("[Debug] "); + } +} func RunTimer() { X, err := xgb.NewConn() @@ -33,23 +41,26 @@ draw := xproto.Drawable(screen.Root) screensaver.Init(X) + // connect to webscocket server + origin := "http://localhost:12345/" + url := "ws://localhost:12345/echo" + for { time.Sleep(1 * time.Second) cookie := screensaver.QueryInfo(X, draw) reply, _ := cookie.Reply() fmt.Println("Idle since", reply.MsSinceUserInput); - + ws, _ := websocket.Dial(url, "", origin) + msSinceUserInputString := fmt.Sprintf("{idle:%d}", reply.MsSinceUserInput) + /*if _, err := ws.Write([]byte(msSinceUserInputString)); err != nil { + log.Fatal(err) + }*/ + websocket.Message.Send(ws, msSinceUserInputString) } } func main() { - go RunTimer() - http.Handle("/echo", websocket.Handler(EchoServer)); - err := http.ListenAndServe(":12345", nil); - if err != nil { - //panic("ListenAndServe: ", err.String()) - fmt.Println("[Debug] "); - } + go WebSocketServer() + RunTimer() } -

1 0

r2910 - in branches/ng-jtimer/jtimer-server/src/main: . go
by echatellier＠users.chorem.org July 23, 2013

July 23, 2013

Author: echatellier Date: 2013-07-23 23:15:26 +0200 (Tue, 23 Jul 2013) New Revision: 2910 Url: http://chorem.org/projects/jtimer/repository/revisions/2910 Log: Add go client (idle detect and websocket server) Added: branches/ng-jtimer/jtimer-server/src/main/go/ branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go Added: branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go 2013-07-23 21:15:26 UTC (rev 2910) @@ -0,0 +1,55 @@ +package main + +import ( + "fmt" + "net/http" + "time" + "github.com/BurntSushi/xgb" + "github.com/BurntSushi/xgb/xproto" + "github.com/BurntSushi/xgb/screensaver" + "code.google.com/p/go.net/websocket" +) + + +// echo back the websocket. +func EchoServer(ws *websocket.Conn) { + fmt.Println("Allo ?"); + //var message string + //websocket.Message.Receive(ws, &message) + //fmt.Println("[Debug] ", message); + websocket.Message.Send(ws, "Hello") +} + + +func RunTimer() { + X, err := xgb.NewConn() + if err != nil { + fmt.Println(err) + return + } + + screen := xproto.Setup(X).DefaultScreen(X) + //wid, err := xproto.NewWindowId(X) + draw := xproto.Drawable(screen.Root) + screensaver.Init(X) + + for { + time.Sleep(1 * time.Second) + cookie := screensaver.QueryInfo(X, draw) + reply, _ := cookie.Reply() + fmt.Println("Idle since", reply.MsSinceUserInput); + + + } +} + +func main() { + go RunTimer() + http.Handle("/echo", websocket.Handler(EchoServer)); + err := http.ListenAndServe(":12345", nil); + if err != nil { + //panic("ListenAndServe: ", err.String()) + fmt.Println("[Debug] "); + } +} +

1 0

r2909 - in branches/ng-jtimer/jtimer-server: . src/main/java/org/chorem/jtimer/web src/main/webapp/WEB-INF
by echatellier＠users.chorem.org July 23, 2013

July 23, 2013

Author: echatellier Date: 2013-07-23 21:44:03 +0200 (Tue, 23 Jul 2013) New Revision: 2909 Url: http://chorem.org/projects/jtimer/repository/revisions/2909 Log: Switch to restlet Added: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/ProjectsResource.java branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestApplication.java Removed: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestController.java Modified: branches/ng-jtimer/jtimer-server/pom.xml branches/ng-jtimer/jtimer-server/src/main/webapp/WEB-INF/web.xml Modified: branches/ng-jtimer/jtimer-server/pom.xml =================================================================== --- branches/ng-jtimer/jtimer-server/pom.xml 2013-07-19 14:43:56 UTC (rev 2908) +++ branches/ng-jtimer/jtimer-server/pom.xml 2013-07-23 19:44:03 UTC (rev 2909) @@ -27,10 +27,20 @@ <version>2.2.4</version> </dependency> <dependency> - <groupId>org.debux.webmotion</groupId> - <artifactId>webmotion</artifactId> - <version>2.4-SNAPSHOT</version> + <groupId>org.restlet.jee</groupId> + <artifactId>org.restlet</artifactId> + <version>2.1.2</version> </dependency> + <dependency> + <groupId>org.restlet.jee</groupId> + <artifactId>org.restlet.ext.servlet</artifactId> + <version>2.1.2</version> + </dependency> + <dependency> + <groupId>org.restlet.jee</groupId> + <artifactId>org.restlet.ext.jackson</artifactId> + <version>2.1.2</version> + </dependency> </dependencies> <build> @@ -64,4 +74,12 @@ </plugin> </plugins> </build> + + <repositories> + <repository> + <id>maven-restlet</id> + <name>Public online Restlet repository</name> + <url>http://maven.restlet.org</url> + </repository> + </repositories> </project> Copied: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/ProjectsResource.java (from rev 2907, branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestController.java) =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/ProjectsResource.java (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/ProjectsResource.java 2013-07-23 19:44:03 UTC (rev 2909) @@ -0,0 +1,32 @@ +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.representation.Representation; +import org.restlet.resource.Get; +import org.restlet.resource.ServerResource; + +public class ProjectsResource extends ServerResource { + + protected Storage storage; + + public ProjectsResource() { + 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")); + } + } + + @Get("json") + public Representation getProjects() { + Representation jsonRep = new JacksonRepresentation<>(storage.getProjects()); + return jsonRep; + } +} Added: 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 (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestApplication.java 2013-07-23 19:44:03 UTC (rev 2909) @@ -0,0 +1,24 @@ +package org.chorem.jtimer.web; + +import org.restlet.Application; +import org.restlet.Restlet; +import org.restlet.routing.Router; + +public class RestApplication extends Application { + + /** + * Creates a root Restlet that will receive all incoming calls. + */ + @Override + public synchronized Restlet createInboundRoot() { + // Create a router Restlet that routes each call to a + // new instance of HelloWorldResource. + Router router = new Router(getContext()); + + // Defines only one route + router.attach("/projects", ProjectsResource.class); + + return router; + } + +} \ No newline at end of file Property changes on: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestApplication.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestController.java =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestController.java 2013-07-19 14:43:56 UTC (rev 2908) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestController.java 2013-07-23 19:44:03 UTC (rev 2909) @@ -1,27 +0,0 @@ -package org.chorem.jtimer.web; - -import java.util.ArrayList; -import java.util.List; - -import org.chorem.jtimer.entities.TimerProject; -import org.debux.webmotion.server.WebMotionController; -import org.debux.webmotion.server.render.Render; - -public class RestController extends WebMotionController { - - protected List<TimerProject> projects; - - public RestController() { - projects = new ArrayList<>(); - projects.add(new TimerProject("jTimer")); - projects.add(new TimerProject("Chorem")); - projects.add(new TimerProject("Wikitty")); - projects.add(new TimerProject("Nuiton-js")); - projects.add(new TimerProject("Angular")); - projects.add(new TimerProject("Isis-Fish")); - } - - public Render getProjects() { - return renderJSON(projects); - } -} Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/WEB-INF/web.xml 2013-07-19 14:43:56 UTC (rev 2908) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/WEB-INF/web.xml 2013-07-23 19:44:03 UTC (rev 2909) @@ -1,4 +1,19 @@ -<web-app xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" - version="3.0" /> \ No newline at end of file +<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> + + <context-param> + <param-name>org.restlet.application</param-name> + <param-value>org.chorem.jtimer.web.RestApplication</param-value> + </context-param> + + <servlet> + <servlet-name>RestletServlet</servlet-name> + <servlet-class>org.restlet.ext.servlet.ServerServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>RestletServlet</servlet-name> + <url-pattern>/rest/*</url-pattern> + </servlet-mapping> +</web-app>

1 0

r2908 - branches/ng-jtimer/jtimer-server
by echatellier＠users.chorem.org July 19, 2013

July 19, 2013

Author: echatellier Date: 2013-07-19 16:43:56 +0200 (Fri, 19 Jul 2013) New Revision: 2908 Url: http://chorem.org/projects/jtimer/repository/revisions/2908 Log: svn:ignore Modified: branches/ng-jtimer/jtimer-server/ Property changes on: branches/ng-jtimer/jtimer-server ___________________________________________________________________ Added: svn:ignore + .settings .classpath .project

1 0