Merge branch 'developer' into developer_mobilefirst

src/app/app-routing.module.ts

@@ -1,153 +1,157 @@
-import { NgModule } from '@angular/core';
-import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
-import { ChatPage } from './pages/chat/chat.page';
-import { MessagesPage } from './pages/chat/messages/messages.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule)
-  },
-  {
-    path: '',
-    loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
-  },
-  {
-    path: 'empty-chat',
-    loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule)
-  },
-  {
-    path: 'empty-container',
-    loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule)
-  },
-  {
-    path: 'events-to-approve',
-    loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule)
-  },
-  {
-    path: 'expedients',
-    loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule)
-  },
-  {
-    path: 'document-detail',
-    loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule)
-  },
-  {
-    path: 'edit-group',
-    loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule)
-  },
-  {
-    path: 'pedidos',
-    loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule)
-  },
-  {
-    path: 'event-list',
-    loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule)
-  },
-  {
-    path: 'despachos',
-    loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule)
-  },
-  {
-    path: 'create-process',
-    loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule)
-  },
-  {
-    path: 'pendentes',
-    loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule)
-  },
-  {
-    path: 'delegar',
-    loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule)
-  },
-  {
-    path: 'add-note',
-    loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule)
-  },
-  {
-    path: 'dar-parecer',
-    loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule)
-  },
-  {
-    path: 'opts-expediente',
-    loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule)
-  },
-  {
-    path: 'despachos-pr',
-    loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule)
-  },
-  {
-    path: 'diplomas',
-    loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule)
-  },
-  {
-    path: 'expedientes-pr',
-    loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule)
-  },
-  {
-    path: 'diplomas-assinar',
-    loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule)
-  },
-  {
-    path: 'opts-expediente-pr',
-    loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule)
-  },
-  {
-    path: 'despachos-options',
-    loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule)
-  },
-  {
-    path: 'despachos-pr-options',
-    loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule)
-  },
-  {
-    path: 'deploma-options',
-    loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule)
-  },
-  {
-    path: 'pin',
-    loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule)
-  },
-  {
-    path: 'fingerprint',
-    loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule)
-  },
-  {
-    path: 'new-event',
-    loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule)
-  },
-  {
-    path: 'event-list',
-    loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule)
-  },
-  {
-    path: 'approve-event',
-    loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule)
-  },
-  {
-    path: 'bad-request',
-    loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule)
-  },
-  {
-    path: 'success-message',
-    loadChildren: () => import('./shared/popover/success-message/success-message.module').then( m => m.SuccessMessagePageModule)
-  },
-  {
-    path: 'forward',
-    loadChildren: () => import('./modals/forward/forward.module').then( m => m.ForwardPageModule)
+import { NgModule } from '@angular/core';
+import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
+import { ChatPage } from './pages/chat/chat.page';
+import { MessagesPage } from './pages/chat/messages/messages.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule)
+  },
+  {
+    path: '',
+    loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
+  },
+  {
+    path: 'empty-chat',
+    loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule)
+  },
+  {
+    path: 'empty-container',
+    loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule)
+  },
+  {
+    path: 'events-to-approve',
+    loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule)
+  },
+  {
+    path: 'expedients',
+    loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule)
+  },
+  {
+    path: 'document-detail',
+    loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule)
+  },
+  {
+    path: 'edit-group',
+    loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule)
+  },
+  {
+    path: 'pedidos',
+    loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule)
+  },
+  {
+    path: 'event-list',
+    loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule)
+  },
+  {
+    path: 'despachos',
+    loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule)
+  },
+  {
+    path: 'create-process',
+    loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule)
+  },
+  {
+    path: 'pendentes',
+    loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule)
+  },
+  {
+    path: 'delegar',
+    loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule)
+  },
+  {
+    path: 'add-note',
+    loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule)
+  },
+  {
+    path: 'dar-parecer',
+    loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule)
+  },
+  {
+    path: 'opts-expediente',
+    loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule)
+  },
+  {
+    path: 'despachos-pr',
+    loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule)
+  },
+  {
+    path: 'diplomas',
+    loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule)
+  },
+  {
+    path: 'expedientes-pr',
+    loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule)
+  },
+  {
+    path: 'diplomas-assinar',
+    loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule)
+  },
+  {
+    path: 'opts-expediente-pr',
+    loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule)
+  },
+  {
+    path: 'despachos-options',
+    loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule)
+  },
+  {
+    path: 'despachos-pr-options',
+    loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule)
+  },
+  {
+    path: 'deploma-options',
+    loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule)
+  },
+  {
+    path: 'pin',
+    loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule)
+  },
+  {
+    path: 'fingerprint',
+    loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule)
+  },
+  {
+    path: 'new-event',
+    loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule)
+  },
+  {
+    path: 'event-list',
+    loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule)
+  },
+  {
+    path: 'approve-event',
+    loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule)
+  },
+  {
+    path: 'bad-request',
+    loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule)
+  },
+  {
+    path: 'success-message',
+    loadChildren: () => import('./shared/popover/success-message/success-message.module').then( m => m.SuccessMessagePageModule)
+  },
+  {
+    path: 'forward',
+    loadChildren: () => import('./modals/forward/forward.module').then( m => m.ForwardPageModule)
+  },
+  {
+    path: 'edit-event-to-approve',
     loadChildren: () => import('./shared/agenda/edit-event-to-approve/edit-event-to-approve.module').then( m => m.EditEventToApprovePageModule)
   },
-
- /*  {
-    path: 'chat',
-    component: ChatPage
-  } */
-
-];
-@NgModule({
-  imports: [
-    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
-  ],
-  exports: [RouterModule]
-})
-export class AppRoutingModule {}
+
+
+
+ /*  {
+    path: 'chat',
+    component: ChatPage
+  } */
+
+];
+@NgModule({
+  imports: [
+    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
+  ],
+  exports: [RouterModule]
+})

