From 4174471f39d2c0194f35896e2564d6c9d745a601 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 18 Oct 2021 16:20:51 +0100 Subject: [PATCH 1/3] Fix --- .../document-detail/document-detail.page.ts | 42 ++++--------------- .../document-set-up-meeting.page.ts | 1 - .../despacho-pr/despacho-pr.page.ts | 2 + .../expedient-task-modal.page.ts | 3 ++ 4 files changed, 14 insertions(+), 34 deletions(-) diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index 047a19fdc..0efb39141 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -72,33 +72,9 @@ export class DocumentDetailPage implements OnInit { let folder: SearchFolderDetails = this.LoadedDocument if(this.LoadedDocument.ApplicationID == 361 || this.LoadedDocument.ApplicationId == 361) { - // task = { - // serialNumber: folder.DispatchNumber, - // taskStartDate: folder.DateDispatch, - // isEvent: true, - // workflowInstanceDataFields: { - // FolderID: folder['FolderId'] || folder['FolderID'] || folder.folderId, - // Subject: folder.Assunto, - // SourceSecFsID: folder.ApplicationID || folder['ApplicationId'], - // SourceType: 'FOLDER', - // SourceID: folder.folderId, - // DispatchNumber: folder.DispatchNumber - // }, - // } + } else if (document.ApplicationID == 8 || document.ApplicationId == 8) { - // task = { - // serialNumber: document.DocId, - // taskStartDate: document.DocDate, - // isEvent: true, - // workflowInstanceDataFields: { - // FolderID: null, - // Subject: document.Assunto, - // DispatchNumber: null, - // SourceSecFsID: document.ApplicationID || document.folderId, - // SourceType: 'DOC', - // SourceID: document.DocId, - // } - // } + } else { console.log('unexpected ApplicationID') } @@ -155,7 +131,7 @@ export class DocumentDetailPage implements OnInit { const selectedDoc = this.LoadedDocument.Documents[ this.dicIndex] - this.task = { + let task = { serialNumber: '', taskStartDate: '', isEvent: true, @@ -174,15 +150,15 @@ export class DocumentDetailPage implements OnInit { componentProps: { trustedUrl: '', file: { - title: this.task.workflowInstanceDataFields.Subject, + title: task.workflowInstanceDataFields.Subject, url: '', title_link: '', }, Document: this.LoadedDocument.Documents[ this.dicIndex], - applicationId: this.task.workflowInstanceDataFields.SourceSecFsID, - docId: this.task.workflowInstanceDataFields.SourceID , + applicationId: task.workflowInstanceDataFields.SourceSecFsID, + docId: task.workflowInstanceDataFields.SourceID , folderId: '', - task: this.task + task: task }, cssClass: 'modal modal-desktop' }); @@ -215,7 +191,7 @@ export class DocumentDetailPage implements OnInit { component: ExpedientTaskModalPage, componentProps: { taskAction: taskAction, - task: this.task, + task: this.DocumentTask, seachDocuments: this.LoadedDocument, aplicationId: this.LoadedDocument.ApplicationId || this.LoadedDocument.ApplicationID }, @@ -238,7 +214,7 @@ export class DocumentDetailPage implements OnInit { const modal = await this.modalController.create({ component: DocumentSetUpMeetingPage, componentProps: { - subject: this.task.workflowInstanceDataFields.Subject, + subject: this.LoadedDocument.Assunto, document: this.LoadedDocument, }, cssClass: classs, diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index 74beab957..947058b71 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -184,7 +184,6 @@ export class DocumentSetUpMeetingPage implements OnInit { } else{ console.log(this.document); -alert('PARA') this.docs.push({ ApplicationId: this.document.ApplicationId || this.document.ApplicationType, Source: 1, diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 48104a7d7..f033435a5 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -109,6 +109,8 @@ export class DespachoPrPage implements OnInit { "activityInstanceName": res.activityInstanceName, } this.fulltask = res; + + console.log(this.task); console.log('GetTask', res); diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index bb6b2a947..9429153b1 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -110,6 +110,9 @@ export class ExpedientTaskModalPage implements OnInit { this.loggeduser = userAuth.ValidatedUser; this.task = this.navParams.get('task'); + + console.log('create dispatch with this data', this.task); + this.SearchFolder = this.navParams.get('SearchFolder'); this.aplicationId = this.navParams.get('aplicationId') From b956ad4d29a91283c2e2e196a2edea27f91a50e7 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 19 Oct 2021 14:31:14 +0100 Subject: [PATCH 2/3] save --- src/app/modals/create-process/create-process.page.ts | 2 +- .../despachos-pr/despachos-pr.page.ts | 6 +++--- .../diplomas-assinar/diplomas-assinar.page.ts | 2 +- .../pages/gabinete-digital/diplomas/diplomas.page.ts | 8 ++++---- .../expedient-task-modal/expedient-task-modal.page.ts | 2 +- src/app/services/chat.service.ts | 11 ++++++++--- src/app/shared/chat/messages/messages.page.html | 7 ++++--- src/app/shared/chat/messages/messages.page.ts | 6 +++++- .../despachos-pr/despachos-pr.page.ts | 2 +- .../expedientes-pr/expedientes-pr.page.ts | 4 +++- .../shared/gabinete-digital/pedidos/pedidos.page.ts | 2 +- 11 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index f1dfce511..a566bfdcc 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -382,7 +382,7 @@ export class CreateProcessPage implements OnInit { } else{ this.validateField = true; - this.toastService.badRequest('Por favor adicione uma nota'); + this.toastService.badRequest('Por favor adicione uma descrição'); } loader.remove(); break; diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index 6938ce759..10f02616a 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -17,9 +17,9 @@ import { NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angul import { __awaiter } from 'tslib'; import { DespachosprStore } from 'src/app/store/despachospr-store.service'; -import { SqliteService } from 'src/app/services/sqlite.service'; import { synchro } from 'src/app/services/socket/synchro.service'; import { SortService } from 'src/app/services/functions/sort.service'; +import { SqliteService } from 'src/app/services/sqlite.service'; @Component({ selector: 'app-despachos-pr', @@ -125,7 +125,7 @@ export class DespachosPrPage implements OnInit { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": taskDate, + "CreateDate": new Date(element.taskStartDate), "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, "DocumentsQty": element.totalDocuments, @@ -187,7 +187,7 @@ export class DespachosPrPage implements OnInit { "SerialNumber": element.serialNumber, "Folio": JSON.parse(element.workflowInstanceDataFields).Subject, "Senders": JSON.parse(element.workflowInstanceDataFields).Sender, - "CreateDate": taskDate, + "CreateDate": new Date(element.taskStartDate), "DocumentURL": JSON.parse(element.workflowInstanceDataFields).ViewerRequest, "Remetente": JSON.parse(element.workflowInstanceDataFields).Remetente, "DocumentsQty": element.totalDocuments, diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index af0a19575..690222b2a 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -80,7 +80,7 @@ export class DiplomasAssinarPage implements OnInit { this.diplomasList = []; let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma"); - diplomasAssinar = this.sortService.sortArrayByDate(diplomasAssinar); + diplomasAssinar = this.sortService.sortArrayISODate(diplomasAssinar); diplomasAssinar.forEach(element => { let task: customTask = this.customTaskPipe.transform(element) this.diplomasList.push(task); diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index ff6849091..67849391e 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -170,7 +170,7 @@ export class DiplomasPage implements OnInit, OnDestroy { diplomasList.push(task); }); - this.diplomasList = this.sortService.sortArrayByDate(diplomasList).reverse(); + this.diplomasList = this.sortService.sortArrayISODate(diplomasList).reverse(); let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado"); @@ -181,7 +181,7 @@ export class DiplomasPage implements OnInit, OnDestroy { diplomasAssinadoList.push(task); }); console.log('diplomasAssinados', diplomasAssinados) - this.diplomasAssinadoList = this.sortService.sortArrayByDate(diplomasAssinadoList).reverse(); + this.diplomasAssinadoList = this.sortService.sortArrayISODate(diplomasAssinadoList).reverse(); } @@ -212,7 +212,7 @@ export class DiplomasPage implements OnInit, OnDestroy { diplomasList.push(task); }); - this.diplomasList = this.sortService.sortArrayByDate(diplomasList).reverse(); + this.diplomasList = this.sortService.sortArrayISODate(diplomasList).reverse(); let diplomasAssinados = process.reverse().filter(data => data.activityInstanceName == "Diploma Assinado"); let diplomasAssinadoList = [] @@ -222,7 +222,7 @@ export class DiplomasPage implements OnInit, OnDestroy { diplomasAssinadoList.push(task); }); console.log('diplomasAssinados', diplomasAssinados) - this.diplomasAssinadoList = this.sortService.sortArrayByDate(diplomasAssinadoList).reverse(); + this.diplomasAssinadoList = this.sortService.sortArrayISODate(diplomasAssinadoList).reverse(); }) } diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 658efc907..4203e5a68 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -441,7 +441,7 @@ export class ExpedientTaskModalPage implements OnInit { } else{ this.validateField = true; - this.toastService.badRequest('Por favor adicione uma nota'); + this.toastService.badRequest('Por favor adicione uma descrição'); } loader.remove(); break; diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index 612975aaf..0b05b66eb 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -53,14 +53,19 @@ export class ChatService { let headersc = new HttpHeaders(); headersc = headersc.set('X-User-Id', this.loggedUserChat['data'].userId); headersc = headersc.set('X-Auth-Token', this.loggedUserChat['data'].authToken); + headersc = headersc.set('Sec-Fetch-Dest', 'attachment'); + headersc = headersc.set('Sec-Fetch-Mode', 'navigate'); + headersc = headersc.set('Cookie', 'rc_uid=fsMwcNdufWvdnChj7'); + headersc = headersc.set('Cookie', 'rc_token=MLbhikLQI4xo9_vL43HqheKPPbxjag7hKfwxe9AjcvY'); // headersc = headersc.set("Host", "www.tabularium.pt"); // headersc = headersc.set("Origin", "http://localhost:8100"); - // headersc = headersc.set("Referer", "http://localhost:8100/"); + headersc = headersc.set('Referer', 'http://localhost:8100/'); let optionsc = { headers: headersc, + withCredentials: true }; - let fullUrl = "https://www.tabularium.pt/" + url; - return this.http.get(fullUrl, optionsc).subscribe(()=>{ + //let fullUrl = "https://www.tabularium.pt/" + url; + return this.http.get(url, optionsc).subscribe(()=>{ //this.fileService.viewDocumentByUrl(url) }); } diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index fb8f6d46f..648d9ed68 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -12,6 +12,10 @@ + -
- -
{{last ? scrollToBottom() : ''}} diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index c66eded15..1885c984f 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -248,9 +248,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy this.openViewDocumentModal(file); } else{ - let fullUrl = "https://www.tabularium.pt" + url; + let fullUrl; + fullUrl = "https://www.tabularium.pt" + url; + //fullUrl = "http://www.africau.edu/images/default/sample.pdf"; + this.frameUrl = fullUrl; //this.fileService.viewDocumentByUrl(fullUrl); + this.chatService.getDocumentDetails(fullUrl); } } diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts index c0f7289c4..1da06551a 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -74,7 +74,7 @@ constructor ( despachoList.push(task); }); - despachoList = this.sortService.sortArrayByDate(despachoList).reverse() + despachoList = this.sortService.sortArrayISODate(despachoList).reverse() this.despachosprstore.reset(despachoList); this.skeletonLoader = false; diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index d008b112a..53263290d 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -40,7 +40,7 @@ export class ExpedientesPrPage implements OnInit { ngOnInit() { this.LoadList() - + this.router.events.forEach((event) => { if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital?expedientespr=true') || @@ -72,6 +72,8 @@ export class ExpedientesPrPage implements OnInit { let task = this.expedienteTaskPipe.transform(element); this.taskslist.push(task); }); + console.log(this.taskslist); + this.expedienteGdStore.reset(this.taskslist); this.skeletonLoader = false; diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index a605e7a95..07adf868e 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -110,7 +110,7 @@ export class PedidosPage implements OnInit { let task: customTask = this.customTaskPipe.transform(element); this.deferimentoList.push(task); }); - this.pedidosstore.resetdeferimento(this.sortService.sortArrayByDate(this.deferimentoList)); + this.pedidosstore.resetdeferimento(this.sortService.sortArrayISODate(this.deferimentoList)); }); } From f14bd19bc1c81c5086e402d911ec638165323ce6 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 19 Oct 2021 14:38:49 +0100 Subject: [PATCH 3/3] Fix bug --- .gitignore | 3 ++- package-lock.json | 25 +++++++++++++++++++++---- package.json | 2 +- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c3cc397fa..8e9cdb052 100644 --- a/.gitignore +++ b/.gitignore @@ -49,4 +49,5 @@ src/app/store/notification.service.spec.ts src/app/store/notification.service.ts -src/assets/www/pdfjs/web/compressed.tracemonkey-pldi-09.pdf.pdf \ No newline at end of file +src/assets/www/pdfjs/web/compressed.tracemonkey-pldi-09.pdf.pdf +node_modules_ \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index d1536dc0e..e7ef6064f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2304,14 +2304,31 @@ } }, "@ionic/angular": { - "version": "5.8.1", - "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.8.1.tgz", - "integrity": "sha512-VKgq71yPPyiS+wN8cyfTsVmp0EEamUAGaYq7lZuupnhZ+/8LNyo5Xp/kl8txtCnGFTNIDZpMpmI8+/7KnU8Zuw==", + "version": "5.8.4", + "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.8.4.tgz", + "integrity": "sha512-pvy7qOTVih3mqcyIV6C3BK8seeZOEoanRFw+Z5m+soXDcvgrouHBBAKzURu2RUx8uDZqlX38Pkn89ontvqIZUg==", "requires": { - "@ionic/core": "5.8.1", + "@ionic/core": "5.8.4", "tslib": "^1.9.3" }, "dependencies": { + "@ionic/core": { + "version": "5.8.4", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.8.4.tgz", + "integrity": "sha512-ioaH7wXAtexcpk23III0KArjSXStkpPrpZ5BCNkyter3EbOmDVd8XIXRcT86zRG68rbGI7Pd9GrugxeaDyMk/g==", + "requires": { + "@stencil/core": "^2.4.0", + "ionicons": "^5.5.3", + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + } + } + }, "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", diff --git a/package.json b/package.json index 30de89858..7a56af1fc 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "@ionic-native/sqlite-porter": "^4.20.0", "@ionic-native/status-bar": "^5.0.0", "@ionic-native/wheel-selector": "^5.31.1", - "@ionic/angular": "^5.5.4", + "@ionic/angular": "^5.8.4", "@ionic/core": "^5.8.1", "@ionic/pwa-elements": "^3.0.2", "@ionic/storage": "^2.3.1",