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

r1764 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org 07 Jul '15

07 Jul '15

Author: ygrego Date: 2015-07-07 09:31:42 +0000 (Tue, 07 Jul 2015) New Revision: 1764 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1764 Log: Become unnecessary. Removed: oipf/emulator/js/contollers/RemoteControlControllers.js Deleted: oipf/emulator/js/contollers/RemoteControlControllers.js =================================================================== --- oipf/emulator/js/contollers/RemoteControlControllers.js 2015-07-07 09:28:04 UTC (rev 1763) +++ oipf/emulator/js/contollers/RemoteControlControllers.js 2015-07-07 09:31:42 UTC (rev 1764) @@ -1,181 +0,0 @@ -/* - * 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 RemoteControlControllers = angular.module('RemoteControlControllers', []); - -RemoteControlControllers.controller('RemoteControlController', - ['$rootScope', '$scope', '$http', '$timeout', function ($rootScope, $scope, $http, $timeout) { - - $http.get('./emulator/remoteControl/remoteControl.json').success(function(data) { - $scope.remoteControl = data; - }); - - $scope.remoteControlClick = function(buttonId) { - var methodName = $scope.clickMapping[buttonId]; - console.log("methodName:", methodName, $scope[methodName]); - methodName && $scope[methodName].call($scope, buttonId); - }; - - $scope.channel = ""; - $scope.channelNumber = ""; - $scope.channelNumberActive = false; - $scope.volumeViewActive = false; - $rootScope.powerChange = false; - - $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" - }; - -}]); - - -RemoteControlControllers.controller("PowerStateController", - ["$rootScope", "$scope", "$timeout", "ConfigurationService", function($rootScope, $scope, $timeout, ConfigurationService) { - - $scope.onStarting = true; - $scope.state = "show"; - $scope.beforeON = false; - $rootScope.systemReady = false; - $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.state = "show"; - $rootScope.systemReady = false; - } else { - console.log("POWER STATE CHANGE: ON."); - $scope.state = "hidden"; - $rootScope.systemReady = true; - } - - } 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.beforeON = true; - $timeout(function() { - $scope.beforeON = false; - $scope.result = $scope.configurationService.localSystem.setPowerState(1); - }, 5000); - - - } else if ($scope.configurationService.localSystem.powerState == 1) { - - $scope.waitingState = 0; - $scope.result = $scope.configurationService.localSystem.setPowerState(0); - } - - } else { - $scope.onStarting = false; - } - - }); - -}]); - -RemoteControlControllers.controller("VideoBroadcastController", - ["$rootScope", "$scope", "$timeout", "VideoBroadcastService", function($rootScope, $scope, $timeout, VideoBroadcastService) { - - $scope.videoBroadcastService = VideoBroadcastService; - - $scope.currentVolume = 50; - $rootScope.channelInfo = false; - - $scope.setChannelByNumber = function(buttonId) { - $scope.channelNumberActive = true; - - if ($scope.channel.length == 0) { - $timeout(function() { - $scope.channel = $scope.channelNumber.toString(); - $scope.channelNumber = ""; - $scope.channelNumberActive = false; - }, 3000); - } - $scope.channelNumber += buttonId; - - }; - - $scope.setVolume = function(buttonId) { - $scope.volumeViewActive = true; - if (buttonId == "V+" && $scope.currentVolume < 100) { - $scope.currentVolume++; - } else if (buttonId == "V-" && $scope.currentVolume > 0) { - $scope.currentVolume--; - } - $timeout(function() { - $scope.volumeViewActive = false; - }, 3000); - }; - - $rootScope.$watch("systemReady", function(isReady) { - - if (isReady) { - console.group("VideoBroadcastController"); - console.log("System ready after power ON: active channel info view"); - $rootScope.channelInfo = true; - console.groupEnd("VideoBroadcastController"); - $timeout(function() { - $rootScope.channelInfo = false; - }, 4000); - } - - }); - -}]); - -RemoteControlControllers.controller("PanelChannelController", - ["$rootScope", "$scope", function($rootScope, $scope) { - $scope.isRequired = false; - - $rootScope.$watch("channelInfo", function(newInfo) { - console.group("PanelChannelController"); - if (newInfo) { - console.log("Panel channel info will be activated."); - $scope.isRequired = true; - - } else if (!newInfo) { - console.log("Panel channel info will be deactivated."); - $scope.isRequired = false; - } - console.groupEnd("PanelChannelController"); - }); - -}]); -

1 0

r1763 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org 07 Jul '15

07 Jul '15

Author: ygrego Date: 2015-07-07 09:28:04 +0000 (Tue, 07 Jul 2015) New Revision: 1763 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1763 Log: The name was not appropriated. Added: oipf/emulator/js/contollers/RemoteControlController.js Added: oipf/emulator/js/contollers/RemoteControlController.js =================================================================== --- oipf/emulator/js/contollers/RemoteControlController.js (rev 0) +++ oipf/emulator/js/contollers/RemoteControlController.js 2015-07-07 09:28:04 UTC (rev 1763) @@ -0,0 +1,57 @@ +/* + * 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. + */ +Controllers.controller("RemoteControlController", + ["$rootScope", "$scope", "$http", "VideoBroadcastService", function($rootScope, $scope, $http, VideoBroadcastService) { + + $http.get("./emulator/remoteControl/remoteControl.json").success(function(data) { + $scope.remoteControl = data; + }); + + $scope.remoteControlClick = function(buttonId) { + var methodName = $scope.clickMapping[buttonId]; + console.log("methodName:", methodName, $scope[methodName]); + methodName && $scope[methodName].call($scope, buttonId); + }; + + $scope.videoBroadcastService = VideoBroadcastService; + + $scope.channel = ""; + $scope.channelNumber = ""; + $scope.channelNumberActive = false; + $rootScope.channelChange = false; + + $scope.setPowerChange = function() { + $scope.$broadcast("PowerStateChangeEvent"); + }; + + $scope.setChannel = function(changeType) { + $scope.$broadcast("ChannelChangeEvent", changeType); + }; + + $scope.setVolume = function(changeType) { +// $rootScope.volumeChange = id; + $scope.$broadcast("VolumeEvent", changeType); + }; + + $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", + "P+": "setChannel", + "P-": "setChannel" + }; + +}]);

1 0

r1762 - oipf/emulator/js/filters
by ygrego＠users.nuiton.org 07 Jul '15

07 Jul '15

Author: ygrego Date: 2015-07-07 09:21:45 +0000 (Tue, 07 Jul 2015) New Revision: 1762 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1762 Log: Manage the stopping of volume. Modified: oipf/emulator/js/filters/VolumeFilter.js Modified: oipf/emulator/js/filters/VolumeFilter.js =================================================================== --- oipf/emulator/js/filters/VolumeFilter.js 2015-07-07 09:16:19 UTC (rev 1761) +++ oipf/emulator/js/filters/VolumeFilter.js 2015-07-07 09:21:45 UTC (rev 1762) @@ -1,14 +1,14 @@ -/* +/* * 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. */ -angular.module('VolumeFilter', []).filter('checkVolume', function() { +angular.module("VolumeFilter", []).filter("checkVolume", function() { return function(input) { if (input == 0) { - return '&#xe037'; + return "\uE037"; } - return '&#xe038'; + return "\uE038"; } });

1 0

r1761 - oipf/emulator/js
by ygrego＠users.nuiton.org 07 Jul '15

07 Jul '15

Author: ygrego Date: 2015-07-07 09:16:19 +0000 (Tue, 07 Jul 2015) New Revision: 1761 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1761 Log: A better organization of controllers. Modified: oipf/emulator/js/emulator.js Modified: oipf/emulator/js/emulator.js =================================================================== --- oipf/emulator/js/emulator.js 2015-07-07 08:15:38 UTC (rev 1760) +++ oipf/emulator/js/emulator.js 2015-07-07 09:16:19 UTC (rev 1761) @@ -1,10 +1,12 @@ /* * */ +var Controllers = angular.module("Controllers", []); + var emulatorApplication = angular.module('emulatorApplication', [ "OIPFServices", - 'RemoteControlControllers', + 'Controllers', 'VolumeFilter' ]);

1 0

r1760 - oipf/emulator/js/utils
by ygrego＠users.nuiton.org 07 Jul '15

07 Jul '15

Author: ygrego Date: 2015-07-07 08:15:38 +0000 (Tue, 07 Jul 2015) New Revision: 1760 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1760 Log: Know the running state of method. Modified: oipf/emulator/js/utils/Service.js Modified: oipf/emulator/js/utils/Service.js =================================================================== --- oipf/emulator/js/utils/Service.js 2015-07-06 14:46:39 UTC (rev 1759) +++ oipf/emulator/js/utils/Service.js 2015-07-07 08:15:38 UTC (rev 1760) @@ -12,6 +12,7 @@ var error = currentTransition.error; if (begin == this.previousState && end == newState && error == errorCode) { + console.log("Transition succeeded."); currentTransition.callback && currentTransition.callback(); this.previousState = newState; this.currentIndex++;

1 0

r1759 - oipf/emulator/view
by ＠users.nuiton.org 06 Jul '15

06 Jul '15

Author: Date: 2015-07-06 14:46:39 +0000 (Mon, 06 Jul 2015) New Revision: 1759 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1759 Log: Permit utilization of event dispatching for notify the remote control actions to controllers. Manage easier the display of channel information. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-06-22 11:36:30 UTC (rev 1758) +++ oipf/emulator/view/index.html 2015-07-06 14:46:39 UTC (rev 1759) @@ -14,54 +14,58 @@ <script src="./lib/build/oipf-lib.js" type="text/javascript"></script> <script src="./emulator/node_modules/angular/angular.js"></script> + <script src="./emulator/js/emulator.js"></script> <script src="./emulator/js/filters/VolumeFilter.js"></script> <script src="./emulator/js/utils/Service.js"></script> <script src="./emulator/js/services/OIPFServices.js"></script> - <script src="./emulator/js/contollers/RemoteControlControllers.js"></script> - <script src="./emulator/js/emulator.js"></script> + <script src="./emulator/js/contollers/RemoteControlController.js"></script> + <script src="./emulator/js/contollers/VideoBroadcastController.js"></script> + <script src="./emulator/js/contollers/PowerStateController.js"></script> + <script src="./emulator/js/contollers/PanelChannelController.js"></script> </head> <body> - <div class="container-fluid"> + <div class="container-fluid" ng-controller="RemoteControlController"> <div class="row"> <div id="emulator" class="col-md-9"> <div id="panelSwitching" ng-controller="PanelChannelController" ng-show="isRequired"> <div class="col-md-2"> - <img src="http://telepoche.guidetele.com/medias/chaines/tf1.png"/> + <img ng-src="{{chanLogo}}"/> </div> <div class="col-md-6"> <div> - efzefzefzefezfze + Toto TV </div> <div> - four-column layout + SÉRIE </div> </div> </div> - <div id="volumeView" class="text-center" ng-show="volumeViewActive"> - <div> - <h3> - <span class="label label-default"> - {{currentVolume}} - <span class="glyphicon glyphicon-volume-up"></span> - </span> - </h3> - <div class="progress"> - <div class="progress-bar" role="progressbar" aria-valuenow="0" - aria-valuemin="0" aria-valuemax="100" style="width:{{currentVolume}}%"> - </div> - </div> - </div> - </div> <div class="off" id="powerStateView" ng-controller="PowerStateController" ng-class="state"> <div id="imgChannel" ng-show="beforeON"> - <h1>Emulator</h1> + <h1>EMULATOR</h1> </div> </div> - <object class="ready" id="videoBroadcast" is="video-broadcast" ng-controller="VideoBroadcastController"> + <object id="videoBroadcast" is="video-broadcast" ng-controller="VideoBroadcastController"> + <img class="pull-right" ng-src="{{chanLogo}}"/> + <div id="volumeView" class="text-center" ng-show="volumeViewActive"> + <div> + <h3> + <span class="label label-default"> + {{currentVolume}} + <span class="glyphicon {{volumeClass}}"></span> + </span> + </h3> + <div class="progress"> + <div class="progress-bar" role="progressbar" aria-valuenow="0" + aria-valuemin="0" aria-valuemax="100" style="width:{{currentVolume}}%"> + </div> + </div> + </div> + </div> </object>  @@ -74,13 +78,13 @@ </div> - <div class="col-sm-2 col-sm-offset-1" ng-controller="RemoteControlController"> + <div class="col-md-2 col-sm-offset-1"> - <div class="panel panel-default"> + <div class="panel panel-default panel2"> <div class="panel-body"> <div class="row"> <div class="col-md-2 col-md-offset-2"> - <button type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('POWER')"> + <button id="marg" type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('POWER')"> <span class="glyphicon glyphicon-off"></span> </button> </div>

1 0

r1758 - oipf/lib/js/impl
by ygrego＠users.nuiton.org 22 Jun '15

22 Jun '15

Author: ygrego Date: 2015-06-22 11:36:30 +0000 (Mon, 22 Jun 2015) New Revision: 1758 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1758 Log: This property is useless. Modified: oipf/lib/js/impl/VideoBroadcastObject.js Modified: oipf/lib/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/lib/js/impl/VideoBroadcastObject.js 2015-06-22 09:50:14 UTC (rev 1757) +++ oipf/lib/js/impl/VideoBroadcastObject.js 2015-06-22 11:36:30 UTC (rev 1758) @@ -153,7 +153,6 @@ this._timerManager = new TimerManager(); this._timeout = this._timerManager.createTimer.bind(this._timerManager, 0); - this._timeoutLong = this._timerManager.createTimer.bind(this._timerManager, 100); } createdCallback() {

1 0

r1757 - oipf/lib/js/utils
by ygrego＠users.nuiton.org 22 Jun '15

22 Jun '15

Author: ygrego Date: 2015-06-22 09:50:14 +0000 (Mon, 22 Jun 2015) New Revision: 1757 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1757 Log: The value returned by these methods must be of type Integer. Modified: oipf/lib/js/utils/DateUtils.js Modified: oipf/lib/js/utils/DateUtils.js =================================================================== --- oipf/lib/js/utils/DateUtils.js 2015-06-22 09:45:13 UTC (rev 1756) +++ oipf/lib/js/utils/DateUtils.js 2015-06-22 09:50:14 UTC (rev 1757) @@ -14,7 +14,7 @@ } millisecondsToSeconds(timeInMilliseconds) { - return timeInMilliseconds / 1000; + return this.round(timeInMilliseconds / 1000); } nowInSeconds() { @@ -22,15 +22,19 @@ } secondsToMilliseconds(timeInSeconds) { - return timeInSeconds * 1000; + return this.round(timeInSeconds * 1000); } secondsToMinutes(timeInSeconds) { - return timeInSeconds / 60; + return this.round(timeInSeconds / 60); } yesterday() { return this._yesterday; } + round(time) { + return Math.round(time); + } + }

1 0

r1756 - oipf/test/js
by ygrego＠users.nuiton.org 22 Jun '15

22 Jun '15

Author: ygrego Date: 2015-06-22 09:45:13 +0000 (Mon, 22 Jun 2015) New Revision: 1756 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1756 Log: The title don't have to be inject in the body of test page at this moment. Modified: oipf/test/js/Test.js Modified: oipf/test/js/Test.js =================================================================== --- oipf/test/js/Test.js 2015-06-22 09:42:07 UTC (rev 1755) +++ oipf/test/js/Test.js 2015-06-22 09:45:13 UTC (rev 1756) @@ -978,10 +978,8 @@ } displayInLineArray() { - var content = "<div id='testsDisplay'>"; - content += "<div id='title'><h1>OIPF Tests</h1></div>"; - content += "<div id='testControllerDiv'>"; - content += "<div id='titleTestControllerDiv'><h4>All tests</h4></div>"; + var content = "<div id='testControllerDiv'>"; + content += "<div id='titleTestControllerDiv'><h4>All tests</h4></div>"; content += "<button id='runAllBtn'>Run All</button>"; content += "<button id='displayConfigBtn'>Hide/Show</button>"; content += "<div id='globalTestResultsDiv'>"; @@ -1034,7 +1032,6 @@ content += "</div>"; } content += "</div>"; - content += "</div>"; document.body.innerHTML += content; }

1 0

r1755 - oipf/test/view
by ygrego＠users.nuiton.org 22 Jun '15

22 Jun '15

Author: ygrego Date: 2015-06-22 09:42:07 +0000 (Mon, 22 Jun 2015) New Revision: 1755 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1755 Log: Te title must be there, it's not a variable part of test page. Modified: oipf/test/view/test.html Modified: oipf/test/view/test.html =================================================================== --- oipf/test/view/test.html 2015-06-22 08:16:07 UTC (rev 1754) +++ oipf/test/view/test.html 2015-06-22 09:42:07 UTC (rev 1755) @@ -101,5 +101,8 @@ </script> </head> <body onload="start()"> + <div id="title"> + <h1>OIPF Tests</h1> + </div> </body> </html>

1 0