May 2015 - Sandbox-commits - mailman.cloud.codelutin.com

r1454 - oipf/data
by ygrego＠users.nuiton.org 26 May '15

26 May '15

Author: ygrego Date: 2015-05-26 07:54:51 +0000 (Tue, 26 May 2015) New Revision: 1454 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1454 Log: This xml file represent a part of the french channel line-up. Added: oipf/data/oipfChannels.xml Added: oipf/data/oipfChannels.xml =================================================================== --- oipf/data/oipfChannels.xml (rev 0) +++ oipf/data/oipfChannels.xml 2015-05-26 07:54:51 UTC (rev 1454) @@ -0,0 +1,432 @@ +<?xml version="1.0" encoding="UTF-8"?> +<channelList> + <channel> + <name>ARTE</name> + <channelType>TYPE_TV</channelType> + <idType>12</idType> + <ccid></ccid> + <tunerID></tunerID> + <onid></onid> + <nid></nid> + <tsid></tsid> + <sid></sid> + <sourceID></sourceID> + <freq></freq> + <cni></cni> + <majorChannel></majorChannel> + <minorChannel></minorChannel> + <dsd></dsd> + <favourite></favourite> + <favIDs></favIDs> + <locked></locked> + <manualBlock></manualBlock> + <ipBroadcastID></ipBroadcastID> + <channelMaxBitRate></channelMaxBitRate> + <channelTTR></channelTTR> + <recordable>true</recordable> + <longName></longName> + <description></description> + <authorised>true</authorised> + <genre></genre> + <hidden>false</hidden> + <is3D>false</is3D> + <isHD>false</isHD> + <logoUR>null</logoUR> + </channel> + <channel> + <name>D17</name> + <channelType>TYPE_TV</channelType> + <idType>12</idType> + <ccid></ccid> + <tunerID></tunerID> + <onid></onid> + <nid></nid> + <tsid></tsid> + <sid></sid> + <sourceID></sourceID> + <freq></freq> + <cni></cni> + <majorChannel></majorChannel> + <minorChannel></minorChannel> + <dsd></dsd> + <favourite></favourite> + <favIDs></favIDs> + <locked></locked> + <manualBlock></manualBlock> + <ipBroadcastID></ipBroadcastID> + <channelMaxBitRate></channelMaxBitRate> + <channelTTR></channelTTR> + <recordable>true</recordable> + <longName></longName> + <description></description> + <authorised>true</authorised> + <genre></genre> + <hidden>false</hidden> + <is3D>false</is3D> + <isHD>false</isHD> + <logoUR>null</logoUR> + </channel> + <channel> + <name>FRANCE_2</name> + <channelType>TYPE_TV</channelType> + <idType>12</idType> + <ccid></ccid> + <tunerID></tunerID> + <onid></onid> + <nid></nid> + <tsid></tsid> + <sid></sid> + <sourceID></sourceID> + <freq></freq> + <cni></cni> + <majorChannel></majorChannel> + <minorChannel></minorChannel> + <dsd></dsd> + <favourite></favourite> + <favIDs></favIDs> + <locked></locked> + <manualBlock></manualBlock> + <ipBroadcastID></ipBroadcastID> + <channelMaxBitRate></channelMaxBitRate> + <channelTTR></channelTTR> + <recordable>true</recordable> + <longName></longName> + <description></description> + <authorised>true</authorised> + <genre></genre> + <hidden>false</hidden> + <is3D>false</is3D> + <isHD>false</isHD> + <logoUR>null</logoUR> + </channel> + <channel> + <name>FRANCE_3</name> + <channelType>TYPE_TV</channelType> + <idType>12</idType> + <ccid></ccid> + <tunerID></tunerID> + <onid></onid> + <nid></nid> + <tsid></tsid> + <sid></sid> + <sourceID></sourceID> + <freq></freq> + <cni></cni> + <majorChannel></majorChannel> + <minorChannel></minorChannel> + <dsd></dsd> + <favourite></favourite> + <favIDs></favIDs> + <locked></locked> + <manualBlock></manualBlock> + <ipBroadcastID></ipBroadcastID> + <channelMaxBitRate></channelMaxBitRate> + <channelTTR></channelTTR> + <recordable>true</recordable> + <longName></longName> + <description></description> + <authorised>true</authorised> + <genre></genre> + <hidden>false</hidden> + <is3D>false</is3D> + <isHD>false</isHD> + <logoUR>null</logoUR> + </channel> + <channel> + <name>FRANCE_4</name> + <channelType>TYPE_TV</channelType> + <idType>12</idType> + <ccid></ccid> + <tunerID></tunerID> + <onid></onid> + <nid></nid> + <tsid></tsid> + <sid></sid> + <sourceID></sourceID> + <freq></freq> + <cni></cni> + <majorChannel></majorChannel> + <minorChannel></minorChannel> + <dsd></dsd> + <favourite></favourite> + <favIDs></favIDs> + <locked></locked> + <manualBlock></manualBlock> + <ipBroadcastID></ipBroadcastID> + <channelMaxBitRate></channelMaxBitRate> + <channelTTR></channelTTR> + <recordable>true</recordable> + <longName></longName> + <description></description> + <authorised>true</authorised> + <genre></genre> + <hidden>false</hidden> + <is3D>false</is3D> + <isHD>false</isHD> + <logoUR>null</logoUR> + </channel> + <channel> + <name>FRANCE_5</name> + <channelType>TYPE_TV</channelType> + <idType>12</idType> + <ccid></ccid> + <tunerID></tunerID> + <onid></onid> + <nid></nid> + <tsid></tsid> + <sid></sid> + <sourceID></sourceID> + <freq></freq> + <cni></cni> + <majorChannel></majorChannel> + <minorChannel></minorChannel> + <dsd></dsd> + <favourite></favourite> + <favIDs></favIDs> + <locked></locked> + <manualBlock></manualBlock> + <ipBroadcastID></ipBroadcastID> + <channelMaxBitRate></channelMaxBitRate> + <channelTTR></channelTTR> + <recordable>true</recordable> + <longName></longName> + <description></description> + <authorised>true</authorised> + <genre></genre> + <hidden>false</hidden> + <is3D>false</is3D> + <isHD>false</isHD> + <logoUR>null</logoUR> + </channel> + <channel> + <name>M6</name> + <channelType>TYPE_TV</channelType> + <idType>12</idType> + <ccid></ccid> + <tunerID></tunerID> + <onid></onid> + <nid></nid> + <tsid></tsid> + <sid></sid> + <sourceID></sourceID> + <freq></freq> + <cni></cni> + <majorChannel></majorChannel> + <minorChannel></minorChannel> + <dsd></dsd> + <favourite></favourite> + <favIDs></favIDs> + <locked></locked> + <manualBlock></manualBlock> + <ipBroadcastID></ipBroadcastID> + <channelMaxBitRate></channelMaxBitRate> + <channelTTR></channelTTR> + <recordable>true</recordable> + <longName></longName> + <description></description> + <authorised>true</authorised> + <genre></genre> + <hidden>false</hidden> + <is3D>false</is3D> + <isHD>false</isHD> + <logoUR>null</logoUR> + </channel> + <channel> + <name>NRJ_12</name> + <channelType>TYPE_TV</channelType> + <idType>12</idType> + <ccid></ccid> + <tunerID></tunerID> + <onid></onid> + <nid></nid> + <tsid></tsid> + <sid></sid> + <sourceID></sourceID> + <freq></freq> + <cni></cni> + <majorChannel></majorChannel> + <minorChannel></minorChannel> + <dsd></dsd> + <favourite></favourite> + <favIDs></favIDs> + <locked></locked> + <manualBlock></manualBlock> + <ipBroadcastID></ipBroadcastID> + <channelMaxBitRate></channelMaxBitRate> + <channelTTR></channelTTR> + <recordable>true</recordable> + <longName></longName> + <description></description> + <authorised>true</authorised> + <genre></genre> + <hidden>false</hidden> + <is3D>false</is3D> + <isHD>false</isHD> + <logoUR>null</logoUR> + </channel> + <channel> + <name>NT1</name> + <channelType>TYPE_TV</channelType> + <idType>12</idType> + <ccid></ccid> + <tunerID></tunerID> + <onid></onid> + <nid></nid> + <tsid></tsid> + <sid></sid> + <sourceID></sourceID> + <freq></freq> + <cni></cni> + <majorChannel></majorChannel> + <minorChannel></minorChannel> + <dsd></dsd> + <favourite></favourite> + <favIDs></favIDs> + <locked></locked> + <manualBlock></manualBlock> + <ipBroadcastID></ipBroadcastID> + <channelMaxBitRate></channelMaxBitRate> + <channelTTR></channelTTR> + <recordable>true</recordable> + <longName></longName> + <description></description> + <authorised>true</authorised> + <genre></genre> + <hidden>false</hidden> + <is3D>false</is3D> + <isHD>false</isHD> + <logoUR>null</logoUR> + </channel> + <channel> + <name>RTL9</name> + <channelType>TYPE_TV</channelType> + <idType>12</idType> + <ccid></ccid> + <tunerID></tunerID> + <onid></onid> + <nid></nid> + <tsid></tsid> + <sid></sid> + <sourceID></sourceID> + <freq></freq> + <cni></cni> + <majorChannel></majorChannel> + <minorChannel></minorChannel> + <dsd></dsd> + <favourite></favourite> + <favIDs></favIDs> + <locked></locked> + <manualBlock></manualBlock> + <ipBroadcastID></ipBroadcastID> + <channelMaxBitRate></channelMaxBitRate> + <channelTTR></channelTTR> + <recordable>true</recordable> + <longName></longName> + <description></description> + <authorised>true</authorised> + <genre></genre> + <hidden>false</hidden> + <is3D>false</is3D> + <isHD>false</isHD> + <logoUR>null</logoUR> + </channel> + <channel> + <name>TF1</name> + <channelType>TYPE_TV</channelType> + <idType>12</idType> + <ccid></ccid> + <tunerID></tunerID> + <onid></onid> + <nid></nid> + <tsid></tsid> + <sid></sid> + <sourceID></sourceID> + <freq></freq> + <cni></cni> + <majorChannel></majorChannel> + <minorChannel></minorChannel> + <dsd></dsd> + <favourite></favourite> + <favIDs></favIDs> + <locked></locked> + <manualBlock></manualBlock> + <ipBroadcastID></ipBroadcastID> + <channelMaxBitRate></channelMaxBitRate> + <channelTTR></channelTTR> + <recordable>true</recordable> + <longName></longName> + <description></description> + <authorised>true</authorised> + <genre></genre> + <hidden>false</hidden> + <is3D>false</is3D> + <isHD>false</isHD> + <logoUR>null</logoUR> + </channel> + <channel> + <name>TMC</name> + <channelType>TYPE_TV</channelType> + <idType>12</idType> + <ccid></ccid> + <tunerID></tunerID> + <onid></onid> + <nid></nid> + <tsid></tsid> + <sid></sid> + <sourceID></sourceID> + <freq></freq> + <cni></cni> + <majorChannel></majorChannel> + <minorChannel></minorChannel> + <dsd></dsd> + <favourite></favourite> + <favIDs></favIDs> + <locked></locked> + <manualBlock></manualBlock> + <ipBroadcastID></ipBroadcastID> + <channelMaxBitRate></channelMaxBitRate> + <channelTTR></channelTTR> + <recordable>true</recordable> + <longName></longName> + <description></description> + <authorised>true</authorised> + <genre></genre> + <hidden>false</hidden> + <is3D>false</is3D> + <isHD>false</isHD> + <logoUR>null</logoUR> + </channel> + <channel> + <name>W9</name> + <channelType>TYPE_TV</channelType> + <idType>12</idType> + <ccid></ccid> + <tunerID></tunerID> + <onid></onid> + <nid></nid> + <tsid></tsid> + <sid></sid> + <sourceID></sourceID> + <freq></freq> + <cni></cni> + <majorChannel></majorChannel> + <minorChannel></minorChannel> + <dsd></dsd> + <favourite></favourite> + <favIDs></favIDs> + <locked></locked> + <manualBlock></manualBlock> + <ipBroadcastID></ipBroadcastID> + <channelMaxBitRate></channelMaxBitRate> + <channelTTR></channelTTR> + <recordable>true</recordable> + <longName></longName> + <description></description> + <authorised>true</authorised> + <genre></genre> + <hidden>false</hidden> + <is3D>false</is3D> + <isHD>false</isHD> + <logoUR>null</logoUR> + </channel> +</channelList> \ No newline at end of file

