crear bitacora, boton de bluethoo e inicio de app

yhyenifer · Apr 17, 2018 · 3f667cb · 3f667cb
1 parent f18a7bb
commit 3f667cb
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 32 deletions.
diff --git a/ATOME/src/app/app.component.ts b/ATOME/src/app/app.component.ts
@@ -2,6 +2,7 @@ import { Component, ViewChild } from '@angular/core';
 import { Nav, Platform } from 'ionic-angular';
 import { StatusBar } from '@ionic-native/status-bar';
 import { SplashScreen } from '@ionic-native/splash-screen';
+import { AngularFireAuth } from 'angularfire2/auth';
 
 
 
@@ -18,7 +19,9 @@ export class MyApp {
   pages: Array<{title: string, component: any}>;
   pagesAdmin: Array<{title: string, component: any, icono: any}>;
 
-  constructor(public platform: Platform, public statusBar: StatusBar, public splashScreen: SplashScreen) {
+  constructor(public platform: Platform, public statusBar: StatusBar, 
+    public splashScreen: SplashScreen,
+    private afAuth: AngularFireAuth) {
     this.initializeApp();
 
     // used for an example of ngFor and navigation
@@ -46,4 +49,12 @@ export class MyApp {
     // we wouldn't want the back button to show in this scenario
     this.nav.setRoot(page.component);
   }
+
+
+salir(){
+
+  this.afAuth.auth.signOut();
+  this.platform.exitApp();
+  this.nav.setRoot('LoginPage');
 }
+}
diff --git a/ATOME/src/app/app.html b/ATOME/src/app/app.html
@@ -1,6 +1,6 @@
-<ion-menu id="menu1" [content]="content">
-  <ion-header>
-    <ion-toolbar>
+<ion-menu id="menu1" [content]="content" >
+  <ion-header >
+    <ion-toolbar color="azulatome">
       <ion-title>Menu</ion-title>
     </ion-toolbar>
   </ion-header>
@@ -19,9 +19,9 @@
 
 </ion-menu>
 
-<ion-menu id="menu2" [content]="content">
+<ion-menu id="menu2" [content]="content" color="azulatome">
   <ion-header>
-    <ion-toolbar>
+    <ion-toolbar color="azulatome">
       <ion-title>Menu Admin</ion-title>
     </ion-toolbar>
   </ion-header>

diff --git a/ATOME/src/app/app.scss b/ATOME/src/app/app.scss
@@ -17,4 +17,9 @@
 .separador{
     border: solid 1px #000000;
     margin-left: 1em;
+}
+
+.toolbar-md-azulatome .bar-button-clear-md, .toolbar-md-azulatome .bar-button-default-md, .toolbar-md-azulatome .bar-button-outline-md, .toolbar-md-azulatome .toolbar-title-md
+{
+    color : #000
 }
diff --git a/ATOME/src/app/models/estacion.ts b/ATOME/src/app/models/estacion.ts
@@ -0,0 +1,4 @@
+export interface Estacion {
+    nombre: string;
+    descripcion: string
+}
diff --git a/ATOME/src/pages/crear-bitacora/crear-bitacora.html b/ATOME/src/pages/crear-bitacora/crear-bitacora.html
@@ -12,10 +12,19 @@
 <ion-content padding>
 
   <ion-item>
-    <ion-label>Estacion de Trabajo:</ion-label>
-    <ion-select [(ngModel)]="selectedvalue">
-      <!--  carga los alamcenes del centro comercial -->
-      <ion-option *ngFor="let estacion of estaciones | async"><h2>{{ estacion.nombre }}</h2></ion-option>
+    <ion-label>Estacion de Trabajo:<br></ion-label>
+    <ion-select [(ngModel)]="selectedvalue" (change)="onChange()" >
+      <ion-option *ngFor="let item of items | async"  >
+        <h2> {{item.nombre}}</h2>
+      </ion-option>
     </ion-select>
   </ion-item>
+  <ion-row>
+      <button ion-button><ion-icon name="bluetooth"></ion-icon></button>
+  </ion-row>
+
+  <ion-fab right bottom>
+      <button ion-fab color="atome" (click)="iniciarPractica()"><ion-icon name="play"></ion-icon></button>
+
+    </ion-fab>
 </ion-content>
diff --git a/ATOME/src/pages/crear-bitacora/crear-bitacora.ts b/ATOME/src/pages/crear-bitacora/crear-bitacora.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams } from 'ionic-angular';
-//import {  FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2';
+import { IonicPage, NavController, NavParams, MenuController } from 'ionic-angular';
+import {  AngularFireObject , AngularFireList  } from 'angularfire2/database';
 import { AngularFireDatabase } from 'angularfire2/database';
+import { Observable } from 'rxjs/Observable';
 
 /**
  * Generated class for the CrearBitacoraPage page.
@@ -16,13 +17,32 @@ import { AngularFireDatabase } from 'angularfire2/database';
   templateUrl: 'crear-bitacora.html',
 })
 export class CrearBitacoraPage {
- // almacenes: FirebaseListObservable<any>;
+  items: Observable<any[]>;
+  public selectedvalue;
+  constructor(public navCtrl: NavController, public navParams: NavParams,
+    private database: AngularFireDatabase,
+    public menu: MenuController,
+  ) {
+    console.log('carga estaciones');   
+    this.items = database.list('estacion').valueChanges();
+    console.log('selecciona');
+    console.log(this.selectedvalue);
+  }
 
-  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  menu1Active() {
+    this.menu.enable(true, 'menu1');
   }
+  onChange(){
+  console.log('selecciona');
+  console.log(this.selectedvalue);
+}
+
+iniciarPractica(){
+  console.log('inicia la practica');
+
+}
 
   ionViewDidLoad() {
-    console.log('ionViewDidLoad CrearBitacoraPage');
   }
 
 }
diff --git a/ATOME/src/pages/login/login.html b/ATOME/src/pages/login/login.html
@@ -61,10 +61,6 @@
       </div>
     </form>
   </ion-list>
-<ion-list>
-  <ion-item *ngFor="let item of usuarios ">
-<h3>{{item.tipo}}</h3>
-  </ion-item>
-</ion-list> 
+
 
 </ion-content>
diff --git a/ATOME/src/pages/login/login.ts b/ATOME/src/pages/login/login.ts
@@ -4,8 +4,9 @@ import { MenuController } from 'ionic-angular';
 import { AngularFireAuth } from 'angularfire2/auth';
 import { User } from '../../app/models/user';
 //import { FirebaseObjectObservable} from 'angularfire2/database';
+import { AngularFireDatabase, AngularFireList } from 'angularfire2/database';
+import { Observable } from 'rxjs/Observable';
 import { Usuarios } from '../../app/models/usuario';
-import { AngularFireDatabase } from 'angularfire2/database';
 
 
 
@@ -27,15 +28,15 @@ import { AngularFireDatabase } from 'angularfire2/database';
 })
 export class LoginPage {
   user= { } as User;
-  usuarios = [];
   tipo ;
+  usuarios: AngularFireList<Usuarios[]>;
  // usuarioss: AngularFireList<any>;
 //  tipo: FirebaseObjectObservable<any>;
  // usuarios$: FirebaseListObservable<Usuarios[]>;
 
   constructor(public navCtrl: NavController, public navParams: NavParams, public menu: MenuController,
     private afAuth: AngularFireAuth,
-    private   fdb: AngularFireDatabase,
+    private   database: AngularFireDatabase,
     public alertCtrl : AlertController
   ) {
 
@@ -70,7 +71,9 @@ export class LoginPage {
    const authObserv= this.afAuth.authState.subscribe(auth => {
     console.log('sucees');
     console.log(auth.uid);
-
+    this.usuarios = this.database.list('/usuarios/'+auth.uid);
+    console.log(this.usuarios);
+
     this.tipo=0;
     if (this.tipo=="0"){
 
@@ -80,15 +83,9 @@ export class LoginPage {
     }else{
       this.navCtrl.setRoot('AdministradorPage');
 
-      // this.navCtrl.setRoot('ListPage',{
-
-      // });
+
     }
-  // this.usuarios$ = this.fdb.list('/usuarios/'+auth.uid );
-  // this.usuarios$.subscribe(_data => {
-  //   this.usuarios  = _data;
-// })
-  // console.log(this.usuarios);
+