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

r1213 - in wit: . js
by jruchaud＠users.nuiton.org 16 Apr '15

16 Apr '15

Author: jruchaud Date: 2015-04-16 09:00:43 +0000 (Thu, 16 Apr 2015) New Revision: 1213 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1213 Log: Plug db Modified: wit/index.html wit/js/main.js Modified: wit/index.html =================================================================== --- wit/index.html 2015-04-16 08:54:51 UTC (rev 1212) +++ wit/index.html 2015-04-16 09:00:43 UTC (rev 1213) @@ -23,10 +23,14 @@ <div id="stop"> <div class="icon"></div> </div> + <div id="rapport"> + <div class="icon">R</div> + </div> </div> <div id="time"></div> <script type="application/javascript" src="js/main.js"></script> + <script type="application/javascript" src="js/database.js"></script> </body> </html> Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-04-16 08:54:51 UTC (rev 1212) +++ wit/js/main.js 2015-04-16 09:00:43 UTC (rev 1213) @@ -6,6 +6,7 @@ var playNode = document.getElementById("play"); var stopNode = document.getElementById("stop"); var timeNode = document.getElementById("time"); +var rapportNode = document.getElementById("rapport"); var templateTag = "<li class=\"tag\"><span class=\"remove\">x</span>{{value}}</li>"; @@ -66,3 +67,30 @@ setTimeout(updateTime.bind(), 1000); } updateTime(); + + +rapportNode.onclick = function(e) { + +} + +// Load library +var gui = require('nw.gui'); + +// Reference to window and tray +var win = gui.Window.get(); +var tray; + + // Get the minimize event + win.on('minimize', function() { + // Hide window + this.hide(); + + // Show tray + tray = new gui.Tray({ icon: 'icon.png' }); + + // Show window and remove tray when clicked + tray.on('click', function() { + win.show(); + this.remove(); + tray = null; +}); \ No newline at end of file

1 0

r1212 - in wit: css js
by jruchaud＠users.nuiton.org 16 Apr '15

16 Apr '15

