Skip to content

Commit

Permalink
pantalla de mis bitacoras y estaciones de trabajo
Browse files Browse the repository at this point in the history
  • Loading branch information
yhyenifer committed Apr 16, 2018
1 parent 45f9cdc commit f18a7bb
Show file tree
Hide file tree
Showing 13 changed files with 121 additions and 15 deletions.
9 changes: 9 additions & 0 deletions ATOME/bash.exe.stackdump
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Stack trace:
Frame Function Args
000FFFFA328 0018005D44E (0018023C1CD, 0018021DC26, 000FFFFA328, 000FFFF9220)
000FFFFA328 00180046609 (00000000000, 00000000000, 00000000000, 001005F0D44)
000FFFFA328 00180046642 (0018023C289, 000FFFFA1D8, 000FFFFA328, 00000000000)
000FFFFA328 001800AA5FF (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFA328 001800AA84D (000FFFFA340, 00000000000, 00000000000, 00000000000)
000FFFFA3C0 001800ABB1C (000FFFFA340, 00000000000, 00000000000, 00000000000)
End of stack trace
21 changes: 21 additions & 0 deletions ATOME/src/pages/crear-bitacora/crear-bitacora.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<ion-header>
<ion-navbar color="azulatome">
<button ion-button menuToggle>
<ion-icon name="menu"></ion-icon>
</button>
<ion-title>Crear Bitácora de Trabajo</ion-title>
</ion-navbar>

</ion-header>


<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-select>
</ion-item>
</ion-content>
13 changes: 13 additions & 0 deletions ATOME/src/pages/crear-bitacora/crear-bitacora.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { CrearBitacoraPage } from './crear-bitacora';

@NgModule({
declarations: [
CrearBitacoraPage,
],
imports: [
IonicPageModule.forChild(CrearBitacoraPage),
],
})
export class CrearBitacoraPageModule {}
10 changes: 10 additions & 0 deletions ATOME/src/pages/crear-bitacora/crear-bitacora.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
page-crear-bitacora {

.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 : black
}
}
28 changes: 28 additions & 0 deletions ATOME/src/pages/crear-bitacora/crear-bitacora.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
//import { FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2';
import { AngularFireDatabase } from 'angularfire2/database';

/**
* Generated class for the CrearBitacoraPage page.
*
* See https://ionicframework.com/docs/components/#navigation for more info on
* Ionic pages and navigation.
*/

@IonicPage()
@Component({
selector: 'page-crear-bitacora',
templateUrl: 'crear-bitacora.html',
})
export class CrearBitacoraPage {
// almacenes: FirebaseListObservable<any>;

constructor(public navCtrl: NavController, public navParams: NavParams) {
}

ionViewDidLoad() {
console.log('ionViewDidLoad CrearBitacoraPage');
}

}
6 changes: 3 additions & 3 deletions ATOME/src/pages/estaciones/estaciones.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<ion-header>
<ion-navbar>
<ion-navbar color="azulatome">
<button ion-button menuToggle>
<ion-icon name="menu"></ion-icon>
</button>
<ion-title>Estaciones de Trabajo</ion-title>
</ion-navbar>
<ion-navbar>
<ion-navbar color="azulatome">
<ion-row>
<ion-col class="groupTabs">
<div class="centrar">
Expand Down Expand Up @@ -43,7 +43,7 @@

<ion-col>
<div class="izq">
<button class="opcion puntos"><ion-icon name="checkmark"></ion-icon><br>Seleccionar</button>
<button class="opcion puntos"(click)="openPageHija('CrearBitacoraPage')" ><ion-icon name="checkmark"></ion-icon><br>Seleccionar</button>
</div>
</ion-col>
</ion-row>
Expand Down
12 changes: 10 additions & 2 deletions ATOME/src/pages/estaciones/estaciones.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
page-estaciones {

.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 : black
}
.groupTabs{

background-color: #acc5c6 ;
border-right-color: #244c24;
border-right-style: inset;
}
.tab{
background-color: #acc5c6 ;
font-size: 20px;
background-color: #f8f8f8;
color: black;
margin-left: 9em;
}
Expand Down
8 changes: 5 additions & 3 deletions ATOME/src/pages/estaciones/estaciones.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ export class EstacionesPage {

ionViewDidLoad() {
}
openPage(page){
openPage(page) {
this.navCtrl.setRoot(page);
}

}
openPageHija(page) {
this.navCtrl.push(page);
}
}
8 changes: 4 additions & 4 deletions ATOME/src/pages/misestaciones/misestaciones.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<ion-header>
<ion-navbar>
<ion-navbar color="azulatome">
<button ion-button menuToggle>
<ion-icon name="menu"></ion-icon>
</button>
<ion-title>Estaciones de Trabajo</ion-title>
</ion-navbar>
<ion-navbar>
<ion-row>
<ion-navbar color="azulatome">
<ion-row >
<ion-col class="groupTabs">
<div class="centrar">
<button class="tab tab1" (click)="openPage('MisestacionesPage')">Mis Bitácoras</button>
Expand Down Expand Up @@ -72,7 +72,7 @@
</ion-list>

<ion-fab right bottom>
<button ion-fab color="atome"><ion-icon name="add"></ion-icon></button>
<button ion-fab color="atome" (click)="openPageHija('CrearBitacoraPage')"><ion-icon name="add"></ion-icon></button>

</ion-fab>
</ion-content>
Expand Down
12 changes: 10 additions & 2 deletions ATOME/src/pages/misestaciones/misestaciones.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
page-misestaciones {

.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 : black
}
.groupTabs{

background-color: #acc5c6 ;
border-right-color: #244c24;
border-right-style: inset;
}
.tab{
font-size: 20px;
background-color: #f8f8f8;
background-color: #acc5c6 ;
color: black;
margin-left: 9em;
}
Expand Down
4 changes: 4 additions & 0 deletions ATOME/src/pages/misestaciones/misestaciones.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,8 @@ export class MisestacionesPage {
this.navCtrl.setRoot(page);
}

openPageHija(page){
this.navCtrl.push(page);
}

}
5 changes: 4 additions & 1 deletion ATOME/src/theme/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,13 @@ $colors: (
danger: #f53d3d,
light: #f4f4f4,
dark: #222,
atome: #244c24
atome: #244c24,
azulatome: #acc5c6
);




// App iOS Variables
// --------------------------------------------------
// iOS only Sass variables can go here
Expand Down
Binary file removed documentacion/~$_0_3_Arq Software_MegaCity.docx
Binary file not shown.

0 comments on commit f18a7bb

Please sign in to comment.