Fixe merge

src/app/shared/agenda/approve-event/approve-event.component.html

@@ -66,6 +66,7 @@
         </div>
       </div>
       <div class="line"></div>
+
       <div class="middle-content">
         <div *ngIf="loadedEvent.workflowInstanceDataFields.ParticipantsList">
           <h5>Intervenientes</h5>
@@ -95,6 +96,11 @@
         </ion-list>
       </div>
     </div>
+
+    <div class="overflow-y-auto">
+      
+    </div>
+
     <div *ngIf="showAside" class="aside-right flex-column height-100">
       <div class="aside-buttons">
         <button hidden full class="btn-ok" shape="round" >Editar evento</button>
@@ -104,8 +110,10 @@
         <button (click)="rejectTask(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
       </div>
     </div>
+
   </div>
 </ion-content>
+
 <ion-footer class="display-none-{{showAside}}">
     <div class="buttons">
       <button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>

src/app/shared/agenda/edit-event/edit-event.component.ts

@@ -207,7 +207,9 @@ export class EditEventComponent implements OnInit {
       component: SearchPage,
       cssClass: 'modal-width-100-width-background modal',
       componentProps: {
-        type: 'AccoesPresidenciais & ArquivoDespachoElect'
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        showSearchInput: true,
+        select: true,
       }
     });
     await modal.present();

src/app/shared/agenda/new-event/new-event.component.html

@@ -210,6 +210,7 @@
       </ion-item>
       </ion-list>
     </div> 
+    
   </div>    
 </ion-content>
 <ion-footer class="ion-no-border px-20">

src/app/shared/agenda/new-event/new-event.component.ts

@@ -132,7 +132,9 @@ export class NewEventPage implements OnInit {
       component: SearchPage,
       cssClass: 'modal-width-100-width-background modal',
       componentProps: {
-        type: 'AccoesPresidenciais & ArquivoDespachoElect'
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        showSearchInput: true,
+        select: true
       }
     });
     await modal.present();

src/app/shared/agenda/view-event/options/options.component.html

@@ -0,0 +1,14 @@
+<ion-content class="container">
+  <div class="arrow-right">
+    <button class="btn-no-color">
+      <ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+    </button>
+  </div>
+  <div class="buttons">
+    <button  class="btn-cancel" shape="round" >Efectuar Despacho</button>
+    <button  class="btn-ok" shape="round" >Pedido de Parecer</button>
+    <div class="solid"></div>
+    <button full class="btn-cancel mobile-only" shape="round" >Pedido de Deferimento</button>
+    <button  class="btn-delete" shape="round">Marcar reunião</button>
+  </div>
+</ion-content>

src/app/shared/agenda/view-event/options/options.component.scss

@@ -0,0 +1,54 @@
+.container{
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
+  }
+  .arrow-right{
+    display: none;
+    margin-bottom: 20px;
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: 35px;
+        overflow: hidden;
+    }
+  }
+  .buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+  }
+  .solid {
+    display: none;
+    width: 90%;
+    border-top: 1px solid #bbb;
+    margin: 0 auto !important;
+  }
+  @media only screen and (min-width: 1024px) {
+    .arrow-right{
+        display: flex;
+        justify-content: flex-end;
+    }
+    .btn-cancel{
+        //display: none;
+        width: 100% !important;
+        margin-bottom: 10px !important;
+    }
+    .btn-ok{
+      width: 100% !important;
+      margin-bottom: 10px !important;
+  }
+    .btn-delete{
+        width: 100% !important;
+        margin-bottom: 10px !important;
+        margin-top: 10px !important;
+    }
+    .solid{
+        display: block;
+    }
+    .mobile-only{
+      display: none !important;
+    }
+  }
+  

src/app/shared/agenda/view-event/options/options.component.spec.ts

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { OptionsComponent } from './options.component';
+
+describe('OptionsComponent', () => {
+  let component: OptionsComponent;
+  let fixture: ComponentFixture<OptionsComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ OptionsComponent ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(OptionsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/shared/agenda/view-event/options/options.component.ts

@@ -0,0 +1,14 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-options',
+  templateUrl: './options.component.html',
+  styleUrls: ['./options.component.scss'],
+})
+export class OptionsComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {}
+
+}

src/app/shared/agenda/view-event/view-event.module.ts

