Fix go back

This commit is contained in:
Peter Maquiran
2021-08-18 12:52:51 +01:00
parent d3e18efcd5
commit 7fe82be2d9
6 changed files with 22 additions and 103 deletions
+2 -16
View File
@@ -90,16 +90,6 @@ export class EventsPage implements OnInit {
this.prEventList = null;
// list
this.LoadList();
/* this.screenOrientation.onChange().subscribe(
() => {
alert("Orientation updated" + this.screenOrientation.type);
this.existingScreenOrientation = this.screenOrientation.type;
}
); */
this.platform.resize.subscribe(async () => {
//alert('Resize event detected');
console.log('Resize event detected');
@@ -109,18 +99,14 @@ export class EventsPage implements OnInit {
}
ngOnInit() {
//Inicializar segment
this.segment = "Combinada";
//Initialize profile as mdgpr
this.profile = "mdgpr";
/* console.log(this.profile); */
this.showGreeting();
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == pathname) {
if(event instanceof NavigationEnd && event.url == '/home/events') {
this.RefreshEvents();
this.LoadList();
}
@@ -65,7 +65,7 @@
<ion-list>
<h5>Documentos Anexados</h5>
<ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of fulltask.Documents">
<ion-label class="d-block" (click)="viewDocument()">
<ion-label class="d-block" (click)="viewDocument(Document.DocId)">
<p class="attach-title-item">{{ Document.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
<p><span class="span-left">{{ Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd/MM/yyyy HH:mm' }}</span></p>
</ion-label>
@@ -48,7 +48,6 @@ export class ExpedientePrPage implements OnInit {
private iab: InAppBrowser,
private events: EventsService,
private menu: MenuController,
private router: Router,
private modalController: ModalController,
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute,
@@ -86,7 +85,7 @@ export class ExpedientePrPage implements OnInit {
return new Date(e).toDateString()
}
close(){
close() {
this.modalController.dismiss();
}
@@ -129,7 +128,7 @@ export class ExpedientePrPage implements OnInit {
} */
}
sendExpedienteToPending(){
sendExpedienteToPending() {
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
console.log(res);
this.toastService.successMessage('Processo enviado para pendentes')
@@ -155,9 +154,9 @@ export class ExpedientePrPage implements OnInit {
"CreateDate":taskDate,
"DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
"Remetente": res.workflowInstanceDataFields.Sender,
"Note": res.workflowInstanceDataFields.TaskMessage || res.workflowInstanceDataFields.Note,
"Note": res.workflowInstanceDataFields.TaskMessage || res.workflowInstanceDataFields.Note, //
"FolderId": res.workflowInstanceDataFields.FolderID,
"FsId": res.workflowInstanceDataFields.FsId,
"FsId": res.workflowInstanceDataFields.FsId, //
"DocId": res.workflowInstanceDataFields.DocId || res.workflowInstanceDataFields.DocID,
"WorkflowName": res.workflowDisplayName,
"activityInstanceName": res.activityInstanceName,
@@ -196,32 +195,6 @@ export class ExpedientePrPage implements OnInit {
});
}
getAttachments(serialNumber){
console.log(serialNumber);
this.attachmentsService.getAttachmentsBySerial(serialNumber).subscribe(res=>{
this.attachments = res;
console.log('res', res);
});
}
async LoadRelatedEvents(serial: string) {
if (this.eventsList == null) {
this.attachmentsService.getAttachmentsBySerial(serial).subscribe(res => {
console.log(res);
res.forEach(att => {
if (this.eventsList == null) {
this.eventsList = new Array();
}
this.events.getEvent(att.ParentId).subscribe(event => {
this.eventsList.push(event);
console.log(this.eventsList);
});
});
});
}
}
viewDocument(DocId:string) {
this.processes.GetDocumentUrl(DocId, this.task.FsId).subscribe(res=>{
console.log(res);
@@ -562,7 +535,6 @@ export class ExpedientePrPage implements OnInit {
});
}
async openOptions(taskAction?: any) {
const popover = await this.popoverController.create({
component: OptsExpedientePrPage,