diff --git a/src/services/time-slots-service.js b/src/services/time-slots-service.js index dfb53a9..849470e 100644 --- a/src/services/time-slots-service.js +++ b/src/services/time-slots-service.js @@ -325,6 +325,9 @@ module.exports = async( programs, schedule ) => { } } + if (ts > t0) { + pushFlex( ts - t0 ); + } while ( (t < hardLimit) && (p.length < LIMIT) ) { await throttle(); //ensure t is padded diff --git a/web/controllers/guide.js b/web/controllers/guide.js index 1cbbb75..aa65776 100644 --- a/web/controllers/guide.js +++ b/web/controllers/guide.js @@ -340,6 +340,7 @@ module.exports = function ($scope, $timeout, dizquetv) { } } + $scope.adjustZoom(); $scope.refresh(); $scope.checkUpdates = async () => { diff --git a/web/directives/channel-config.js b/web/directives/channel-config.js index 8f15518..2dc63a4 100644 --- a/web/directives/channel-config.js +++ b/web/directives/channel-config.js @@ -397,9 +397,8 @@ module.exports = function ($timeout, $location, dizquetv, resolutionOptions) { adjustStartTimeToCurrentProgram(); updateChannelDuration(); } - scope.removeDuplicates = () => { + let removeDuplicatesSub = (progs) => { let tmpProgs = {} - let progs = scope.channel.programs for (let i = 0, l = progs.length; i < l; i++) { if ( progs[i].type ==='redirect' ) { tmpProgs['_redirect ' + progs[i].channel + ' _ '+ progs[i].duration ] = progs[i]; @@ -414,7 +413,10 @@ module.exports = function ($timeout, $location, dizquetv, resolutionOptions) { for (let i = 0, l = keys.length; i < l; i++) { newProgs.push(tmpProgs[keys[i]]) } - scope.channel.programs = newProgs + return newProgs; + } + scope.removeDuplicates = () => { + scope.channel.programs = removeDuplicatesSub(scope.channel.programs); updateChannelDuration(); //oops someone forgot to add this } scope.removeOffline = () => { @@ -1880,10 +1882,12 @@ module.exports = function ($timeout, $location, dizquetv, resolutionOptions) { scope.onTimeSlotsButtonClick = () => { - scope.timeSlots.startDialog(scope.channel.programs, scope.maxSize, scope.channel.scheduleBackup ); + let progs = removeDuplicatesSub( scope.channel.programs ); + scope.timeSlots.startDialog( progs, scope.maxSize, scope.channel.scheduleBackup ); } scope.onRandomSlotsButtonClick = () => { - scope.randomSlots.startDialog(scope.channel.programs, scope.maxSize, scope.channel.randomScheduleBackup ); + let progs = removeDuplicatesSub( scope.channel.programs ); + scope.randomSlots.startDialog(progs, scope.maxSize, scope.channel.randomScheduleBackup ); } scope.logoOnChange = (event) => { diff --git a/web/public/index.html b/web/public/index.html index 360b80c..b39f56d 100644 --- a/web/public/index.html +++ b/web/public/index.html @@ -12,7 +12,7 @@ -
+

dizqueTV @@ -27,7 +27,7 @@ - + diff --git a/web/public/templates/channel-config.html b/web/public/templates/channel-config.html index d0a655d..dd7f5d0 100644 --- a/web/public/templates/channel-config.html +++ b/web/public/templates/channel-config.html @@ -311,7 +311,7 @@ Add Flex...

-

Programs a Flex time slot. Normally you't use pad times, restrict times or add breaks to add a large quantity of Flex times at once, but this exists for more specific cases.

+

Programs a Flex time slot. Normally you'd use pad times, restrict times or add breaks to add a large quantity of Flex times at once, but this exists for more specific cases.