@@ -8,6 +8,7 @@ import { ViewEventPageRoutingModule } from './view-event-routing.module';
 
 import { ViewEventPage } from './view-event.page';
 import { SharedModule } from 'src/app/shared/shared.module';
+import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page';
 
 @NgModule({
   imports: [
@@ -17,6 +18,9 @@ import { SharedModule } from 'src/app/shared/shared.module';
     SharedModule,
     ViewEventPageRoutingModule
   ],
-  declarations: [ViewEventPage]
+  declarations: [
+    ViewEventPage,
+    ChatPopoverPage
+  ]
 })
 export class ViewEventPageModule {}

src/app/shared/agenda/view-event/view-event.page.html

@@ -35,18 +35,18 @@
 
 <ion-header  class="ion-no-border">
   <ion-toolbar class="header-toolbar">
-    <div class="main-header px-20">
+    <div class="main-header px-20" style="overflow: unset !important;">
       <div class="title-content d-flex"  >
         <div class="left">
           <button class="btn-no-color" (click)="close()">
             <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
           </button>
         </div>
-        <div class="middle flex-grow-1">
+        <div class="middle flex-grow-1" (click)="openOptions()">
           <ion-label class="title">{{loadedEvent.Subject}}</ion-label>
         </div>
 
-        <div class="div-icon">
+        <div class="div-icon d-flex">
           <button class="btn-no-color" (click)="editEvent()">
             <ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
           </button>
@@ -102,10 +102,10 @@
       <ion-list class="width-100">
         <ion-item *ngFor="let attach of loadedAttachments; let i = index" class="width-100" lines="none" class="ion-no-margin ion-no-padding">
           <ion-label class="width-100 d-flex " >
-            <div class="flex-grow-1"  (click)="viewDocument(attach.SourceId)">
-              <p class="attach-title-item">{{attach.SourceName}}</p>
+            <p class="flex-grow-1"  (click)="viewDocument(attach.SourceId)">
+              <span class="attach-title-item">{{attach.SourceName}}</span>
               <span class="span-left">{{attach.Stakeholders}}</span>
-            </div>
+            </p>
 
             <div class="d-flex align-end">
               <span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span>
@@ -120,5 +120,7 @@
       </ion-list>
     </div>
     <!-- <div class="line"></div> -->
-  </div>    
+  </div>  
+  
+  
 </ion-content>

src/app/shared/agenda/view-event/view-event.page.scss

