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

r1734 - oipf/lib/js/utils
by ygrego＠users.nuiton.org June 17, 2015

June 17, 2015

Author: ygrego Date: 2015-06-17 14:58:07 +0000 (Wed, 17 Jun 2015) New Revision: 1734 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1734 Log: Addition of goods indentations. Modified: oipf/lib/js/utils/ProgrammeHelper.js Modified: oipf/lib/js/utils/ProgrammeHelper.js =================================================================== --- oipf/lib/js/utils/ProgrammeHelper.js 2015-06-17 14:53:28 UTC (rev 1733) +++ oipf/lib/js/utils/ProgrammeHelper.js 2015-06-17 14:58:07 UTC (rev 1734) @@ -87,7 +87,7 @@ return this.channelService.getADvbTChannel(name); } - transformInDateObject(wrongDateFormat) { + transformToDateObject(wrongDateFormat) { var pattern = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\s\+(\d{2})/; var tmpDate = wrongDateFormat; @@ -100,12 +100,13 @@ var mins = parseInt(tmpDate[5]); var secs = parseInt(tmpDate[6]); - var actualDate = new Date(year, month, day, hs, mins, secs); - return actualDate; + var date = new Date(year, month, day, hs, mins, secs); + + return date; } transformInSecondSince01011970(wrongDateFormat) { - return this.transformInDateObject(wrongDateFormat).getTime() / 1000; + return this.transformToDateObject(wrongDateFormat).getTime() / 1000; } minutesToSeconds(minutes) {

1 0

r1733 - oipf/lib/js/utils
by ygrego＠users.nuiton.org June 17, 2015

June 17, 2015

Author: ygrego Date: 2015-06-17 14:53:28 +0000 (Wed, 17 Jun 2015) New Revision: 1733 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1733 Log: Avoid to parse xml comment. Modified: oipf/lib/js/utils/XmlToJson.js Modified: oipf/lib/js/utils/XmlToJson.js =================================================================== --- oipf/lib/js/utils/XmlToJson.js 2015-06-17 14:38:01 UTC (rev 1732) +++ oipf/lib/js/utils/XmlToJson.js 2015-06-17 14:53:28 UTC (rev 1733) @@ -28,7 +28,7 @@ return null; } - this.rootsNode = this.xmlDocument.firstChild; + this.rootsNode = this.xmlDocument.firstElementChild; //We already know that document contains at least one child. var rootsName = this.rootsNode.nodeName;

1 0

r1732 - oipf/lib/js/utils
by ygrego＠users.nuiton.org June 17, 2015

June 17, 2015

Author: ygrego Date: 2015-06-17 14:38:01 +0000 (Wed, 17 Jun 2015) New Revision: 1732 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1732 Log: Avoid getting xml comment node. Modified: oipf/lib/js/utils/ProgrammeHelper.js Modified: oipf/lib/js/utils/ProgrammeHelper.js =================================================================== --- oipf/lib/js/utils/ProgrammeHelper.js 2015-06-17 11:42:06 UTC (rev 1731) +++ oipf/lib/js/utils/ProgrammeHelper.js 2015-06-17 14:38:01 UTC (rev 1732) @@ -15,19 +15,19 @@ }; this.channelNameMap = { - "ART1.kazer.org" : "ARTE", - "EUR2.kazer.org" : "D17", - "FRA2.kazer.org" : "FRANCE_2", - "FRA3.kazer.org" : "FRANCE_3", - "FRA4.kazer.org" : "FRANCE_4", - "FRA5.kazer.org" : "FRANCE_5", - "M61.kazer.org" : "M6", - "NRJ1.kazer.org" : "NRJ_12", - "NT11.kazer.org" : "NT1", - "RTL2.kazer.org" : "RTL9", - "TF11.kazer.org" : "TF1", - "TMC1.kazer.org" : "TMC", - "W91.kazer.org" : "W9" + "ART1.kazer.org": "ARTE", + "EUR2.kazer.org": "D17", + "FRA2.kazer.org": "FRANCE_2", + "FRA3.kazer.org": "FRANCE_3", + "FRA4.kazer.org": "FRANCE_4", + "FRA5.kazer.org": "FRANCE_5", + "M61.kazer.org": "M6", + "NRJ1.kazer.org": "NRJ_12", + "NT11.kazer.org": "NT1", + "RTL2.kazer.org": "RTL9", + "TF11.kazer.org": "TF1", + "TMC1.kazer.org": "TMC", + "W91.kazer.org": "W9" }; this.programmes = null; @@ -87,29 +87,25 @@ return this.channelService.getADvbTChannel(name); } - transformToActualDate(wrongDateFormat) { + transformInDateObject(wrongDateFormat) { var pattern = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\s\+(\d{2})/; var tmpDate = wrongDateFormat; tmpDate = pattern.exec(tmpDate); - var dateTmp = new Date(); - /*year = parseInt(tmpSSTime[1]); - month = parseInt(tmpSSTime[2]); - day = parseInt(tmpSSTime[3]);*/ - var year = dateTmp.getFullYear(); - var month = dateTmp.getUTCMonth(); - var day = dateTmp.getUTCDate(); + var year = parseInt(tmpDate[1]); + var month = parseInt(tmpDate[2]); + var day = parseInt(tmpDate[3]); var hs = parseInt(tmpDate[4]); var mins = parseInt(tmpDate[5]); var secs = parseInt(tmpDate[6]); - var actualDate = new Date(year, month, day, hs, mins, secs); + var actualDate = new Date(year, month, day, hs, mins, secs); return actualDate; } transformInSecondSince01011970(wrongDateFormat) { - return this.transformToActualDate(wrongDateFormat).getTime() / 1000; + return this.transformInDateObject(wrongDateFormat).getTime() / 1000; } minutesToSeconds(minutes) {

1 0

r1731 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org June 17, 2015

June 17, 2015

Author: ygrego Date: 2015-06-17 11:42:06 +0000 (Wed, 17 Jun 2015) New Revision: 1731 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1731 Log: Manage the information of current channel set in emulator and the channel switching. Modified: oipf/emulator/js/contollers/RemoteControlControllers.js Modified: oipf/emulator/js/contollers/RemoteControlControllers.js =================================================================== --- oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-16 15:35:00 UTC (rev 1730) +++ oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-17 11:42:06 UTC (rev 1731) @@ -133,3 +133,15 @@ }); }]); + +RemoteControlControllers.controller("VideoBroadcastController", + ["$rootScope", "$scope", "ConfigurationService", function($rootScope, $scope, ConfigurationService) { + + +}]); + +RemoteControlControllers.controller("PanelChannelController", + ["$rootScope", "$scope", function($rootScope, $scope) { + $scope.isRequired = false; +}]); +

