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

r1274 - in wit: css js/components
by smaisonneuve＠users.nuiton.org 27 Apr '15

27 Apr '15

Author: smaisonneuve Date: 2015-04-27 16:12:35 +0000 (Mon, 27 Apr 2015) New Revision: 1274 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1274 Log: [Wit] - Timeline : remove labels. The time range will be merge into the rapport view Modified: wit/css/timeline.less wit/js/components/Timeline.js Modified: wit/css/timeline.less =================================================================== --- wit/css/timeline.less 2015-04-27 15:36:35 UTC (rev 1273) +++ wit/css/timeline.less 2015-04-27 16:12:35 UTC (rev 1274) @@ -30,20 +30,4 @@ } } } - - .timeLabels { - - height: @timeLabelsDefaultHeight; - line-height: @timeLabelsDefaultHeight; - - color: black; - padding: 0 5px; - - .start { - float:left; - } - .end { - float:right; - } - } } Modified: wit/js/components/Timeline.js =================================================================== --- wit/js/components/Timeline.js 2015-04-27 15:36:35 UTC (rev 1273) +++ wit/js/components/Timeline.js 2015-04-27 16:12:35 UTC (rev 1274) @@ -64,10 +64,6 @@ return ( <div className="timeline"> - <div className="timeLabels"> - <div className="start"> | An hour ago...</div> - <div className="end">Now |</div> - </div> <div className="sessions"> {items} </div> @@ -90,4 +86,4 @@ <div className="slice" style={style} title={title}>{title}</div> ); } -}); \ No newline at end of file +});

1 0

r1273 - in wit/js: components services
by jruchaud＠users.nuiton.org 27 Apr '15

27 Apr '15

