This commit is contained in:
Peter Maquiran
2021-08-16 15:02:33 +01:00
parent ddaab33878
commit a65c5a1fdb
6 changed files with 12 additions and 17 deletions
@@ -7,7 +7,7 @@
</div>
<ion-content>
<div class="main-content d-flex height-100">
<div class="main-content d-flex height-100 overflow-hidden">
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header" style="overflow: unset !important;">
<div class="title-content width-100 d-flex justify-between">
@@ -67,10 +67,7 @@
<ion-list>
<div class="content-items width-100" *ngIf="eventsList">
<ion-list>
<ion-item class=" ion-no-padding width-100 cursor-pointer"
lines="none" *ngFor="let event of eventsList"
(click)="goToEvent(event.EventId)"
>
<ion-item class=" ion-no-padding width-100 cursor-pointer" lines="none" *ngFor="let event of eventsList" (click)="goToEvent(event.EventId)">
<div class="d-flex content-{{profile}}-{{event.CalendarName}}">
<div class="schedule-time">
<div class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
@@ -82,7 +79,6 @@
</div>
</div>
</ion-item>
</ion-list>
</div>
</ion-list>
@@ -90,7 +86,7 @@
</div>
</div>
<div *ngIf="task && !p.userRole(['PR'])" class="aside-right flex-column height-100">
<div *ngIf="task && !p.userRole(['PR'])" class="aside-right flex-column height-100 overflow-y-auto">
<div class="buttons">
<div class="option-desc"> <div>Enviar para o PR</div> </div>
<button (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
@@ -108,7 +104,7 @@
</div>
</div>
<div *ngIf="task && p.userRole(['PR'])" class="aside-right flex-column height-100">
<div *ngIf="task && p.userRole(['PR'])" class="aside-right flex-column height-100 overflow-y-auto">
<div class="buttons">
<button (click)="openExpedientActionsModal('0', fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
@@ -159,8 +159,9 @@ ion-button{
font-size: 13px;
}
}
.aside-right{
padding: 30px 20px 0 20px !important;
.aside-right {
padding: 0px 20px;
margin: 20px 0px;
.arrow-right{
display: flex;
@@ -72,7 +72,6 @@ export class ExpedientePrPage implements OnInit {
ngOnInit() {
this.profile = "mdgpr";
console.log(this.serialnumber);
this.activatedRoute.paramMap.subscribe(paramMap => {
if (!paramMap.has('SerialNumber')) {
@@ -80,8 +79,6 @@ export class ExpedientePrPage implements OnInit {
}
this.LoadTaskDetail(this.serialnumber);
});
this.LoadTaskDetail(this.serialnumber);
this.getAttachments(this.serialnumber);
}
@@ -356,6 +356,7 @@ export class PedidoPage implements OnInit {
}
});
}
async distartExpedientModal(){
console.log(this.fulltask);
const modal = await this.modalController.create({
@@ -98,7 +98,7 @@
</div>
<div class="exp-bottom-detail">
<div class="exp-remetente">
<ion-label>{{task.Senders}}</ion-label>
<ion-label>{{task.Senders}} sender</ion-label>
</div>
</div>
<div class="exp-middle-detail">
@@ -101,10 +101,10 @@ export class PedidosPage implements OnInit {
this.openExpedientDetail.emit(data);
}
async LoadList(){
async LoadList() {
this.skeletonLoader = true
if(this.segment == 'parecer'){
if(this.segment == 'parecer') {
this.taskType = "Pedido de Parecer";
let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
@@ -125,7 +125,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,