1 0

r1730 - oipf/emulator/js/services
by ygrego＠users.nuiton.org June 16, 2015

June 16, 2015

Author: ygrego Date: 2015-06-16 15:35:00 +0000 (Tue, 16 Jun 2015) New Revision: 1730 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1730 Log: The objects created must be returned. Modified: oipf/emulator/js/services/OIPFServices.js Modified: oipf/emulator/js/services/OIPFServices.js =================================================================== --- oipf/emulator/js/services/OIPFServices.js 2015-06-16 15:28:55 UTC (rev 1729) +++ oipf/emulator/js/services/OIPFServices.js 2015-06-16 15:35:00 UTC (rev 1730) @@ -2,13 +2,16 @@ OIPFServices.factory("ChannelConfigService", function() { return oipfObjectFactory.createChannelConfig(); -}) -.factory("SearchManagerService", function() { - oipfObjectFactory.createSearchManagerObject(); -}) -.factory("ConfigurationService", function() { - oipfObjectFactory.createConfigurationObject(); -}) -.factory("RecordingSchedulerService", function() { - oipfObjectFactory.createRecordingSchedulerObject(); }); + +OIPFServices.factory("SearchManagerService", function() { + return oipfObjectFactory.createSearchManagerObject(); +}); + +OIPFServices.factory("ConfigurationService", function() { + return oipfObjectFactory.createConfigurationObject.bind(oipfObjectFactory); +}); + +OIPFServices.factory("RecordingSchedulerService", function() { + return oipfObjectFactory.createRecordingSchedulerObject(); +});

1 0

r1729 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org June 16, 2015

June 16, 2015

