Erikdev ogapi2

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,16 +32,21 @@ 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();
 
     };
 
     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();
 
-} );
+} );
+
+// function init() {
+//
+//     ogAPI.init( {
+//         appType:       'tv',
+//         appName:       "io.ourglass.squares",
+//         modelCallback: modelUpdate
+//     } );
+//
+//     ogAPI.loadModel(); //this will automatically call the modelUpdate
+//
+// }
+//
+// init();

opp/io.ourglass.nowserving/app/control/index.html

@@ -13,7 +13,7 @@
 
     <!-- App Main and AngularJS Routes -->
     <script src="app/ogNowServingControlApp.module.js"></script>
-    <script src="../../../../common/js/ogAPI.js"></script>
+    <script src="../../../../common/js/ogAPI2.js"></script>
 
     <!-- Controllers -->
     <script src="app/components/controlscreen/controlscreen.controller.js"></script>

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();
 
 });
-

opp/io.ourglass.nowserving/app/tv/index.html

@@ -11,7 +11,7 @@
 
     <!-- App Main and AngularJS Routes -->
     <script src="app/ogNowServingApp.module.js"></script>
-    <script src="../../../../common/js/ogAPI.js"></script>
+    <script src="../../../../common/js/ogAPI2.js"></script>
 
     <!-- Controllers -->
     <script src="app/components/mainscreen/mainscreen.controller.js"></script>

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",

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();
 
-    } );
+    });

opp/io.ourglass.shuffleboard/app/control/index.html

@@ -13,7 +13,7 @@
 
     <!-- App Main and AngularJS Routes -->
     <script src="app/optvShuffConApp.module.js"></script>
-    <script src="../../../../common/js/ogAPI.js"></script>
+    <script src="../../../../common/js/ogAPI2.js"></script>
 
     <!-- Controllers -->
     <script src="app/components/shuffcon/ShuffconController.js"></script>

opp/io.ourglass.shuffleboard/app/tv/app/components/shuffleboard/ShuffleController.js

@@ -3,15 +3,14 @@
  */
 
 app.controller( "shuffleController",
-    function ($scope, $timeout, $http, $interval, ogTVModel, $log ) {
+    function ($scope, $timeout, $http, $interval, ogAPI, $log ) {
 
         console.log( "Loading shuffleController(TV)" );
 
         $scope.score = { red: 0, blue: 0, redHighlight: false, blueHighlight: false };
 
         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();
-
-
 
-    } );
+    });

opp/io.ourglass.shuffleboard/app/tv/index.html

@@ -13,7 +13,7 @@
 
   <!-- App Main and AngularJS Routes -->
   <script src="app/optvShuffleApp.module.js"></script>
-  <script src="../../../../common/js/ogAPI.js"></script>
+  <script src="../../../../common/js/ogAPI2.js"></script>
 
   <!-- Controllers -->
   <script src="app/components/shuffleboard/ShuffleController.js"></script>

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();
 
 }]);
 

opp/io.ourglass.waitinglist/app/tv/index.html

@@ -8,7 +8,7 @@
 
     <script src="../../../../common/bower_components/angular/angular.min.js"></script>
     <script src="../../../../common/bower_components/lodash/dist/lodash.min.js"></script>
-    <script src="../../../../common/js/ogAPI.js"></script>
+    <script src="../../../../common/js/ogAPI2.js"></script>
     <script src="../../../../common/bower_components/angular-animate/angular-animate.js"></script>
 
     <script src="app/optvWaitingList.module.js"></script>