diff --git a/config.xml b/config.xml index 7cb062033..ea0586ed8 100644 --- a/config.xml +++ b/config.xml @@ -81,7 +81,7 @@ 0 - 8.0.0.00-20210905-154328 + 8.0.0.00-20210308-063916 diff --git a/package-lock.json b/package-lock.json index d1536dc0e..b24c34acf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23602,9 +23602,9 @@ } }, "typescript": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz", - "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==", + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", "dev": true }, "ua-parser-js": { diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts index 3b122f16a..cb5b52480 100644 --- a/src/app/modals/view-document/view-document.page.ts +++ b/src/app/modals/view-document/view-document.page.ts @@ -15,9 +15,6 @@ import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-se }) export class ViewDocumentPage implements OnInit { - url: string; - a:string = "https://equilibrium.dyndns.info/FileShare/pdfjs/web/viewer.html?file="; - viewerUrl: string; trustedUrl: any; file: any; applicationId: any; @@ -49,11 +46,11 @@ export class ViewDocumentPage implements OnInit { ngOnInit() { this.processes.GetViewer(this.docId, this.applicationId).subscribe(res=> { - const link: string = res + const link: string = res; this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(link); }, ()=>{ - this.close() - }) + this.close(); + }); } diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index bac53f6b3..0cfda76da 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -102,7 +102,7 @@ export class PendentesPage implements OnInit { }); pendentesList = removeDuplicate(pendentesList) - pendentesList = this.sortService.sortArrayByDate(pendentesList); + pendentesList = this.sortService.sortArrayISODate(pendentesList); this.listToPresent = pendentesList; this.skeletonLoader = false; @@ -135,7 +135,7 @@ export class PendentesPage implements OnInit { } }); - pendingList = this.sortService.sortArrayISODate(pendingList); + pendingList = pendingList; this.listToPresent = pendingList; console.log('pendentes', pendingList) diff --git a/src/app/services/functions/file.service.ts b/src/app/services/functions/file.service.ts index d5f3af27b..55483dc5c 100644 --- a/src/app/services/functions/file.service.ts +++ b/src/app/services/functions/file.service.ts @@ -314,7 +314,7 @@ export class FileService { } viewDocumentByUrl(url) { - const browser = this.iab.create(url,"_blank"); + const browser = this.iab.create(url,"_parent"); browser.show(); } } diff --git a/src/app/services/functions/sort.service.ts b/src/app/services/functions/sort.service.ts index 58c866878..9d580897b 100644 --- a/src/app/services/functions/sort.service.ts +++ b/src/app/services/functions/sort.service.ts @@ -8,14 +8,18 @@ export class SortService { constructor() { } sortArrayISODate(myArray: any) { - return myArray.sort(function (a, b) { - return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); - }); + if(myArray.length > 0){ + return myArray.sort(function (a, b) { + return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); + }); + } } sortArrayByDate(myArray: any) { console.log(myArray[0].taskStartDate); - return myArray.sort(function (a, b) { - return (new Date(a.workflowInstanceDataFields.StartDate) < new Date(b.workflowInstanceDataFields.StartDate)) ? -1 : ((new Date(a.workflowInstanceDataFields.StartDate) > new Date(b.workflowInstanceDataFields.StartDate)) ? 1 : 0); - }); + if(myArray.length > 0){ + return myArray.sort(function (a, b) { + return (new Date(a.workflowInstanceDataFields.StartDate) < new Date(b.workflowInstanceDataFields.StartDate)) ? -1 : ((new Date(a.workflowInstanceDataFields.StartDate) > new Date(b.workflowInstanceDataFields.StartDate)) ? 1 : 0); + }); + } } } diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 1fc04fa76..fb8f6d46f 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -71,6 +71,9 @@ +
+ +
{{last ? scrollToBottom() : ''}} diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 6c75ef5c0..88679c1e2 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -54,6 +54,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy mesageItemDropdownOptions: boolean = false; scrollToBottomBtn = false; longPressActive = false; + frameUrl: any; constructor( public popoverController: PopoverController, @@ -246,7 +247,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy } else{ let fullUrl = "https://www.tabularium.pt" + url; - this.fileService.viewDocumentByUrl(fullUrl); + this.frameUrl = fullUrl; + //this.fileService.viewDocumentByUrl(fullUrl); } } 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 065465439..8e5c542e4 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 @@ -61,7 +61,7 @@ export class AllProcessesPage implements OnInit { async loadAllProcesses() { let allProcessesList = await this.processesService.GetTasksList("", false).toPromise(); - console.log(allProcessesList); + //console.log(allProcessesList); this.skeletonLoader = true; diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index fd9165cc1..cc20a4a26 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -62,7 +62,7 @@ export class PendentesPage implements OnInit { }); pendentesList = removeDuplicate( pendentesList) - pendentesList = this.sortService.sortArrayByDate(pendentesList); + pendentesList = this.sortService.sortArrayISODate(pendentesList); this.pendentesstore.reset(pendentesList); this.skeletonLoader = false;