This commit is contained in:
Tiago Kayaya
2020-11-24 15:01:16 +01:00
parent 10ae85da2c
commit 029d1e3e28
7 changed files with 19 additions and 23 deletions
+1 -5
View File
@@ -31,13 +31,9 @@ export class HomePage implements OnInit {
} }
else{ else{
this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.prEventList = res; this.eventsList = res;
this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.mdEventList = res;
this.eventsList = this.prEventList.concat(this.mdEventList);
this.totalEvent = this.eventsList.length; this.totalEvent = this.eventsList.length;
}); });
});
} }
this.processesbackend.GetTasksList("Expediente", true).subscribe(result =>{ this.processesbackend.GetTasksList("Expediente", true).subscribe(result =>{
+2 -2
View File
@@ -3,13 +3,13 @@
<ion-toolbar> <ion-toolbar>
<ion-buttons slot="end"> <ion-buttons slot="end">
<!-- customized TOGGLE button --> <!-- customized TOGGLE button -->
<!-- <div class="toggleBox"> <div class="toggleBox">
<div (click)="changeProfile()" class="toggle"> <div (click)="changeProfile()" class="toggle">
<input type="checkbox"> <input type="checkbox">
<label for="" class="onbtn">PR</label> <label for="" class="onbtn">PR</label>
<label for="" class="ofbtn">MDGPR</label> <label for="" class="ofbtn">MDGPR</label>
</div> </div>
</div> --> </div>
</ion-buttons> </ion-buttons>
<ion-title>Agenda</ion-title> <ion-title>Agenda</ion-title>
</ion-toolbar> </ion-toolbar>
+1 -1
View File
@@ -61,7 +61,7 @@ export class AgendaPage implements OnInit {
) {} ) {}
ngOnInit() { ngOnInit() {
this.profile = "pr"; this.profile = "mdgpr";
//Inicializar segment //Inicializar segment
/* localStorage.setItem('test', this.eventSelectedDate.toString()); */ /* localStorage.setItem('test', this.eventSelectedDate.toString()); */
+3 -3
View File
@@ -10,13 +10,13 @@
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-buttons slot="end"> <ion-buttons slot="end">
<!-- <div class="toggleBox"> <div class="toggleBox">
<div (click)="changeProfile()" class="toggle"> <div (click)="changeProfile()" class="toggle">
<input type="checkbox"> <input type="checkbox">
<label for="" class="onbtn">PR</label> <label for="" class="onbtn">PR</label>
<label for="" class="ofbtn">MDGPR</label> <label for="" class="ofbtn">MDGPR</label>
</div> </div>
</div> --> </div>
</ion-buttons> </ion-buttons>
</ion-toolbar> </ion-toolbar>
<ion-toolbar> <ion-toolbar>
@@ -24,7 +24,7 @@
<ion-item class="ion-text-right" lines="none"> <ion-item class="ion-text-right" lines="none">
<ion-label class="ion-text-wrap"> <ion-label class="ion-text-wrap">
<h3 class="header-medium"> {{greetting}} Excelência <br /> <h3 class="header-medium"> {{greetting}} Excelência <br />
<!-- Ministro Director do Gabinete do --><!-- <br /> --> Ministro Director do Gabinete do<!-- <br /> -->
Presidente da República Presidente da República
</h3> </h3>
+1 -1
View File
@@ -63,7 +63,7 @@ export class EventsPage implements OnInit {
//Inicializar segment //Inicializar segment
this.segment = "Combinada"; this.segment = "Combinada";
//Initialize profile as mdgpr //Initialize profile as mdgpr
this.profile = "pr"; this.profile = "mdgpr";
console.log(this.profile); console.log(this.profile);
@@ -10,7 +10,7 @@
<ion-refresher-content> <ion-refresher-content>
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<!-- <ion-card color="#d4d5ca"> <ion-card color="#d4d5ca">
<ion-card-header> <ion-card-header>
<ion-card-title>Eventos para Aprovação</ion-card-title> <ion-card-title>Eventos para Aprovação</ion-card-title>
<ion-card-content> <ion-card-content>
@@ -18,14 +18,14 @@
<ion-label>Minha agenda</ion-label> <ion-label>Minha agenda</ion-label>
<ion-button slot="end">{{count_ev_md}}</ion-button> <ion-button slot="end">{{count_ev_md}}</ion-button>
</ion-item> </ion-item>
<ion-item (click)="openEventsToApproveList('PR')" class="ion-item-change-color"> [routerLink]="['/home/gabinete-digital/event-list', 'pr']" <ion-item (click)="openEventsToApproveList('PR')" class="ion-item-change-color"><!-- [routerLink]="['/home/gabinete-digital/event-list', 'pr']" -->
<ion-label>Agenda do Presidente</ion-label> <ion-label>Agenda do Presidente</ion-label>
<ion-button slot="end">{{count_ev_pr}}</ion-button> <ion-button slot="end">{{count_ev_pr}}</ion-button>
</ion-item> </ion-item>
</ion-card-content> </ion-card-content>
</ion-card-header> </ion-card-header>
</ion-card> --> </ion-card>
<!-- <ion-card color="#d4d5ca"> <ion-card color="#d4d5ca">
<ion-card-header> <ion-card-header>
<ion-card-title>Expediente</ion-card-title> <ion-card-title>Expediente</ion-card-title>
<ion-card-content> <ion-card-content>
@@ -43,7 +43,7 @@
</ion-item> </ion-item>
</ion-card-content> </ion-card-content>
</ion-card-header> </ion-card-header>
</ion-card> --> </ion-card>
<ion-card color="#d4d5ca"> <ion-card color="#d4d5ca">
<ion-card-header> <ion-card-header>
<ion-card-title>Expediente para o PR</ion-card-title> <ion-card-title>Expediente para o PR</ion-card-title>
@@ -70,10 +70,10 @@
<ion-card-header> <ion-card-header>
<ion-card-title>Diplomas</ion-card-title> <ion-card-title>Diplomas</ion-card-title>
<ion-card-content> <ion-card-content>
<!-- <ion-item primary (click)="notImplemented()" class="ion-activated"> <ion-item primary (click)="notImplemented()" class="ion-activated">
<ion-label>Por validar (MDGPR)</ion-label> <ion-label>Por validar (MDGPR)</ion-label>
<ion-button slot="end">{{count_dip_pv}}</ion-button> <ion-button slot="end">{{count_dip_pv}}</ion-button>
</ion-item> --> </ion-item>
<ion-item (click)="notImplemented()" class="ion-item-change-color"> <ion-item (click)="notImplemented()" class="ion-item-change-color">
<ion-label>Assinados pelo PR</ion-label> <ion-label>Assinados pelo PR</ion-label>
<ion-button slot="end">{{count_dip_apr}}</ion-button> <ion-button slot="end">{{count_dip_apr}}</ion-button>
+1 -1
View File
@@ -7,7 +7,7 @@ export const environment = {
apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/',
apiChatUrl: 'http://192.168.100.111:3000/api/v1/', apiChatUrl: 'http://192.168.100.111:3000/api/v1/',
domain: 'gabinetedigital.local', domain: 'gabinetedigital.local',
defaultuser: 'tiago.kayaya', defaultuser: 'paulo.pinto',
defaultuserpwd: 'tabteste@006' defaultuserpwd: 'tabteste@006'
}; };