Author: ygrego Date: 2015-06-16 15:28:55 +0000 (Tue, 16 Jun 2015) New Revision: 1729 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1729 Log: The power state of emulator must be managed by a distinct controller. Modified: oipf/emulator/js/contollers/RemoteControlControllers.js Modified: oipf/emulator/js/contollers/RemoteControlControllers.js =================================================================== --- oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-16 10:38:11 UTC (rev 1728) +++ oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-16 15:28:55 UTC (rev 1729) @@ -6,25 +6,16 @@ var RemoteControlControllers = angular.module('RemoteControlControllers', []); RemoteControlControllers.controller('RemoteControlController', - ['$scope', '$http', '$timeout', function ($scope, $http, $timeout) { + ['$rootScope', '$scope', '$http', '$timeout', function ($rootScope, $scope, $http, $timeout) { + $http.get('./emulator/remoteControl/remoteControl.json').success(function(data) { $scope.remoteControl = data; }); - $scope.clickMapping = { - "POWER": "setEmulatorON", - "0": "setChannelByNumber", - "1": "setChannelByNumber", - "2": "setChannelByNumber", - "3": "setChannelByNumber", - "4": "setChannelByNumber", - "5": "setChannelByNumber", - "6": "setChannelByNumber", - "7": "setChannelByNumber", - "8": "setChannelByNumber", - "9": "setChannelByNumber", - "V+": "setVolume", - "V-": "setVolume", + $scope.remoteControlClick = function(buttonId) { + var methodName = $scope.clickMapping[buttonId]; + console.log("methodName:", methodName, $scope[methodName]); + methodName && $scope[methodName].call($scope, buttonId); }; $scope.state = 'OFF'; @@ -32,16 +23,33 @@ $scope.channelNumber = ""; $scope.channelNumberActive = false; $scope.volumeViewActive = false; - $scope.emulatorON = false; + $rootScope.powerChange = false; $scope.currentVolume = 50; $scope.setSate = function() { }; - $scope.setEmulatorON = function() { - $scope.emulatorON = !$scope.emulatorON; + $scope.setPowerChange = function() { + $rootScope.powerChange = !$rootScope.powerChange; + console.log($rootScope.powerChange); }; + $scope.clickMapping = { + "POWER": "setPowerChange", + "0": "setChannelByNumber", + "1": "setChannelByNumber", + "2": "setChannelByNumber", + "3": "setChannelByNumber", + "4": "setChannelByNumber", + "5": "setChannelByNumber", + "6": "setChannelByNumber", + "7": "setChannelByNumber", + "8": "setChannelByNumber", + "9": "setChannelByNumber", + "V+": "setVolume", + "V-": "setVolume" + }; + $scope.setChannelByNumber = function(buttonId) { $scope.channelNumberActive = true; @@ -67,13 +75,61 @@ $scope.volumeViewActive = false; }, 3000); }; +}]); - $scope.remoteControlClick = function(buttonId) { - var methodName = $scope.clickMapping[buttonId]; - console.log("methodName:", methodName, $scope[methodName]); - methodName && $scope[methodName].call($scope, buttonId); - }; - }]); +RemoteControlControllers.controller("PowerStateController", + ["$rootScope", "$scope", "ConfigurationService", function($rootScope, $scope, ConfigurationService) { + $scope.onStarting = true; + $scope.videoStyle = "off"; + $scope.configurationService = ConfigurationService(); + + $scope.configurationService.localSystem.onPowerStateChange = function(state) { + if ($scope.waitingState == state && $scope.result) { + if (state == 0) { + + console.log("POWER STATE CHANGE: OFF."); + $scope.videoStyle = "off"; + + } else { + + console.log("POWER STATE CHANGE: ON."); + $scope.videoStyle = "on"; + + } + } else { + + console.log("POWER STATE CHANGE: ERROR."); + + } + $scope.$apply(); + + console.groupEnd("PowerStateController"); + }; + + $rootScope.$watch("powerChange", function() { + + if (!$scope.onStarting) { + console.group("PowerStateController"); + console.log("The power state will change."); + + if ($scope.configurationService.localSystem.powerState == 0) { + + $scope.waitingState = 1; + $scope.result = $scope.configurationService.localSystem.setPowerState(1); + + } else if ($scope.configurationService.localSystem.powerState == 1) { + + $scope.waitingState = 0; + $scope.result = $scope.configurationService.localSystem.setPowerState(0); + } + } else { + $scope.onStarting = false; + } + + + }); + +}]);

