From ebac5ce1ad13f0debfd3a4fbf8ae5dfb68d77b67 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 12 Oct 2021 10:48:10 +0100 Subject: [PATCH 1/4] save --- src/app/shared/event/attendee-modal/attendee-modal.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html index d259c2355..1c3a0d70f 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.html +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html @@ -1,6 +1,6 @@ - Adicionar intervenientes aganda + Adicionar intervenientes From 262511580066daf56e3e0f9cc45c4875a8401bf5 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 13 Oct 2021 16:33:56 +0100 Subject: [PATCH 2/4] add viewer at events to approve view Order list of all tasks, most recent on top --- .../approve-event/approve-event.page.html | 11 ++--- .../approve-event/approve-event.page.ts | 42 ++++++++++--------- .../gabinete-digital/gabinete-digital.page.ts | 3 +- .../pedidos/pedido/pedido.page.ts | 2 +- src/app/services/auth.service.ts | 4 +- .../all-processes/all-processes.page.ts | 3 +- 6 files changed, 35 insertions(+), 30 deletions(-) diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html index 977fe6f70..894359f57 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html @@ -73,15 +73,16 @@ -
+
Documentos Anexados
+ *ngFor="let attachment of loadedEvent.Documents" + (click)="viewDocument(attachment.DocId, attachment)"> -

{{attach.SourceName}}

-

{{attach.Stakeholders}}{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}

+

{{ attachment.Assunto }}

+

{{ attachment.DocNumber }}