Author: jruchaud Date: 2015-04-16 08:54:51 +0000 (Thu, 16 Apr 2015) New Revision: 1212 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1212 Log: Plug db Modified: wit/css/select.css wit/js/main.js Modified: wit/css/select.css =================================================================== --- wit/css/select.css 2015-04-16 08:20:10 UTC (rev 1211) +++ wit/css/select.css 2015-04-16 08:54:51 UTC (rev 1212) @@ -1,10 +1,12 @@ .selection { background-color: #f8f8f8; - /*border: 1px solid #AAA;*/ border-radius: 4px; cursor: text; - min-height: 32px; + overflow-x: scroll; + overflow-y: hidden; + height: 50px; + -webkit-user-select: none; } @@ -12,7 +14,6 @@ list-style: outside none none; margin: 0px; padding: 0px 5px; - width: 100%; display: inline-block; overflow: hidden; @@ -25,7 +26,7 @@ border: 1px solid #AAA; border-radius: 4px; cursor: default; - float: left; + display: inline-block; margin-right: 5px; margin-top: 5px; padding: 0px 5px; @@ -40,7 +41,7 @@ } .selection li.input { - float: left; + display: inline-block; } .selection li input { Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-04-16 08:20:10 UTC (rev 1211) +++ wit/js/main.js 2015-04-16 08:54:51 UTC (rev 1212) @@ -14,13 +14,14 @@ inputTagNode.parentNode.insertAdjacentHTML("beforebegin", templateTag.replace("{{value}}", this.value)); this.value = ""; - time = null; + stopTime(); } } tagsNode.onclick = function(e) { if (e.target.classList.contains("remove")) { tagsNode.removeChild(e.target.parentNode); + stopTime(); } else { inputTagNode.focus(); @@ -34,7 +35,24 @@ } stopNode.onclick = function(e) { - //console.log("time", performance.now() - time); + stopTime(); +} + +var stopTime = function() { + if (!time) { + return; + } + + var tags = []; + + var children = tagsNode.children; + for (var i = 0, l = children.length - 1; i < l; i ++) { // -1 without input + var tag = children[i].childNodes[1].nodeValue; + tags.push(tag); + } + + db.insertLog(tags, time, new Date()); + time = null; }

1 0

r1211 - wit/css
by jruchaud＠users.nuiton.org 16 Apr '15

16 Apr '15

Author: jruchaud Date: 2015-04-16 08:20:10 +0000 (Thu, 16 Apr 2015) New Revision: 1211 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1211 Log: Change colors Modified: wit/css/actions.css wit/css/select.css wit/css/style.css Modified: wit/css/actions.css =================================================================== --- wit/css/actions.css 2015-04-16 08:07:15 UTC (rev 1210) +++ wit/css/actions.css 2015-04-16 08:20:10 UTC (rev 1211) @@ -2,8 +2,8 @@ display: flex; justify-content: center; - background-color: aliceblue; - position: fixed; + background-color: #47484b; + position: absolute; bottom: 0; width: 100%; border-top: 2px #ccc solid; @@ -12,7 +12,7 @@ .actions>div { height: 50px; width: 50px; - background-color: #ccc; + background-color: #2d2e30; margin: 5px; display: flex; @@ -26,7 +26,7 @@ border-top: transparent 15px solid; /* border-right: transparent 20px solid; */ border-bottom: transparent 15px solid; - border-left: black 15px solid; + border-left: #699bb1 15px solid; height: 0px; width: 0px; @@ -34,17 +34,17 @@ } #stop .icon { - height: 25px; - width: 25px; - background-color: black; + height: 20px; + width: 20px; + background-color: #699bb1; } #time { text-align: center; position: absolute; width: 100%; - bottom: 62px; + bottom: 60px; border-top: 2px #ccc solid; - background-color: antiquewhite; + background-color: #47484b; } \ No newline at end of file Modified: wit/css/select.css =================================================================== --- wit/css/select.css 2015-04-16 08:07:15 UTC (rev 1210) +++ wit/css/select.css 2015-04-16 08:20:10 UTC (rev 1211) @@ -1,5 +1,5 @@ .selection { - background-color: #FFF; + background-color: #f8f8f8; /*border: 1px solid #AAA;*/ border-radius: 4px; cursor: text; @@ -21,7 +21,7 @@ } .selection li.tag { - background-color: #E4E4E4; + background-color: #47484b; border: 1px solid #AAA; border-radius: 4px; cursor: default; @@ -32,7 +32,7 @@ } .selection .remove { - color: #999; + color: #699bb1; cursor: pointer; display: inline-block; font-weight: bold; Modified: wit/css/style.css =================================================================== --- wit/css/style.css 2015-04-16 08:07:15 UTC (rev 1210) +++ wit/css/style.css 2015-04-16 08:20:10 UTC (rev 1211) @@ -5,6 +5,8 @@ } body { - width: 100%; - height: 100%; + width: 100%; + height: 100%; + background-color: #f8f8f8; + color: #f3f3f3; }

1 0

r1210 - in wit: . css
by jruchaud＠users.nuiton.org 16 Apr '15

16 Apr '15

Author: jruchaud Date: 2015-04-16 08:07:15 +0000 (Thu, 16 Apr 2015) New Revision: 1210 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1210 Log: Improve style :-/ Modified: wit/css/actions.css wit/css/select.css wit/css/style.css wit/package.json Modified: wit/css/actions.css =================================================================== --- wit/css/actions.css 2015-04-15 16:44:34 UTC (rev 1209) +++ wit/css/actions.css 2015-04-16 08:07:15 UTC (rev 1210) @@ -1,9 +1,15 @@ .actions { display: flex; justify-content: center; + + background-color: aliceblue; + position: fixed; + bottom: 0; + width: 100%; + border-top: 2px #ccc solid; } -.actions div { +.actions>div { height: 50px; width: 50px; background-color: #ccc; @@ -12,13 +18,15 @@ display: flex; justify-content: center; align-items: center; + + border-radius: 25px; } #play .icon { - border-top: transparent 20px solid; + border-top: transparent 15px solid; /* border-right: transparent 20px solid; */ - border-bottom: transparent 20px solid; - border-left: black 20px solid; + border-bottom: transparent 15px solid; + border-left: black 15px solid; height: 0px; width: 0px; @@ -26,11 +34,17 @@ } #stop .icon { - height: 30px; - width: 30px; + height: 25px; + width: 25px; background-color: black; } #time { text-align: center; + position: absolute; + width: 100%; + bottom: 62px; + + border-top: 2px #ccc solid; + background-color: antiquewhite; } \ No newline at end of file Modified: wit/css/select.css =================================================================== --- wit/css/select.css 2015-04-15 16:44:34 UTC (rev 1209) +++ wit/css/select.css 2015-04-16 08:07:15 UTC (rev 1210) @@ -1,6 +1,6 @@ .selection { background-color: #FFF; - border: 1px solid #AAA; + /*border: 1px solid #AAA;*/ border-radius: 4px; cursor: text; min-height: 32px; Modified: wit/css/style.css =================================================================== --- wit/css/style.css 2015-04-15 16:44:34 UTC (rev 1209) +++ wit/css/style.css 2015-04-16 08:07:15 UTC (rev 1210) @@ -1,3 +1,10 @@ * { box-sizing: border-box; + margin: 0; + padding: 0; } + +body { + width: 100%; + height: 100%; +} Modified: wit/package.json =================================================================== --- wit/package.json 2015-04-15 16:44:34 UTC (rev 1209) +++ wit/package.json 2015-04-16 08:07:15 UTC (rev 1210) @@ -3,8 +3,11 @@ "main": "index.html", "version": "1.0.0", "window": { - "width": 300, - "height": 300 + "width": 480, + "height": 180, + "toolbar": true, + "frame": true, + "transparent": false }, "dependencies": { "nedb": "^1.1.2",

1 0

r1209 - wit/js
by smaisonneuve＠users.nuiton.org 15 Apr '15

15 Apr '15

Author: smaisonneuve Date: 2015-04-15 16:44:34 +0000 (Wed, 15 Apr 2015) New Revision: 1209 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1209 Log: [DB] Implement basic support Modified: wit/js/main.js Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-04-15 16:24:34 UTC (rev 1208) +++ wit/js/main.js 2015-04-15 16:44:34 UTC (rev 1209) @@ -1,4 +1,5 @@ var moment = require('moment'); +var db = require("./js/database.js"); var tagsNode = document.getElementById("tags"); var inputTagNode = document.getElementById("inputTag");

1 0

r1208 - in wit: . js
by smaisonneuve＠users.nuiton.org 15 Apr '15

15 Apr '15

Author: smaisonneuve Date: 2015-04-15 16:24:34 +0000 (Wed, 15 Apr 2015) New Revision: 1208 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1208 Log: [DB] Implement basic support Modified: wit/index.html wit/js/database.js Modified: wit/index.html =================================================================== --- wit/index.html 2015-04-15 15:38:46 UTC (rev 1207) +++ wit/index.html 2015-04-15 16:24:34 UTC (rev 1208) @@ -28,6 +28,5 @@ <div id="time"></div> <script type="application/javascript" src="js/main.js"></script> - <script type="application/javascript" src="js/database.js"></script> </body> </html> Modified: wit/js/database.js =================================================================== --- wit/js/database.js 2015-04-15 15:38:46 UTC (rev 1207) +++ wit/js/database.js 2015-04-15 16:24:34 UTC (rev 1208) @@ -1,2 +1,37 @@ var Datastore = require('nedb'); -var db = new Datastore(); \ No newline at end of file +var db = new Datastore(); + +exports.insertLog = function (tags, startDate, endDate) { + return new Promise(function(resolve, reject) { + db.insert({ + tags: tags, + startDate: startDate, + endDate: endDate + }, function(err, newDocs) { + if (!err) { + resolve(newDocs); + } else { + reject(err); + } + }); + }); +}, + +exports.searchLogs = function (tags, startDate, endDate) { + var query = {}; + + if (tags) { query.tags = { $in: tags }; } + if (startDate) { query.startDate = { $gte: startDate } } + if (endDate) { query.endDate = { $lte: endDate } } + + return new Promise(function(resolve, reject) { + db.find(query, function(err, docs) { + if (!err) { + resolve(docs); + } else { + reject(err); + } + }); + }); +} +

1 0

r1207 - oipf/js/test
by ygrego＠users.nuiton.org 15 Apr '15

15 Apr '15

Author: ygrego Date: 2015-04-15 15:38:46 +0000 (Wed, 15 Apr 2015) New Revision: 1207 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1207 Log: New methods: "testAnd" and "testOr". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-15 15:26:10 UTC (rev 1206) +++ oipf/js/test/SearchManagerTest.js 2015-04-15 15:38:46 UTC (rev 1207) @@ -611,4 +611,43 @@ }, + testAnd: function(resolve, reject) { + var metadataSearch = this.searchManagerObj. + createSearch(this.SCHEDULED_CONTENT); + + var queryA = metadataSearch.createQuery("name", 0, "X:ENIUS"); + var queryB = metadataSearch.createQuery("name", 0, "X:ENIUS"); + + var newQuery = queryA.and(queryB); + + if (this.assertNotNull(newQuery) && + !this.assertEquals(newQuery, queryA)) { + + resolve(); + } else { + reject(); + } + + }, + + testOr: function(resolve, reject) { + var metadataSearch = this.searchManagerObj. + createSearch(this.SCHEDULED_CONTENT); + + var queryA = metadataSearch.createQuery("name", 0, "X:ENIUS"); + var queryB = metadataSearch.createQuery("name", 0, "X:ENIUS"); + + var newQuery = queryA.or(queryB); + + if (this.assertNotNull(newQuery) && + !this.assertEquals(newQuery, queryA)) { + + resolve(); + } else { + reject(); + } + + } + + }); \ No newline at end of file