Author: jruchaud Date: 2015-04-27 15:36:35 +0000 (Mon, 27 Apr 2015) New Revision: 1273 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1273 Log: Implement a simple history Modified: wit/js/components/ActionsBar.js wit/js/components/Tags.js wit/js/components/Time.js wit/js/services/TimerService.js wit/js/services/database.js Modified: wit/js/components/ActionsBar.js =================================================================== --- wit/js/components/ActionsBar.js 2015-04-27 15:16:30 UTC (rev 1272) +++ wit/js/components/ActionsBar.js 2015-04-27 15:36:35 UTC (rev 1273) @@ -10,10 +10,23 @@ timer.stop(true); }, + prevHistory: function() { + timer.stop(); + timer.prevHistory(); + }, + + nextHistory: function() { + timer.stop(); + timer.nextHistory(); + }, + render: function() { return ( <div className="text-center"> <div className="btn-group" role="group"> + <button type="button" className="btn btn-primary btn-lg" onClick={this.prevHistory}> + <span className="glyphicon glyphicon-step-backward" aria-hidden="true"></span> + </button> <button type="button" className="btn btn-primary btn-lg"> <span className="glyphicon glyphicon-backward" aria-hidden="true"></span> </button> @@ -26,6 +39,9 @@ <button type="button" className="btn btn-primary btn-lg"> <span className="glyphicon glyphicon-forward" aria-hidden="true"></span> </button> + <button type="button" className="btn btn-primary btn-lg" onClick={this.nextHistory}> + <span className="glyphicon glyphicon-step-forward" aria-hidden="true"></span> + </button> </div> </div> ); Modified: wit/js/components/Tags.js =================================================================== --- wit/js/components/Tags.js 2015-04-27 15:16:30 UTC (rev 1272) +++ wit/js/components/Tags.js 2015-04-27 15:36:35 UTC (rev 1273) @@ -6,16 +6,24 @@ return timer; }, + componentDidMount: function() { + this.forceUpdate_bound = this.forceUpdate.bind(this); + timer.subscribeTagsChanged(this.forceUpdate_bound); + }, + + componentWillUnmount: function() { + timer.unsubscribeTagsChanged(this.forceUpdate_bound); + }, + onKey: function(e) { var target = e.target; var value = target.value; if (e.keyCode == 13 && value != "") { // On enter target.value = ""; - + + timer.stop(); timer.addTag(value); - timer.stop(); - this.forceUpdate(); } }, @@ -23,9 +31,8 @@ var target = e.target; var index = target.dataset.index; + timer.stop(); timer.removeTag(index); - timer.stop(); - this.forceUpdate(); }, render: function() { Modified: wit/js/components/Time.js =================================================================== --- wit/js/components/Time.js 2015-04-27 15:16:30 UTC (rev 1272) +++ wit/js/components/Time.js 2015-04-27 15:36:35 UTC (rev 1273) @@ -7,9 +7,14 @@ }, componentDidMount: function() { - timer.subscribeTimeChanged(this.forceUpdate.bind(this)); + this.forceUpdate_bound = this.forceUpdate.bind(this); + timer.subscribeTimeChanged(this.forceUpdate_bound); }, + componentWillUnmount: function() { + timer.unsubscribeTimeChanged(this.forceUpdate_bound); + }, + render: function() { return ( <h1 className="digit"> Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-04-27 15:16:30 UTC (rev 1272) +++ wit/js/services/TimerService.js 2015-04-27 15:36:35 UTC (rev 1273) @@ -11,6 +11,8 @@ var time = null; var idleTime = null; +var historyIndex = -1; + var updateUserIdleTime = function() { x11.createClient(function(err, display) { var X = display.client; @@ -31,6 +33,8 @@ exports.start = function() { time = idleTime || new Date(); idleTime = null; + historyIndex = -1; + timeChange(); }; @@ -63,10 +67,12 @@ exports.addTag = function(tag) { tags.push(tag); + eventEmitter.emit('onTagsChanged'); }; exports.removeTag = function(index) { tags.splice(index, 1); + eventEmitter.emit('onTagsChanged'); }; var timeChangeTimer = null; @@ -82,6 +88,10 @@ } }; +exports.subscribeTagsChanged = function(callback) { + eventEmitter.on('onTagsChanged', callback); +}; + exports.subscribeTimeChanged = function(callback) { eventEmitter.on('onTimeChanged', callback); }; @@ -90,6 +100,18 @@ eventEmitter.on('onIdle', callback); }; +exports.unsubscribeTagsChanged = function(callback) { + eventEmitter.removeListener('onTagsChanged', callback); +}; + +exports.unsubscribeTimeChanged = function(callback) { + eventEmitter.removeListener('onTimeChanged', callback); +}; + +exports.unsubscribeIdle = function(callback) { + eventEmitter.removeListener('onIdle', callback); +}; + exports.keepIdle = function() { idleTime = null; }; @@ -110,3 +132,34 @@ clearTimeout(timeChangeTimer); eventEmitter.emit('onTimeChanged'); }; + +var setTagsFromHistory = function() { + + db.getHistory(historyIndex) + .then(function(logs) { + + if (logs && logs.length) { + var log = logs[0]; + tags = log.tags.slice(0); + } else { + tags = []; + } + eventEmitter.emit('onTagsChanged'); + }); +}; + +exports.prevHistory = function() { + historyIndex++; + + setTagsFromHistory(); +}; + +exports.nextHistory = function() { + if (historyIndex == -1) { + return; + } + + historyIndex--; + + setTagsFromHistory(); +}; Modified: wit/js/services/database.js =================================================================== --- wit/js/services/database.js 2015-04-27 15:16:30 UTC (rev 1272) +++ wit/js/services/database.js 2015-04-27 15:36:35 UTC (rev 1273) @@ -3,7 +3,7 @@ var Datastore = require('nedb'); var db = new Datastore({filename : path, autoload: true}); -exports.insertLog = function (tags, startDate, endDate) { +exports.insertLog = function(tags, startDate, endDate) { return new Promise(function(resolve, reject) { db.insert({ tags: tags, @@ -19,7 +19,7 @@ }); }; -exports.searchLogs = function (tags, startDate, endDate) { +exports.searchLogs = function(tags, startDate, endDate) { var query = {}; if (tags) { query.tags = { $in: tags }; } @@ -27,7 +27,7 @@ if (endDate) { query.endDate = { $lte: endDate.getTime() } } return new Promise(function(resolve, reject) { - db.find(query, function(err, docs) { + db.find(query).sort({ startDate: -1 }).exec(function(err, docs) { if (!err) { resolve(docs); } else { @@ -37,4 +37,15 @@ }); }; - +exports.getHistory = function(index) { + + return new Promise(function(resolve, reject) { + db.find({}).sort({ startDate: -1 }).skip(index).limit(1).exec(function (err, docs) { + if (!err) { + resolve(docs); + } else { + reject(err); + } + }); + }); +};

1 0

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

27 Apr '15

Author: ygrego Date: 2015-04-27 15:16:30 +0000 (Mon, 27 Apr 2015) New Revision: 1272 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1272 Log: Modification of the object constructor in order to initialize its properties with values by default. Modified: oipf/js/impl/model/LNBInfo.js Modified: oipf/js/impl/model/LNBInfo.js =================================================================== --- oipf/js/impl/model/LNBInfo.js 2015-04-27 15:13:51 UTC (rev 1271) +++ oipf/js/impl/model/LNBInfo.js 2015-04-27 15:16:30 UTC (rev 1272) @@ -91,16 +91,8 @@ */ orbitalPosition: null, - init: function(lnbType, lnbLowFreq, lnbHighFreq, crossoverFrequency, - lnbStartFrequency, lnbStopFrequency, orbitalPosition) { - - this.lnbType = lnbType; - this.lnbLowFreq = lnbLowFreq; - this.lnbHighFreq = lnbHighFreq; - this.crossoverFrequency = crossoverFrequency; - this.lnbStartFrequency = lnbStartFrequency; - this.lnbStopFrequency = lnbStopFrequency; - this.orbitalPosition = orbitalPosition; + init: function(defaultProperties) { + oipf.utils.initProperties.call(this, defaultProperties); } });

1 0

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

27 Apr '15

Author: ygrego Date: 2015-04-27 15:13:51 +0000 (Mon, 27 Apr 2015) New Revision: 1271 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1271 Log: Modification of the object constructor. Modified: oipf/js/impl/model/Collection.js Modified: oipf/js/impl/model/Collection.js =================================================================== --- oipf/js/impl/model/Collection.js 2015-04-27 15:09:08 UTC (rev 1270) +++ oipf/js/impl/model/Collection.js 2015-04-27 15:13:51 UTC (rev 1271) @@ -6,10 +6,14 @@ var Collection = Array.extend({ - item: function(index) { - return this[index]; - } + init: function() { + this.push.apply(this, arguments); + }, + item: function(index) { + return this[index]; + } + });

1 0

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

27 Apr '15

Author: ygrego Date: 2015-04-27 15:09:08 +0000 (Mon, 27 Apr 2015) New Revision: 1270 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1270 Log: Addition of methods "displayGlobalTestResults", "totalPercentage" and "percentageCalculating". Modification of method "runAll" in order to launch method "totalPercentage" and declare object "currentResult" to calculate the number of tests failed and succeeded. Modification of method "runLoop" in order to reset the object "currentResult" when a other test object must be launch. Modification of method "displayInLineArray" in order to display a table containing results for each test section which has been launched. Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-27 14:57:07 UTC (rev 1269) +++ oipf/js/test/Test.js 2015-04-27 15:09:08 UTC (rev 1270) @@ -409,15 +409,135 @@ label: "Call method 'and' of a 'Query' object.", method: "testOr" } + ]},{ + name: "ConfigurationTest", + object: new ConfigurationTest(), + tests: [ + { + label: "Call method 'setScreenSize' with right parameters(Type and value).", + method: "testSetScreenSize" + }, + { + label: "Call method 'setScreenSize' without parameters.", + method: "testSetScreenSizeWithoutParameters" + }, + { + label: "Call method 'setScreenSize' with 'String' parameters.", + method: "testSetScreenSizeWithUnexpectedTypeParameters" + }, + { + label: "Call method 'setScreenSize' with an excessive number of parameters.", + method: "testSetScreenSizeWithExcessiveParametersNumber" + }, + { + label: "Call method 'setTvStandard' with right parameters(Type and value).", + method: "testSetTvStandard" + }, + { + label: "Call method 'setTvStandard' without parameters.", + method: "testSetTvStandardWihtoutParameters" + }, + { + label: "Call method 'setTvStandard' with wrong parameters(Type).", + method: "testSetTvStandardWithUnexpectedTypeParameters" + }, + { + label: "Call method 'setTvStandard' with an excessive number of parameters.", + method: "testSetTvStandardWithExcessiveParametersNumber" + }, + { + label: "Call method 'setPvrSupport' with right parameters(Type and value).", + method: "testSetPvrSupport" + }, + { + label: "Call method 'setPvrSupport' without parameters.", + method: "testSetPvrSupportWithoutParameters" + }, + { + label: "Call method 'setPvrSupport' with wrong parameters(Type).", + method: "testSetPvrSupportWithUnexpectedTypeParameters" + }, + { + label: "Call method 'setPvrSupport' with an excessive number of parameters.", + method: "testSetPvrSupportWithExcessiveParametersNumber" + }, + { + label: "Call method 'setPowerState' with right parameters(Type and value).", + method: "testSetPowerState" + }, + { + label: "Call method 'setPowerState' without parameters.", + method: "testSetPowerStateWithoutParameters" + }, + { + label: "Call method 'setPowerState' with wrong parameters(Type).", + method: "testSetPowerStateWithUnexpectedTypeParameters" + }, + { + label: "Call method 'setPowerState' with an excessive number of parameters.", + method: "testSetPowerStateWithExcessiveParametersNumber" + }, + { + label: "Call method 'setDigestCredentials' with right parameters(Type and value).", + method: "testSetDigestCredentials" + }, + { + label: "Call method 'setDigestCredentials' without parameters.", + method: "testSetDigestCredentialsWithoutParameters" + }, + { + label: "Call method 'setDigestCredentials' with wrong parameters(Type).", + method: "testSetDigestCredentialsWithUnexpectedTypeParameters" + }, + { + label: "Call method 'setDigestCredentials' with an excessive number of parameters.", + method: "testSetDigestCredentialsWithExcessiveParametersNumber" + }, + { + label: "Call method 'clearDigestCredentials' with right parameters(Type and value).", + method: "testClearDigestCredentials" + }, + { + label: "Call method 'clearDigestCredentials' without parameters.", + method: "testClearDigestCredentialsWithoutParameters" + }, + { + label: "Call method 'clearDigestCredentials' with wrong parameters(Type).", + method: "testClearDigestCredentialsWithUnexpectedTypeParameters" + }, + { + label: "Call method 'clearDigestCredentials' with an excessive number of parameters.", + method: "testClearDigestCredentialsWithExcessiveParametersNumber" + }, + { + label: "Call method 'hasDigestCredentials' with right parameters(Type and value).", + method: "testHasDigestCredentials" + }, + { + label: "Call method 'hasDigestCredentials' without parameters.", + method: "testHasDigestCredentialsWithoutParameters" + }, + { + label: "Call method 'hasDigestCredentials' with wrong parameters(Type).", + method: "testHasDigestCredentialsWithUnexpectedTypeParameters" + }, + { + label: "Call method 'hasDigestCredentials' with an excessive number of parameters.", + method: "testHasDigestCredentialsWithExcessiveParametersNumber" + } ] }], init: function() { - }, runAll: function() { - this.runLoop(0, 0); + this.results = []; + this.currentResult = { + succeeded: 0, + failed: 0 + }; + this.runLoop(0, 0).then(this.totalPercentage.bind(this)); }, runLoop: function(indexObject, indexTest) { @@ -428,17 +548,98 @@ var self = this; var loop = function() { if (indexTest < tests.length - 1) { - self.runLoop(indexObject, indexTest + 1); - - } else if (indexObject < self.testsObjects.length -1) { - self.runLoop(indexObject + 1, 0); + return self.runLoop(indexObject, indexTest + 1); + + } else if (indexObject < self.testsObjects.length - 1) { + element.results = { + testName: "", + failed: 0, + succeeded: 0 + }; + element.results.testName = element.name; + element.results.failed = self.currentResult.failed; + element.results.succeeded = self.currentResult.succeeded; + self.currentResult.failed = 0; + self.currentResult.succeeded = 0; + return self.runLoop(indexObject + 1, 0); + } + if (indexObject == self.testsObjects.length - 1) { + element.results = { + testName: "", + failed: 0, + succeeded: 0 + }; + element.results.testName = element.name; + element.results.failed = self.currentResult.failed; + element.results.succeeded = self.currentResult.succeeded; + } }; - this.updateTestResult(tests[indexTest], object) + return this.updateTestResult(tests[indexTest], object) .then(loop).catch(loop); + }, + percentageCalculating: function(currentResult) { + this.round = Math.round.bind(Math); + var testNumber = currentResult.failed + currentResult.succeeded; + currentResult.failed = this.round((currentResult.failed/testNumber)*100); + currentResult.succeeded = this.round((currentResult.succeeded/testNumber)*100); + }, + + totalPercentage: function() { + this.resultsPercentageFailed = 0; + this.resultsPercentageSucceeded = 0; + + for (var i = 0, l = this.testsObjects.length; i < l; i++) { + + this.percentageCalculating(this.testsObjects[i].results); + this.resultsPercentageFailed += this.testsObjects[i].results.failed; + this.resultsPercentageSucceeded += this.testsObjects[i].results.succeeded; + } + this.resultsPercentageFailed = this.resultsPercentageFailed/this.testsObjects.length; + this.resultsPercentageSucceeded = this.resultsPercentageSucceeded/this.testsObjects.length; + this.displayGlobalTestResults(); + }, + + displayGlobalTestResults: function() { + var id = "globalTestResultsTable"; + var tableResult = document.getElementById(id); + var content; + content += "<thead>"; + content += "<tr>"; + content += "<th></th>"; + content += "<th>Succeeded (%)</th>"; + content += "<th>Failed (%)</th>"; + content += "</tr>"; + content += "</thead>"; + content += "<tbody>"; +// for (var i = 0, l = this.results.length; i < l; i++) { +// content += +// this.percentageCalculating(this.results[i]); +// this.result.percentageFailed += this.results[i].failed; +// this.result.percentageSucceeded += this.results[i].succeeded +// content += "<tr>"; +// content += "<th>" + this.results[i].testName + "<th>"; +// content += "<td>" + + "</td>"; +// content += "<td>" + + "</td>"; +// content += "</tr>"; +// } + content += "<tr>"; + content += "<th>Total</th>"; + content += "<td>" + this.resultsPercentageSucceeded + "</td>"; + content += "<td>" + this.resultsPercentageFailed + "</td>"; + content += "</tr>"; + content += "</tbody>"; + content += "</table>"; + + tableResult.innerHTML = content; + + var style = document.getElementById("globalTestResultsDiv").style; + style.display = (!style.display || style.display == "none") ? "block" : "none"; + }, + runSectionTest : function(indexObject, indexTest) { var element = this.testsObjects[indexObject]; var object = element.object; @@ -464,7 +665,18 @@ }, displayInLineArray: function() { - var content = "<div id='testsDisplay'><button id='runAllBtn'>Run All</button>"; + var content = "<div id='testsDisplay'>"; + content += "<div id='title'><h1> Test Page</h1></div>"; + content += "<div id='testControllerDiv'>"; + content += "<div id='titleTestControllerDiv'><h4>Test Controller<h4></div>"; + content += "<button id='runAllBtn'>Run All</button>"; + content += "<button id='stopAllBtn'>Stop All</button>"; + content += "<div id='globalTestResultsDiv'>"; + content += "<div id='titleGlobalTestResultsDiv'><h4>Global Test Results<h4></div>"; + content += "<table id='globalTestResultsTable'></table>"; + content += "</div>"; + content += "</div>"; + var testsObjects = this.testsObjects; content += "<div id=AllTestDiv>"; @@ -510,21 +722,20 @@ document.body.innerHTML = content; }, - - updateTestResult: function(currentTest, object) { console.group(currentTest["label"]); var timeStart = new Date(); var self = this; var result = false; - return new Promise(function(resolve, reject) { + var promiseTest = new Promise(function(resolve, reject) { try { timeout(5000) - .then(reject.bind(this, "No result returned.")) + .then(reject.bind(null, "No result returned.")) .then(function() { !result && object.afterTest && object.afterTest.bind(object); + self.currentResult && self.currentResult.failed++; }); object.beforeTest && object.beforeTest(resolve, reject); object[currentTest["method"]] && object[currentTest["method"]](resolve, reject); @@ -536,10 +747,12 @@ result = true; console.groupEnd(currentTest["label"]); var timeEnd = new Date(); + self.currentResult && self.currentResult.succeeded++; self.updateTestResultSuccess(timeStart, timeEnd, currentTest, val); object.afterTest && object.afterTest(); }) .catch(function(val) { + self.currentResult && self.currentResult.failed++; result = true; console.log(val); console.groupEnd(currentTest["label"]); @@ -547,6 +760,8 @@ self.updateTestResultError(timeStart, timeEnd, currentTest, val); object.afterTest && object.afterTest(); }); + + return promiseTest; }, updateTestResultSuccess: function(timeStart, timeEnd, currentTest, message) { @@ -561,7 +776,6 @@ document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; } - });

1 0

r1269 - wit/js/components
by jruchaud＠users.nuiton.org 27 Apr '15

27 Apr '15

Author: jruchaud Date: 2015-04-27 14:57:07 +0000 (Mon, 27 Apr 2015) New Revision: 1269 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1269 Log: Remove log Modified: wit/js/components/FilterBar.js Modified: wit/js/components/FilterBar.js =================================================================== --- wit/js/components/FilterBar.js 2015-04-27 14:48:58 UTC (rev 1268) +++ wit/js/components/FilterBar.js 2015-04-27 14:57:07 UTC (rev 1269) @@ -27,7 +27,7 @@ db.searchLogs(null, beginDate) .then(function(result) { self.props.onSearchResult(result); - console.log(result); +// console.log(result); }); },

1 0

r1268 - wit/js/services
by smaisonneuve＠users.nuiton.org 27 Apr '15

27 Apr '15

Author: smaisonneuve Date: 2015-04-27 14:48:58 +0000 (Mon, 27 Apr 2015) New Revision: 1268 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1268 Log: [Wit] - Database : store data under $HOME/.wit/wit.json Modified: wit/js/services/database.js Modified: wit/js/services/database.js =================================================================== --- wit/js/services/database.js 2015-04-27 14:44:18 UTC (rev 1267) +++ wit/js/services/database.js 2015-04-27 14:48:58 UTC (rev 1268) @@ -1,5 +1,7 @@ +var path = (process.env.HOME || process.env.USERPROFILE) + "/.wit/wit.json"; + var Datastore = require('nedb'); -var db = new Datastore(); +var db = new Datastore({filename : path, autoload: true}); exports.insertLog = function (tags, startDate, endDate) { return new Promise(function(resolve, reject) { @@ -34,3 +36,5 @@ }); }); }; + +

1 0

r1267 - wit/js
by jruchaud＠users.nuiton.org 27 Apr '15

27 Apr '15

Author: jruchaud Date: 2015-04-27 14:44:18 +0000 (Mon, 27 Apr 2015) New Revision: 1267 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1267 Log: Complet Todo Modified: wit/js/main.js Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-04-27 14:40:30 UTC (rev 1266) +++ wit/js/main.js 2015-04-27 14:44:18 UTC (rev 1267) @@ -1,9 +1,11 @@ /** @jsx React.DOM */ // Popup Idle -// Options with idle time + nb tags +// Options with idle time + nb tags + Configuration week day // Route // Dropdown rapport week/day/month +// Alias +// Total time during day global.document = window.document; global.navigator = window.navigator;

1 0

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

27 Apr '15

Author: ygrego Date: 2015-04-27 14:40:30 +0000 (Mon, 27 Apr 2015) New Revision: 1266 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1266 Log: Addition of method "waitForError". Modified: oipf/js/test/TestCase.js Modified: oipf/js/test/TestCase.js =================================================================== --- oipf/js/test/TestCase.js 2015-04-27 14:39:00 UTC (rev 1265) +++ oipf/js/test/TestCase.js 2015-04-27 14:40:30 UTC (rev 1266) @@ -20,6 +20,16 @@ assertNotNull: function(elmt) { return elmt; + }, + + waitForError: function(callback, resolve) { + new Promise(function(resolve, reject) { + callback(); + }) + .catch(function(val) { + console.log(val); + resolve(); + }); } });

