Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

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

@@ -118,6 +118,8 @@ export class DespachoPrPage implements OnInit {
         "activityInstanceName": res.activityInstanceName,
       }
       this.fulltask = res;
+
+
       console.log(this.task);
 
       console.log('GetTask', res);

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

@@ -145,7 +145,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,
@@ -196,7 +196,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,

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

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

@@ -175,26 +175,26 @@ export class DiplomasPage implements OnInit, OnDestroy {
       this.skeletonLoader = true
 
       let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-  
+
       this.skeletonLoader = false
       this.showLoader = false;
-  
-  
+
+
       let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
       let diplomasList = [];
       diplomasValidar.forEach(async element => {
-  
+
         let task = this.pipeTask(element)
         diplomasList.push(task);
-  
+
       });
       this.diplomasList = this.sortService.sortArrayByDate(diplomasList.reverse());
-  
-  
+
+
       let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
       let diplomasAssinadoList = []
       diplomasAssinados.forEach(async element => {
-  
+
         let task = this.pipeTask(element)
         diplomasAssinadoList.push(task);
       });
@@ -219,7 +219,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 = []
@@ -229,7 +229,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();
 
     })
   }

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -111,6 +111,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')
 
@@ -441,7 +444,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;