@@ -19,7 +19,6 @@ ion-menu{
     border-top-left-radius: 25px;
     border-top-right-radius: 25px;
     background-color: #fff;
-    overflow:hidden;
     padding: 30px 0px 0px 0px;
     color:#000;
     transform: translate3d(0, 1px, 0);
@@ -36,7 +35,6 @@ ion-menu{
         overflow: hidden;
       }
       .middle{
-          width: 230px;
           padding: 0!important;
           float: left;
           margin: 2.5px 0 0 0;
@@ -45,12 +43,10 @@ ion-menu{
         width: 45px;
         font-size: 45px;
         float: right;
-        overflow: auto;
+
       }
       .div-icon{
-        width: 92px;
         float: right;
-        overflow: auto;
         padding: 1px;
       }
       .div-icon .edit{
@@ -87,7 +83,7 @@ ion-menu{
           width: 100%;
           margin: 0 auto;
           padding: 0;
-          overflow: auto;
+
 
           .date{
             float: left;
@@ -168,4 +164,14 @@ ion-menu{
         font-size: 13px;
         }
     }
-  }
+  }
+
+.chat-popover .popover-content {
+  width: 100% !important;
+  left: 0 !important;
+  bottom: 0 !important;
+  right: 0 !important;
+  top: calc(100% - 160px) !important;
+  max-height: 160px;
+  min-height: 160px; 
+}

src/app/shared/agenda/view-event/view-event.page.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { AlertController, ModalController, NavParams } from '@ionic/angular';
+import { AlertController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { Attachment } from 'src/app/models/attachment.model';
 import { EventBody } from 'src/app/models/eventbody.model';
 import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -10,6 +10,8 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
 import { momentG }  from 'src/plugin/momentG';
 import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page';
+import { OptionsComponent } from './options/options.component';
 
 @Component({
   selector: 'app-view-event',
@@ -49,6 +51,7 @@ export class ViewEventPage implements OnInit {
     private iab: InAppBrowser,
     private processes: ProcessesService,
     private modalController: ModalController,
+    public popoverController: PopoverController
   ) 
   {
     this.isEventEdited = false;
@@ -178,6 +181,27 @@ export class ViewEventPage implements OnInit {
     });
   }
 
+  async openOptions(ev: any) {
+    const popover = await this.popoverController.create({
+      component: OptionsComponent,
+      cssClass: 'chat-popover modal-desktop',
+      event: ev,
+      componentProps: {
+        // room: this.room,
+      },
+      translucent: true
+    });
+    await popover.present();
+    popover.onDidDismiss().then(res=>{
+      console.log(res);
+      if(res.data){
+        // this.getRoomInfo();
+        //this.modalController.dismiss(); 
+      };
+      
+    });
+  }
+
   async openBookMeetingModal(task: any) {
 
     const doc = this.loadedAttachments[ this.dicIndex];

src/app/shared/gabinete-digital/despachos/despachos.page.html

@@ -1,3 +1,38 @@
+<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)="distartExpedientModal()">
+        <ion-icon name="trash" slot="start"></ion-icon>
+        <ion-label>Descartar</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-header class="ion-no-border">
   <div class="title">
     <div class="thetitle"><ion-label >Despachos</ion-label></div>
@@ -23,21 +58,25 @@
       <ion-list>
         <ion-item 
             class="expediente ion-no-padding"  
-            *ngFor = "let task of despachoList"
+            *ngFor = "let task of despachoList; let i = index"
             (click)="viewExpedientDetail(task.SerialNumber)"
             >
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
               <div class="item width-100">
-                <div class="exp-top-detail">
+                <div class="exp-top-detail ">
                   <div class="exp-date">
                     <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
                   </div>
                   <div class="exp-remetente">
                     <ion-label>{{task.Senders}}</ion-label>
                   </div>
-                  <div class="exp-icon">
+                  <div class="exp-icon d-flex align-center">
                     <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
                     <label>{{task.DocumentsQty}}</label>
+
+                    <!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+                      <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    </ion-menu-button> -->
                   </div>
                 </div>
                 <div class="exp-bottom-detail">

src/app/shared/gabinete-digital/despachos/despachos.page.ts

@@ -1,16 +1,19 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
-import { DailyWorkTask } from '../../../models/dailyworktask.model';
+import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { formatDate } from '@angular/common';
-import { LoadingService } from 'src/app/services/loading.service';
-import { ModalController, NavParams } from '@ionic/angular';
+import { ModalController } 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';
+
+import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
+
 import { AuthService } from 'src/app/services/auth.service';
+import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
 
 @Component({
   selector: 'app-despachos',
@@ -25,6 +28,9 @@ export class DespachosPage implements OnInit {
  taskslist:DailyWorkTask[];
  despachoList:DailyWorkTask[];
  deferimentoList:DailyWorkTask[];
+
+ taskList:tasksList[] = [];
+ 
  taskType: string;
  serialNumber:string;
  totalDocs:any;
@@ -33,7 +39,10 @@ export class DespachosPage implements OnInit {
  segment:string;
  @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
 
- constructor(
+ loadedAttachments:any;
+ dicIndex = 0;
+
+ constructor (
    private processes:ProcessesService,
    private modalController: ModalController,
    private alertService: AlertService,
@@ -150,5 +159,119 @@ export class DespachosPage implements OnInit {
    });
  }
 
+  // old
+  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 doc = this.loadedAttachments[ this.dicIndex];
+
+    task = {
+      serialNumber: doc.SourceId,
+      taskStartDate: doc.CreateDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.ApplicationId, 
+        FolderID: null,
+        DocId: doc.SourceId, 
+        Subject: doc.SourceName
+      },
+    }
+
+    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();
+
+      }
+
+    });
+  }
+
+  async openBookMeetingModal(task: any) {
+
+    const doc = this.loadedAttachments[ this.dicIndex];
+
+    task = {
+      serialNumber: doc.SourceId,
+      taskStartDate: doc.CreateDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.ApplicationId, 
+        FolderID: null,
+        DocId: doc.SourceId, 
+        Subject: doc.SourceName
+      },
+    }
+    
+    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 distartExpedientModal() {
+
+    const doc = this.taskList[ this.dicIndex];
+
+    console.log(doc, this.dicIndex, this.taskList)
+    
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: doc.serialNumber,
+        folderId: doc.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(); */
+      }
+      
+    });
+  }
+
+  docIndex(index: number) {
+    this.dicIndex = index;
+  }
+  
 }
  

