Melhorias

src/app/pages/events/events.page.html

@@ -1,6 +1,21 @@
 <ion-header class="ion-no-border">
   <app-header-no-search></app-header-no-search>
 </ion-header>
+<ion-header class="ion-no-border">
+  <ion-toolbar class="bg-blue">
+    <ion-label>
+      <p class="time ion-text-center">{{customDate}}</p>
+    </ion-label>
+    <ion-label>
+      <p class="event-number p-small ion-text-center"> <strong>{{totalEvent}}</strong> eventos agendados para hoje</p>
+    </ion-label>
+  
+    <div class="next-meeting">
+      <div class="meeting-time">{{currentHoursMinutes | date: 'HH:mm'}}</div>
+      <div class="meeting-description"> "{{currentEvent}}"</div>
+    </div>
+  </ion-toolbar>
+</ion-header>
 
 <!-- Default Refresher -->
 
@@ -12,7 +27,7 @@
   
     <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
     
-    <ion-label>
+    <!-- <ion-label>
       <p class="time ion-text-center">{{customDate}}</p>
     </ion-label>
     <ion-label>
@@ -22,7 +37,7 @@
     <div class="next-meeting">
       <div class="meeting-time">{{currentHoursMinutes | date: 'HH:mm'}}</div>
       <div class="meeting-description"> "{{currentEvent}}"</div>
-    </div>
+    </div> -->
 
     <div class="conteiner-box" ng-swipe-up="swipe($event)">
       <div class="schedule">
@@ -84,18 +99,18 @@
         </div>
         <div class="content">
           <ul>
-            <li *ngFor = "let task of taskslist"
+            <li *ngFor = "let task of expedientList"
             (click)="viewExpedientDetail(task.SerialNumber)">
            <!--  [routerLink]="['/home/gabinete-digital/expediente']" -->
             >
             <div class="d-flex">
               <div class="schedule-date">
-                <div class="time-end">{{task.CreateDate | date: 'd/M/yy'}}</div>
-                <div class="time-start">{{task.CreateDate | date: 'HH:mm'}}</div>
+                <div class="time-end">{{task.taskStartDate | date: 'dd-MM-yy'}}</div>
+                <div class="time-start">{{task.taskStartDate | date: 'HH:mm'}}</div>
               </div>
               <div class="schedule-details pointer">
-                <div class="description">{{ task.Folio }}</div>
-                <div class="location">{{ task.Remetente }}</div>
+                <div class="description">{{ task.workflowInstanceFolio }}</div>
+                <div class="location">{{ task.workflowInstanceDataFields.Sender }}</div>
               </div>
             </div>
             </li>

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

@@ -58,6 +58,7 @@ export class EventsPage implements OnInit {
   showLoader: boolean;
   
   taskslist:DailyWorkTask[];
+  expedientList:any;
 
   constructor(private eventService: EventsService, 
     private router: Router, 
@@ -248,26 +249,8 @@ export class EventsPage implements OnInit {
   LoadList()
   {
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
-
-      const AllResult = new Array();
-
-      result.forEach(element => {
-        let task: DailyWorkTask = {
-          "SerialNumber": element.serialNumber,
-          "Folio": element.workflowInstanceFolio,
-          "Senders": element.originator.email,
-          "CreateDate": new Date(element.taskStartDate).toLocaleString(),
-          "DocumentURL": element.formURL,
-          "Remetente": element.workflowInstanceDataFields.Remetente
-        }
-        // CreateDate
-        AllResult.push(task);
-      });
-
-      console.log(AllResult);
-
-      this.taskslist = this.sortArrayISODate(AllResult).reverse()
-
+      this.expedientList = result.reverse();
+      console.log(this.expedientList);
     });
   }
 

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -63,7 +63,7 @@ export class ExpedienteDetailPage implements OnInit {
         "Folio": res.workflowInstanceFolio,
         "Senders": res.originator.email,
         "CreateDate": formatDate(new Date(res.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-        "DocumentURL": res.formURL,
+        "DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
         "Remetente": res.workflowInstanceDataFields.Remetente
       }
       this.fulltask = res;
@@ -93,7 +93,7 @@ export class ExpedienteDetailPage implements OnInit {
 
   viewDocument(){
     const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
-    const browser = this.iab.create(url,"_blank");
+    const browser = this.iab.create(url,"_parent");
     browser.show();
   }
 

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

@@ -48,7 +48,7 @@ export class ExpedientePage implements OnInit {
           "Folio": element.workflowInstanceFolio,
           "Senders": element.originator.email,
           "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-          "DocumentURL": element.formURL,
+          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
           "Remetente": element.workflowInstanceDataFields.Remetente
         }
         this.taskslist.push(task);

src/app/pages/gabinete-digital/gabinete-digital.page.html

@@ -8,7 +8,7 @@
         <div class="div-title">
           <ion-label class="title">Gabinete Digital</ion-label>
         </div>
-        <div class="div-icon">
+        <div hidden class="div-icon">
           <ion-icon slot="end" src='assets/images/icons-add.svg'></ion-icon>
         </div>
       </div>