organizando un solo display para el usuario

correasebastian · correasebastian · commit 110a413897cc · 2015-12-21T12:03:43.000-05:00
diff --git a/README.md b/README.md
@@ -18,4 +18,7 @@ birthdays.getChanges()
 
 a=birthdays.getChanges()
 [Object, Object]
-a.forEach(function(o,i){console.log(o)})
+a.forEach(function(o,i){console.log(o)})
+
+filter
+ <!-- | date:"dd MMMM yyyy" -->
diff --git a/www/index.html b/www/index.html
@@ -36,37 +36,37 @@ <h1 class="title">🎂  Birthdays  🎉</h1>
         <ion-content>
             <ion-toggle ng-model="vm.online" ng-click="vm.setOnline(vm.online)" toggle-class="toggle-calm">online</ion-toggle>
             <ion-list>
-                <div class="item item-divider">
+               <!--  <div class="item item-divider">
                     local
                 </div>
                 <ion-item ng-repeat="b in vm.birthdays" ng-click="vm.showEditBirthdayModal(b)">
                     <div style="float: left">{{ b.fbVal.Name }}</div>
                     <div style="float: right">{{ b.fbKey }}</div>
-                    <!-- | date:"dd MMMM yyyy" -->
+                   
                 </ion-item>
                 <div class="item item-divider">
                     temp
                 </div>
                 <ion-item ng-class="{ns:vm.isSync(b.$id)}" ng-repeat="b in vm.temp track by b.$id" ng-click="vm.showEditBirthdayModal(b)">
                     <div style="float: left">{{ b.Name }}</div>
                     <div style="float: right">{{ b.$id }}</div>
-                </ion-item>
+                </ion-item> -->
                 <div class="item item-divider">
                     emulate
                 </div>
-                <ion-item  ng-repeat="b in vm.birthdays track by b.$id" >
+                <ion-item  ng-class="{ns:vm.isSync(b.$id)}" ng-repeat="b in vm.emu track by b.$id" >
                     <div style="float: left">{{ b.Name }}</div>
                     <div style="float: right">{{ b.$id }}</div>
                 </ion-item>
-                <div class="item item-divider">
+                <!-- <div class="item item-divider">
                     firebase
                 </div>
                 <ion-item ng-class="{ns:vm.isSync(b.$id)}" ng-repeat="b in vm.fb" ng-click="vm.showEditBirthdayModal(b)">
                     <div style="float: left">{{ b.Name }}</div>
                     <div style="float: right">{{ b.$id }}</div>
-                </ion-item>
+                </ion-item> -->
             </ion-list>
-            <!-- {{vm.fb | json}} -->
+            <!-- {{vm.emu | json}} -->
             <!-- </br>
             {{vm.temp | json}} -->
         </ion-content>
diff --git a/www/js/birthday.service.js b/www/js/birthday.service.js
@@ -7,9 +7,11 @@ var db, birthdays, fbA, tm, temp;
         ]);
 
     function BirthdayService($q, Loki, $firebaseArray, $timeout, $interval, $ionicPlatform) {
-
+ 
 
         var _db;
+        tm=$timeout;
+
         var _birthdays;
         var _alreadyLoad = null;
         var _temp;
@@ -22,6 +24,7 @@ var db, birthdays, fbA, tm, temp;
         _bd.$loaded()
             .then(function(res) {
                 console.log('array loaded', res);
+                
             })
             .catch(function(err) {
                 console.log('cant loaded info from fb', err);
@@ -159,8 +162,6 @@ var db, birthdays, fbA, tm, temp;
                 var fbKey = obj.$id;
                 var objClone = angular.copy(obj);
 
-
-
                 if (delete objClone.$id && delete objClone.$loki) {
                     console.log('format obj', fbKey, objClone)
                     _bdRef.child(fbKey).set(objClone, syncCb(fbKey));
@@ -199,6 +200,7 @@ var db, birthdays, fbA, tm, temp;
                 .then(dbOK);
 
             function dbOK() {
+                // service.emu = _birthdays.data;
                 return _birthdays.data;
             }
         }
@@ -353,7 +355,8 @@ var db, birthdays, fbA, tm, temp;
 
         }
 
-        return {
+        var service = {
+            // emu: [],
             initDB: initDB,
             getAllBirthdays: getAllBirthdays,
             addBirthday: addBirthday,
@@ -365,5 +368,7 @@ var db, birthdays, fbA, tm, temp;
             getTempById: getTempById
 
         };
+
+        return service;
     }
 })();
diff --git a/www/js/overview.controller.js b/www/js/overview.controller.js
@@ -1,13 +1,18 @@
+var v, bs;
 (function() {
     angular.module('starter')
-        .controller('OverviewController', ['$scope', '$ionicModal', '$ionicPlatform', 'BirthdayService', OverviewController]);
+        .controller('OverviewController', ['$scope', '$ionicModal', '$ionicPlatform', 
+            'BirthdayService','$timeout', OverviewController]);
 
-    function OverviewController($scope, $ionicModal, $ionicPlatform, birthdayService) {
+    function OverviewController($scope, $ionicModal, $ionicPlatform, birthdayService,$timeout) {
         var vm = this;
+        v = vm;
+        bs = birthdayService;
         vm.online = true;
         vm.fb = birthdayService.getBdArray();
         vm.isSync = isSync;
         vm.emulateFb = emulateFb;
+        vm.emu = [];
         // $ionicPlatform.ready(function() {
 
         //     // Initialize the database.
@@ -20,6 +25,17 @@
         //         });
         // });
 
+        vm.fb.$loaded()
+            .then(function(res) {
+                console.info('loaded from controlller');
+
+                $timeout(function(){
+                    console.info('timeout');
+                    vm.emu = res;
+                }, 2000);
+                
+            })
+
         function isSync(key) {
             if (birthdayService.getTempById(key)) {
                 return true;
@@ -40,7 +56,9 @@
         function activate() {
             birthdayService.getBirthdays()
                 .then(function(birthdays) {
+                    console.log('birthday received');
                     vm.birthdays = birthdays;
+                    vm.emu=birthdays;
                 });
 
             birthdayService.getTemp()
