Git pull made- changes made on list order

src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts

@@ -18,8 +18,8 @@ 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 { BackgroundService } from 'src/app/services/background.service';
+import { SortService } from 'src/app/services/functions/sort.service';
 
 @Component({
   selector: 'app-despachos-pr',
@@ -61,7 +61,8 @@ export class DespachosPrPage implements OnInit {
     private authService: AuthService,
     private router: Router,
     private sqliteservice: SqliteService,
-    private backgroundservice: BackgroundService
+    private backgroundservice: BackgroundService,
+    private sortService: SortService,
   ) {
 
     this.loggeduser = authService.ValidatedUser;
@@ -113,35 +114,33 @@ export class DespachosPrPage implements OnInit {
   async LoadList() {
 
     this.processes.GetTasksList("Despacho do Presidente da República", false).subscribe(async res => {
-
       this.skeletonLoader = true
 
       let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
       this.despachoList = [];
       this.skeletonLoader = false;
       console.log(result);
-  
+
       let despachosPr;
+      let despachos = this.sortService.sortArrayByDate(result);
       switch (this.loggeduser.Profile) {
         case 'MDGPR':
-          despachosPr = await result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
+          despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
           break;
         case 'PR':
-          console.log(result);
-  
-          despachosPr = await result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
+          despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
           break;
       }
-  
+
       console.log(despachosPr);
       despachosPr = despachosPr.filter(data => data.workflowInstanceDataFields.Status == "Active");
-  
+
       despachosPr.forEach((element, index) => {
-  
+
         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();
-  
+
         let task = {
           "SerialNumber": element.serialNumber,
           "Folio": element.workflowInstanceDataFields.Subject,
@@ -154,7 +153,7 @@ export class DespachosPrPage implements OnInit {
           "WorkflowName": element.workflowDisplayName,
           "activityInstanceName": element.activityInstanceName,
         }
-  
+
         this.despachoList.push(task);
         console.log(this.despachoList);
       });
@@ -214,12 +213,6 @@ export class DespachosPrPage implements OnInit {
     })
   }
 
-  sortArrayISODate(myArray: any) {
-    return myArray.sort(function (a, b) {
-      return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
-    });
-  }
-
   doRefresh() {
 
     setTimeout(() => {

src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts

@@ -7,6 +7,7 @@ import { ModalController, NavParams } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
 import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
+import { SortService } from 'src/app/services/functions/sort.service';
 
 @Component({
   selector: 'app-diplomas-assinar',
@@ -31,6 +32,7 @@ export class DiplomasAssinarPage implements OnInit {
    private modalController: ModalController,
    private alertService: AlertService,
    private router: Router,
+   private sortService: SortService,
    ) {
    }
 
@@ -39,7 +41,7 @@ export class DiplomasAssinarPage implements OnInit {
     const pathname = location.pathname + location.search
 
     this.LoadList()
-    
+
     this.router.events.forEach((event) => {
       if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
         if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
@@ -78,8 +80,7 @@ export class DiplomasAssinarPage implements OnInit {
     this.diplomasList = [];
 
     let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
-    console.log(diplomasAssinar);
-
+    diplomasAssinar = this.sortService.sortArrayByDate(diplomasAssinar);
     diplomasAssinar.forEach(element => {
       let task: customTask = this.customTaskPipe.transform(element)
       this.diplomasList.push(task);

src/app/pages/gabinete-digital/diplomas/diplomas.page.ts

@@ -4,8 +4,8 @@ import { DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 
 import { SqliteService } from 'src/app/services/sqlite.service';
-import { synchro } from 'src/app/services/socket/synchro.service';
 import { BackgroundService } from 'src/app/services/background.service';
+import { SortService } from 'src/app/services/functions/sort.service';
 
 @Component({
   selector: 'app-diplomas',
@@ -29,11 +29,10 @@ export class DiplomasPage implements OnInit, OnDestroy {
     private router: Router,
     private activatedRoute: ActivatedRoute,
     private sqliteservice: SqliteService,
-    private backgroundservice: BackgroundService
+    private backgroundservice: BackgroundService,
+    private sortService: SortService,
   ) {
-    this.diplomasList = [];
     //Inicializar segment
-    this.segment = 'validar';
 
     this.activatedRoute.queryParams.subscribe(params => {
       if (params['validar'] == 'true') {
@@ -189,7 +188,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
         diplomasList.push(task);
   
       });
-      this.diplomasList = this.sortArrayISODate(diplomasList.reverse());
+      this.diplomasList = this.sortService.sortArrayByDate(diplomasList.reverse());
   
   
       let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
@@ -200,7 +199,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
         diplomasAssinadoList.push(task);
       });
       console.log('diplomasAssinados', diplomasAssinados)
-      this.diplomasAssinadoList = this.sortArrayISODate(diplomasAssinadoList).reverse();
+      this.diplomasAssinadoList = this.sortService.sortArrayByDate(diplomasAssinadoList).reverse();
 
     }, (error) => {
       this.getFromDb()
@@ -219,18 +218,18 @@ export class DiplomasPage implements OnInit, OnDestroy {
         let task = this.pipeTaskOffline(element)
         diplomasList.push(task);
 
-      });
-      this.diplomasList = this.sortArrayISODate(diplomasList.reverse());
+        });
+        this.diplomasList = this.sortService.sortArrayByDate(diplomasList).reverse();
 
       let diplomasAssinados = process.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
       let diplomasAssinadoList = []
       diplomasAssinados.forEach(async element => {
 
-        let task = this.pipeTaskOffline(element)
-        diplomasAssinadoList.push(task);
-      });
-      console.log('diplomasAssinados', diplomasAssinados)
-      this.diplomasAssinadoList = this.sortArrayISODate(diplomasAssinadoList).reverse();
+          let task = this.pipeTaskOffline(element)
+          diplomasAssinadoList.push(task);
+        });
+        console.log('diplomasAssinados', diplomasAssinados)
+        this.diplomasAssinadoList = this.sortService.sortArrayByDate(diplomasAssinadoList).reverse();
 
     })
   }
@@ -244,7 +243,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
       "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,
@@ -264,7 +263,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
       "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,
@@ -275,11 +274,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
     }
   }
 
-  sortArrayISODate(myArray: any) {
-    return myArray.sort(function (a, b) {
-      return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
-    });
-  }
+
 
   async refreshing() {
     setTimeout(() => {

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -11,6 +11,7 @@ import { Location } from '@angular/common';
 import { SqliteService } from '../../../services/sqlite.service';
 import { BackgroundService } from '../../../services/background.service';
 import { Platform } from '@ionic/angular';
+import { SortService } from 'src/app/services/functions/sort.service';
 
 @Component({
   selector: 'app-event-list',
@@ -40,6 +41,7 @@ export class EventListPage implements OnInit {
     private location: Location,
     private sqliteservice: SqliteService,
     private platform: Platform,
+    private sortService: SortService,
     private backgroundservice: BackgroundService
   ) { }
 
@@ -80,12 +82,13 @@ export class EventListPage implements OnInit {
     this.platform.ready().then(() => {
 
       this.sqliteservice.getListOfEventAprove('Agenda Oficial MDGPR', 'Agenda Pessoal MDGPR').then((event: any[]) => {
-        this.eventsMDGPRList = event
+        this.eventsMDGPRList = this.sortService.sortArrayByDate(event).reverse()
+        
         console.log("All evento to aprove from db ", event)
       })
 
       this.sqliteservice.getListOfEventAprove('Agenda Oficial PR', 'Agenda Pessoal PR').then((event: any[]) => {
-        this.eventsPRList = event
+        this.eventsPRList = this.sortService.sortArrayByDate(event).reverse()
         console.log("All evento to aprove from db ", event)
       })
     })
@@ -97,26 +100,24 @@ export class EventListPage implements OnInit {
   }
 
   async LoadToApproveEvents() {
-
     this.processes.GetTasksList('Agenda Oficial MDGPR', false).subscribe(async res => {
       this.showLoader = true;
       this.skeletonLoader = true
-  
+
       console.log(this.segment);
       if (this.segment == 'MDGPR') {
         let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
         let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
         this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
-        console.log('Event aprove', this.eventsMDGPRList);
-  
-  
-        this.eventaprovacaostore.resetmd(this.eventsMDGPRList);
+        this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList).reverse()
+        this.eventaprovacaostore.resetmd(this.sortService.sortArrayByDate(this.eventsMDGPRList).reverse());
       }
       else if (this.segment == 'PR') {
         let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
         let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
         this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
-        this.eventaprovacaostore.resetpr(this.eventsPRList);
+        this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList).reverse();
+        this.eventaprovacaostore.resetpr(this.sortService.sortArrayByDate(this.eventsPRList).reverse());
       }
       this.showLoader = false;
       this.skeletonLoader = false

src/app/pages/gabinete-digital/pedidos/pedidos.page.ts

@@ -10,6 +10,7 @@ import { ModalService } from 'src/app/services/modal.service';
 
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
+import { SortService } from 'src/app/services/functions/sort.service';
 
 @Component({
   selector: 'app-pedidos',
@@ -46,6 +47,7 @@ export class PedidosPage implements OnInit {
     private activatedRoute: ActivatedRoute,
     private modalService: ModalService,
     private sqliteservice: SqliteService,
+    private sortService: SortService,
     private backgroundservice: BackgroundService
   ) {
     //Inicializar segment
@@ -67,23 +69,23 @@ export class PedidosPage implements OnInit {
   ngOnInit() {
 
     this.LoadList()
-    
-      this.router.events.forEach((event) => {
-        if(event instanceof NavigationStart && '/home/gabinete-digital/pedidos?parecer=true'.startsWith(event.url) ||
-          event instanceof NavigationStart && '/home/gabinete-digital/pedidos?deferimento=true'.startsWith(event.url)
-        )  {
-  
-          if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
-            this.refreshing()
-          } else {
-            this.LoadList()
-          }
-        }
-      });
 
-      this.backgroundservice.registerBackService('Online', () => {
-        this.getFromDb();
-      });
+    this.router.events.forEach((event) => {
+      if (event instanceof NavigationStart && '/home/gabinete-digital/pedidos?parecer=true'.startsWith(event.url) ||
+        event instanceof NavigationStart && '/home/gabinete-digital/pedidos?deferimento=true'.startsWith(event.url)
+      ) {
+
+        if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
+          this.refreshing()
+        } else {
+          this.LoadList()
+        }
+      }
+    });
+
+    this.backgroundservice.registerBackService('Online', () => {
+      this.getFromDb();
+    });
   }
 
   goBack() {
@@ -126,27 +128,27 @@ export class PedidosPage implements OnInit {
 
       if (this.segment == 'parecer') {
         this.taskType = "Pedido de Parecer";
-  
+
         let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
         let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
-  
+
         this.skeletonLoader = false
-  
+
         let allParecer = parecer.concat(parecerPr).reverse().filter(data => data.workflowInstanceDataFields.Status == "Active")
-  
+
         this.parecerList = [];
-  
+
         allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").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();
-  
+
           let task = {
             "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,
@@ -157,32 +159,32 @@ export class PedidosPage implements OnInit {
           this.parecerList.push(task);
         });
         this.sqliteservice.addProcess(this.parecerList);
-        this.listToPresentparecerList = this.parecerList
-  
+        this.listToPresentparecerList = this.sortService.sortArrayISODate(this.parecerList);
+
       }
       else if (this.segment == 'deferimento') {
         this.taskType = "Pedido de Deferimento";
         this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
-  
+
           this.skeletonLoader = false
-  
+
           console.log(result);
-  
+
           this.deferimentoList = [];
-  
+
           let res = result.filter(data => data.workflowInstanceDataFields.Status == "Active")
           res = res.reverse()
-  
+
           res.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();
-  
+
             let task = {
               "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,
@@ -190,20 +192,17 @@ export class PedidosPage implements OnInit {
               "WorkflowName": element.workflowDisplayName,
               "activityInstanceName": element.activityInstanceName,
             }
-  
+
             if (element.workflowInstanceDataFields.Status == "Active") {
               this.deferimentoList.push(task);
             }
-  
-  
           });
-          this.sqliteservice.addProcess(this.deferimentoList);
-          this.listToPresentdeferimentoList = this.deferimentoList
-  
-  
         });
+        this.sqliteservice.addProcess(this.deferimentoList);
+        this.listToPresentdeferimentoList = this.sortService.sortArrayISODate(this.deferimentoList);
       }
 
+
     }, (error) => {
       this.getFromDb()
     })
@@ -237,7 +236,7 @@ export class PedidosPage implements OnInit {
           parecerlist.push(task)
         }
       })
-      this.listToPresentparecerList = parecerlist;
+      this.listToPresentparecerList = this.sortService.sortArrayISODate(parecerlist);
       console.log('parecer', process)
     })
 
@@ -263,7 +262,7 @@ export class PedidosPage implements OnInit {
           deferimentolist.push(task)
         }
       })
-      this.listToPresentdeferimentoList = deferimentolist;
+      this.listToPresentdeferimentoList = this.sortService.sortArrayISODate(deferimentolist);
       console.log('deferimento', process)
     })
   }

src/app/pages/gabinete-digital/pendentes/pendentes.page.ts

@@ -13,6 +13,7 @@ import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
 import { Platform } from '@ionic/angular';
+import { SortService } from 'src/app/services/functions/sort.service';
 
 
 @Component({
@@ -44,7 +45,8 @@ export class PendentesPage implements OnInit {
     private activatedRoute: ActivatedRoute,
     private sqliteservice: SqliteService,
     private platform: Platform,
-    private backgroundservices: BackgroundService
+    private backgroundservices: BackgroundService,
+    private sortService: SortService,
   ) {
     this.loggeduser = authService.ValidatedUser;
     this.profile = 'mdgpr';
@@ -100,7 +102,7 @@ export class PendentesPage implements OnInit {
       });
 
       pendentesList = removeDuplicate(pendentesList)
-      pendentesList = this.sortArrayISODate(pendentesList);
+      pendentesList = this.sortService.sortArrayByDate(pendentesList);
       this.listToPresent = pendentesList;
       this.skeletonLoader = false;
 
@@ -110,12 +112,6 @@ export class PendentesPage implements OnInit {
 
   }
 
-  sortArrayISODate(myArray: any) {
-    return myArray.sort(function (a, b) {
-      return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
-    });
-  }
-
   getFromDb() {
 
     this.platform.ready().then(() => {
@@ -125,7 +121,7 @@ export class PendentesPage implements OnInit {
           var workflow = JSON.parse(element.workflowInstanceDataFields);
           if (workflow.Status === "Pending") {
             let task = {
-              "CreateDate": element.taskStartDate,
+              "CreateDate": new Date(element.taskStartDate),
               "DocumentsQty": element.totalDocuments,
               "FolderID": workflow.FolderID,
               "Folio": workflow.Subject,
@@ -139,7 +135,7 @@ export class PendentesPage implements OnInit {
           }
         });
 
-        pendingList = this.sortArrayISODate(pendingList);
+        pendingList = this.sortService.sortArrayISODate(pendingList);
         this.listToPresent = pendingList;
         console.log('pendentes', pendingList)