Pull of bug fixed on pendents

config.xml

@@ -81,7 +81,7 @@
         </mfp:windows10>
         <mfp:appChecksum>0</mfp:appChecksum>
     </mfp:windows>
-    <mfp:platformVersion>8.0.0.00-20210905-154328</mfp:platformVersion>
+    <mfp:platformVersion>8.0.0.00-20210308-063916</mfp:platformVersion>
     <mfp:clientCustomInit enabled="false" />
     <mfp:server runtime="mfp" url="http://gpr-dev-10.gabinetedigital.local:9080" />
     <mfp:serverUri url="" />

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": {

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();
+    });
 
   }
 

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)
 

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();
   }
 }

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);
+      });
+    }
   }
 }

src/app/shared/chat/messages/messages.page.html

@@ -71,6 +71,9 @@
                 </div>
             </div>
           </div>
+          <div *ngIf="frameUrl">
+            <iframe id="iframe" [src]="frameUrl" height="100%" width="100%" title="Iframe Example"></iframe>
+          </div>
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>

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);
      }
   }
 

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;
 

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;