Fixe merge conflit

src/app/pages/events/event-detail-modal/event-detail-modal.page.html

@@ -16,16 +16,16 @@
   <div *ngIf="loadedEvent">
     <ion-item-group>
       <ion-item-sliding>
-        <form [formGroup]="ionicForm" novalidate>
+        <!-- <form [formGroup]="ionicForm" novalidate>
           <ion-item>
             <ion-label class="capitalizeText" position="stacked">Assunto</ion-label>
             <ion-input class="capitalizeText"  [(ngModel)]="loadedEvent.Subject" formControlName="subject" type="text" required></ion-input>
           </ion-item>
-          <!-- Error messages -->
+          //Error messages
           <span class="error ion-padding" *ngIf="errorControl.subject.errors?.required">
             Campo obrigatório
           </span>          
-        </form>
+        </form> -->
         <ion-item>
           <ion-label position="stacked">Descrição</ion-label>
           <ion-input class="capitalizeText" [(ngModel)]='loadedEvent.Body.Text'></ion-input>

src/app/pages/events/events.page.ts

@@ -123,13 +123,6 @@ export class EventsPage implements OnInit {
     event.target.complete();
   }
 
-
-  sortArrayISODate(myArray: any){
-    return myArray.sort(function(a, b) {
-      return (a.Data < b.Data) ? -1 : ((a.Data > b.Data) ? 1 : 0);
-    });
-  }
-
   onSegmentChange(){
     this.RefreshEvents();
   }
@@ -143,9 +136,11 @@ export class EventsPage implements OnInit {
         if(this.profile == "mdgpr"){
           this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt') /* + ' 00:00:00' */, formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
             this.eventsList = res;
-            console.log(res)
-            console.log(res[0])
-            this.currentEvent = res[0].Subject;
+            
+            if(res.length > 0){
+              this.currentEvent = res[0].Subject;
+            }
+            
             this.totalEvent = this.eventsList.length;
             this.showLoader = false;
            });
@@ -266,7 +261,9 @@ export class EventsPage implements OnInit {
   LoadList()
   {
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
-      this.taskslist = new Array();
+
+      const AllResult = new Array();
+
       result.forEach(element => {
         let task: DailyWorkTask = {
           "SerialNumber": element.serialNumber,
@@ -276,9 +273,27 @@ export class EventsPage implements OnInit {
           "DocumentURL": element.formURL,
           "Remetente": element.workflowInstanceDataFields.Remetente
         }
-        this.taskslist.push(task);
+        // CreateDate
+        AllResult.push(task);
       });
+
+      console.log(AllResult);
+
+      this.taskslist = this.sortArrayISODate(AllResult).reverse()
+
+
+    });
+
+
+  }
+
+  sortArrayISODate(myArray: any){
+    return myArray.sort(function(a, b) {
+      return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
     });
   }
+  
+  
+  
 }