src/app/modals/delegar/delegar.page.ts

@@ -72,7 +72,6 @@ export class DelegarPage implements OnInit {
   }
 
   close() {
-    this.router.navigate(['/home/gabinete-digital/expediente']);
     this.modalController.dismiss(null);
   }
 

src/app/pages/agenda/agenda.module.ts

@@ -30,6 +30,7 @@ import { NewEventPageModule } from 'src/app/shared/agenda/new-event/new-event.mo
 import { EventsToApprovePageModule } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module';
 import { EventListPageModule } from 'src/app/shared/agenda/event-list/event-list.module';
 import { EditEventPageModule } from 'src/app/shared/agenda/edit-event/edit-event.module';
+import { EditEventToApprovePageModule } from 'src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.module';
 
 @NgModule({
   imports: [
@@ -53,6 +54,7 @@ import { EditEventPageModule } from 'src/app/shared/agenda/edit-event/edit-event
     NewEventPageModule,
     EventListPageModule,
     EditEventPageModule,
+    EditEventToApprovePageModule,
   ],
   declarations: [
     AgendaPage

src/app/pages/agenda/agenda.page.html

@@ -356,7 +356,8 @@
           mobileComponent.showEventList == false &&
           mobileComponent.showEventToApprove == false &&
           mobileComponent.showAttendees == false &&
-          mobileComponent.showAttendeeModal == false
+          mobileComponent.showAttendeeModal == false &&
+          mobileComponent.showEditEventToApprove == false
         )
         "
         class="text-black nothing-to-show">
@@ -407,7 +408,9 @@
       ></app-view-event>
 
       
-      <app-event-list [class.transparent]="mobileComponent.transparentEventList" *ngIf="mobileComponent.showEventList"
+      <app-event-list 
+        [class.transparent]="mobileComponent.transparentEventList" 
+        *ngIf="mobileComponent.showEventList"
         [profile]="profile"
         (approveEventDismiss) = "approveEventDismiss($event)"
         (cloneAllmobileComponent)="viewEventDetailDismiss($event)"
@@ -415,15 +418,32 @@
       </app-event-list>
 
       
-      <app-approve-event  class="d-flex flex-column" *ngIf="mobileComponent.showEventToApprove" [class.transparent]="mobileComponent.transparentEventToApprove"
+      <app-approve-event  class="d-flex flex-column" 
+        *ngIf="mobileComponent.showEventToApprove" 
+        [class.transparent]="mobileComponent.transparentEventToApprove"
         [serialNumber] = "eventToaprove.serialNumber"
         [InstanceId] = "eventToaprove.InstanceId"
         (cloneAllmobileComponent)="viewEventDetailDismiss($event)"
         (closeEventToApprove)="closeEventToApprove()"
         (AproveEventEditEvent)="AproveEventEditEvent($event)"
+        (EditApproveEventDismiss)="EditApproveEventDismiss()"
         [eventAttendees]="contacts"
       >
       </app-approve-event>
+
+      <app-edit-event-to-approve
+        class="d-flex flex-column height-100"
+        *ngIf="mobileComponent.showEditEventToApprove"
+        [taskParticipants]="taskParticipants"
+        [taskParticipantsCc]="taskParticipantsCc"
+        [serialNumber] = "eventToaprove.serialNumber"
+        (setContact)="setContact($event)"
+        (clearContact)="clearContact()"
+        (openAttendeesComponent)="openAttendeesComponent($event)"
+        (closeComponent)="closeComponentEditEventOrAdd()"
+        (setIntervenient)="setIntervenient($event)"
+        (setIntervenientCC)="setIntervenientCC($event)"
+      ></app-edit-event-to-approve>
     
       <app-attendee-modal
         [footer]="true"

src/app/pages/agenda/agenda.page.ts

@@ -135,7 +135,8 @@ export class AgendaPage implements OnInit {
     transparentEventToApprove: false,
     showEventToApprove: false,
     showAttendees: false,
-    showAttendeeModal: false
+    showAttendeeModal: false,
+    showEditEventToApprove: false,
   }
 
   eventToaprove: any = {
@@ -1209,7 +1210,7 @@ export class AgendaPage implements OnInit {
   }
 
   async viewEventsToApprove(){
-    await this.cloneAllmobileComponent()
+    await this.cloneAllmobileComponent();
 
     if( window.innerWidth <= 801){
       this.router.navigate(['/home/agenda/event-list']);
@@ -1249,6 +1250,11 @@ export class AgendaPage implements OnInit {
     
   }
 
+  EditApproveEventDismiss(){
+    this.cloneAllmobileComponent();
+    this.mobileComponent.showEditEventToApprove = true;
+  }
+
   async cloneAllmobileComponent(){
 
     this.mobileComponent.showAddNewEvent = false;
@@ -1258,6 +1264,7 @@ export class AgendaPage implements OnInit {
     this.mobileComponent.showEventToApprove = false;
     this.mobileComponent.showAttendees = false;
     this.mobileComponent.showAttendeeModal = false;
+    this.mobileComponent.showEditEventToApprove = false;
 
     this.closeEventToApprove();
   }

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

@@ -108,12 +108,6 @@ export class ViewEventPage implements OnInit {
         this.router.navigate(['/home',params["params"].caller]);
       }
     });
-
-    /* this.activatedRoute.queryParams.subscribe(params => {
-      if(params["caller"]) {
-        this.router.navigate(['/home',params["caller"]]);
-      }
-    }); */
   }
 
   loadEvent(){

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

@@ -46,7 +46,7 @@
               </ion-select>
 
 
-              <mat-form-field  class="d-none d-md-block width-100">
+              <mat-form-field floatLabel="never" class="d-none d-md-block width-100">
                 <mat-select placeholder="Selecione agenda" [(ngModel)]="postData.CalendarName" >
                   <mat-option value="Oficial">
                     Oficial

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

@@ -154,17 +154,9 @@ export class BookMeetingModalPage implements OnInit {
   
   goBack() {
     this.modalController.dismiss(null);
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "expedientes": true,
-      }
-    }
-    if( window.innerWidth < 801) {
-      this.router.navigate(['/home/gabinete-digital/expediente']);
-    } else {
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    }
+    window.history.back();
   }
+  
   async saveTask(){
     // issue12323423
     let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);

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

@@ -35,6 +35,7 @@ export class ExpedienteDetailPage implements OnInit {
   fulltask: any;
   eventsList: Event[];
   serialnumber: string;
+  caller:string;
   serialNumber: string;
   profile: string;
   intervenientes: any;
@@ -65,6 +66,9 @@ export class ExpedienteDetailPage implements OnInit {
         if(params["params"].SerialNumber) {
           this.serialnumber = params["params"].SerialNumber;
         }
+        if(params["params"].caller) {
+          this.caller = params["params"].caller;
+        }
 
       });
 
@@ -97,7 +101,7 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
   goBack() {
-    if(this.task.Status == "Pending"){
+    if(this.task.Status == "Pending" && this.caller != 'events'){
       if (window.innerWidth <= 800) {
         this.router.navigate(['/home/gabinete-digital/pendentes']);
       } 
@@ -111,6 +115,7 @@ export class ExpedienteDetailPage implements OnInit {
       }
     }
     else{
+      console.log('HERE');
       this.activatedRoute.paramMap.subscribe(params => {
         switch (params["params"].caller) {
           case 'events':

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

@@ -189,57 +189,6 @@ export class GabineteDigitalPage implements OnInit {
       this.openDiplomasPage('');
       this.selectedElement='DiplomasAssinar';
     }
-
-    /* this.activatedRoute.queryParams.subscribe(params => {
-      switch (params)
-      {
-        case params["eventos"]:
-          this.openEventsToApprovePage("MDGPR");
-          this.selectedElement='approval';
-          break;
-
-        case params["expedientes"]:
-          this.openExpedientListPage();
-          this.selectedElement='Correspondence';
-          this.expedientesPage.doRefresh();
-          break;
-
-        case params["pendentes"]:
-          this.openPendentesPage('');
-          this.selectedElement='Pending';
-          break;
-  
-        case params["despachos"]:
-          this.openDespachosPage('');
-          this.selectedElement='Dispatches';
-          break;
-
-        case params["pedidos"]:
-          this.openPedidosPage('parecer');
-          this.selectedElement='RequestsForOpinion';
-          break;
-
-        case params["expedientespr"]:
-          this.openEventsToApprovePage("MDGPR");
-          this.selectedElement='Expediente Presidente'
-          break;
-
-        case params["despachospr"]:
-          this.openDespachosPrPage('');
-          this.selectedElement='DispatchesPr'
-          break;
-
-        case params["diplomas"]:
-          this.openDiplomasPage('validar');
-          this.selectedElement='DiplomasPorValidar';
-          break;
-
-        case params["diplomasassinar"]:
-          this.openDiplomasPage('');
-          this.selectedElement='DiplomasAssinar';
-          break;
-      }
-    }); */
   }
 
   refreshExpedientes(){

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

@@ -11,7 +11,7 @@
             <ion-icon  slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
           </div>
           <!-- <app-btn-modal-dismiss></app-btn-modal-dismiss> -->
-          <div class="middle d-flex align-center flex-grow-1">
+          <div class="middle">
             <ion-label class="title">{{ task.Folio}}</ion-label>
           </div>
           <div class="div-icon">

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss

@@ -23,65 +23,32 @@
   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;
-
+      .title-content{
         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;
+        justify-content:space-between;
+        align-items: flex-start !important;
+        border-radius: 0 !important;
 
-        .header-bottom-icon{
-          width: 30px;
-          font-size: 25px;
-          float: left;
-          padding: 2px;
+        .middle{
+          /* width: calc(100% - 37px); */
+          overflow: auto;
         }
-        .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{
+          width: fit-content;
+          height: auto;
           font-size: 25px;
           overflow: auto;
           float: left;
+          padding-left: 5px;
         }
         .div-icon{
-          width: 40px;
-          float: right;
-          font-size: 35px;
-          overflow: auto;
+          width: 37px !important;
+          font-size: 35px !important;
           padding: 1px;
+          right: 0 !important;
         }
+      }
 }
 ion-item-group{
     margin: 15px;

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

@@ -39,6 +39,7 @@ export class PedidoPage implements OnInit {
   fulltask: any;
   eventsList: Event[];
   serialnumber: string;
+  caller: string;
   intervenientes: any;
   cc: any = [];
   loggeduser: User;
@@ -61,6 +62,9 @@ export class PedidoPage implements OnInit {
           if(params["serialNumber"]) {
             this.serialnumber = params["serialNumber"];
           }
+          if(params["caller"]) {
+            this.caller = params["caller"];
+          }
         });
     }
 
@@ -445,7 +449,7 @@ export class PedidoPage implements OnInit {
   }
   
   goBack() {
-    if(this.task.Status == "Pending"){
+    if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
       if (window.innerWidth <= 800) {
         this.router.navigate(['/home/gabinete-digital/pendentes']);
       } 

src/app/pages/publications/new-publication/new-publication.page.ts

@@ -76,7 +76,7 @@ export class NewPublicationPage implements OnInit {
 
     this.camera.getPicture(options).then((imageData) => {
      // imageData is either a base64 encoded string or a file URI
-     // If it's base64 (DATA_URL):
+     // If it's base64 (DATA_URL): 
      let base64Image = 'data:image/jpeg;base64,' + imageData;
      this.capturedImage = imageData;
      this.capturedImageTitle = new Date().getTime() + '.jpeg';
@@ -107,6 +107,8 @@ export class NewPublicationPage implements OnInit {
   }
 
   async save(){
+    console.log('SAVE');
+    
     if(this.publicationType == '3'){
       console.log(this.navParams.get('publication'));
        
@@ -124,7 +126,7 @@ export class NewPublicationPage implements OnInit {
         }
         console.log('Edit change image');
         console.log(this.publication);
-        this.publications.UpdatePublication(this.publication.ProcessId, this.publication);
+        this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise();
         this.close();
       }
       else{
@@ -139,14 +141,13 @@ export class NewPublicationPage implements OnInit {
           FileBase64: this.publication.FileBase64,
           FileExtension: 'jpeg',
         }
-        /* console.log('Edit - keep image');
-        console.log(this.publication); */
-        this.publications.UpdatePublication(this.publication.ProcessId, this.publication);
+        console.log('Edit - keep image');
+        console.log(this.publication);
+        this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise();
         this.close();
       }
     }
     else{
-      
       this.publication = {
         DateIndex: new Date(),
         DocumentId:null,
@@ -161,7 +162,7 @@ export class NewPublicationPage implements OnInit {
       
       /* console.log('Create');
       console.log(this.publication); */
-      this.publications.CreatePublication(this.folderId, this.publication);
+      this.publications.CreatePublication(this.folderId, this.publication).toPromise();
       this.close();
     }
   }

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

@@ -39,6 +39,8 @@ export class ApproveEventPage implements OnInit {
   @Output() closeEventToApprove = new EventEmitter<any>();
   @Output() AproveEventEditEvent = new EventEmitter<any>();
 
+  @Output() EditApproveEventDismiss = new EventEmitter<any>();
+
   constructor(
     private router:Router,
     private modalController: ModalController,
@@ -202,9 +204,13 @@ export class ApproveEventPage implements OnInit {
 
 
   async editar(serialNumber: string) {
-    
-
-    const modal = await this.modalController.create({
+    if(window.innerWidth > 800){
+      console.log('DESTOP');
+      
+      this.EditApproveEventDismiss.emit();
+    }
+    else{
+    /* const modal = await this.modalController.create({
       component: EditEventToApproveComponent,
       componentProps: {
         serialNumber: serialNumber,
@@ -213,15 +219,16 @@ export class ApproveEventPage implements OnInit {
       cssClass: 'modal modal-desktop',
       // backdropDismiss: false
     });
-
     await modal.present();
-
     modal.onDidDismiss().then(res => {
       this.getTask();
       this.getAttachments();
-    });
+    }); */
+    }
+
+  }
+
 
-  } 
 
 
 }

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { EditEventToApprovePage } from './edit-event-to-approve.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: EditEventToApprovePage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class EditEventToApprovePageRoutingModule {}

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.module.ts

@@ -0,0 +1,45 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { EditEventToApprovePageRoutingModule } from './edit-event-to-approve-routing.module';
+
+import { EditEventToApprovePage } from './edit-event-to-approve.page';
+
+import { MatNativeDateModule } from '@angular/material/core';
+import {
+  NgxMatDatetimePickerModule,
+  NgxMatNativeDateModule,
+  NgxMatTimepickerModule
+} from '@angular-material-components/datetime-picker';
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatSelectModule } from '@angular/material/select';
+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
+import { MAT_DATE_LOCALE } from '@angular/material/core';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatInputModule } from '@angular/material/input';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    EditEventToApprovePageRoutingModule,
+    MatDatepickerModule,
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
+    ReactiveFormsModule
+  ],
+  declarations: [EditEventToApprovePage],
+  exports: [EditEventToApprovePage]
+})
+export class EditEventToApprovePageModule {}

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html

@@ -0,0 +1,282 @@
+<ion-content>
+  <!-- Edit event for Inicio -->
+  <div class="main-content height-100 d-flex">
+
+    <div class="content d-flex flex-column width-md-100 height-100">
+      
+      <div class="main-header pt-30 px-20 background-white pb-15">
+        <ion-header>
+          <div class="title-content">
+            <div class="middle">
+              <ion-label class="title">Editar evento por aprovar</ion-label>
+            </div>
+          </div>
+        </ion-header>
+      </div>
+      <ion-item-sliding class="overflow-y-auto">
+        <div class="px-20">
+          <div class="ion-item-container width-100">
+            <ion-input  placeholder="Assunto*" [(ngModel)]="eventProcess.workflowInstanceDataFields.Subject"></ion-input>
+          </div>
+          <div class="container-div width-100">
+            <div class="ion-item-class-2">
+              <div class="ion-icon-class">
+                <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
+              </div>
+              <div class="ion-input-class">
+                <ion-input placeholder="Localização*" [(ngModel)]="eventProcess.workflowInstanceDataFields.Location"></ion-input>
+              </div>
+            </div>
+            <!-- Error messages -->
+            <!-- <span class="error ion-padding" >
+              Campo obrigatório
+            </span> -->
+        
+          </div>
+        
+          <div class="container-div width-100">
+            <div class="ion-item-class-2">
+              <div class="ion-icon-class">
+                <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+              </div>
+              <div class="ion-input-class">
+                
+                <ion-select disabled  placeholder="Selecione agenda*"
+                  class="d-block d-md-none"
+                  selectedText="{{eventProcess.workflowInstanceDataFields.Agenda}}" 
+                  [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda" 
+                  interface="action-sheet" Cancel-text="Cancelar" 
+                  required
+                >
+                  <ion-select-option value="Oficial">Oficial</ion-select-option>
+                  <ion-select-option value="Pessoal">Pessoal</ion-select-option>
+                </ion-select>
+
+
+                <mat-form-field  class="d-none d-md-block width-100" >
+                  <mat-select placeholder="Selecione agenda" [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda" >
+                    <mat-option value="Oficial">
+                      Oficial
+                    </mat-option>
+                    <mat-option value="Pessoal">
+                      Pessoal
+                    </mat-option>
+                  </mat-select>
+                </mat-form-field>
+
+              </div>
+            </div>
+          </div>
+    
+          <div class="container-div width-100">
+            <div class="ion-item-class-2 width-100">
+              <div class="ion-icon-class">
+                <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+              </div>
+              <div class="ion-input-class width-100">
+                <ion-datetime 
+                  class="d-block d-md-none"
+                  placeholder="Início"
+                  [(ngModel)]="dateControlEnd"
+                  displayFormat="D MMM YYYY H:mm"
+                  minuteValues="0,15,30,45"
+                  monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
+                  min="2018" 
+                  max="2022" 
+                >
+                </ion-datetime>
+
+                <mat-form-field class="width-100 date-hour-picker d-none d-md-block">
+                  <input matInput [ngxMatDatetimePicker]="picker1" 
+                    placeholder="Choose a date" 
+                    [formControl]="dateControlStart"
+                    [min]="minDate" [max]="maxDate" 
+                    [disabled]="disabled"
+                  >
+                  <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
+                  <ngx-mat-datetime-picker #picker1 
+                    [showSpinners]="showSpinners" 
+                    [showSeconds]="showSeconds"
+                    [stepHour]="stepHour" [stepMinute]="stepMinute" 
+                    [stepSecond]="stepSecond"
+                    [touchUi]="touchUi">
+                  </ngx-mat-datetime-picker>
+                </mat-form-field>
+              </div>
+            </div>
+          </div>
+          
+          <div class="container-div width-100">
+            <div class="ion-item-class-2">
+              <div class="ion-icon-class">
+                <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+              </div>
+              <div class="ion-input-class">
+                <ion-datetime 
+                  class="d-none d-md-none"
+                  placeholder="Fim"
+                  [(ngModel)]="eventProcess.workflowInstanceDataFields.EndDate"
+                  displayFormat="D MMM YYYY H:mm"
+                  minuteValues="0,15,30,45"
+                  monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
+                  min="2018" 
+                  max="2022" 
+                >
+                </ion-datetime>
+
+                <mat-form-field class="width-100 date-hour-picker d-none d-md-block">
+                  <input matInput [ngxMatDatetimePicker]="fim" 
+                    placeholder="Choose a date" 
+                    [formControl]="dateControlEnd"
+                    [min]="minDate" [max]="maxDate" 
+                    [disabled]="disabled"
+                  >
+                  <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
+                  <ngx-mat-datetime-picker #fim 
+                    [showSpinners]="showSpinners" 
+                    [showSeconds]="showSeconds"
+                    [stepHour]="stepHour" [stepMinute]="stepMinute" 
+                    [stepSecond]="stepSecond"
+                    [touchUi]="touchUi">
+                  </ngx-mat-datetime-picker>
+                </mat-form-field>
+
+              </div>
+            </div>
+          </div>
+          
+          <div class="container-div width-100">
+            <div class="ion-item-class-2">
+              <div class="ion-icon-class">
+                <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
+              </div>
+              <div class="ion-input-class">
+                <ion-select 
+                placeholder="Selecione repetição"
+                class="d-block d-md-none" 
+                [(ngModel)]="eventProcess.workflowInstanceDataFields.IsRecurring"
+                selectedText="{{isRecurring}}" 
+                interface="action-sheet" 
+                Cancel-text="Cancelar" required>
+                  <ion-select-option value="false">Não se repete</ion-select-option>
+                  <ion-select-option value="true">Repete</ion-select-option>
+                </ion-select>
+
+                <mat-form-field  
+                  class="width-100 d-none d-md-block" 
+                  placeholder="Selecione repetição" 
+                  value="false" 
+                  interface="action-sheet" 
+                  required
+                >
+                  <mat-select [(value)]="eventProcess.workflowInstanceDataFields.IsRecurring">
+                    <mat-option value="false">
+                      Não se repete
+                    </mat-option>
+                    <mat-option value="true">
+                      Repete
+                    </mat-option>
+                  </mat-select>
+                </mat-form-field>
+
+              </div>
+            </div>
+          </div>
+          
+  
+  
+          <div class="container-div width-100">
+            <div class="ion-item-class-2">
+              <div class="ion-icon-class">
+                <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
+              </div>
+              <div class="ion-input-class-no-height d-flex">
+                <div class="list-people flex-grow-1">
+                  <ion-item lines="none">
+                    <ion-list>
+                      <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes*</ion-label>
+                      <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
+                    </ion-list>
+                  </ion-item>
+                </div>
+                <div class="add-people cursor-pointer"  (click)="addParticipants()">
+                  <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div class="container-div width-100">
+            <div class="ion-item-class-2">
+              <div class="ion-icon-class">
+                <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
+              </div>
+              <div class="ion-input-class-no-height d-flex">
+                <div class="list-people flex-grow-1">
+                  <ion-item lines="none">
+                    <ion-list>
+                      <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
+                      <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
+                    </ion-list>
+                  </ion-item>
+                </div>
+                <div class="add-people cursor-pointer" (click)="addParticipantsCC()">
+                  <ion-icon  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div (click)="getDoc()" class="cursor-pointer d-flex container-div width-100 ion-item-container-no-border" >
+            <ion-label>
+              <div class="attach-icon">
+                <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
+              </div>
+              <div class="attach-document">
+                <ion-label>Adicionar documentos</ion-label>
+              </div> 
+            </ion-label>
+          </div>
+          
+          <div class="d-flex container-div width-100"  > 
+            <ion-list class="width-100 "> 
+              <ion-item class="width-100"   *ngFor="let document of loadedAttachments; let i = index">
+                <ion-label class="width-100 d-block list" *ngIf="document.action != 'delete' ">
+                  <p class="d-flex ion-justify-content-between"> 
+                    <span class="attach-title-item">{{document.SourceName}}</span> 
+                    <span class="app-name" *ngIf="document.ApplicationId  == 8"> Correspondencia </span>
+                    <span class="app-name" *ngIf="document.ApplicationId == 386"> AccoesPresidenciais </span>
+                    <span class="app-name" *ngIf="document.ApplicationId == 361 "> ArquivoDespachoElect </span>
+                    <span class="close-button text-black cursor-pointer" (click)="deleteAttachment(document, i)" >
+                      <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
+                    </span>
+                  </p> 
+                  <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yy'}} </span></p>
+                </ion-label>
+              </ion-item>
+            </ion-list>
+          </div>
+
+          <div class="container-div d-flex width-100">
+            <div class="ion-item-class-2 d-flex width-100">
+              <div class="ion-icon-class">
+                <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
+              </div>
+              <div class="ion-input-class-no-height width-100 flex-grow-1">
+                <ion-textarea [(ngModel)]="eventProcess.workflowInstanceDataFields.Body"  placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
+              </div>
+            </div>
+          </div>
+
+        </div>
+      </ion-item-sliding>
+    </div>
+  </div>    
+</ion-content>
+
+<ion-footer class="background-whit">
+  <div class="buttons">
+    <button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
+    <button class="btn-ok cursor-pointer" shape="round" (click)="save()">Gravar</button>
+  </div>
+</ion-footer>

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss

@@ -0,0 +1,201 @@
+
+
+.title-content::after, .header-md::after{
+    display: none;
+  }
+  
+    .content {
+      margin: 0;
+      float: left;
+      border-right: 1px solid #d8d8d8 !important;
+    }
+    .main-header{
+      font-family: Roboto;
+      background-color: #fff;
+      
+      overflow:hidden;
+      transform: translate3d(0, 1px, 0);
+      
+      .title-content{
+        margin: 0px auto;
+        padding: 0 !important;
+        background: #fff;
+         .middle{
+          padding: 0!important;
+          float: left;
+        }
+      }
+  
+      .title{
+        font-size: 25px;
+      }
+  
+    }
+      .ion-item-container{
+          margin: 15px auto;
+          border: 1px solid #ebebeb;
+          border-radius: 5px;
+          padding-left: 10px;
+        }
+        .ion-item-container-no-border{
+          width: 100%;
+          margin: 0px auto;
+          padding: 0 !important;
+        }
+        .container-div{
+          margin-bottom: 15px;
+          float: left;
+        }
+        .ion-item-class-2{
+          margin: 0px auto;
+        }
+        .ion-icon-class{
+          width: 45px;
+          height: 45px;
+          float: left;
+          padding: 10px;
+          font-size: 25px;
+        }
+        ion-select{
+          padding-left: 5px;
+          margin-left: 0;
+        }
+        .ion-input-class{
+          width: calc(100% - 45px);
+          height: 45px;
+          border: 1px solid #ebebeb;
+          border-radius: 5px;
+          padding-left: 5px;
+          padding-right: 10px;
+          float: left;
+        }
+        .ion-input-class-no-height{
+          width: calc(100% - 45px);
+          border: 1px solid #ebebeb;
+          border-radius: 5px;
+        }
+        .list-people{
+          float: left;
+        
+        }
+        .add-people{
+          width: 45px;
+          float: right;
+          overflow: auto;
+          font-size: 25px;
+          padding: 10px;
+        }
+        .list-people-title{
+          /* font-size: 13px; */
+          color: #797979;
+        }
+        .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{
+          width: 100%;
+          font-size: 15px;
+          color:#0d89d1;
+        }
+        /* SPAN */
+        .span-left{
+          float: left;
+          font-size: 15x;
+        }
+        .span-right{
+        text-align: right;
+        float: right;
+        font-size: 13px;
+        }
+        .container-footer{
+            margin:0 auto;
+            overflow: auto;
+        }
+        .button-cancel {
+            width: 170px;
+            height: 44px;
+            border-radius: 22.5px;
+            --background: #e0e9ee;
+            --color: #061b52;
+            margin:10px;
+          }
+          .button-save {
+            width: 170px;
+            height: 44px;
+            border-radius: 22.5px;
+            --background: #42b9fe;
+            --color:#ffffff;
+            margin:10px;
+          }
+        
+        .text-input{
+          width: 100%;
+          border: 1px solid #ebebeb;
+          margin: 0px 15px 15px 0px;
+          padding: 0 !important;
+          border-radius: 5px;
+        }
+        
+        /* Error Messages */
+        .error{
+          color:red;
+          font-size: 12px;
+          font-weight: bold;
+          padding-bottom: 20px;
+        }
+        .span-color{
+          color:red;
+        }
+  
+    
+    .buttons{
+      display: flex;
+      justify-content: space-between;
+      padding: 20px;
+      overflow: auto;
+    }
+    
+  
+  
+    .app-name{
+      background: #42b9f2;
+      border-radius: 18px;
+      text-align: center;
+      display: flex;
+      align-items: center;
+      padding: 0px 5px;
+      color: white;
+      font-size: 9pt;
+      font-weight: 500;
+      height: 19px;
+      -webkit-border-radius: 18px;
+      -moz-border-radius: 18px;
+      -ms-border-radius: 18px;
+      -o-border-radius: 18px;
+    }
+    
+    
+  .close-button {
+    display: none;
+  }
+  
+  
+  .list:hover {
+  
+    .app-name {
+      display: none;
+    }
+  
+    .close-button {
+      display: block !important;
+    }
+  }

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.spec.ts

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

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts

@@ -0,0 +1,426 @@
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { FormControl } from '@angular/forms';
+import { AlertController, AnimationController, ModalController } from '@ionic/angular';
+import * as moment from 'moment';
+import { Attachment } from 'src/app/models/attachment.model';
+import { EventPerson } from 'src/app/models/eventperson.model';
+import { SearchDocument } from 'src/app/models/search-document';
+import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
+import { SearchPage } from 'src/app/pages/search/search.page';
+import { AttachmentsService } from 'src/app/services/attachments.service';
+import { EventsService } from 'src/app/services/events.service';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ToastService } from 'src/app/services/toast.service';
+import { Event } from '../../../models/event.model';
+import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+
+
+const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
+  parse: {
+    dateInput: "YYYY-MMMM-DD HH:mm"
+  },
+  display: {
+    dateInput: "DD MMM YYYY H:mm",
+    monthYearLabel: "MMM YYYY",
+    dateA11yLabel: "LL",
+    monthYearA11yLabel: "MMMM YYYY"
+  }
+}
+
+@Component({
+  selector: 'app-edit-event-to-approve',
+  templateUrl: './edit-event-to-approve.page.html',
+  styleUrls: ['./edit-event-to-approve.page.scss'],
+})
+export class EditEventToApprovePage implements OnInit {
+  public date: any;
+  public disabled = false;
+  public showSpinners = true;
+  public showSeconds = false;
+  public touchUi = false;
+  public enableMeridian = false;
+  public minDate: any;
+  public maxDate: any;
+  public stepHour = 1;
+  public stepMinute = 5;
+  public stepSecond = 5;
+
+  public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
+  public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
+
+  showLoader = false
+
+  get dateStart () {
+    return this.dateControlStart.value
+  }
+
+  get dateEnd () {
+    return this.dateControlEnd.value
+  }
+
+  @ViewChild('picker') picker: any;
+  @ViewChild('fim') fim: any;
+  @ViewChild('inicio') inicio: any;
+  @ViewChild('picker1') picker1: any;
+  
+  @Input() serialNumber: string
+
+
+  loadedAttachments: Attachment[]= []
+
+  eventProcess = {
+    serialNumber: "",
+    taskStartDate: "",
+    workflowInstanceDataFields:{
+      Body: "",
+      IsRecurring: false,
+      ParticipantsList: [],
+      Agenda: '',
+      EndDate: '',
+      Location: '',
+      Subject: '',
+      InstanceId: '',
+      EventType: '',
+      StartDate: '',
+      MDEmail: '',
+      MDName: '',
+      IsAllDayEvent: '',
+      Message: ''
+    }
+  }
+
+  show = false
+
+  postEvent: Event;
+  isRecurring:string;
+  isEventEdited: boolean;
+  segment:string = "true";
+  profile:string;
+  eventAttendees: EventPerson[];
+
+  loadedEventAttachments: Attachment[];
+  taskParticipants: any = [];
+  taskParticipantsCc: any = [];
+  adding: "intervenient" | "CC" = "intervenient";
+
+  Location = ''
+
+  showAttendees = false;
+
+  InstanceId: string
+
+  @Output() openAttendeesComponent = new EventEmitter<any>();
+  @Output() clearContact = new EventEmitter<any>();
+  @Output() setIntervenient = new EventEmitter<any>();
+  @Output() setIntervenientCC = new EventEmitter<any>();
+  @Output() closeComponent = new EventEmitter<any>();
+
+  constructor(
+    private modalController: ModalController,
+    private eventsService: EventsService,
+    public alertController: AlertController,
+    private attachmentsService: AttachmentsService,
+    private processes:ProcessesService,
+    private animationController: AnimationController,
+    private toastService: ToastService,
+  ) {
+
+   /*  this.serialNumber = this.navParams.get('serialNumber'); */
+
+    this.isEventEdited = false;
+    this.dateControlStart = new FormControl(moment(new Date()));
+    this.dateControlEnd = new FormControl(moment(new Date()));
+
+  }
+
+  ngOnInit() {
+    this.getTask();
+    console.log(this.serialNumber);
+  }
+
+  async getTask() {
+    console.log('this.eventProcess', this.eventProcess);
+
+    const result = await this.processes.GetTask(this.serialNumber).subscribe( result =>{
+    this.eventProcess = result
+      
+    this.restoreDatepickerData()
+  
+      console.log(this.eventProcess.workflowInstanceDataFields.Subject)
+      
+      // description
+      let body : any =this.eventProcess.workflowInstanceDataFields.Body.replace(/<[^>]+>/g, '')
+      this.eventProcess.workflowInstanceDataFields.Body = body
+      this.Location = this.eventProcess.workflowInstanceDataFields.Location
+
+      this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId
+      this.getAttachments()
+  
+      if(this.eventProcess.workflowInstanceDataFields.IsRecurring == false) {
+        this.isRecurring = "Não se repete";
+      }
+      else {
+        this.isRecurring = "Repete";
+      }
+  
+      this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
+        if(e.IsRequired) {
+          this.taskParticipants.push(e);
+        } else {
+          this.taskParticipantsCc.push(e);
+        }
+      })
+    })
+  }
+  
+  close() {
+    console.log('CLOSE');
+    
+    this.closeComponent.emit();
+    /* this.setIntervenient.emit([]);
+    this.setIntervenientCC.emit([]);
+    this.clearContact.emit(); */
+
+    //this.deleteTemporaryData();
+  }
+
+  save() {  
+    // set dates to eventProcess object
+    this.getDatepickerData()
+
+    this.taskParticipantsCc.forEach(e=>{
+      e.IsRequired = false
+    })
+    
+    this.eventProcess.workflowInstanceDataFields.ParticipantsList = this.taskParticipants.concat(this.taskParticipantsCc)
+
+    this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e=>{
+      
+      if(e.hasOwnProperty('$type')) {
+        delete e.$type
+      }
+    })
+
+    const event: any = {
+      Agenda: this.eventProcess.workflowInstanceDataFields.Agenda,
+      Body: this.eventProcess.workflowInstanceDataFields.Body,
+      EndDate: this.eventProcess.workflowInstanceDataFields.EndDate,
+      EventType: this.eventProcess.workflowInstanceDataFields.EventType,
+      IsAllDayEvent: this.eventProcess.workflowInstanceDataFields.IsAllDayEvent,
+      IsRecurring: this.eventProcess.workflowInstanceDataFields.IsRecurring,
+      Location: this.eventProcess.workflowInstanceDataFields.Location,
+      Subject: this.eventProcess.workflowInstanceDataFields.Subject,
+      serialNumber: this.eventProcess.serialNumber,
+      StartDate: this.eventProcess.workflowInstanceDataFields.StartDate,
+      MDEmail: this.eventProcess.workflowInstanceDataFields.MDEmail,
+      MDName: this.eventProcess.workflowInstanceDataFields.MDName,
+      Message: this.eventProcess.workflowInstanceDataFields.Message,
+      ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
+      Private: false,
+      ReviewUserComment: ''
+    }
+
+    console.log(event);
+    
+    this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
+      this.toastService.successMessage('Evento editado');
+    }, error =>{
+      this.toastService.badRequest('Evento não editado');
+    })
+
+
+    this.loadedAttachments.forEach((document:any)=>{
+      if(document['action'] == 'add') {
+        delete document.action
+        this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{
+          this.toastService.successMessage();
+        }, error =>{
+          this.toastService.badRequest();
+        });
+      } else if(document['action'] == 'delete') {
+        delete document.action
+        this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{
+          this.toastService.successMessage()
+        }, error =>{
+          this.toastService.badRequest()
+        })
+      }
+
+    })
+
+
+    this.modalController.dismiss();
+
+  }
+
+  /* async openAttendees() {
+
+    if(window.innerWidth <= 1024) {
+      const modal = await this.modalController.create({
+        component: AttendeesPageModal,
+         componentProps: {
+          adding: this.adding,
+          taskParticipants: this.taskParticipants,
+          taskParticipantsCc: this.taskParticipantsCc
+        },
+        cssClass: 'attendee modal modal-desktop',
+        backdropDismiss: false
+      });
+  
+      await modal.present();
+  
+      modal.onDidDismiss().then((data) => {
+        
+        if(data){
+          data = data['data'];
+
+          const newAttendees: EventPerson[] = data['taskParticipants'];
+          const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
+
+          this.setIntervenient(newAttendees);
+          this.setIntervenientCC(newAttendeesCC);
+        }
+      });
+    } else {
+      this.showAttendees = true
+    }
+  }
+
+  setIntervenient(data){
+    this.taskParticipants = data;
+    this.postEvent.Attendees = data;
+  }
+  
+  setIntervenientCC(data) {
+    this.taskParticipantsCc = data;
+  }
+
+  addParticipants(){
+    this.adding = 'intervenient'
+
+    this.openAttendees();
+  }
+
+  addParticipantsCC(){
+    
+    this.adding = 'CC'
+    this.openAttendees();
+  }
+
+  dynamicSetIntervenient({taskParticipants, taskParticipantsCc}){
+    this.taskParticipants = taskParticipants;
+    this.taskParticipantsCc = taskParticipantsCc;
+  } */
+
+
+  async addParticipants() {
+
+    //this.saveTemporaryData();
+
+    this.openAttendeesComponent.emit({
+      type: "intervenient"
+    });
+
+    this.clearContact.emit();
+  }
+
+
+  async addParticipantsCC() {
+
+    //this.saveTemporaryData();
+
+    this.openAttendeesComponent.emit({
+      type: "CC"
+    });
+
+    this.clearContact.emit();
+  }
+
+  saveTemporaryData() {
+    
+    this.getDatepickerData()
+
+    window['temp.path:/home/agenda/edit-event-to-approve.page.ts'] = {
+      postEvent: this.postEvent,
+      segment: this.segment
+    }
+  }
+
+
+  async getAttachments() {
+
+   let result: any = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise();
+
+    result.forEach((e)=>{
+      e.action = false
+    })
+
+    this.loadedAttachments = result
+
+    console.log('this.loadedAttachments', this.loadedAttachments, result)
+  }
+
+  deleteAttachment(attachment: Attachment, index) {
+
+    this.loadedAttachments[index]['action'] = 'delete'
+  }
+
+  async getDoc() {
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'modal-width-100-width-background modal',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        showSearchInput: true,
+        select: true,
+      }
+    });
+    await modal.present();
+    modal.onDidDismiss().then( async (res)=>{
+      if(res){
+        
+        const data: SearchDocument = res.data.selected;
+
+        const DocumentToSave: any = {
+          SourceTitle: data.Assunto,
+          ParentId: this.InstanceId,
+          Source: '1',
+          SourceId: data.Id,
+          ApplicationId: data.ApplicationType.toString(),
+          Id: '',
+          Link: '',
+          SerialNumber: '',
+          action: 'add',
+          CreateDate: data.Data,
+          Data: data.Data,
+          Description: data.DocTypeDesc,
+          SourceName: data.Assunto,
+          Stakeholders: data.EntidadeOrganicaNome,
+        };
+
+
+        this.loadedAttachments.push(DocumentToSave)
+        console.log('push', DocumentToSave)
+
+        // await this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(()=>{
+        //   this.getAttachments();
+        // });
+      }
+    });
+  }
+
+  restoreDatepickerData() {
+
+    this.dateControlStart = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.StartDate)));
+    this.dateControlEnd = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.EndDate)));
+    
+  }
+
+  getDatepickerData() {
+
+    this.eventProcess.workflowInstanceDataFields.StartDate = this.dateStart
+    this.eventProcess.workflowInstanceDataFields.EndDate = this.dateEnd
+  
+  }
+
+}

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

