player2 reboot support and issue #160 fixed

colloqi · Jul 26, 2022 · f49cc58 · f49cc58
1 parent 8ff4b0d
commit f49cc58
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/app/controllers/players.js b/app/controllers/players.js
@@ -167,7 +167,7 @@ var sendConfig = function (player, group, periodic) {
     retObj.imageLetterboxed = group.imageLetterboxed || false;
     retObj.brightness = group.brightness || { defaults: { control: 'None', level: 'Bright' }, schedule: [] };
     retObj.sleep = group.sleep || {enable: false, ontime: null , offtime: null };
-    retObj.reboot = group.reboot || {enable: false, time: null };
+    retObj.reboot = group.reboot || {enable: false, time: null,absoluteTime: null };
     retObj.signageBackgroundColor =  group.signageBackgroundColor || "#000";
     retObj.omxVolume = (group.omxVolume || group.omxVolume == 0)?group.omxVolume:100;
     retObj.timeToStopVideo = group.timeToStopVideo || 0;

diff --git a/app/models/group.js b/app/models/group.js
@@ -49,7 +49,8 @@ var GroupSchema = new Schema({
                                 offtime: {type: String}
     },
     reboot:                 {   enable: {type: Boolean,default: false},
-                                time: { type: String}
+                                time: { type: String},
+                                absoluteTime: { type: String}
                             },
     kioskUi:                {   enable: {type: Boolean,default: false},
                                 url:        {type: String},

diff --git a/config/env/development.js b/config/env/development.js
@@ -5,6 +5,7 @@ module.exports = {
     https: false,
     port: process.env.PORT || 3000,
     mongo: {
-        uri: 'mongodb://127.0.0.1:27017/pisignage-server-dev'
+        uri: process.env.MONGOLAB_URI ||
+            'mongodb://127.0.0.1:27017/pisignage-server-dev'
     }
 };
diff --git a/config/env/production.js b/config/env/production.js
@@ -5,6 +5,7 @@ module.exports = {
     https: false,
     port: process.env.PORT || 3000,
     mongo: {
-        uri: 'mongodb://127.0.0.1:27017/pisignage-server-dev'
+        uri: process.env.MONGOLAB_URI ||
+            'mongodb://mongo:27017/pisignage-server-dev'
     }
 };
diff --git a/public/app/js/controllers/groups.js b/public/app/js/controllers/groups.js
@@ -559,6 +559,7 @@ angular.module('piGroups.controllers', [])
 
             $scope.displayModal.close();
             var minutes,hours;
+            var rebootMinutes, rebootHours;
             if ($scope.tempPopup.sleep && $scope.tempPopup.sleep.ontimeObj) {
                 hours = $scope.tempPopup.sleep.ontimeObj.getHours()
                 $scope.group.selectedGroup.sleep.ontime = (hours < 10)?("0"+hours):(""+hours);
@@ -572,6 +573,13 @@ angular.module('piGroups.controllers', [])
                 $scope.group.selectedGroup.offtime += (minutes < 10)?(":0"+minutes):":"+minutes;
             }
 
+            if($scope.tempPopup.reboot && $scope.tempPopup.reboot.time){
+                rebootHours = $scope.tempPopup.reboot.time.getHours()
+                $scope.group.selectedGroup.reboot.absoluteTime = (rebootHours < 10)?("0"+rebootHours):(""+rebootHours);
+                rebootMinutes = $scope.tempPopup.reboot.time.getMinutes();
+                $scope.group.selectedGroup.reboot.absoluteTime += (rebootMinutes < 10)?(":0"+rebootMinutes):":"+rebootMinutes;
+            }
+
             switch ($scope.group.selectedGroup.imageSize) {
                 case 1:
                     $scope.group.selectedGroup.imageLetterboxed = true;