1 0

r1453 - oipf/js/configuration
by ygrego＠users.nuiton.org 26 May '15

26 May '15

Author: ygrego Date: 2015-05-26 07:51:38 +0000 (Tue, 26 May 2015) New Revision: 1453 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1453 Log: Addition of a class to set the stub. Added: oipf/js/configuration/OipfConfiguration.js Added: oipf/js/configuration/OipfConfiguration.js =================================================================== --- oipf/js/configuration/OipfConfiguration.js (rev 0) +++ oipf/js/configuration/OipfConfiguration.js 2015-05-26 07:51:38 UTC (rev 1453) @@ -0,0 +1,24 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + +var OipfConfiguartion = Class.extends({ + + init: function() { + + //Channels configuration + this.channelNumber = 13; + this.channelCountry = "France"; + this.channelList = "../../data/oipfChannels.xml"; + + //Programmes configuration + this.programmeType = "xmlTV"; + this.programmeCountry = "France"; + this.programme = "../../data/xmlTVProgrammes.xml"; + + + } +}); +

1 0

r1452 - in wit/js: components services
by smaisonneuve＠users.nuiton.org 22 May '15

22 May '15

Author: smaisonneuve Date: 2015-05-22 16:19:29 +0000 (Fri, 22 May 2015) New Revision: 1452 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1452 Log: [UserActivity] Refactoring service by moving sessions utilities to a new service Added: wit/js/services/SessionsService.js Modified: wit/js/components/FilterLogs.js Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-05-22 15:53:43 UTC (rev 1451) +++ wit/js/components/FilterLogs.js 2015-05-22 16:19:29 UTC (rev 1452) @@ -1,5 +1,7 @@ "use strict"; +var nonce = require("nonce")(); + var FilterLogs = React.createClass({ getCSV: function() { @@ -167,7 +169,6 @@ }, renderTd: function(date, tags, tagObject) { - var nonce = require("nonce")(); var r = []; if (tagObject.duration) { @@ -176,7 +177,7 @@ return state.tags[tag]; }); - var key = date + nonce(); + var key = nonce(); if (filterTags.length) { r.push( @@ -210,7 +211,6 @@ }, render: function() { - var nonce = require("nonce")(); var items = []; var classString = ""; Added: wit/js/services/SessionsService.js =================================================================== --- wit/js/services/SessionsService.js (rev 0) +++ wit/js/services/SessionsService.js 2015-05-22 16:19:29 UTC (rev 1452) @@ -0,0 +1,108 @@ +/** This module is meant to manage activity sessions and keep track of the currently active session **/ + +"use strict"; + +var moment = require("moment"); +var log = require("loglevel"); +var db = require("./database.js"); + +var crtSession; + +var createFakeSession = function(startDate, endDate) { + var d1 = moment(startDate), d2 = moment(endDate); + + return { + name: "", + color: "transparent", + startDate: d1, + endDate: d2 + }; +}; + +exports.getCrtSession = function() { + return crtSession; +}; + +exports.setCrtSession = function(session) { + crtSession = session; +}; + +exports.createNewSession = function(windowName, color, startDate) { + var now = moment(); + + // Stop current session + + if (crtSession) { + crtSession.endDate = now.valueOf(); + db.insertSession(crtSession); + } + + // Check if a session corresponding to the given name already exists, + // so that we can retrieve some properties + + var prev = db.getSessionByName(windowName); + + // Create new session + + crtSession = { + name: windowName, + color: color || prev && prev.color || "#" + (Math.floor(Math.random() * (999 - 100 + 1)) + 100), + startDate: startDate || now.valueOf() + }; +}; + +/** + * Retrieve window activity sessions for the period [startDAte; endDate] + * If withEmptySession parameter equals true, then if there is a gap between 2 sessions in the results, + * it will be filled with a fake session + */ +exports.getSessions = function(startDate, endDate, withEmptySession) { + var rst; + if (!startDate || !endDate) { + + log.error("[UserActivityService] getSessions : parameter missing !"); + + } else { + var d1 = moment(startDate), d2 = moment(endDate); + + rst = db.getSessions(d1.toDate(), d2.toDate()) + .then(function(sessions) { + + // Append the current active session to the sessions list + + return crtSession ? sessions.concat([crtSession]) : sessions; + }) + .then(function(sessions) { + var result = JSON.parse(JSON.stringify(sessions)); + + // Convert results + + var lastSessionEnd = d1, s; + for (var i = 0; i < result.length; i++) { + + s = result[i]; + + // Convert timestamp to moment + + s.startDate = moment(s.startDate); + s.endDate = s.endDate ? moment(s.endDate) : d2; + + // Create an empty session when there is a hole between 2 sessions + + if (withEmptySession && lastSessionEnd.isBefore(s.startDate)) { + result.splice(i, 0, createFakeSession(lastSessionEnd, s.startDate)); + i++; + } + lastSessionEnd = s.endDate; + } + + if (withEmptySession && lastSessionEnd.isBefore(d2)) { + result.push(createFakeSession(lastSessionEnd, d2)); + } + + return result; + }); + } + + return rst; +};

1 0

r1451 - in wit/js: . components services
by smaisonneuve＠users.nuiton.org 22 May '15

22 May '15

Author: smaisonneuve Date: 2015-05-22 15:53:43 +0000 (Fri, 22 May 2015) New Revision: 1451 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1451 Log: [UserActivity] Refactoring service by moving sessions utilities to a new service Modified: wit/js/components/Timeline.js wit/js/main.js wit/js/services/UserActivityService.js Modified: wit/js/components/Timeline.js =================================================================== --- wit/js/components/Timeline.js 2015-05-22 15:31:41 UTC (rev 1450) +++ wit/js/components/Timeline.js 2015-05-22 15:53:43 UTC (rev 1451) @@ -24,7 +24,7 @@ if (startDate && endDate) { var setState = this.setState.bind(this); - scope.user.getSessions(startDate, endDate, true) + scope.sessions.getSessions(startDate, endDate, true) .then(function(sessions) { setState({ sessions: sessions Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-05-22 15:31:41 UTC (rev 1450) +++ wit/js/main.js 2015-05-22 15:53:43 UTC (rev 1451) @@ -14,6 +14,9 @@ global.scope = window.scope = {}; // Services // +var sessions = require("./js/services/SessionsService.js"); +scope.sessions = sessions; + var timer = require("./js/services/TimerService.js"); scope.timer = timer; Modified: wit/js/services/UserActivityService.js =================================================================== --- wit/js/services/UserActivityService.js 2015-05-22 15:31:41 UTC (rev 1450) +++ wit/js/services/UserActivityService.js 2015-05-22 15:53:43 UTC (rev 1451) @@ -4,12 +4,10 @@ var xprop = require("xprop"); var moment = require("moment"); var log = require("loglevel"); -var db = require("./database.js"); var events = require("events"); var eventEmitter = new events.EventEmitter(); -var crtSession; var activityChangeTimer; var disableActivityDetection = false; @@ -144,119 +142,31 @@ // Let's create a new session but with same color attributes than the last one, // since the active window has not really changed, only some of its attributes - if (crtSession.name !== windowName) { - createNewSession(windowName, crtSession.color); + var crtSession = scope.sessions.getCrtSession(); + if (crtSession && crtSession.name !== windowName) { + scope.sessions.createNewSession(windowName, crtSession.color); } }); }; -var createNewSession = function(windowName, color, startDate) { - var now = moment(); - - // Stop current session - - if (crtSession) { - crtSession.endDate = now.valueOf(); - db.insertSession(crtSession); - } - - // Check if a session corresponding to the given name already exists, - // so that we can retrieve some properties - - var prev = db.getSessionByName(windowName); - - // Create new session - - crtSession = { - name: windowName, - color: color || prev && prev.color || "#" + (Math.floor(Math.random() * (999 - 100 + 1)) + 100), - startDate: startDate || now.valueOf() - }; -}; - -var createFakeSession = function(startDate, endDate) { - var d1 = moment(startDate), d2 = moment(endDate); - - return { - name: "", - color: "transparent", - startDate: d1, - endDate: d2 - }; -}; - /** * Create a new window session */ var addWindowSession = function(xClient, ev) { - var crt = crtSession; + var ss = scope.sessions; + var crtSession = ss.getCrtSession(); return getActiveWindowId(xClient, ev) .then(getWindowName) - .then(createNewSession) - .then(setupActivityDetection.bind(null, crt)); + .then(ss.createNewSession.bind(ss)) + .then(setupActivityDetection.bind(null, crtSession)); }; /////////////// // Exports // /////////////// -/** - * Retrieve window activity sessions for the period [startDAte; endDate] - * If withEmptySession parameter equals true, then if there is a gap between 2 sessions in the results, - * it will be filled with a fake session - */ -exports.getSessions = function(startDate, endDate, withEmptySession) { - var rst; - if (!startDate || !endDate) { - log.error("[UserActivityService] getSessions : parameter missing !"); - - } else { - var d1 = moment(startDate), d2 = moment(endDate); - - rst = db.getSessions(d1.toDate(), d2.toDate()) - .then(function(sessions) { - - // Append the current active session to the sessions list - - return crtSession ? sessions.concat([crtSession]) : sessions; - }) - .then(function(sessions) { - var result = JSON.parse(JSON.stringify(sessions)); - - // Convert results - - var lastSessionEnd = d1, s; - for (var i = 0; i < result.length; i++) { - - s = result[i]; - - // Convert timestamp to moment - - s.startDate = moment(s.startDate); - s.endDate = s.endDate ? moment(s.endDate) : d2; - - // Create an empty session when there is a hole between 2 sessions - - if (withEmptySession && lastSessionEnd.isBefore(s.startDate)) { - result.splice(i, 0, createFakeSession(lastSessionEnd, s.startDate)); - i++; - } - lastSessionEnd = s.endDate; - } - - if (withEmptySession && lastSessionEnd.isBefore(d2)) { - result.push(createFakeSession(lastSessionEnd, d2)); - } - - return result; - }); - } - - return rst; -}; - /** * Offers an api for services interesting in activity change detection */

1 0

r1450 - wit/js
by jruchaud＠users.nuiton.org 22 May '15

22 May '15

Author: jruchaud Date: 2015-05-22 15:31:41 +0000 (Fri, 22 May 2015) New Revision: 1450 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1450 Log: Fix multiple tray Modified: wit/js/gui.js wit/js/main.js Modified: wit/js/gui.js =================================================================== --- wit/js/gui.js 2015-05-22 15:07:51 UTC (rev 1449) +++ wit/js/gui.js 2015-05-22 15:31:41 UTC (rev 1450) @@ -11,10 +11,6 @@ // Get the minimize event win.on("minimize", function() { - // Hide window - this.hide(); - - // Show tray tray = new gui.Tray({icon: "img/stopwatch-34108_640.png"}); var menu = new gui.Menu(); @@ -28,4 +24,14 @@ this.remove(); tray = null; }); + + // Hide window + this.hide(); }); + +win.on("focus", function() { + if (tray) { + tray.remove(); + tray = null; + } +}); Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-05-22 15:07:51 UTC (rev 1449) +++ wit/js/main.js 2015-05-22 15:31:41 UTC (rev 1450) @@ -131,7 +131,7 @@ window.on("close", function() { this.hide(); // Pretend to be closed already -// this.close(true); + this.close(true); popups.splice(popups.indexOf(window), 1);

1 0

r1449 - wit/js/services
by jruchaud＠users.nuiton.org 22 May '15

22 May '15

Author: jruchaud Date: 2015-05-22 15:07:51 +0000 (Fri, 22 May 2015) New Revision: 1449 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1449 Log: Detection no use wit but it is started Added: wit/js/services/NoTimerService.js Added: wit/js/services/NoTimerService.js =================================================================== --- wit/js/services/NoTimerService.js (rev 0) +++ wit/js/services/NoTimerService.js 2015-05-22 15:07:51 UTC (rev 1449) @@ -0,0 +1,26 @@ +"use strict"; + +var moment = require("moment"); +var notTimerTimer; + +exports.detect = function() { + var noTimerConfig = scope.config.getNoTimer(); + if (noTimerConfig) { + + var duration = moment.duration(noTimerConfig, "m"); + + notTimerTimer = setTimeout( + function() { + global.window.alert("Do you need wit ?"); + exports.detect(); + + }, duration.asMilliseconds()); + } +}; + +scope.timer.subscribeTimeChanged(function() { + clearTimeout(notTimerTimer); + if (!scope.timer.time) { + exports.detect(); + } +});

1 0

r1448 - in wit: . js js/pages js/services
by jruchaud＠users.nuiton.org 22 May '15

22 May '15

Author: jruchaud Date: 2015-05-22 15:06:36 +0000 (Fri, 22 May 2015) New Revision: 1448 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1448 Log: Detection no use wit but it is started Modified: wit/.eslintrc wit/js/main.js wit/js/pages/Options.js wit/js/services/ConfigurationService.js wit/js/services/TimerService.js Modified: wit/.eslintrc =================================================================== --- wit/.eslintrc 2015-05-22 15:05:59 UTC (rev 1447) +++ wit/.eslintrc 2015-05-22 15:06:36 UTC (rev 1448) @@ -5,7 +5,8 @@ "globals": { "console": false, "React": false, - "scope": false + "scope": false, + "alert": false }, "env": { "browser": true, Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-05-22 15:05:59 UTC (rev 1447) +++ wit/js/main.js 2015-05-22 15:06:36 UTC (rev 1448) @@ -13,6 +13,7 @@ global.scope = window.scope = {}; +// Services // var timer = require("./js/services/TimerService.js"); scope.timer = timer; @@ -22,6 +23,11 @@ var config = require("./js/services/ConfigurationService.js"); scope.config = config; +var noTimer = require("./js/services/NoTimerService.js"); +scope.noTimer = noTimer; +noTimer.detect(); + +// React conf // var React = require("react"); var Router = require("react-router"); Modified: wit/js/pages/Options.js =================================================================== --- wit/js/pages/Options.js 2015-05-22 15:05:59 UTC (rev 1447) +++ wit/js/pages/Options.js 2015-05-22 15:06:36 UTC (rev 1448) @@ -10,6 +10,10 @@ scope.config.setActivityTime(e.target.value); }, + setNoTimer: function(e) { + scope.config.setNoTimer(e.target.value); + }, + setWeekDay: function(e) { scope.config.setWeekDay(e.target.value); }, @@ -17,6 +21,7 @@ render: function() { var idleTime = scope.config.getIdleTime(); var activityTime = scope.config.getActivityTime(); + var noTimer = scope.config.getNoTimer(); var weekDay = scope.config.getWeekDay(); return <div className="form-horizontal"> @@ -36,6 +41,13 @@ </div> <div className="form-group"> + <label for="noTimer" className="col-sm-2 control-label">No timer (minutes)</label> + <div className="col-sm-10"> + <input type="number" className="form-control" defaultValue={noTimer} min="0" step="1" onChange={this.setNoTimer}/> + </div> + </div> + + <div className="form-group"> <label for="idleTime" className="col-sm-2 control-label">Week day</label> <div className="col-sm-10"> <select name="select" className="form-control" id="weekDay" defaultValue={weekDay} onChange={this.setWeekDay}> Modified: wit/js/services/ConfigurationService.js =================================================================== --- wit/js/services/ConfigurationService.js 2015-05-22 15:05:59 UTC (rev 1447) +++ wit/js/services/ConfigurationService.js 2015-05-22 15:06:36 UTC (rev 1448) @@ -6,6 +6,7 @@ var DEFAULT_IDLE_TIME = 1; // 1 min var DEFAULT_ACTIVITY_TIME = 1; // 1 min +var DEFAULT_NO_TIMER = 0; // desabled var DEFAULT_WEEK_DAY = 0; // Monday // time as minutes @@ -34,3 +35,11 @@ exports.getWeekDay = function() { return parseInt(storage.weekDay || DEFAULT_WEEK_DAY, 10); }; + +exports.setNoTimer = function(time) { + storage.noTimer = time; +}; + +exports.getNoTimer = function() { + return parseInt(storage.noTimer || DEFAULT_NO_TIMER, 10); +}; Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-05-22 15:05:59 UTC (rev 1447) +++ wit/js/services/TimerService.js 2015-05-22 15:06:36 UTC (rev 1448) @@ -2,7 +2,6 @@ var moment = require("moment"); var db = require("./database.js"); -var config = require("./ConfigurationService.js"); var x11 = require("x11"); var log = require("loglevel"); @@ -181,14 +180,30 @@ eventEmitter.emit("onTimeChanged"); }; +exports.getDayTime = function() { + var diff = dayTime; + if (time) { + var now = moment(); + diff += now.diff(time); + } + + var value = moment(diff).utcOffset(0); + return value.format("HH:mm:ss"); +}; + +exports.deleteLog = function(id) { + db.deleteLog(id); +}; + +// History var setTagsFromHistory = function() { db.getHistory(historyIndex) .then(function(logs) { if (logs && logs.length) { - var log = logs[0]; - tags = log.tags.slice(0); + var row = logs[0]; + tags = row.tags.slice(0); } else { tags = []; } @@ -215,18 +230,3 @@ exports.getLastTags = function() { return db.getLastTags(); }; - -exports.getDayTime = function() { - var diff = dayTime; - if (time) { - var now = moment(); - diff += now.diff(time); - } - - var value = moment(diff).utcOffset(0); - return value.format("HH:mm:ss"); -}; - -exports.deleteLog = function(id) { - db.deleteLog(id); -};

1 0

r1447 - in wit/js: components pages services
by smaisonneuve＠users.nuiton.org 22 May '15

22 May '15

Author: smaisonneuve Date: 2015-05-22 15:05:59 +0000 (Fri, 22 May 2015) New Revision: 1447 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1447 Log: [Timeline] Fixing main timeline in report Modified: wit/js/components/FilterBar.js wit/js/components/FilterLogs.js wit/js/pages/Rapport.js wit/js/services/database.js Modified: wit/js/components/FilterBar.js =================================================================== --- wit/js/components/FilterBar.js 2015-05-22 14:33:05 UTC (rev 1446) +++ wit/js/components/FilterBar.js 2015-05-22 15:05:59 UTC (rev 1447) @@ -20,22 +20,15 @@ var moment = require("moment"); var db = require("./js/services/database.js"); - this.startDate = moment(this.refs.beginDate.getDOMNode().value); - this.endDate = moment(this.refs.endDate.getDOMNode().value); + var startDate = moment(this.refs.beginDate.getDOMNode().value), + endDate = moment(this.refs.endDate.getDOMNode().value); - return db.searchLogs(null, this.startDate, this.endDate, true); + return db.searchLogs(null, startDate, endDate, true); }, onSearch: function() { - var startDate = this.startDate; - var endDate = this.endDate; - var onSearchResult = this.props.onSearchResult; - this.search() - .then(function(result) { - onSearchResult(result, startDate, endDate); -// console.log(result); - }); + this.search().then(onSearchResult); }, render: function() { Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-05-22 14:33:05 UTC (rev 1446) +++ wit/js/components/FilterLogs.js 2015-05-22 15:05:59 UTC (rev 1447) @@ -161,8 +161,8 @@ this.setState({ data: data, tags: currentState.tags || tags, - startDate: currentState.data.startDate, - endDate: currentState.data.endDate + startDate: currentState.data.result.startDate, + endDate: currentState.data.result.endDate }); }, Modified: wit/js/pages/Rapport.js =================================================================== --- wit/js/pages/Rapport.js 2015-05-22 14:33:05 UTC (rev 1446) +++ wit/js/pages/Rapport.js 2015-05-22 15:05:59 UTC (rev 1447) @@ -11,10 +11,8 @@ }; }, - handleSearchResult: function(result, startDate, endDate) { + handleSearchResult: function(result) { this.setState({ - startDate: startDate, - endDate: endDate, result: result }); }, Modified: wit/js/services/database.js =================================================================== --- wit/js/services/database.js 2015-05-22 14:33:05 UTC (rev 1446) +++ wit/js/services/database.js 2015-05-22 15:05:59 UTC (rev 1447) @@ -74,6 +74,9 @@ }); } + docs.startDate = startDate; + docs.endDate = endDate; + resolve(docs); } else { reject(err);

1 0

r1446 - in wit/js: . pages services
by jruchaud＠users.nuiton.org 22 May '15

22 May '15

Author: jruchaud Date: 2015-05-22 14:33:05 +0000 (Fri, 22 May 2015) New Revision: 1446 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1446 Log: Add scope variable for the services Modified: wit/js/main.js wit/js/pages/Options.js wit/js/services/TimerService.js wit/js/services/UserActivityService.js Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-05-22 14:25:34 UTC (rev 1445) +++ wit/js/main.js 2015-05-22 14:33:05 UTC (rev 1446) @@ -20,6 +20,7 @@ scope.user = user; var config = require("./js/services/ConfigurationService.js"); +scope.config = config; var React = require("react"); var Router = require("react-router"); Modified: wit/js/pages/Options.js =================================================================== --- wit/js/pages/Options.js 2015-05-22 14:25:34 UTC (rev 1445) +++ wit/js/pages/Options.js 2015-05-22 14:33:05 UTC (rev 1446) @@ -3,21 +3,21 @@ var Options = React.createClass({ setIdleTime: function(e) { - config.setIdleTime(e.target.value); + scope.config.setIdleTime(e.target.value); }, setActivityTime: function(e) { - config.setActivityTime(e.target.value); + scope.config.setActivityTime(e.target.value); }, setWeekDay: function(e) { - config.setWeekDay(e.target.value); + scope.config.setWeekDay(e.target.value); }, render: function() { - var idleTime = config.getIdleTime(); - var activityTime = config.getActivityTime(); - var weekDay = config.getWeekDay(); + var idleTime = scope.config.getIdleTime(); + var activityTime = scope.config.getActivityTime(); + var weekDay = scope.config.getWeekDay(); return <div className="form-horizontal"> Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-05-22 14:25:34 UTC (rev 1445) +++ wit/js/services/TimerService.js 2015-05-22 14:33:05 UTC (rev 1446) @@ -30,7 +30,7 @@ // console.log('Idle time ' + info.idle + "ms"); if (time) { - var configIdleTime = config.getIdleTime(); + var configIdleTime = scope.config.getIdleTime(); var durationIdleTime = moment.duration(configIdleTime, "m"); if (info.idle >= durationIdleTime.asMilliseconds() && !idleTime) { Modified: wit/js/services/UserActivityService.js =================================================================== --- wit/js/services/UserActivityService.js 2015-05-22 14:25:34 UTC (rev 1445) +++ wit/js/services/UserActivityService.js 2015-05-22 14:33:05 UTC (rev 1446) @@ -5,7 +5,6 @@ var moment = require("moment"); var log = require("loglevel"); var db = require("./database.js"); -var config = require("./ConfigurationService.js"); var events = require("events"); var eventEmitter = new events.EventEmitter(); @@ -110,7 +109,7 @@ } else { var now = moment(); - if (now.diff(session.startDate, "m") >= config.getActivityTime()) { + if (now.diff(session.startDate, "m") >= scope.config.getActivityTime()) { // The user has stayed more than "config.getActivityTime()" minutes on a window // and now has just switched to another window. @@ -118,7 +117,7 @@ activityChangeTimer = setTimeout( eventEmitter.emit.bind(eventEmitter, "onActivityChange", now.toDate()), - moment.duration(config.getActivityTime(), "m").as("ms") + moment.duration(scope.config.getActivityTime(), "m").as("ms") ); activityChangeTimer.crtActivityName = session.name; activityChangeTimer.changeDetectedDate = now.toDate();

1 0

r1445 - wit/js/components
by smaisonneuve＠users.nuiton.org 22 May '15

22 May '15

Author: smaisonneuve Date: 2015-05-22 14:25:34 +0000 (Fri, 22 May 2015) New Revision: 1445 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1445 Log: [SVN] - reverting bad commit Modified: wit/js/components/FilterLogs.js wit/js/components/Timeline.js Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-05-22 14:24:47 UTC (rev 1444) +++ wit/js/components/FilterLogs.js 2015-05-22 14:25:34 UTC (rev 1445) @@ -193,7 +193,7 @@ ); r.push( <tr ref={key} className="hidden"> - <td colSpan="4"></td> + <td colSpan="4"><Timeline data={tagObject} key={key}/></td> </tr> ); } Modified: wit/js/components/Timeline.js =================================================================== --- wit/js/components/Timeline.js 2015-05-22 14:24:47 UTC (rev 1444) +++ wit/js/components/Timeline.js 2015-05-22 14:25:34 UTC (rev 1445) @@ -23,7 +23,7 @@ if (startDate && endDate) { var setState = this.setState.bind(this); -console.log(sessions); + scope.user.getSessions(startDate, endDate, true) .then(function(sessions) { setState({

1 0