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

r1324 - oipf/js/impl
by ygrego＠users.nuiton.org 06 May '15

06 May '15

Author: ygrego Date: 2015-05-06 14:32:37 +0000 (Wed, 06 May 2015) New Revision: 1324 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1324 Log: Addition of a property "_modelFactory" created then passed to concerned objects constructors in method "init". The object "RecordingScheduler" become available this one is created in method "init". The method "isObjectSupported" has been modified due to availability of object "RecordingScheduler". Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-05-06 14:17:10 UTC (rev 1323) +++ oipf/js/impl/OipfObjectFactory.js 2015-05-06 14:32:37 UTC (rev 1324) @@ -8,6 +8,7 @@ init: function() { console.log("[INFO] constructor of OipfObjectFactory class called."); + this._modelFactory = new ModelFactory(); //this.applicationManagerObject = new ApplicationManagerObject(); //this.capabilitiesObject = new CapabilitiesObject(); //this.codManagerObject = new CodManagerObject(); @@ -16,9 +17,10 @@ //this.mdtfObject = new MDTFObject(); //this.notifSocketObject = new NotifSocket(); //this.parentalControlManagerObject = new ParentalControlManagerObject(); - //this.recordingSchedulerObject = new RecordingSchedulerObject(); - this.searchManagerObject = new SearchManagerObject(); this.configurationObject = new ConfigurationObject(); + this.recordingSchedulerObject = new RecordingSchedulerObject( + this.configurationObject.configuration, this._modelFactory); + this.searchManagerObject = new SearchManagerObject(this._modelFactory); //this.downloadManagerObject= new DownloadManagerObject(); //this.downloadTriggerObject= new DownloadTriggerObject(); //this.drmAgentObject= new DrmAgentObject(); @@ -136,7 +138,7 @@ "application/oipfGatewayInfo" : false, "application/oipfMDTF" : false, "application/oipfParentalControlManager" : false, - "application/oipfRecordingScheduler" : false, + "application/oipfRecordingScheduler" : true, "application/oipfRemoteControlFunction" : false, "application/oipfRemoteManagement" : false, "application/oipfSearchManager" : true,

1 0

r1323 - oipf/js/impl/model
by ygrego＠users.nuiton.org 06 May '15

06 May '15

Author: ygrego Date: 2015-05-06 14:17:10 +0000 (Wed, 06 May 2015) New Revision: 1323 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1323 Log: Addition of new class giving access to severals globals objects or permit to obtain new object like an instance of Recording, MetadataManager, ... Added: oipf/js/impl/model/ModelFactory.js Added: oipf/js/impl/model/ModelFactory.js =================================================================== --- oipf/js/impl/model/ModelFactory.js (rev 0) +++ oipf/js/impl/model/ModelFactory.js 2015-05-06 14:17:10 UTC (rev 1323) @@ -0,0 +1,65 @@ +/* + * 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 ModelFactory = Class.extend({ + + init: function(metadataObject) { + this.metadataObject = metadataObject; + this.metadaManager = null; + this.xmlTvData = null; + this.createXmlTvData(); + }, + + createXmlTvData: function() { + + return this.return("xmlTvData") || + this.setProperty("xmlTvData", + new XmlTvData(this.metadataObject)); + + }, + + getXmlTvData: function() { + return this.xmlTvData; + }, + + + /* + * FIXME: Yannis - 06/05/2015 - Get a method to find an available number for + * randomIndex. + */ + getAProgrammeFromXmlTvData: function() { + + var randomIndex = 150; + + if (this.xmlTvData && this.xmlTvData.programmes[randomIndex]) { + return this.xmlTvData.programmes[15]; + } + + }, + + createScheduledRecording: function() { + return new ScheduledRecording(this.getAPrgrammeFromXmlTvData()); + }, + + createRecording: function() { + return new Recording(this.createScheduledRecording()); + }, + + createMetadataManager: function() { + return this.return("metadaManager") || + this.setProperty("metadaManager", + new MetadataManager()); + }, + + getProperty: function(propertyName) { + return this[propertyName]; + }, + + setProperty: function(propertyName, value) { + this[propertyName] = value; + } + +});

1 0

r1322 - in wit/js: . components pages
by jruchaud＠users.nuiton.org 05 May '15

