Merge branch 'developer' into developer_mobilefirst

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

@@ -62,13 +62,6 @@ export class ApproveEventPage implements OnInit {
         this.caller = params["params"].caller;
       }
     });
-
-    /* this.activatedRoute.queryParams.subscribe(params => {
-      if(params["serialNumber"]) {
-        this.serialNumber = params["serialNumber"];
-        console.log(params["serialNumber"]);
-      }
-    }); */
   }
 
   ngOnInit() {

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts

@@ -141,13 +141,15 @@ export class BookMeetingModalPage implements OnInit {
       HasAttachments: true,
     }
     console.log(this.postData);
+    console.log(this.task);
+    
 
     if(this.task.FsId == '8') {
 
       try {
         switch (this.loggeduser.Profile) {
           case 'MDGPR':
-            await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise();
+            //await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise();
             break;
         
           case 'PR':

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

@@ -135,7 +135,7 @@ export class ExpedienteDetailPage implements OnInit {
   async LoadTaskDetail(serial: string) {
 
     this.processes.GetTask(serial).subscribe(res => {
-      //console.log(res);
+      /* console.log(res); */
       
       this.task = {
         "SerialNumber": res.serialNumber,

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

@@ -279,6 +279,8 @@ export class GabineteDigitalPage implements OnInit {
   }
 
   doRefresh(event) {
+    console.log(event);
+    
     this.closeAllDesktopComponents();
     switch(this.loggeduser.Profile){
       case 'MDGPR':
@@ -294,7 +296,15 @@ export class GabineteDigitalPage implements OnInit {
     this.LoadCounts();
     //this.refreshExpedientes();
 
+    if(event){
+      setTimeout(() => {
         event.target.complete();
+      }, 2000);
+    }
+    else{
+      console.log('null');
+      
+    }
   }
 
   notImplemented(){

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html

@@ -30,7 +30,7 @@
       <ion-item 
         class="item ion-no-padding width-100 cursor-pointer" 
         *ngFor="let event of eventsMDGPRList"
-        (click)="goToEventDetail(event.serialNumber)"
+        (click)="goToEventDetail(event)"
         >
         <!-- (click)="openApproveModal(event)" -->
         <div class="event-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts

@@ -59,21 +59,10 @@ export class EventsToApprovePage implements OnInit {
     this.eventsPRList = prEvents;
     console.log(this.eventsPRList);
     
-    /* this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
-      this.showLoader = false;
-      this.eventsPRList = res;
-
-      console.log('this.eventsPRList', this.eventsPRList)
-    }); */
     let mdEvents =  await this.processes.GetToApprovedEvents('MDGPR','false').toPromise();
     this.eventsMDGPRList = mdEvents;
     console.log(this.eventsMDGPRList);
-    /* this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
-      this.showLoader = false;
-      this.eventsMDGPRList = res;
     
-      console.log('this.eventsMDGPRList', this.eventsMDGPRList)
-    }); */
     this.showLoader = false;
   }