@@ -117,7 +117,6 @@ export class ViewEventPage implements OnInit {
   }
 
   async editEvent() {
-
     this.viewEventDetailDismiss.emit({
       type: 'edit',
       event: this.loadedEvent

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

@@ -127,23 +127,26 @@ export class EditEventToApproveComponent implements OnInit {
 
     this.isEventEdited = false;
 
-    this.getTask()
-
     this.dateControlStart = new FormControl(moment(new Date()));
     this.dateControlEnd = new FormControl(moment(new Date()));
 
   }
 
+  
+
+  ngOnInit() {
+    this.getTask()
+    console.log('HERE');
+    
+  }
+
   async getTask() {
-    console.log('this.eventProcess', this.eventProcess);
 
     const result = await this.processes.GetTask(this.serialNumber).subscribe( result =>{
     this.eventProcess = result
       
     this.restoreDatepickerData()
   
-      console.log(this.eventProcess.workflowInstanceDataFields.Subject)
-      
       // description
       let body : any =this.eventProcess.workflowInstanceDataFields.Body.replace(/<[^>]+>/g, '')
       this.eventProcess.workflowInstanceDataFields.Body = body
@@ -169,10 +172,6 @@ export class EditEventToApproveComponent implements OnInit {
     })
 
 
-  }
-
-  ngOnInit() {
-    
   }
   
   close() {

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

@@ -24,7 +24,7 @@
      <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  <div class="main-content overflow-y-auto height-100" [ngSwitch]="segment" *ngIf="eventsMDGPRList.length >= 1">
+  <div class="main-content overflow-y-auto height-100" [ngSwitch]="segment" *ngIf="eventsMDGPRList">
    <!--  <div class="header-content width-100"> -->
      
   <!-- </div> -->