Fix merge

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/expedient-task-modal/expedient-task-modal.page.ts

@@ -248,7 +248,7 @@ export class ExpedientTaskModalPage implements OnInit {
                     }
                   }
                   this.taskResult = await this.processes.postParecer(this.postData).toPromise();
-                  await this.toastService.successMessage('Processo efetuado');
+                  await this.toastService.successMessage('Pedido enviado');
                   this.modalController.dismiss(action_parecer);
                   
                 } catch (error) {

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

@@ -35,14 +35,6 @@
 
       <div class="overflow-y-auto">
         <div class="middle-content">
-          <!-- <h5 *ngIf="intervenientes">Intervenientes</h5>
-          <ion-item class="ion-no-margin ion-no-padding">
-            <ion-label>
-              <div *ngFor="let interveniente of intervenientes">
-                <p>{{interveniente.Name}}</p>
-              </div>
-            </ion-label>
-          </ion-item> -->
           <div *ngIf="cc.length > 0">
             <h5>Com conhecimento</h5>
             <ion-item class="ion-no-margin ion-no-padding">
@@ -99,7 +91,7 @@
       </div>
     </div>
 
-    <div class="aside-right flex-column height-100">
+    <div *ngIf="task" class="aside-right flex-column height-100">
       <div class="buttons">
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
@@ -114,48 +106,6 @@
       </div>
     </div>
 
-    <div *ngIf="!task">
-      <ion-list>
-        <ion-list-header>
-          <ion-label>
-            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-          </ion-label>
-        </ion-list-header>
-        <ion-item>
-          <ion-label>
-            <h3>
-              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-            </h3>
-            <p>
-              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
-            </p>
-          </ion-label>
-        </ion-item>
-        <ion-item>
-          <ion-label>
-            <h3>
-              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-            </h3>
-            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-          </ion-label>
-        </ion-item>
-        <ion-item>
-          <ion-label>
-            <h3>
-              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-            </h3>
-            <p>
-              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
-            </p>
-          </ion-label>
-        </ion-item>
-        <ion-button color="medium" shape="round" expand="block">
-          <!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
-          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-        </ion-button>
-      </ion-list>
-    </div>
-
   </div>
 </ion-content>
 

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,
@@ -204,11 +204,6 @@ export class ExpedienteDetailPage implements OnInit {
     });
   }
 
-  openMenu() {
-    this.menu.open();
-    this.modalController.dismiss();
-  }
-
   async openExpedientActionsModal(taskAction: any, task: any) {
     //this.modalController.dismiss();
     let classs;