peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 13:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Peter Maquiran
2021-07-29 17:05:58 +01:00
parent 9138f9903c 29b2bc9c38
commit 06cccbc1c2
7 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/view-event/view-event.page.ts
+5 -4
View File
@@ -94,6 +94,7 @@ export class ViewEventPage implements OnInit {
loadEvent() {
this.eventsService.getEvent(this.eventId).subscribe(res => {
console.log(res);
this.loadedEvent = res;
this.today = new Date(res.StartDate);
this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]);
@@ -110,14 +111,14 @@ export class ViewEventPage implements OnInit {
this.toastService.badRequest('não é possível vizualizar este event no modo offline')
} else {
this.toastService.badRequest('Este evento já não existe na sua agenda')
}
}
})
;
}
async deleteEvent(){
if (this.loadedEvent.IsRecurring) {
} else {
@@ -130,7 +131,7 @@ export class ViewEventPage implements OnInit {
}
async deleteRecurringEvent() {
const modal = await this.modalController.create({
component: EliminateEventPage,
componentProps: {},
src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+12 -12
View File
@@ -27,15 +27,15 @@
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher>
<div class="width-100 overflow-y-auto height-100" [ngSwitch]="segment">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<div *ngIf="pedidosstore.listparecer.length >= 1">
<ion-list *ngSwitchCase="'parecer'">
<!-- *ngFor = "let task of pedidosstore.listparecer; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)" -->
<div
class="expediente ion-no-padding ion-no-margin cursor-pointer"
<div
class="expediente ion-no-padding ion-no-margin cursor-pointer"
*ngFor = "let task of pedidosstore.listparecer"
(click)="goToPedido(task.SerialNumber)"
>
@@ -61,7 +61,7 @@
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-date">
{{ task.CreateDate }}
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
@@ -75,7 +75,7 @@
<div *ngIf="pedidosstore.listdeferimento.length >= 1">
<ion-list *ngSwitchCase="'deferimento'">
<div
class="expediente ion-no-padding ion-no-margin cursor-pointer"
class="expediente ion-no-padding ion-no-margin cursor-pointer"
*ngFor = "let task of pedidosstore.listdeferimento"
(click)="goToPedido(task.SerialNumber)"
>
@@ -109,18 +109,18 @@
</ion-list>
</div>
<div *ngSwitchCase="'parecer'" class="d-flex height-100 align-center justify-content-center" >
<div
*ngIf="!skeletonLoader && pedidosstore.listparecer.length == 0"
<div *ngSwitchCase="'parecer'" class="d-flex align-center justify-content-center" >
<div
*ngIf="!skeletonLoader && pedidosstore.listparecer.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
</div>
<div *ngSwitchCase="'deferimento'" class="d-flex height-100 align-center justify-content-center">
<div
*ngIf="!skeletonLoader && pedidosstore.listdeferimento.length == 0"
<div *ngSwitchCase="'deferimento'" class="d-flex align-center justify-content-center">
<div
*ngIf="!skeletonLoader && pedidosstore.listdeferimento.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
@@ -128,7 +128,7 @@
</div>
<div *ngIf="skeletonLoader && pedidosstore.listparecer.length == 0 && skeletonLoader && pedidosstore.listdeferimento.length == 0 ">
<ion-list>
<ion-item>
<ion-thumbnail slot="end">
src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+1 -1
View File
@@ -111,7 +111,7 @@ export class PedidosPage implements OnInit {
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.originator.email,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
src/app/shared/header/header.page.html
+3 -7
View File
@@ -10,13 +10,9 @@
<div class="div-logo height-fit-content">
<img src='assets/images/logo-no-bg.png' alt='logo'>
</div>
<div class="div-profile">
<button class="btn-no-color" (click)="openProfile()">
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'MDGPR'" src='assets/images/icons-profile.svg'></ion-icon>
</button>
<button class="btn-no-color" (click)="openProfile()">
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'PR' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</button>
<div class="div-profile" (click)="openProfile()">
<ion-icon class="icon" src='assets/images/icons-profile.svg'></ion-icon>
<ion-label class="profile-text">{{loggeduser.Profile}}</ion-label>
</div>
</div>
src/app/shared/headers/header-no-search/header-no-search.page.html
+3 -3
View File
@@ -9,9 +9,9 @@
<img src='assets/images/logo-no-bg.png' alt='logo'>
</div>
<div class="div-profile" (click)="openProfile()">
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'MDGPR'" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'PR' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
<div class="div-profile cursor-pointer" (click)="openProfile()">
<ion-icon class="icon" src='assets/images/icons-profile.svg'></ion-icon>
<ion-label class="profile-text">{{loggeduser.Profile}}</ion-label>
</div>
</div>