src/app/shared/gabinete-digital/expediente/expediente.page.html

@@ -1,3 +1,5 @@
+
+
 <ion-header  class="ion-no-border">
   <ion-toolbar class="header-toolbar">
     <div class="main-header">
@@ -7,9 +9,9 @@
           <ion-label class="title">Detalhes do Expediente</ion-label>
         </div>
         <div class="div-icon">
-            <ion-menu-button autoHide="false">
-              <ion-icon name="ellipsis-vertical-outline"></ion-icon>
-            </ion-menu-button>
+          <ion-menu-button autoHide="false">
+            <ion-icon name="ellipsis-vertical-outline"></ion-icon>
+          </ion-menu-button>
         </div>
       </div>
     </div>
@@ -29,45 +31,6 @@
   </ion-toolbar>
 </ion-header> -->
 
-<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 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" id="main-content">
-  <ion-menu-button></ion-menu-button>
-</div>
-
 <ion-content  padding>
   <div *ngIf="task">
   <h3 class="h3-event-title">Detalhes do Expediente</h3>

src/app/shared/gabinete-digital/pedidos/pedidos.page.html

@@ -1,3 +1,38 @@
+<ion-menu autoHide="false" side="end" content-id="main-content" >
+  <ion-header>
+    <ion-toolbar translucent>
+      <ion-title>Menu PEDIDO</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)="distartExpedientModal()">
+        <ion-icon name="trash" slot="start"></ion-icon>
+        <ion-label>Descartar</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-header class="ion-no-border">
   <div class="title">
     <div class="thetitle"><ion-label >Pedidos</ion-label></div>
@@ -31,10 +66,13 @@
   <div class="width-100" [ngSwitch]="segment">
     <div *ngIf="parecerList">
       <ion-list *ngSwitchCase="'parecer'">
+        <!-- *ngFor = "let task of parecerList; let i = index"
+        (click)="viewExpedientDetail(task.SerialNumber)" -->
         <ion-item 
             class="expediente ion-no-padding"  
             *ngFor = "let task of parecerList"
             (click)="viewPedidoDetail(task.SerialNumber)"
+
             >
             <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
@@ -47,8 +85,9 @@
                     <ion-label>{{task.Remetente}}</ion-label>
                   </div>
                   <div class="exp-icon">
-                    <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                    <label></label>
+                    <!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+                      <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    </ion-menu-button> -->
                   </div>
                 </div>
                 <div class="exp-bottom-detail">
@@ -77,8 +116,9 @@
                     <ion-label>{{task.Remetente}}</ion-label>
                   </div>
                   <div class="exp-icon">
-                    <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                    <label></label>
+                    <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+                      <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    </ion-menu-button> 
                   </div>
                 </div>
                 <div class="exp-bottom-detail">

src/app/shared/gabinete-digital/pedidos/pedidos.page.ts