05 May '15

Author: jruchaud Date: 2015-05-05 13:10:06 +0000 (Tue, 05 May 2015) New Revision: 1322 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1322 Log: Replace React.findDOMNode by getDOMNode Modified: wit/js/components/FilterBar.js wit/js/components/FilterLogs.js wit/js/components/Time.js wit/js/main.js wit/js/pages/EditionLogs.js Modified: wit/js/components/FilterBar.js =================================================================== --- wit/js/components/FilterBar.js 2015-05-04 12:29:11 UTC (rev 1321) +++ wit/js/components/FilterBar.js 2015-05-05 13:10:06 UTC (rev 1322) @@ -12,16 +12,16 @@ now.subtract(7, 'days'); var startDefaultDate = now.format("YYYY-MM-DDThh:mm"); - React.findDOMNode(this.refs.beginDate).value = startDefaultDate; - React.findDOMNode(this.refs.endDate).value = endDefaultDate; + this.refs.beginDate.getDOMNode().value = startDefaultDate; + this.refs.endDate.getDOMNode().value = endDefaultDate; }, search: function() { var moment = require('moment'); var db = require("./js/services/database.js"); - this.startDate = moment(React.findDOMNode(this.refs.beginDate).value); - this.endDate = moment(React.findDOMNode(this.refs.endDate).value); + this.startDate = moment(this.refs.beginDate.getDOMNode().value); + this.endDate = moment(this.refs.endDate.getDOMNode().value); return db.searchLogs(null, this.startDate, this.endDate, true); }, Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-05-04 12:29:11 UTC (rev 1321) +++ wit/js/components/FilterLogs.js 2015-05-05 13:10:06 UTC (rev 1322) @@ -83,12 +83,12 @@ }, onShowSummary: function () { - React.findDOMNode(this.refs.summary).classList.toggle("hidden"); + this.refs.summary.getDOMNode().classList.toggle("hidden"); }, onLogDetails: function (e) { var nodeId = e.target.dataset.id; - nodeId && React.findDOMNode(this.refs[nodeId]).classList.toggle("hidden"); + nodeId && this.refs[nodeId].getDOMNode().classList.toggle("hidden"); }, mail: function(content) { @@ -98,7 +98,7 @@ }, onToggleFilterTag: function() { - React.findDOMNode(this.refs.filterTags).classList.toggle("hidden"); + this.refs.filterTags.getDOMNode().classList.toggle("hidden"); }, getInitialState: function() { Modified: wit/js/components/Time.js =================================================================== --- wit/js/components/Time.js 2015-05-04 12:29:11 UTC (rev 1321) +++ wit/js/components/Time.js 2015-05-05 13:10:06 UTC (rev 1322) @@ -16,22 +16,22 @@ }, onEdit: function(e) { - React.findDOMNode(this.refs.editButton).classList.toggle("hidden"); - React.findDOMNode(this.refs.editInput).classList.toggle("hidden"); - React.findDOMNode(this.refs.timeValue).classList.toggle("hidden"); + this.refs.editButton.getDOMNode().classList.toggle("hidden"); + this.refs.editInput.getDOMNode().classList.toggle("hidden"); + this.refs.timeValue.getDOMNode().classList.toggle("hidden"); var time = timer.getTime() || "00:00:00"; - var editInputTime = React.findDOMNode(this.refs.editInputTime); + var editInputTime = this.refs.editInputTime.getDOMNode(); editInputTime.value = time; editInputTime.max = time; }, onSaveTime: function(e) { - React.findDOMNode(this.refs.editButton).classList.toggle("hidden"); - React.findDOMNode(this.refs.editInput).classList.toggle("hidden"); - React.findDOMNode(this.refs.timeValue).classList.toggle("hidden"); + this.refs.editButton.getDOMNode().classList.toggle("hidden"); + this.refs.editInput.getDOMNode().classList.toggle("hidden"); + this.refs.timeValue.getDOMNode().classList.toggle("hidden"); - var editInputTime = React.findDOMNode(this.refs.editInputTime); + var editInputTime = this.refs.editInputTime.getDOMNode(); timer.editTime(editInputTime.value); }, Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-05-04 12:29:11 UTC (rev 1321) +++ wit/js/main.js 2015-05-05 13:10:06 UTC (rev 1322) @@ -30,18 +30,18 @@ var App = React.createClass({ openRapport: function(e) { - React.findDOMNode(this.refs.rapportDropdown).classList.toggle("open"); - React.findDOMNode(this.refs.editionDropdown).classList.remove("open"); + this.refs.rapportDropdown.getDOMNode().classList.toggle("open"); + this.refs.editionDropdown.getDOMNode().classList.remove("open"); }, openEdition: function(e) { - React.findDOMNode(this.refs.editionDropdown).classList.toggle("open"); - React.findDOMNode(this.refs.rapportDropdown).classList.remove("open"); + this.refs.editionDropdown.getDOMNode().classList.toggle("open"); + this.refs.rapportDropdown.getDOMNode().classList.remove("open"); }, closeAll: function(e) { - React.findDOMNode(this.refs.editionDropdown).classList.remove("open"); - React.findDOMNode(this.refs.rapportDropdown).classList.remove("open"); + this.refs.editionDropdown.getDOMNode().classList.remove("open"); + this.refs.rapportDropdown.getDOMNode().classList.remove("open"); }, render: function() { Modified: wit/js/pages/EditionLogs.js =================================================================== --- wit/js/pages/EditionLogs.js 2015-05-04 12:29:11 UTC (rev 1321) +++ wit/js/pages/EditionLogs.js 2015-05-05 13:10:06 UTC (rev 1322) @@ -23,9 +23,9 @@ var moment = require('moment'); var db = require("./js/services/database.js"); - var tags = React.findDOMNode(this.refs.tags).value.split(","); - var startDate = moment(React.findDOMNode(this.refs.beginDate).value); - var endDate = moment(React.findDOMNode(this.refs.endDate).value); + var tags = this.refs.tags.getDOMNode().value.split(","); + var startDate = moment(this.refs.beginDate.getDOMNode().value); + var endDate = moment(this.refs.endDate.getDOMNode().value); return db.insertLog(tags, startDate, endDate); },

1 0

r1321 - wit/js/components
by smaisonneuve＠users.nuiton.org 04 May '15

04 May '15

Author: smaisonneuve Date: 2015-05-04 12:29:11 +0000 (Mon, 04 May 2015) New Revision: 1321 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1321 Log: [Wit] - Fix timeline main view Modified: wit/js/components/FilterLogs.js Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-05-04 12:17:13 UTC (rev 1320) +++ wit/js/components/FilterLogs.js 2015-05-04 12:29:11 UTC (rev 1321) @@ -271,7 +271,7 @@ </div> <div ref="summary" className="hidden"> - <Timeline data={this.state}/> + <Timeline key={nonce()} data={this.state}/> </div> <table className="table">

1 0

r1320 - wit/js/components
by jruchaud＠users.nuiton.org 04 May '15

04 May '15

Author: jruchaud Date: 2015-05-04 12:17:13 +0000 (Mon, 04 May 2015) New Revision: 1320 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1320 Log: Fix timeline refresh Modified: wit/js/components/FilterLogs.js wit/js/components/Timeline.js Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-05-04 10:57:53 UTC (rev 1319) +++ wit/js/components/FilterLogs.js 2015-05-04 12:17:13 UTC (rev 1320) @@ -191,7 +191,7 @@ ); r.push( <tr ref={key} className="hidden"> - <td colSpan="4"><Timeline data={tagObject}/></td> + <td colSpan="4"><Timeline data={tagObject} key={key}/></td> </tr> ); } Modified: wit/js/components/Timeline.js =================================================================== --- wit/js/components/Timeline.js 2015-05-04 10:57:53 UTC (rev 1319) +++ wit/js/components/Timeline.js 2015-05-04 12:17:13 UTC (rev 1320) @@ -4,32 +4,16 @@ var Timeline = React.createClass({ getInitialState: function() { - var data = this.props.data; - - this.startDate = data && data.startDate && moment(data.startDate), - this.endDate = data && data.endDate && moment(data.endDate); - return { - sessions: [], + sessions: [] }; }, componentDidMount: function () { - - // Retrieve window focus activity + var startDate = this.props.data.startDate && moment(this.props.data.startDate); + var endDate = this.props.data.endDate && moment(this.props.data.endDate); - this.refresh(this.startDate, this.endDate); - }, - - componentWillReceiveProps: function(nextProps) { - this.refresh(nextProps.data.startDate, nextProps.data.endDate); - }, - - refresh: function (startDate, endDate) { if (startDate && endDate) { - this.startDate = startDate; - this.endDate = endDate; - var self = this; user.getSessions(startDate, endDate, true) @@ -48,14 +32,17 @@ // Create a wrapper for each window session + var startDate = this.props.data.startDate && moment(this.props.data.startDate); + var endDate = this.props.data.endDate && moment(this.props.data.endDate); + var self = this, - timeRange = this.endDate && this.endDate.diff(this.startDate); + timeRange = endDate && endDate.diff(startDate); items = items.concat( sessions.map(function(session) { var rst = ""; - var ns = self._normalize(session, self.startDate, self.endDate); // normalize session according to timeline boundaries + var ns = self._normalize(session, startDate, endDate); // normalize session according to timeline boundaries var data = { title: ns.name,

1 0

r1319 - oipf/js/test
by ygrego＠users.nuiton.org 04 May '15

04 May '15

Author: ygrego Date: 2015-05-04 10:57:53 +0000 (Mon, 04 May 2015) New Revision: 1319 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1319 Log: New methods added : "startAnimationInProgress", "stopAnimationInProgress". New test section added in property "testsObjects": "RecordingTest". A new property called "animation" is initialized in constructor class. Modification of method "updateTestResult" in order to call when that is necessary either method "startAnimationInProgress" or "stopAnimationInProgress". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-05-01 13:57:43 UTC (rev 1318) +++ oipf/js/test/Test.js 2015-05-04 10:57:53 UTC (rev 1319) @@ -525,10 +525,24 @@ label: "Call method 'hasDigestCredentials' with an excessive number of parameters.", method: "testHasDigestCredentialsWithExcessiveParametersNumber" } + ]},{ + name: "RecordingSchedulerTest", + object: new RecordingSchedulerTest(), + timer: 120000, + tests: [ + { + label: "Call method 'setRecord' in order to record current programme.", + method: "testRecordCurrentProgramme" + } ] }], init: function() { + this.animation = { + i: 1, + start: true, + intervalID: 0 + }; }, runAll: function() { @@ -729,21 +743,24 @@ var result = false; var promiseTest = new Promise(function(resolve, reject) { try { - timeout(5000) + timeout(object.timer || 5000) .then(reject.bind(null, "No result returned.")) .then(function() { !result + && self.stopAnimationInProgress(currentTest) && 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); + self.startAnimationInProgress(currentTest); } catch (error) { reject(error); } }) .then(function(val) { + self.stopAnimationInProgress(currentTest); result = true; console.groupEnd(currentTest["label"]); var timeEnd = new Date(); @@ -752,6 +769,7 @@ object.afterTest && object.afterTest(); }) .catch(function(val) { + self.stopAnimationInProgress(currentTest); self.currentResult && self.currentResult.failed++; result = true; console.log(val); @@ -774,6 +792,35 @@ document.getElementById(currentTest["method"] + "Result").textContent = message || "Error"; document.getElementById(currentTest["method"] + "Result").style.backgroundColor = "red"; document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; + }, + + startAnimationInProgress: function(currentTest) { + var self = this; + + self.animation.intervalID = setInterval(function() { + var currentTestResult = document + .getElementById(currentTest["method"] + "Result"); + + if((self.animation.i%6) == 0) { + currentTestResult.textContent = "*"; + self.animation.i = 1; + } else { + if (self.animation.start) { + currentTestResult.textContent = "*"; + self.animation.start = false; + } else { + currentTestResult.textContent += "*"; + } + console.log("Test in progress"); + self.animation.i++; + } + + }, 500); + }, + + stopAnimationInProgress: function(object, currentTest) { + + clearInterval(this.animation.intervalID); } });

1 0

r1318 - in wit: . js
by jruchaud＠users.nuiton.org 01 May '15

01 May '15

Author: jruchaud Date: 2015-05-01 13:57:43 +0000 (Fri, 01 May 2015) New Revision: 1318 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1318 Log: Fix create x11 client each second Modified: wit/activityChange.html wit/js/main.js Modified: wit/activityChange.html =================================================================== --- wit/activityChange.html 2015-05-01 13:34:37 UTC (rev 1317) +++ wit/activityChange.html 2015-05-01 13:57:43 UTC (rev 1318) @@ -1,6 +1,6 @@ <html> <head> - <title>WIT idle</title> + <title>WIT activity</title> <link rel="stylesheet" href="./node_modules/bootstrap/dist/css/bootstrap.min.css"> <style> Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-05-01 13:34:37 UTC (rev 1317) +++ wit/js/main.js 2015-05-01 13:57:43 UTC (rev 1318) @@ -125,6 +125,9 @@ popups.push(window); window.on('close', function() { + this.hide(); // Pretend to be closed already +// this.close(true); + popups.splice(popups.indexOf(window), 1); if (!popups.length) {

1 0

r1317 - wit/js/services
by jruchaud＠users.nuiton.org 01 May '15

01 May '15

Author: jruchaud Date: 2015-05-01 13:34:37 +0000 (Fri, 01 May 2015) New Revision: 1317 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1317 Log: Fix diff when you reassign time Modified: wit/js/services/TimerService.js Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-05-01 09:43:29 UTC (rev 1316) +++ wit/js/services/TimerService.js 2015-05-01 13:34:37 UTC (rev 1317) @@ -52,7 +52,15 @@ }; exports.start = function() { - time = time || new Date(); + + // Come from to keep idle + if (time) { + var diff = moment(idleTime).diff(moment(time)); + time = moment().subtract(diff, "ms").toDate(); + } else { + time = new Date(); + } + idleTime = null; historyIndex = -1; @@ -143,14 +151,15 @@ time = null; idleTime = null; - clearTimeout(timeChangeTimer); - eventEmitter.emit('onTimeChanged'); + timeChange(); + + exports.start(); }; exports.editTime = function(value) { if (time) { var d = moment.duration(value); - idleTime = moment(time).add(d.asMilliseconds(), "ms").toDate(); + idleTime = moment().subtract(d.asMilliseconds(), "ms").toDate(); this.reassignIdle(); } }; @@ -162,6 +171,7 @@ exports.reassignTimeFrom = function (newStartTime) { insertLog(tags, time, newStartTime); time = newStartTime; + idleTime = new Date(); clearTimeout(timeChangeTimer); eventEmitter.emit('onTimeChanged');

1 0

r1316 - wit/css
by jruchaud＠users.nuiton.org 01 May '15

01 May '15

Author: jruchaud Date: 2015-05-01 09:43:29 +0000 (Fri, 01 May 2015) New Revision: 1316 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1316 Log: Modify size Modified: wit/css/timeline.less Modified: wit/css/timeline.less =================================================================== --- wit/css/timeline.less 2015-05-01 09:10:47 UTC (rev 1315) +++ wit/css/timeline.less 2015-05-01 09:43:29 UTC (rev 1316) @@ -1,5 +1,5 @@ -@timelineDefaultWidth: 100%; -@timelineDefaultHeight: 50px; +@timelineDefaultWidth: 419px; +@timelineDefaultHeight: 30px; .timeline { @@ -10,7 +10,7 @@ width: @timelineDefaultWidth; height: @timelineDefaultHeight; - + background: red; .slice {

1 0

r1315 - wit/js/components
by jruchaud＠users.nuiton.org 01 May '15

01 May '15

Author: jruchaud Date: 2015-05-01 09:10:47 +0000 (Fri, 01 May 2015) New Revision: 1315 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1315 Log: Fix error on click Modified: wit/js/components/FilterLogs.js Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-05-01 09:08:43 UTC (rev 1314) +++ wit/js/components/FilterLogs.js 2015-05-01 09:10:47 UTC (rev 1315) @@ -88,7 +88,7 @@ onLogDetails: function (e) { var nodeId = e.target.dataset.id; - React.findDOMNode(this.refs[nodeId]).classList.toggle("hidden"); + nodeId && React.findDOMNode(this.refs[nodeId]).classList.toggle("hidden"); }, mail: function(content) {

1 0