+

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

 diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 6e05b6c58..ef96118d6 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -11,6 +11,7 @@ import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page'; import { ToastService } from 'src/app/services/toast.service'; import { Location } from '@angular/common'; +import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; @Component({ selector: 'app-approve-event', @@ -30,6 +31,8 @@ export class ApproveEventPage implements OnInit { serialNumber:string; caller:string; + attachments:any; + @Input() InstanceId:string; @Output() approveEventDismiss = new EventEmitter(); @@ -96,9 +99,6 @@ export class ApproveEventPage implements OnInit { this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate); this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); - - let instanceId = this.loadedEvent.workflowInstanceDataFields.InstanceId; - this.getAttachments(instanceId); } async approveTask(serialNumber:string) { @@ -195,25 +195,27 @@ export class ApproveEventPage implements OnInit { } } - async getAttachments(instanceId:string) { - - try { - this.loadedAttachments = await this.attachmentsService.getAttachmentsById(instanceId).toPromise(); - - } catch (error) { - - } - - } - - viewDocument(sourceId){ - this.processes.GetDocumentUrl(sourceId, '8').subscribe(res=>{ - /* console.log(res); */ - const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); - const browser = this.iab.create(url,"_blank"); - browser.show(); + async viewDocument(DocId:string, Document) { + const modal = await this.modalController.create({ + component: ViewDocumentPage, + componentProps: { + trustedUrl: '', + file: { + title: Document.Assunto, + url: '', + title_link: '', + }, + Document, + applicationId: Document.ApplicationId, + docId: Document.DocId || Document.SourceId, + folderId: this.loadedEvent.FolderId, + task: this.loadedEvent + }, + cssClass: 'modal modal-desktop' }); + await modal.present(); + } async openOptions(ev:any) { diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 7f170b159..db164ad97 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -224,7 +224,8 @@ export class GabineteDigitalPage implements OnInit, DoCheck { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": taskDate, + //"CreateDate": taskDate, + "CreateDate": new Date(element.taskStartDate), "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, "DocumentsQty": element.totalDocuments, diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 32278a5ee..b1d06e7f4 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -175,7 +175,7 @@ export class PedidoPage implements OnInit { getDocumentDetails(forlderId:string, applicationId:string){ this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{ this.attachments = res.Documents; - // console.log(res['Documents']); + console.log(res['Documents']); }) } diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index ca61b3319..0f7d6208c 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -102,8 +102,8 @@ export class AuthService { console.log('Login to Rocket chat OK'); this.ValidatedUserChat = responseChat; localStorage.setItem('userChat', JSON.stringify(responseChat)); - localStorage.setItem('Meteor.loginToken', JSON.stringify(responseChat['data'].userId)); - localStorage.setItem('Meteor.userId', JSON.stringify(responseChat['data'].authToken)); + localStorage.setItem('Meteor.loginToken', JSON.stringify(responseChat['data'].authToken)); + localStorage.setItem('Meteor.userId', JSON.stringify(responseChat['data'].userId)); this.storageService.store(AuthConnstants.AUTH, responseChat); return true; } diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index 66532d60c..9d98fdbd3 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -69,7 +69,8 @@ export class AllProcessesPage implements OnInit { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": taskDate, + //"CreateDate": taskDate, + "CreateDate": new Date(element.taskStartDate), "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, "DocumentsQty": element.totalDocuments, From 5ebf77cf8d14531832b1d00b52242d5ecc6caeaa Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 13 Oct 2021 16:47:34 +0100 Subject: [PATCH 3/4] remove media imports --- src/app/app.module.ts | 2 -- src/app/home/home.page.ts | 1 - 2 files changed, 3 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index b4eb8c106..5e03f2fc2 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -35,7 +35,6 @@ import {MatDatepickerModule} from '@angular/material/datepicker'; import {MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core'; import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; import { Network } from '@ionic-native/network/ngx'; -import { Media } from '@ionic-native/media/ngx'; import { File } from '@ionic-native/file/ngx'; @@ -111,7 +110,6 @@ import { SQLite } from '@ionic-native/sqlite/ngx'; ChatService, ScreenOrientation, Network, - Media, File, SQLite ], diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 484ff71f8..baae9d136 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -16,7 +16,6 @@ import { ExpedienteGdStore } from '../store/expedientegd-store.service'; import { InativityService } from '../services/inativity.service'; import { SessionStore } from '../store/session.service'; import { StorageService } from '../services/storage.service'; -import { Media, MediaObject } from '@ionic-native/media/ngx'; import { File } from '@ionic-native/file/ngx'; import { WebNotificationPopupService } from '../services/notification/web-notification-popup.service'; import { DocumentCounterService } from '../services/worker/document-counter.service'; From 01ca3d4739b366c9ad58554079ca6b5738ff91a6 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 13 Oct 2021 17:01:38 +0100 Subject: [PATCH 4/4] save --- .../all-processes/all-processes.page.ts | 96 +++---------------- 1 file changed, 12 insertions(+), 84 deletions(-) diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index 5192c9e93..a5a841814 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -33,7 +33,17 @@ export class AllProcessesPage implements OnInit { ngOnInit() { - this.getAllProcessFromDB() + this.loadAllProcesses(); + + this.router.events.forEach((event) => { + if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital')) { + if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { + this.refreshing(); + } else { + this.loadAllProcesses(); + } + } + }); } doRefresh() { @@ -53,7 +63,6 @@ export class AllProcessesPage implements OnInit { async loadAllProcesses() { let allProcessesList = await this.processesService.GetTasksList("", false).toPromise(); console.log(allProcessesList); - this.addProcessToDB(allProcessesList) this.skeletonLoader = true; @@ -85,93 +94,12 @@ export class AllProcessesPage implements OnInit { this.allProcessesList.push(task); this.allProcessesList = removeDuplicate(this.allProcessesList) this.allProcessesList = this.sortArrayISODate(this.allProcessesList).reverse(); - + }); this.skeletonLoader = false; } - - addProcessToDB(data) { - - data.forEach(element => { - - let process = { - "serialNumber": element.serialNumber, - "workflowInstanceFolio": element.workflowInstanceFolio, - "Documents": element.Documents, - "actions": element.actions, - "activityInstanceName": element.activityInstanceName, - "formURL": element.formURL, - "originator": element.originator, - "taskStartDate": element.taskStartDate, - "totalDocuments": element.totalDocuments, - "workflowDisplayName": element.workflowDisplayName, - "workflowID": element.workflowID, - "workflowInstanceDataFields": element.workflowInstanceDataFields, - "workflowInstanceID": element.workflowInstanceID, - "workflowName": element.workflowName - } - - this.sqliteservice.addProcess(process); - }); - - } - - getAllProcessFromDB() { - - if(synchro.connected === true) { - this.loadAllProcesses(); - - this.router.events.forEach((event) => { - if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital')) { - if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.refreshing(); - } else { - this.loadAllProcesses(); - } - } - }); - } else { - this.sqliteservice.getAllProcess().then((allprocess: any[]) => { - allprocess.forEach(element => { - let date = new Date(element.taskStartDate); - date.setMonth(date.getMonth() + 1); - let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); - - var workflowInstanceDataFields = JSON.parse(element.workflowInstanceDataFields); - - let task = { - "SerialNumber": element.serialNumber, - "Folio": workflowInstanceDataFields.Subject, - "Senders": workflowInstanceDataFields.Sender, - "CreateDate": taskDate, - "DocumentURL": workflowInstanceDataFields.ViewerRequest, - "Remetente": workflowInstanceDataFields.Remetente, - "DocumentsQty": element.totalDocuments, - "DocId": workflowInstanceDataFields.DispatchDocId, - "FolderID": workflowInstanceDataFields.FolderID, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - "Status": workflowInstanceDataFields.Status, - "Agenda": workflowInstanceDataFields.Agenda, - "customDate": this.setFormatDate(new Date(workflowInstanceDataFields.StartDate), new Date(workflowInstanceDataFields.EndDate), workflowInstanceDataFields.IsAllDayEvent), - } - - this.allProcessesList.push(task); - this.allProcessesList = removeDuplicate(this.allProcessesList) - this.allProcessesList = this.sortArrayISODate(this.allProcessesList).reverse(); - - }); - - - - this.allProcessesList = allprocess; - console.log("All process from db ", allprocess) - }) - } - } - sortArrayISODate(myArray: any) { return myArray.sort(function (a, b) { return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);