@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angu
 import { Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
-import { DailyWorkTask } from '../../../models/dailyworktask.model';
+import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { formatDate } from '@angular/common';
 import { LoadingService } from 'src/app/services/loading.service';
@@ -10,6 +10,9 @@ 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 { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido.page';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 
 @Component({
   selector: 'app-pedidos',
@@ -24,6 +27,10 @@ export class PedidosPage implements OnInit {
 
   taskslist:DailyWorkTask[];
   parecerList:DailyWorkTask[];
+  
+  parecerListResult:tasksList[] = [];
+  deferimentoListResult:tasksList[] = [];
+
   deferimentoList:DailyWorkTask[];
   taskType: string;
   serialNumber:string;
@@ -32,6 +39,9 @@ export class PedidosPage implements OnInit {
   @Input() segment:string;
   @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
 
+  loadedAttachments:any;
+  dicIndex = 0;
+
   constructor(
     private processes:ProcessesService,
     private modalController: ModalController,
@@ -62,7 +72,9 @@ export class PedidosPage implements OnInit {
       this.taskType = "Pedido de Parecer";
       this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => {
         console.log(result);
-        
+  
+        this.parecerListResult =result;
+
         this.parecerList = new Array();
         let res = result.reverse();
         res.forEach(element => {
@@ -87,6 +99,8 @@ export class PedidosPage implements OnInit {
       this.taskType = "Pedido de Deferimento";
       this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
         console.log(result);
+
+        this.deferimentoListResult =result;
         
         this.deferimentoList = new Array();
         let res = result.reverse();
@@ -144,5 +158,141 @@ export class PedidosPage implements OnInit {
     });
   }
 
+
+
+  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'
+    }
+
+    let doc: tasksList;
+
+    if (this.segment == 'parecer') {
+      doc = this.parecerListResult[ this.dicIndex];
+    } else if (this.segment == 'deferimento') {
+      doc = this.deferimentoListResult[ this.dicIndex];
+    }
+
+    task = {
+      serialNumber: doc.serialNumber,
+      taskStartDate: doc.taskStartDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.workflowInstanceDataFields.SourceSecFsID, 
+        FolderID: null,
+        DocId: doc.workflowInstanceDataFields.SourceID, 
+        Subject: doc.workflowInstanceFolio
+      },
+    }
+
+    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();
+
+      }
+
+    });
+  }
+
+  async openBookMeetingModal(task: any) {
+
+
+    let doc: tasksList;
+
+    if (this.segment == 'parecer') {
+      doc = this.parecerListResult[ this.dicIndex];
+    } else if (this.segment == 'deferimento') {
+      doc = this.deferimentoListResult[ this.dicIndex];
+    }
+
+    task = {
+      serialNumber: doc.serialNumber,
+      taskStartDate: doc.taskStartDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.workflowInstanceDataFields.SourceSecFsID, 
+        FolderID: null,
+        DocId: doc.workflowInstanceDataFields.SourceID, 
+        Subject: doc.workflowInstanceFolio
+      },
+    }
+
+    
+    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 distartExpedientModal(){
+
+    let doc: tasksList;
+
+    if (this.segment == 'parecer') {
+      doc = this.parecerListResult[ this.dicIndex];
+    } else if (this.segment == 'deferimento') {
+      doc = this.deferimentoListResult[ this.dicIndex];
+    }
+
+    
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: doc.serialNumber,
+        folderId: doc.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(); */
+      }
+      
+    });
+  }
+
+  docIndex(index: number) {
+    this.dicIndex = index;
+  }
+
 }
   

src/app/shared/header/header.page.ts

@@ -41,17 +41,33 @@ export class HeaderPage implements OnInit {
 
   async openSearch() {
 
-    let classs;
+    let classs, showSearchInput, type;
     if(window.innerWidth < 1366) {
       classs = 'modal modal-width-100 modal-padding-top'
+      showSearchInput = true
     } else {
       classs = 'modal modal-width-100 modal-padding-top modal-desktop-shadow modal-desktop-remove-background'
+      showSearchInput = false
+    }
+
+
+
+    if(window.location.pathname  == '/home/agenda') {
+      type = "Agenda"
+    } else if (window.location.pathname  =='/home/gabinete-digital') {
+      type = "AccoesPresidenciais & ArquivoDespachoElect"
+
+    } else if (window.location.pathname  == '/home/publications') {
+      type = "AccoesPresidenciais"
     }
 
     const modal = await this.modalController.create({
       component: SearchPage,
       cssClass: classs,
       componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        showSearchInput: showSearchInput,
+        select: false
       }
     });
     return await modal.present();

src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts

@@ -45,7 +45,8 @@ export class ChatOptionsPopoverPage implements OnInit {
       component: SearchPage,
       cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
       componentProps: {
-        type: 'AccoesPresidenciais & ArquivoDespachoElect'
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        select: true
       }
     });
     await modal.present();

src/app/shared/publication/view-publications/view-publications.page.scss

@@ -91,10 +91,8 @@
   }
 
   .back-icon{
-    width: 37px;
     float: left;
     font-size: 35px;
-    overflow: auto;
     
   }
   .div-title{

src/app/shared/publication/view-publications/view-publications.page.ts

@@ -145,8 +145,8 @@ export class ViewPublicationsPage implements OnInit {
         componentProps:{
           publicationId: publicationId,
         },
-        cssClass: 'publication-detail',
-        backdropDismiss: false
+        cssClass: 'publication-detail modal modal-desktop',
+        //backdropDismiss: false
       });
       await modal.present();
       modal.onDidDismiss().then(()=>{