1 0

r1206 - oipf/js/test
by ygrego＠users.nuiton.org 15 Apr '15

15 Apr '15

Author: ygrego Date: 2015-04-15 15:26:10 +0000 (Wed, 15 Apr 2015) New Revision: 1206 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1206 Log: New tests added in property "testsObjects". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-15 14:58:33 UTC (rev 1205) +++ oipf/js/test/Test.js 2015-04-15 15:26:10 UTC (rev 1206) @@ -400,6 +400,14 @@ { label: "Abort a search.", method: "testAbortWhileProgrammesSearchWithoutConstraints" + }, + { + label: "Call method 'or' of a 'Query' object.", + method: "testAnd" + }, + { + label: "Call method 'and' of a 'Query' object.", + method: "testOr" } ] }],

1 0

r1205 - oipf/js/impl/model
by ygrego＠users.nuiton.org 15 Apr '15

15 Apr '15

Author: ygrego Date: 2015-04-15 14:58:33 +0000 (Wed, 15 Apr 2015) New Revision: 1205 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1205 Log: Deletion of unused variables in method "_getAnyProgramme". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-15 14:54:46 UTC (rev 1204) +++ oipf/js/impl/model/SearchResults.js 2015-04-15 14:58:33 UTC (rev 1205) @@ -190,10 +190,6 @@ }, _getAnyProgramme: function(programmes) { - var field = this._search._currentQuery._field; - var comparison = this._search._currentQuery._comparison; - var value = this._search._currentQuery._value; - var methodName = this._methodToCall[comparison]; for (var i = 0, l = programmes.length; i < l; i++) { var programme = programmes[i];

1 0

r1204 - oipf/js/test
by ygrego＠users.nuiton.org 15 Apr '15

15 Apr '15

Author: ygrego Date: 2015-04-15 14:54:46 +0000 (Wed, 15 Apr 2015) New Revision: 1204 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1204 Log: New methods added. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-15 14:53:48 UTC (rev 1203) +++ oipf/js/test/SearchManagerTest.js 2015-04-15 14:54:46 UTC (rev 1204) @@ -311,6 +311,120 @@ }, + testSetQueryWhileSearchWithoutConstraints: function(resolve, reject) { + var value = 3600; + var stat = "Pending"; + logTest("State: " + stat); + var metadataSearch = this.searchManagerObj. + createSearch(this.SCHEDULED_CONTENT); + + var query = metadataSearch.createQuery("duration", 4, value); + metadataSearch.setQuery(query); + + var offset = 0; + var count = 6; + metadataSearch.result.getResults(offset, count); +// //Must return undefined else wrong implementation of getResults method +// console.log(metadataSearch.result[0]); + metadataSearch.setQuery(query); + + if (this.assertEquals(metadataSearch.result.length, 0)) { + resolve(); + } else { + reject(); + } + + }, + + testFindProgrammesFromStreamWhileSearchWithoutConstraints: function(resolve, reject) { + var self = this; + + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + + var stat = "Pending"; + logTest("State: " + stat); + var searchTarget = 1; + var metadataSearch = self.searchManagerObj.createSearch(searchTarget); + + var currentChannel = self.vidBroadObj.currentChannel; + var startTime = null; + metadataSearch.findProgrammesFromStream(currentChannel, startTime); + + var offset = 0; + var count = 1; + metadataSearch.result.getResults(offset, count); + + metadataSearch.findProgrammesFromStream(currentChannel, startTime); + + if (self.assertEquals(metadataSearch.result.length, 0)) { + resolve(); + } else { + reject(); + } + }); + this.vidBroadObj.bindToCurrentChannel(); + + }, + + testAddChannelConstraintWhileSearchWithoutConstraints: function(resolve, reject) { + var self = this; + + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + + var stat = "Pending"; + logTest("State: " + stat); + var searchTarget = 1; + var metadataSearch = self.searchManagerObj + .createSearch(searchTarget); + + var currentChannel = self.vidBroadObj.currentChannel; + var startTime = null; + metadataSearch.findProgrammesFromStream(currentChannel, startTime); + + var offset = 0; + var count = 1; + metadataSearch.result.getResults(offset, count); + + metadataSearch.addChannelConstraint(currentChannel); + + if (self.assertEquals(metadataSearch.result.length, 0)) { + resolve(); + } else { + reject(); + } + }); + + this.vidBroadObj.bindToCurrentChannel(); + + }, + + testRemoveChannelConstraintWhileSearchWithoutConstraints: function(resolve, reject) { + var value = 3600; + var stat = "Pending"; + logTest("State: " + stat); + var metadataSearch = this.searchManagerObj. + createSearch(this.SCHEDULED_CONTENT); + + var query = metadataSearch.createQuery("duration", 4, value); + metadataSearch.setQuery(query); + + var offset = 0; + var count = 6; + metadataSearch.result.getResults(offset, count); + metadataSearch.addChannelConstraint(null); + + if (this.assertEquals(metadataSearch.result.length, 0)) { + resolve(); + } else { + reject(); + } + + }, + testGetCurrentProgrammeFromNullStream: function (resolve, reject) { var self = this;

1 0