From 759e555392c88ba8757114c5b44de3ff30f5d710 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 23 Apr 2021 17:18:52 +0100
Subject: [PATCH] add despacho view details

---
 .../despacho/despacho-routing.module.ts       |  17 ++
 .../despachos/despacho/despacho.module.ts     |  22 ++
 .../despachos/despacho/despacho.page.html     | 186 +++++++++++++
 .../despachos/despacho/despacho.page.scss     | 236 ++++++++++++++++
 .../despachos/despacho/despacho.page.spec.ts  |  24 ++
 .../despachos/despacho/despacho.page.ts       | 260 ++++++++++++++++++
 .../despachos/despachos-routing.module.ts     |  21 ++
 .../despachos/despachos.module.ts             |  20 ++
 .../despachos/despachos.page.html             |   9 +
 .../despachos/despachos.page.scss             |   0
 .../despachos/despachos.page.spec.ts          |  24 ++
 .../despachos/despachos.page.ts               |  15 +
 .../gabinete-digital-routing.module.ts        |   4 +
 .../gabinete-digital.page.html                |  38 ++-
 .../despachos/despachos.page.html             |   2 +-
 .../despachos/despachos.page.ts               |   5 +-
 .../pedidos/pedidos.page.html                 |   1 +
 .../gabinete-digital/pedidos/pedidos.page.ts  |   4 +-
 18 files changed, 870 insertions(+), 18 deletions(-)
 create mode 100644 src/app/pages/gabinete-digital/despachos/despacho/despacho-routing.module.ts
 create mode 100644 src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts
 create mode 100644 src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
 create mode 100644 src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
 create mode 100644 src/app/pages/gabinete-digital/despachos/despacho/despacho.page.spec.ts
 create mode 100644 src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
 create mode 100644 src/app/pages/gabinete-digital/despachos/despachos-routing.module.ts
 create mode 100644 src/app/pages/gabinete-digital/despachos/despachos.module.ts
 create mode 100644 src/app/pages/gabinete-digital/despachos/despachos.page.html
 create mode 100644 src/app/pages/gabinete-digital/despachos/despachos.page.scss
 create mode 100644 src/app/pages/gabinete-digital/despachos/despachos.page.spec.ts
 create mode 100644 src/app/pages/gabinete-digital/despachos/despachos.page.ts

diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho-routing.module.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho-routing.module.ts
new file mode 100644
index 000000000..d3f2a2b4d
--- /dev/null
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DespachoPage } from './despacho.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DespachoPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DespachoPageRoutingModule {}
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts
new file mode 100644
index 000000000..2ff098185
--- /dev/null
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DespachoPageRoutingModule } from './despacho-routing.module';
+
+import { DespachoPage } from './despacho.page';
+import { SharedModule } from 'src/app/shared/shared.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    SharedModule,
+    DespachoPageRoutingModule
+  ],
+  declarations: [DespachoPage]
+})
+export class DespachoPageModule {}
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
new file mode 100644
index 000000000..513299d8f
--- /dev/null
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -0,0 +1,186 @@
+<ion-menu autoHide="false" side="end" content-id="main-content">
+  <ion-header>
+    <ion-toolbar translucent>
+      <ion-title>Menu</ion-title>
+    </ion-toolbar>
+  </ion-header>
+  <ion-content>
+    <ion-list>
+      <ion-item (click)="openExpedientActionsModal('0',fulltask)">
+        <ion-icon name="documents" slot="start"></ion-icon>
+        <ion-label>Efectuar Despacho</ion-label>
+      </ion-item>
+      <ion-item (click)="openExpedientActionsModal('1',fulltask)">
+        <ion-icon name="arrow-undo" slot="start"></ion-icon>
+        <ion-label>Pedido de Parecer</ion-label>
+      </ion-item>
+      <ion-item (click)="openExpedientActionsModal('2',fulltask)">
+        <ion-icon name="arrow-redo" slot="start"></ion-icon>
+        <ion-label>Pedido de Deferimento</ion-label>
+      </ion-item>
+      <ion-item (click)="openBookMeetingModal(task)">
+        <ion-icon name="calendar" slot="start"></ion-icon>
+        <ion-label>Marcar reunião</ion-label>
+      </ion-item>
+      <ion-item (click)="discartExpedient()">
+        <ion-icon name="trash" slot="start"></ion-icon>
+        <ion-label>Descartar</ion-label>
+      </ion-item>
+      <ion-item hidden disabled>
+        <ion-icon name="paper-plane" slot="start"></ion-icon>
+        <ion-label>Enviar para pendentes</ion-label>
+      </ion-item>
+    </ion-list>
+  </ion-content>
+</ion-menu>
+<div class="ion-page d-none" id="main-content">
+  <ion-menu-button></ion-menu-button>
+</div>
+
+<ion-content>
+  <div class="main-content d-flex height-100">
+    <div class="content d-flex flex-column" *ngIf="task">
+      <div class="main-header">
+        <div class="title-content">
+          <app-btn-modal-dismiss></app-btn-modal-dismiss>
+          <div class="middle">
+            <ion-label class="title">{{ task.Folio}}</ion-label>
+          </div>
+          <div class="div-icon">
+              <ion-menu-button autoHide="false">
+                <ion-icon name="ellipsis-vertical-outline"></ion-icon>
+              </ion-menu-button>
+          </div>
+        </div>
+      </div>
+      <div class="upper-content">
+        <div class="content-details">
+          <ion-label>
+            <p><span class="date">{{customDate}}</span><span class="label">{{ task.WorkflowName }}</span></p>
+            <p><span class="color-red">Muitíssimo urgente</span></p>
+          </ion-label>
+        </div>
+      </div>
+      <div class="line"></div>
+      <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">
+            <ion-label>
+              <div *ngFor="let c of cc">
+                <p>{{c.Name}}</p>
+              </div>
+            </ion-label>
+          </ion-item>
+        </div>
+        <div *ngIf="task.Note">
+          <h5>Detalhes</h5>
+          <ion-item class="ion-no-margin ion-no-padding">
+              <p [innerHTML]="task.Note"></p>
+          </ion-item>
+        </div>
+      </div>
+      <div class="bottom-content width-100">
+        <ion-list>
+          <h5>Documentos Anexados</h5>
+          <ion-item class="ion-no-margin ion-no-padding">
+          <ion-label
+          (click)="viewDocument()">
+            <p class="attach-title-item">{{ task.Folio }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
+            <p><span class="span-left">{{task.Remetente}}</span><span class="span-right">{{ task.CreateDate | date: 'dd/MM/yy' }}</span></p>
+          </ion-label>
+        </ion-item>
+        </ion-list>
+      </div>
+
+      <div *ngIf="eventsList">
+        <h3 class="h3-event-title">Eventos Associados</h3>
+        <ion-list>
+          <div *ngIf="eventsList">
+            <ion-item-sliding>
+              <ion-item 
+                class="Rectangle" lines="none" 
+                *ngFor="let event of eventsList"
+                (click)="viewEventDetail(event.EventId)"
+              >
+                  <!-- [routerLink]="['/home/events', event.EventId, 'events']" -->
+                  <div class="content-{{profile}}-{{event.CalendarName}}">
+                    <div class="approve-event-time">
+                      <p>{{event.StartDate | date: 'hh:mm'}}</p>
+                      <p>{{event.EndDate | date: 'hh:mm'}}</p>
+                    </div>
+                    <div class="approve-event-detail">
+                      <p *ngIf="event.StartDate != event.EndDate">{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}}  |  {{event.Location}}</p>
+                      <p *ngIf="event.StartDate == event.EndDate">{{event.StartDate | date: 'd/M/yy' }}  |  {{event.Location}}</p>
+                      <h3>{{event.Subject}}</h3>
+                    </div>
+                  </div>
+                </ion-item>
+            </ion-item-sliding>
+          </div>
+        </ion-list>
+      </div>
+
+    </div>
+    <div *ngIf="task" class="aside-right flex-column height-100">
+      <div class="buttons">
+        <button (click)="executado()" class="btn-ok" shape="round" >Executado</button>
+        <button (click)="delegar()" class="btn-ok" shape="round" >Delegar</button>
+        <div class="solid"></div>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+        <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+      </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>
+
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
new file mode 100644
index 000000000..860c052db
--- /dev/null
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
@@ -0,0 +1,236 @@
+@import '~src/function.scss';
+.content{
+  padding: 30px 20px 0 20px !important;
+  margin: 0;
+  float: left;
+}
+.color-red{
+  font-weight: 500;
+  color:#d30a0a !important;
+}
+.btn-size{
+  font-size: 18px !important;
+}
+.main-header{
+  font-family: Roboto;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
+  background-color: #fff;
+  overflow:auto;
+  color:#000;
+  transform: translate3d(0, 1px, 0);
+    .header-top{
+      width: 360px;
+      margin: 0px auto;
+      overflow: auto;
+      padding: 0 !important;
+      background: #fff;
+      .middle{
+        padding: 0!important;
+        float: left;
+        width: 280px;
+        margin: 2.5px 0 0 5px;
+        display: flex;
+        align-items: center;
+            
+        }
+        .right{
+          padding: 0!important;
+          float: right;
+          font-size: 25px;
+          color: #0782c9;
+          margin: 5px 0 0 0;
+        }
+      }
+      .header-bottom{
+         width: 310px;
+        overflow: auto;
+        margin: 0 auto;
+
+        .header-bottom-icon{
+          width: 30px;
+          font-size: 25px;
+          float: left;
+          padding: 2px;
+        }
+        .header-bottom-contacts{
+          width: 275px;
+          font-size: 15px;
+          color: #797979;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          float: left;
+            padding: 5px;
+          margin: 1px;
+        }
+      }
+    
+        .title{
+          font-size: 25px;
+          overflow: auto;
+          float: left;
+          padding-top: 4px;
+          padding-left: 5px;
+        }
+        .div-icon{
+          width: 40px;
+          float: right;
+          font-size: 35px;
+          overflow: auto;
+          padding: 1px;
+        }
+}
+ion-item-group{
+    margin: 15px;
+}
+ion-button{
+    display: block;
+    width: 80%;
+    margin: 20px auto;
+}
+
+
+.upper-content{
+  font-family: Roboto;
+  margin-left: 41px;
+  overflow: auto;
+  font-size: 18px;
+
+  .label{
+      border-radius: 20px;
+      background: #ffb703;
+      float: right;
+      padding: 5px 13.5px 5px 13.5px;
+      color: #fff;
+  }
+
+  .button-calendar-type ion-button{
+    height: 25px;
+  }
+  .content-details{
+    font-size: 17px;
+    .date{
+      color: #797979;
+    }
+  }
+}
+.middle-conten{
+ .middle-content p{
+    font-size: 16px;
+  }
+}
+.bottom-content{
+  //width: 360px;
+  margin: 0 auto;
+  
+  .bottom-content h3{
+    font-size: 16px;
+    margin: 0 0 0 10px;
+  }
+  .attach-document{
+    font-size: 15px;
+    color: #0d89d1;
+    margin: 5px 5px 5px 10px;
+    padding: 5px;
+    float: left;
+  }
+  .attach-icon{
+    width: 37px;
+    font-size: 35px;
+    float: left;
+  }
+  .attach-title-item{
+    font-size: 18px;
+    width: 100%;
+    color:#0d89d1;
+    padding-bottom: 5px;
+  }
+  /* SPAN */
+  .span-left{
+    float: left;
+    font-size: 15x;
+  }
+  .span-right{
+  text-align: right;
+  float: right;
+  font-size: 13px;
+  }
+}
+.aside-right{
+  padding: 30px 20px 0 20px !important;
+
+  .arrow-right{
+    display: flex;
+    justify-content: flex-end;
+    margin-bottom: 20px;
+   
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: 35px;
+        overflow: hidden;
+    }
+  }
+  .buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+
+    .btn-ok, .btn-cancel, .btn-delete{
+      height: auto !important;
+      font-size: 16px !important;
+      font-weight: 600 !important;
+      width: 100% !important;
+      margin-bottom: 10px !important;
+      padding: 15px !important;
+    }
+  }
+  .solid {
+    display: block;
+    width: 90%;
+    border-top: 1px solid #ebebeb;
+    margin: 0 auto !important;
+    margin-bottom: 10px !important;
+  }
+}
+
+@media only screen and (max-width: 800px) {
+  .content{
+    width: 100% !important;
+  }
+  .aside-right{
+    display: none;
+  }
+}
+@media only screen and (min-width: 801px) {
+  .div-icon{
+    display: none;
+  }
+  .content{
+    width: 65%;
+    border-right: 1px solid #d8d8d8;
+  }
+
+  .aside-right{
+    width: 35%;
+  }
+}
+
+@media only screen and (min-width: 1024px){
+  .content{
+    width: 70%;
+  }
+  .aside-right{
+    width: 30%;
+  }
+}
+
+@media only screen and (min-width: 1140px){
+  .content{
+    width: 75%;
+  }
+  .aside-right{
+    width: 25%;
+  }
+}
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.spec.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.spec.ts
new file mode 100644
index 000000000..e3b02d05c
--- /dev/null
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DespachoPage } from './despacho.page';
+
+describe('DespachoPage', () => {
+  let component: DespachoPage;
+  let fixture: ComponentFixture<DespachoPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DespachoPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DespachoPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
new file mode 100644
index 000000000..5d42ddc78
--- /dev/null
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -0,0 +1,260 @@
+import { Component, OnInit } from '@angular/core';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { AttachmentsService } from 'src/app/services/attachments.service';
+import { EventsService } from 'src/app/services/events.service';
+import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
+import { DailyWorkTask } from '../../../../models/dailyworktask.model';
+import { ActivatedRoute, Router } from '@angular/router';
+import { formatDate } from '@angular/common';
+import { Event } from '../../../../models/event.model';
+import { MenuController, ModalController, NavParams } from '@ionic/angular';
+import { AlertService } from 'src/app/services/alert.service';
+import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
+import { momentG }  from 'src/plugin/momentG'
+import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
+import { ExpedientTaskModalPage } from '../../expediente/expedient-task-modal/expedient-task-modal.page';
+import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
+
+@Component({
+  selector: 'app-despacho',
+  templateUrl: './despacho.page.html',
+  styleUrls: ['./despacho.page.scss'],
+})
+export class DespachoPage implements OnInit {
+  months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
+  days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
+
+  customDate:any;
+
+  task: any;
+  fulltask: any;
+  eventsList: Event[];
+  serialnumber: string;
+  profile: string;
+  intervenientes: any;
+  cc: any;
+
+  constructor(private activateRoute: ActivatedRoute,
+    private processes: ProcessesService,
+    private iab: InAppBrowser,
+    private attachments: AttachmentsService,
+    private events: EventsService,
+    private menu: MenuController,
+    private router: Router,
+    private modalController: ModalController,
+    private navParams: NavParams,
+    private alertService: AlertService) { 
+      this.serialnumber = this.navParams.get('serialNumber');
+      this.profile = this.navParams.get('profile');
+    }
+
+  ngOnInit() {
+    this.profile = "mdgpr";
+    console.log(this.serialnumber);
+    
+    this.activateRoute.paramMap.subscribe(paramMap => {
+      if (!paramMap.has('SerialNumber')) {
+        return;
+      }
+      /* this.serialnumber = paramMap.get('SerialNumber'); */
+      this.LoadTaskDetail(this.serialnumber);
+      this.LoadRelatedEvents(this.serialnumber);
+    });
+    this.LoadTaskDetail(this.serialnumber);
+    this.LoadRelatedEvents(this.serialnumber);
+  }
+
+  close(){
+    this.modalController.dismiss();
+  }
+
+
+  async LoadTaskDetail(serial: string) {
+    this.processes.GetTask(serial).subscribe(res => {
+      this.task = {
+        "SerialNumber": res.serialNumber,
+        "Folio": res.workflowInstanceDataFields.Subject,
+        "Senders": res.originator.email,
+        "CreateDate": momentG(new Date(res.taskStartDate),'yyyy-MM-dd HH:mm:ss'),
+        "DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": res.workflowInstanceDataFields.Sender,
+        "Note": res.workflowInstanceDataFields.Note,
+        "FolderId": res.workflowInstanceDataFields.FolderID,
+        "FsId": res.workflowInstanceDataFields.FsId,
+        "DocId": res.workflowInstanceDataFields.DocId,
+        "WorkflowName": res.workflowDisplayName,
+      }
+      this.fulltask = res;
+      console.log('GetTask', res);
+
+      let thedate = new Date(this.task.CreateDate);
+      this.customDate = this.days[thedate.getDay()]+ ", "  + thedate.getDate() +" de "  + ( this.months[thedate.getMonth()]);
+
+
+      this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users=>{
+        this.intervenientes = users.filter(user=>{
+          return user.Type == 'I';
+        });
+        this.cc = users.filter(user=>{
+          return user.Type == 'CC';
+        });
+        console.log(users);
+        
+      })
+
+    });
+  }
+
+  async LoadRelatedEvents(serial: string) {
+    if (this.eventsList == null) {
+      this.attachments.getAttachmentsBySerial(serial).subscribe(res => {
+        console.log(res);
+        res.forEach(att => {
+          if (this.eventsList == null) {
+            this.eventsList = new Array();
+          }
+          this.events.getEvent(att.ParentId).subscribe(event => {
+            this.eventsList.push(event);
+            console.log(this.eventsList);
+          });
+        });
+      });
+    }
+  }
+
+  viewDocument(){
+    this.processes.GetDocumentUrl(this.task.DocId, this.task.FsId).subscribe(res=>{
+      console.log(res);
+      const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
+      const browser = this.iab.create(url,"_blank");
+      browser.show();
+      
+    });
+  }
+
+  openMenu() {
+    this.menu.open();
+    this.modalController.dismiss();
+  }
+  executado(){
+
+  }
+  delegar(){
+
+  }
+
+  async openExpedientActionsModal(taskAction: any, task: any) {
+    //this.modalController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: ExpedientTaskModalPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        profile: this.profile,
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      console.log(res['data']);
+      if(res['data']=='openDiscart'){
+        console.log('open discart');
+        
+        this.distartExpedientModal();
+
+      }
+
+    });
+  }
+
+  discartExpedient() {
+    /* let body = { "serialNumber": this.serialnumber, "action": "Passivo" }
+    console.log(body);
+    this.processes.PostTaskAction(body);
+    this.router.navigate(['/home/gabinete-digital/expediente']); */
+  }
+
+  async distartExpedientModal2(task: any){
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: task.serialNumber,
+        folderId: task.workflowInstanceDataFields.FolderID,
+        action: 'discart',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+    
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
+  async openBookMeetingModal(task: any) {
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
+  async viewEventDetail(eventId: any) {
+    console.log(this.profile);
+
+    const modal = await this.modalController.create({
+      component: ViewEventPage,
+      componentProps: {
+        eventId: eventId,
+        profile: this.profile,
+      },
+      cssClass: 'modal modal-desktop',
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res) => {
+      if (res) {
+      }
+    });
+  }
+  async distartExpedientModal(){
+    console.log(this.fulltask);
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: this.fulltask.serialNumber,
+        folderId: this.fulltask.workflowInstanceDataFields.FolderID,
+        action: 'complete',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+    
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      if(res['data']=='close'){
+        this.close();
+        /* console.log('2Expedient Discard closed2');
+        this.close();
+        this.openMenu(); */
+      }
+      
+    });
+  }
+}
diff --git a/src/app/pages/gabinete-digital/despachos/despachos-routing.module.ts b/src/app/pages/gabinete-digital/despachos/despachos-routing.module.ts
new file mode 100644
index 000000000..345680c07
--- /dev/null
+++ b/src/app/pages/gabinete-digital/despachos/despachos-routing.module.ts
@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DespachosPage } from './despachos.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DespachosPage
+  },
+  {
+    path: 'despacho',
+    loadChildren: () => import('./despacho/despacho.module').then( m => m.DespachoPageModule)
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DespachosPageRoutingModule {}
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.module.ts b/src/app/pages/gabinete-digital/despachos/despachos.module.ts
new file mode 100644
index 000000000..848f0659a
--- /dev/null
+++ b/src/app/pages/gabinete-digital/despachos/despachos.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DespachosPageRoutingModule } from './despachos-routing.module';
+
+import { DespachosPage } from './despachos.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DespachosPageRoutingModule
+  ],
+  declarations: [DespachosPage]
+})
+export class DespachosPageModule {}
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
new file mode 100644
index 000000000..5eefd8728
--- /dev/null
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -0,0 +1,9 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>despachos</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+
+</ion-content>
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.scss b/src/app/pages/gabinete-digital/despachos/despachos.page.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.spec.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.spec.ts
new file mode 100644
index 000000000..efae597ec
--- /dev/null
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DespachosPage } from './despachos.page';
+
+describe('DespachosPage', () => {
+  let component: DespachosPage;
+  let fixture: ComponentFixture<DespachosPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DespachosPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DespachosPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
new file mode 100644
index 000000000..cbde3cae7
--- /dev/null
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-despachos',
+  templateUrl: './despachos.page.html',
+  styleUrls: ['./despachos.page.scss'],
+})
+export class DespachosPage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts b/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts
index d90fc4521..426cea21c 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts
@@ -19,6 +19,10 @@ const routes: Routes = [
     path: 'discart-expedient-modal',
     loadChildren: () => import('./discart-expedient-modal/discart-expedient-modal.module').then( m => m.DiscartExpedientModalPageModule)
   },
