diff --git a/opp/io.ourglass.nowserving/app/control/app/components/controlscreen/controlscreen.controller.js b/opp/io.ourglass.nowserving/app/control/app/components/controlscreen/controlscreen.controller.js
index db52806..b1b52d0 100644
--- a/opp/io.ourglass.nowserving/app/control/app/components/controlscreen/controlscreen.controller.js
+++ b/opp/io.ourglass.nowserving/app/control/app/components/controlscreen/controlscreen.controller.js
@@ -2,14 +2,14 @@
* Created by mkahn on 11/18/16.
*/
-app.controller( "ogNowServingController", function ( $scope, $log, ogControllerModel ) {
+app.controller( "ogNowServingController", function ( $scope, $log, ogAPI ) {
$log.debug( "loaded ogNowServingController" );
$scope.ticketNumber = 12456;
function saveModel() {
- ogControllerModel.save()
+ ogAPI.save()
.then( function ( response ) {
$log.debug( "Save was cool" );
} )
@@ -23,7 +23,7 @@ app.controller( "ogNowServingController", function ( $scope, $log, ogControllerM
$log.debug( "Clear pressed" );
$scope.ticketNumber = 0;
- ogControllerModel.model = {ticketNumber: 0};
+ ogAPI.model = { ticketNumber: 0 };
saveModel();
};
@@ -32,7 +32,7 @@ app.controller( "ogNowServingController", function ( $scope, $log, ogControllerM
$log.debug( "Increment pressed" );
$scope.ticketNumber += 1;
- ogControllerModel.model.ticketNumber = $scope.ticketNumber;
+ ogAPI.model.ticketNumber = $scope.ticketNumber;
saveModel();
};
@@ -40,8 +40,13 @@ app.controller( "ogNowServingController", function ( $scope, $log, ogControllerM
function initialize() {
$log.debug( "initializing app and data" );
- ogControllerModel.init( { appName: "io.ourglass.nowserving" } );
- ogControllerModel.loadModel()
+
+ ogAPI.init( {
+ appType: "mobile",
+ appName: "io.ourglass.nowserving"
+ });
+
+ ogAPI.loadModel()
.then( function ( latestData ) {
$scope.ticketNumber = latestData.ticketNumber;
} )
@@ -54,4 +59,18 @@ app.controller( "ogNowServingController", function ( $scope, $log, ogControllerM
initialize();
-} );
\ No newline at end of file
+} );
+
+// function init() {
+//
+// ogAPI.init( {
+// appType: 'tv',
+// appName: "io.ourglass.squares",
+// modelCallback: modelUpdate
+// } );
+//
+// ogAPI.loadModel(); //this will automatically call the modelUpdate
+//
+// }
+//
+// init();
\ No newline at end of file
diff --git a/opp/io.ourglass.nowserving/app/control/index.html b/opp/io.ourglass.nowserving/app/control/index.html
index 585d092..6ac368a 100644
--- a/opp/io.ourglass.nowserving/app/control/index.html
+++ b/opp/io.ourglass.nowserving/app/control/index.html
@@ -13,7 +13,7 @@
-
+
diff --git a/opp/io.ourglass.nowserving/app/tv/app/components/mainscreen/mainscreen.controller.js b/opp/io.ourglass.nowserving/app/tv/app/components/mainscreen/mainscreen.controller.js
index 0176d99..e8673e7 100644
--- a/opp/io.ourglass.nowserving/app/tv/app/components/mainscreen/mainscreen.controller.js
+++ b/opp/io.ourglass.nowserving/app/tv/app/components/mainscreen/mainscreen.controller.js
@@ -2,29 +2,26 @@
* Created by mkahn on 11/17/16.
*/
-app.controller("mainScreenController", function($scope, $log, ogTVModel, $interval){
+app.controller("mainScreenController", function($scope, $log, ogAPI){
$log.debug( "mainScreenController has loaded");
$scope.ticketNumber = 0;
- function modelChanged(newValue){
-
+ function modelChanged( newValue ){
$log.info( "Model changed, yay!" );
$scope.ticketNumber = newValue.ticketNumber;
$scope.$apply();
}
- function updateFromRemote() {
-
- ogTVModel.init( {
- appName: "io.ourglass.nowserving",
- dataCallback: modelChanged
- } );
-
+ function init() {
+ ogAPI.init( {
+ appType: "tv",
+ appName: "io.ourglass.nowserving",
+ modelCallback: modelChanged
+ });
}
- updateFromRemote();
+ init();
});
-
diff --git a/opp/io.ourglass.nowserving/app/tv/index.html b/opp/io.ourglass.nowserving/app/tv/index.html
index 0cccb60..fb6bfc5 100644
--- a/opp/io.ourglass.nowserving/app/tv/index.html
+++ b/opp/io.ourglass.nowserving/app/tv/index.html
@@ -11,7 +11,7 @@
-
+
diff --git a/opp/io.ourglass.nowserving/info/info.json b/opp/io.ourglass.nowserving/info/info.json
index 5756c3c..026d946 100644
--- a/opp/io.ourglass.nowserving/info/info.json
+++ b/opp/io.ourglass.nowserving/info/info.json
@@ -1,7 +1,7 @@
{
"appId": "io.ourglass.nowserving",
"appType": "widget",
- "appName": "NowServing",
+ "appName": "Now Serving",
"icon": "nowserve.png",
"iconLabel": "NowServing",
diff --git a/opp/io.ourglass.shuffleboard/app/control/app/components/shuffcon/ShuffconController.js b/opp/io.ourglass.shuffleboard/app/control/app/components/shuffcon/ShuffconController.js
index ac88e33..6ecc6ba 100644
--- a/opp/io.ourglass.shuffleboard/app/control/app/components/shuffcon/ShuffconController.js
+++ b/opp/io.ourglass.shuffleboard/app/control/app/components/shuffcon/ShuffconController.js
@@ -3,62 +3,51 @@
*/
app.controller( "shuffconController",
- function ($scope, $timeout, $http, $log, ogControllerModel, uibHelper ) {
+ function ($scope, $timeout, $http, $log, ogAPI, uibHelper ) {
$log.info( "Loading shuffconController" );
$scope.ui = { localRed: 0, localBlue: 0 };
function initialize() {
-
- ogControllerModel.init( {
- appName: "io.ourglass.shuffleboard",
+ ogAPI.init( {
+ appType: "mobile",
+ appName: "io.ourglass.shuffleboard"
// dataCallback: function(data){
// $log.debug("New data: "+data);
// }
} );
-
}
$scope.changeBlue = function ( by ) {
-
$scope.ui.localBlue += by;
if ( $scope.ui.localBlue < 0 ) $scope.ui.localBlue = 0;
- ogControllerModel.model.blue = $scope.ui.localBlue;
- ogControllerModel.save();
-
- }
+ ogAPI.model.blue = $scope.ui.localBlue;
+ ogAPI.save();
+ };
$scope.changeRed = function ( by ) {
$scope.ui.localRed += by;
if ( $scope.ui.localRed < 0 ) $scope.ui.localRed = 0;
- ogControllerModel.model.red = $scope.ui.localRed;
- ogControllerModel.save();
-
- }
+ ogAPI.model.red = $scope.ui.localRed;
+ ogAPI.save();
+ };
$scope.resetScores = function () {
uibHelper.confirmModal('Confirm','Are you sure you want to clear the scores?', true)
.then(function(){
- ogControllerModel.model.red = 0;
- ogControllerModel.model.blue = 0;
- ogControllerModel.save();
+ ogAPI.model.red = 0;
+ ogAPI.model.blue = 0;
+ ogAPI.save();
$scope.ui = { localRed: 0, localBlue: 0 };
})
-
-
- }
-
+ };
$scope.move = function () {
-
- ogControllerModel.move();
-
-
- }
-
+ ogAPI.move();
+ };
initialize();
- } );
+ });
diff --git a/opp/io.ourglass.shuffleboard/app/control/index.html b/opp/io.ourglass.shuffleboard/app/control/index.html
index 65c0ed6..26e5857 100644
--- a/opp/io.ourglass.shuffleboard/app/control/index.html
+++ b/opp/io.ourglass.shuffleboard/app/control/index.html
@@ -13,7 +13,7 @@
-
+
diff --git a/opp/io.ourglass.shuffleboard/app/tv/app/components/shuffleboard/ShuffleController.js b/opp/io.ourglass.shuffleboard/app/tv/app/components/shuffleboard/ShuffleController.js
index ba54702..982f24e 100644
--- a/opp/io.ourglass.shuffleboard/app/tv/app/components/shuffleboard/ShuffleController.js
+++ b/opp/io.ourglass.shuffleboard/app/tv/app/components/shuffleboard/ShuffleController.js
@@ -3,7 +3,7 @@
*/
app.controller( "shuffleController",
- function ($scope, $timeout, $http, $interval, ogTVModel, $log ) {
+ function ($scope, $timeout, $http, $interval, ogAPI, $log ) {
console.log( "Loading shuffleController(TV)" );
@@ -11,7 +11,6 @@ app.controller( "shuffleController",
var _remoteScore = {};
-
function updateLocalScore() {
var animRed = $scope.score.red != _remoteScore.red;
@@ -39,23 +38,16 @@ app.controller( "shuffleController",
updateLocalScore();
-
}
-
function updateFromRemote() {
-
- ogTVModel.init( {
- appName: "io.ourglass.shuffleboard",
- dataCallback: modelUpdate
- } );
-
+ ogAPI.init( {
+ appType: "tv",
+ appName: "io.ourglass.shuffleboard",
+ modelCallback: modelUpdate
+ });
}
- // Honk Hionk beep!
-
updateFromRemote();
-
-
- } );
+ });
diff --git a/opp/io.ourglass.shuffleboard/app/tv/index.html b/opp/io.ourglass.shuffleboard/app/tv/index.html
index d5b804d..971fe20 100644
--- a/opp/io.ourglass.shuffleboard/app/tv/index.html
+++ b/opp/io.ourglass.shuffleboard/app/tv/index.html
@@ -13,7 +13,7 @@
-
+
diff --git a/opp/io.ourglass.waitinglist/app/tv/app/components/WaitingListController.js b/opp/io.ourglass.waitinglist/app/tv/app/components/WaitingListController.js
index e094ec9..572c7de 100644
--- a/opp/io.ourglass.waitinglist/app/tv/app/components/WaitingListController.js
+++ b/opp/io.ourglass.waitinglist/app/tv/app/components/WaitingListController.js
@@ -10,14 +10,14 @@
// 'dateCreated': new Date()
// }
-app.controller('waitingListController', ['$scope', 'ogTVModel', '$log', '$timeout', function ($scope, ogTVModel, $log, $timeout) {
+app.controller('waitingListController', ['$scope', 'ogAPI', '$log', '$timeout', function ($scope, ogAPI, $log, $timeout) {
var TESTING = false;
$scope.parties = function() {
if (TESTING)
return parties;
- return ogTVModel.model.parties;
+ return ogAPI.model.parties;
};
@@ -84,22 +84,21 @@ app.controller('waitingListController', ['$scope', 'ogTVModel', '$log', '$timeou
function handleDataCallback(data) {
- if (data.length != ogTVModel.model.parties.length) {
- ogTVModel.model.parties = data.parties;
+ if (data.length != ogAPI.model.parties.length) {
+ ogAPI.model.parties = data.parties;
}
}
- function updateFromRemote() {
-
- ogTVModel.init({
+ function initalize() {
+ ogAPI.init({
+ appType: "tv",
appName: "io.ourglass.waitinglist",
- dataCallback: handleDataCallback
- });
+ modelCallback: handleDataCallback
+ });
+ ogAPI.loadModel();
}
-
- updateFromRemote();
-
+ initalize();
}]);
diff --git a/opp/io.ourglass.waitinglist/app/tv/index.html b/opp/io.ourglass.waitinglist/app/tv/index.html
index d46de56..f44d016 100644
--- a/opp/io.ourglass.waitinglist/app/tv/index.html
+++ b/opp/io.ourglass.waitinglist/app/tv/index.html
@@ -8,7 +8,7 @@
-
+