1 0

r1728 - oipf/lib/configuration
by ygrego＠users.nuiton.org June 16, 2015

June 16, 2015

Author: ygrego Date: 2015-06-16 10:38:11 +0000 (Tue, 16 Jun 2015) New Revision: 1728 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1728 Log: Be consistent about emulator. Modified: oipf/lib/configuration/ConfigDefaultProperties.js Modified: oipf/lib/configuration/ConfigDefaultProperties.js =================================================================== --- oipf/lib/configuration/ConfigDefaultProperties.js 2015-06-15 12:27:23 UTC (rev 1727) +++ oipf/lib/configuration/ConfigDefaultProperties.js 2015-06-16 10:38:11 UTC (rev 1728) @@ -116,7 +116,7 @@ oipfProfile: null, pvrEnabled: true, //This property is deprecated. ciplusEnabled: false, - powerState: 1, + powerState: 0, previousPowerState: 0, timeCurrentPowerState: new Date().getTime(), volume: 0,

1 0

r1727 - in oipf/emulator/js: . services
by ygrego＠users.nuiton.org June 15, 2015

June 15, 2015

Author: ygrego Date: 2015-06-15 12:27:23 +0000 (Mon, 15 Jun 2015) New Revision: 1727 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1727 Log: The objects declared in the factory oipf must be transformed in service for the emulator. Added: oipf/emulator/js/services/ oipf/emulator/js/services/OIPFServices.js Added: oipf/emulator/js/services/OIPFServices.js =================================================================== --- oipf/emulator/js/services/OIPFServices.js (rev 0) +++ oipf/emulator/js/services/OIPFServices.js 2015-06-15 12:27:23 UTC (rev 1727) @@ -0,0 +1,14 @@ +var OIPFServices = angular.module("OIPFServices", []); + +OIPFServices.factory("ChannelConfigService", function() { + return oipfObjectFactory.createChannelConfig(); +}) +.factory("SearchManagerService", function() { + oipfObjectFactory.createSearchManagerObject(); +}) +.factory("ConfigurationService", function() { + oipfObjectFactory.createConfigurationObject(); +}) +.factory("RecordingSchedulerService", function() { + oipfObjectFactory.createRecordingSchedulerObject(); +});

1 0

r1726 - oipf/emulator/view
by ygrego＠users.nuiton.org June 15, 2015

June 15, 2015

Author: ygrego Date: 2015-06-15 12:25:20 +0000 (Mon, 15 Jun 2015) New Revision: 1726 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1726 Log: Make accessible the module OIPFServices. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-06-15 12:23:17 UTC (rev 1725) +++ oipf/emulator/view/index.html 2015-06-15 12:25:20 UTC (rev 1726) @@ -16,6 +16,7 @@ <script src="./emulator/node_modules/angular/angular.js"></script> <script src="./emulator/js/filters/VolumeFilter.js"></script> <script src="./emulator/js/contollers/RemoteControlControllers.js"></script> + <script src="./emulator/js/services/OIPFServices.js"></script> <script src="./emulator/js/emulator.js"></script> </head>

1 0

r1725 - oipf/emulator/js
by ygrego＠users.nuiton.org June 15, 2015

June 15, 2015

Author: ygrego Date: 2015-06-15 12:23:17 +0000 (Mon, 15 Jun 2015) New Revision: 1725 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1725 Log: Make accessible the services declared in module OIPFServices. Modified: oipf/emulator/js/emulator.js Modified: oipf/emulator/js/emulator.js =================================================================== --- oipf/emulator/js/emulator.js 2015-06-15 10:51:32 UTC (rev 1724) +++ oipf/emulator/js/emulator.js 2015-06-15 12:23:17 UTC (rev 1725) @@ -1,9 +1,10 @@ -/* - * +/* + * */ -var emulatorApplication = angular.module('emulatorApplication', +var emulatorApplication = angular.module('emulatorApplication', [ - 'RemoteControlControllers', + "OIPFServices", + 'RemoteControlControllers', 'VolumeFilter' ]);

1 0