+  {
+    path: 'despachos',
+    loadChildren: () => import('./despachos/despachos.module').then( m => m.DespachosPageModule)
+  },
 
 
 ];
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index c06f17bc5..74654ef82 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -68,8 +68,13 @@
             <p class="text-center exp-card-title ">Pedidos de Deferimento</p>
             <p class="text-center exp-card-content">{{count_def_dailywork}} <span class="title1">Documentos</span></p>
           </div>
-
-
+          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex d-none flex-column justify-center" (click)="notImplemented()">
+            <div class="d-flex justify-center">
+              <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
+            </div>
+            <p class="text-center exp-card-title ">Expediente Presidente</p>
+            <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
+          </div>
 
           <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex d-none flex-column justify-center" (click)="notImplemented()">
             <div class="d-flex justify-center">
@@ -79,21 +84,28 @@
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
           </div>
 
-          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
-            <div class="d-flex justify-center">
-              <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
+          <div [class.active]="selectedElement == '£££££££'" class="exp-card-long justify-center width-100" (click)="notImplemented()">
+            <div class="center-div">
+              <div class="exp-card-icon">
+                <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
+              </div>
+              <div class="exp-card-text">
+                <p class="exp-card-title ">Expediente Presidente</p>
+                <p class="exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
+              </div>
             </div>