1 0

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

27 Apr '15

Author: ygrego Date: 2015-04-27 14:39:00 +0000 (Mon, 27 Apr 2015) New Revision: 1265 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1265 Log: Implementation of "BookmarkCollection". Added: oipf/js/impl/model/BookmarkCollection.js Added: oipf/js/impl/model/BookmarkCollection.js =================================================================== --- oipf/js/impl/model/BookmarkCollection.js (rev 0) +++ oipf/js/impl/model/BookmarkCollection.js 2015-04-27 14:39:00 UTC (rev 1265) @@ -0,0 +1,48 @@ +/* + * 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 BookmarkCollection = Collection.extend({ + + init: function() { + this.super.init.apply(this, arguments); + }, + + /* + * Description: + * Add a new bookmark to the collection. If the bookmark cannot be added + * (e.g. because the value given for time lies outside + * the length of the recording), this method SHALL return null. + * + * Argument: + * - time: The time at which the bookmark is set, in seconds since + * the start of the recording. + * + * - name: The name of the bookmark. + */ + addBookmark: function(time, name) { + var newBookmark = new Bookmark(time, name); + this.push(newBookmark); + + }, + + /* + * Description: + * Remove a bookmark from the collection. + * + * Argument: + * - bookmark: The bookmark to be removed. + */ + removeBookmark: function(bookmark) { + var indexOfBookmark = this.indexOf(bookmark); + var lastBookmark = this[this.length-1]; + + if (indexOfBookmark) { + this[indexOfBookmark] = lastBookmark; + this.pop(); + } + } + +});

1 0