Imporve pages

This commit is contained in:
Peter Maquiran
2021-05-26 11:22:50 +01:00
parent 503109053b
commit 6973720c92
12 changed files with 279 additions and 186 deletions
@@ -294,4 +294,9 @@ export class DespachosPrPage implements OnInit {
this.dicIndex = index; this.dicIndex = index;
} }
goBack(){
this.router.navigate(['/home/gabinete-digital']);
}
} }
@@ -17,6 +17,8 @@ import { SharedModule } from 'src/app/shared/shared.module';
SharedModule, SharedModule,
DespachoPageRoutingModule DespachoPageRoutingModule
], ],
declarations: [DespachoPage] declarations: [
DespachoPage,
]
}) })
export class DespachoPageModule {} export class DespachoPageModule {}
@@ -15,8 +15,10 @@ import { SharedModule } from 'src/app/shared/shared.module';
FormsModule, FormsModule,
IonicModule, IonicModule,
SharedModule, SharedModule,
DespachosPageRoutingModule DespachosPageRoutingModule,
], ],
declarations: [DespachosPage] declarations: [
DespachosPage,
]
}) })
export class DespachosPageModule {} export class DespachosPageModule {}
@@ -1,5 +1,13 @@
<ion-header class="ion-no-border"> <ion-header class="ion-no-border">
<app-header > </app-header>
</ion-header>
<ion-header class="ion-no-border header-2">
<div class="title"> <div class="title">
<app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
<div class="thetitle"><ion-label >Despachos</ion-label></div> <div class="thetitle"><ion-label >Despachos</ion-label></div>
<div class="theicon"> <div class="theicon">
<button class="btn-no-color" (click)="doRefresh($event)"> <button class="btn-no-color" (click)="doRefresh($event)">
@@ -9,6 +17,8 @@
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="main-content">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content <ion-refresher-content
pullingIcon="chevron-down-circle-outline" pullingIcon="chevron-down-circle-outline"
@@ -81,5 +91,7 @@
</ion-item> </ion-item>
</ion-list> </ion-list>
</div> </div>
</div>
</ion-content> </ion-content>
@@ -1,9 +1,22 @@
@import '~src/function.scss'; @import '~src/function.scss';
/* CONTENT */ /* CONTENT */
:host{ :host{
padding: 30px 20px 0 20px !important;
margin: 0; margin: 0;
} }
.header-2 {
border-top-right-radius: 24px;
border-top-left-radius: 24px;
}
ion-content, .header-2, .main-content{
padding: 30px 20px 0 20px !important;
background-color: white;
}
.main-content {
padding-top: 0px !important;
}
.title{ .title{
font-family: Roboto; font-family: Roboto;
font-size: 25px; font-size: 25px;
@@ -64,10 +64,15 @@ export class DespachosPage implements OnInit {
console.log(res); console.log(res);
}); });
} }
segmentChanged(ev: any) { segmentChanged(ev: any) {
this.LoadList(); this.LoadList();
} }
goBack(){
this.router.navigate(['/home/gabinete-digital']);
}
notImplemented(){ notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento'); this.alertService.presentAlert('Funcionalidade em desenvolvimento');
} }
@@ -1,5 +1,9 @@
<ion-header class="ion-no-border"> <ion-header class="ion-no-border">
<app-btn-modal-dismiss></app-btn-modal-dismiss> <app-header > </app-header>
</ion-header>
<ion-header class="ion-no-border header-2">
<app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
<div class="title"> <div class="title">
<div class="thetitle"><ion-label >Pedidos</ion-label></div> <div class="thetitle"><ion-label >Pedidos</ion-label></div>
<div class="theicon"> <div class="theicon">
@@ -19,7 +23,10 @@
</ion-segment> </ion-segment>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="main-content">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content <ion-refresher-content
pullingIcon="chevron-down-circle-outline" pullingIcon="chevron-down-circle-outline"
@@ -121,5 +128,8 @@
</ion-item> </ion-item>
</ion-list> </ion-list>
</div> </div>
</div>
</ion-content> </ion-content>
@@ -1,9 +1,22 @@
@import '~src/function.scss'; @import '~src/function.scss';
/* CONTENT */ /* CONTENT */
:host{ :host{
padding: 30px 20px 0 20px !important;
margin: 0; margin: 0;
} }
.header-2 {
border-top-right-radius: 24px;
border-top-left-radius: 24px;
}
ion-content, .header-2, .main-content{
padding: 30px 20px 0 20px !important;
background-color: white;
}
.main-content {
padding-top: 0px !important;
}
.title{ .title{
font-family: Roboto; font-family: Roboto;
font-size: 25px; font-size: 25px;
@@ -52,6 +52,10 @@ export class PedidosPage implements OnInit {
this.LoadList(); this.LoadList();
} }
goBack(){
this.router.navigate(['/home/gabinete-digital']);
}
segmentChanged(ev: any) { segmentChanged(ev: any) {
this.LoadList(); this.LoadList();
} }
@@ -1,5 +1,10 @@
<ion-header class="ion-no-border"> <ion-header class="ion-no-border">
<app-btn-modal-dismiss></app-btn-modal-dismiss> <app-header > </app-header>
</ion-header>
<ion-header class="ion-no-border header-2">
<app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
<div class="title"> <div class="title">
<div class="thetitle"><ion-label >Pendentes</ion-label></div> <div class="thetitle"><ion-label >Pendentes</ion-label></div>
<div class="theicon"> <div class="theicon">
@@ -9,7 +14,10 @@
</div> </div>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="main-content">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content <ion-refresher-content
pullingIcon="chevron-down-circle-outline" pullingIcon="chevron-down-circle-outline"
@@ -78,5 +86,7 @@
</ion-item> </ion-item>
</ion-list> </ion-list>
</div> </div>
</div>
</ion-content> </ion-content>
@@ -1,9 +1,22 @@
@import '~src/function.scss'; @import '~src/function.scss';
/* CONTENT */ /* CONTENT */
:host{ :host{
padding: 30px 20px 0 20px !important;
margin: 0; margin: 0;
} }
.header-2 {
border-top-right-radius: 24px;
border-top-left-radius: 24px;
}
ion-content, .header-2, .main-content{
padding: 30px 20px 0 20px !important;
background-color: white;
}
.main-content {
padding-top: 0px !important;
}
.title{ .title{
font-family: Roboto; font-family: Roboto;
font-size: 25px; font-size: 25px;
@@ -52,6 +52,10 @@ export class PendentesPage implements OnInit {
this.LoadList(); this.LoadList();
} }
goBack() {
this.router.navigate(['/home/gabinete-digital']);
}
notImplemented(){ notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento'); this.alertService.presentAlert('Funcionalidade em desenvolvimento');
} }