Fix merge

This commit is contained in:
Peter Maquiran
2021-05-25 13:40:55 +01:00
24 changed files with 375 additions and 232 deletions
@@ -41,7 +41,11 @@
<div class="upper-content d-flex width-100">
<div class="content-location d-flex justify-between width-100">
<div class="location-detail flex-grow-1">
<ion-label >{{loadedEvent.workflowInstanceDataFields.Location}}</ion-label>
<div *ngIf="loadedEvent.workflowInstanceDataFields.Location">
<ion-label>
{{loadedEvent.workflowInstanceDataFields.Location}}
</ion-label>
</div>
<div class="content-details">
<ion-label>
<p>1 {{customDate}}</p>
@@ -57,14 +61,15 @@
</div>
</div>
<div class="middle-content">
<div *ngIf="loadedEvent.workflowInstanceDataFields.Participants" class="middle-content">
<div *ngIf="loadedEvent.workflowInstanceDataFields.Participants">
<h5>Intervenientes</h5>
<div *ngFor="let att of loadedEvent.workflowInstanceDataFields.ParticipantsList">
<ion-label>{{att.Name}}</ion-label>
</div>
</div>
</div>
<div *ngIf="loadedEvent.workflowInstanceDataFields.Body">
<h5>Detalhes</h5>
<ion-item lines="none" class="ion-no-padding ion-no-margin">
<div [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></div>
@@ -74,17 +79,16 @@
<div class="d-flex container-div width-100" >
<ion-list class="width-100 " >
<h5>Documentos Anexados</h5>
<ion-item class="width-100" *ngFor="let document of loadedAttachments">
<ion-label class="width-100 d-block list">
<ion-label
(click)="viewDocument(document.SourceId, document.ApplicationId)"
class="width-100 d-block list">
<p class="d-flex ion-justify-content-between">
<span class="attach-title-item">{{document.SourceName}}</span>
<span class="app-name" *ngIf="document.ApplicationId == 8"> Correspondencia </span>
<span class="app-name" *ngIf="document.ApplicationId == 386"> AccoesPresidenciais </span>
<span class="app-name" *ngIf="document.ApplicationId == 361 "> ArquivoDespachoElect </span>
<span class="close-button text-black" >
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
</span>
</p>
<p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yy'}} </span></p>
</ion-label>
@@ -10,6 +10,7 @@ import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-requ
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
import { EmendMessageModalPage } from '../../../agenda/emend-message-modal/emend-message-modal.page';
import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/event-actions-popover.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
@Component({
selector: 'app-approve-event-modal',
@@ -38,6 +39,7 @@ export class ApproveEventModalPage implements OnInit {
private menu: MenuController,
private alertService: AlertService,
private activatedRoute: ActivatedRoute,
private iab: InAppBrowser,
) {
@@ -82,6 +84,14 @@ export class ApproveEventModalPage implements OnInit {
})
}
viewDocument(docId:string, applicationId:string){
this.processes.GetDocumentUrl(docId, applicationId).subscribe(res=>{
console.log(res);
const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
const browser = this.iab.create(url,"_blank");
browser.show();
});
}
approveTask(serialNumber:string){
console.log('approveTask SERIALNUMBER: ', serialNumber)
@@ -119,6 +129,9 @@ export class ApproveEventModalPage implements OnInit {
async getAttachments() {
this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise();
console.log(this.loadedAttachments);
}
async openOptions(ev:any) {