-            <p class="text-center exp-card-title ">Expediente Presidente</p>
-            <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
           </div>
 
-
-          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
-            <div class="d-flex justify-center">
-              <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
+          <div [class.active]="selectedElement == '£££££££'" class="exp-card-long width-100" (click)="notImplemented()">
+            <div class="center-div">
+              <div class="exp-card-icon">
+                <ion-icon  src="assets/images/icons-despachos-presidente.svg"></ion-icon>
+              </div>
+              <div class="exp-card-text">
+                <p class="text-center exp-card-title">Despacho do Presidente da República</p>
+                <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
+              </div>
             </div>
-            <p class="text-center exp-card-title ">Despacho do Presidente da República</p>
-            <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
           </div>
 
           <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html
index c7ec589fd..c481a1146 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html
@@ -31,8 +31,8 @@
         <ion-item 
             class="expediente ion-no-padding"  
             *ngFor = "let task of despachoList"
+            (click)="viewExpedientDetail(task.SerialNumber)"
             >
-            <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
               <div class="item width-100">
                 <div class="exp-top-detail">
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
index b12d320c1..64a17206c 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -9,6 +9,7 @@ import { LoadingService } from 'src/app/services/loading.service';
 import { ModalController, NavParams } from '@ionic/angular';
 import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 import { AlertService } from 'src/app/services/alert.service';
+import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
 
 @Component({
   selector: 'app-despachos',
@@ -65,7 +66,7 @@ export class DespachosPage implements OnInit {
        res.forEach(element => {
          let task: DailyWorkTask = {
            "SerialNumber": element.serialNumber,
-           "Folio": element.workflowInstanceFolio,
+           "Folio": element.workflowInstanceDataFields.Subject,
            "Senders": element.originator.email,
            "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
            "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
@@ -96,7 +97,7 @@ export class DespachosPage implements OnInit {
    }
 
    const modal = await this.modalController.create({
-     component: ExpedienteDetailPage,
+     component: DespachoPage,
      componentProps:{
        enterAnimation: "",
        serialNumber: serialNumber,
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 09539eae4..14a383f20 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -34,6 +34,7 @@
         <ion-item 
             class="expediente ion-no-padding"  
             *ngFor = "let task of parecerList"
+            (click)="viewExpedientDetail(task.SerialNumber)"
             >
             <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index 52a0c313e..14613dc95 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -67,7 +67,7 @@ export class PedidosPage implements OnInit {
         res.forEach(element => {
           let task: DailyWorkTask = {
             "SerialNumber": element.serialNumber,
-            "Folio": element.workflowInstanceFolio,
+            "Folio": element.workflowInstanceDataFields.Subject,
             "Senders": element.originator.email,
             "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
@@ -89,7 +89,7 @@ export class PedidosPage implements OnInit {
         res.forEach(element => {
           let task: DailyWorkTask = {
             "SerialNumber": element.serialNumber,
-            "Folio": element.workflowInstanceFolio,
+            "Folio": element.workflowInstanceDataFields.Subject,
             "Senders": element.originator.email,
             "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,