Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

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

@@ -60,7 +60,7 @@ export class EditEventPage implements OnInit {
 
     this.postEvent = new Event();
     this.isEventEdited = false;
-    this.postEvent.EventRecurrence = {Type:'-1'};
+    this.postEvent.EventRecurrence = { Type:'-1', LastOccurrence:''};
     this.postEvent = this.navParams.get('event');
     this.caller = this.navParams.get('caller');
     this.initCalendarName = this.postEvent.CalendarName;

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

@@ -1,6 +1,5 @@
 import { Component, OnInit } from '@angular/core';
 import { AlertController, ModalController, NavParams, PopoverController } from '@ionic/angular';
-import { AuthConnstants } from 'src/app/config/auth-constants';
 import { Attachment } from 'src/app/models/attachment.model';
 import { EventBody } from 'src/app/models/eventbody.model';
 import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -9,8 +8,6 @@ import { Event } from '../../../models/event.model';
 import { EditEventPage } from '../edit-event/edit-event.page';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
-import { BookMeetingModalPage } from '../../gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { ToastService } from 'src/app/services/toast.service';
@@ -208,9 +205,6 @@ export class ViewEventPage implements OnInit {
 
   async editEventDetail() {
 
-    console.log(this.caller);
-
-
     const modal = await this.modalController.create({
       component: EditEventPage,
       componentProps: {

src/app/pages/chat/messages/messages.page.ts

@@ -6,6 +6,7 @@ import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page
 import { AlertService } from 'src/app/services/alert.service';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
+import { connection } from 'src/app/services/socket/synchro.service';
 import { ToastService } from 'src/app/services/toast.service';
 import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
 import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page';
@@ -30,6 +31,7 @@ export class MessagesPage implements OnInit, AfterViewChecked {
   el:any;
   members:any;
 
+  connection  = connection
 
   constructor(
     public popoverController: PopoverController,
@@ -199,7 +201,7 @@ export class MessagesPage implements OnInit, AfterViewChecked {
       //this.loadMessages()
       await this.serverLongPull();
     }
-  });
+    });
   }
 
 }

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts

@@ -3,7 +3,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
-import { DailyWorkTask } from '../../../../models/dailyworktask.model';
+import { DailyWorkTask, fullTask } from '../../../../models/dailyworktask.model';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 
 import { Event } from '../../../../models/event.model';
@@ -36,7 +36,7 @@ export class DespachoPrPage implements OnInit {
   attachments:any;
   fulltask: any;
   eventsList: Event[];
-  serialnumber: string;
+  serialNumber: string;
   caller: string;
   profile: string;
   intervenientes: any;
@@ -57,28 +57,30 @@ export class DespachoPrPage implements OnInit {
     ) {
       this.activatedRoute.paramMap.subscribe(params => {
         if(params["params"].SerialNumber) {
-          this.serialnumber = params["params"].SerialNumber;
+          this.serialNumber = params["params"].SerialNumber;
         }
         if(params["params"].caller) {
           this.caller = params["params"].caller;
         }
       });
+
+      console.log('DespachoPrPage  SerialNumber', this.serialNumber)
     }
 
   ngOnInit() {
     this.profile = "mdgpr";
-    console.log(this.serialnumber);
+    console.log(this.serialNumber);
 
     this.activateRoute.paramMap.subscribe(paramMap => {
       if (!paramMap.has('SerialNumber')) {
         return;
       }
-      /* this.serialnumber = paramMap.get('SerialNumber'); */
-      this.LoadTaskDetail(this.serialnumber);
-      // this.LoadRelatedEvents(this.serialnumber);
+      /* this.serialNumber = paramMap.get('SerialNumber'); */
+      this.LoadTaskDetail(this.serialNumber);
+      // this.LoadRelatedEvents(this.serialNumber);
     });
-    this.LoadTaskDetail(this.serialnumber);
-    // this.LoadRelatedEvents(this.serialnumber);
+    this.LoadTaskDetail(this.serialNumber);
+    // this.LoadRelatedEvents(this.serialNumber);
   }
 
   close() {
@@ -91,7 +93,7 @@ export class DespachoPrPage implements OnInit {
 
 
   async LoadTaskDetail(serial: string) {
-    this.processes.GetTask(serial).subscribe(res => {
+    this.processes.GetTask(serial).subscribe((res:fullTask) => {
       this.task = {
         "SerialNumber": res.serialNumber,
         "Folio": res.workflowInstanceDataFields.Subject,
@@ -179,7 +181,7 @@ export class DespachoPrPage implements OnInit {
 
   async executado(note:string, documents:any) {
     let body = {
-      "serialNumber": this.serialnumber,
+      "serialNumber": this.serialNumber,
       "action": "Conhecimento",
       "ActionTypeId": 104,
       "dataFields": {
@@ -205,7 +207,7 @@ export class DespachoPrPage implements OnInit {
 
   async arquivar(note:string, documents:any){
     let body = {
-      "serialNumber": this.serialnumber,
+      "serialNumber": this.serialNumber,
       "action": "Arquivo",
       "ActionTypeId": 95,
       "dataFields": {
@@ -232,7 +234,7 @@ export class DespachoPrPage implements OnInit {
 
   async generateDiploma(note:string, documents:any){
     let body = {
-      "serialNumber": this.serialnumber,
+      "serialNumber": this.serialNumber,
       "action": "Reencaminhar",
       "ActionTypeId": 99999839,
       "dataFields": {
@@ -258,7 +260,7 @@ export class DespachoPrPage implements OnInit {
 
   async concluir(note:string, documents:any){
     let body = {
-      "serialNumber": this.serialnumber,
+      "serialNumber": this.serialNumber,
       "action": "Executado",
       "ActionTypeId": 104,
       "dataFields": {
@@ -285,7 +287,7 @@ export class DespachoPrPage implements OnInit {
 
   async reexecutar(note:string, documents:any){
     let body = {
-      "serialNumber": this.serialnumber,
+      "serialNumber": this.serialNumber,
       "action": "Reexecutar",
       "ActionTypeId": 100000010,
       "dataFields": {
@@ -314,7 +316,7 @@ export class DespachoPrPage implements OnInit {
   }
 
   sendExpedienteToPending(){
-    this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
+    this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{
       this.goBack();
       this.toastService.successMessage('Processo enviado para pendentes')
     },()=>{

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

@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { CalendarComponent } from 'ionic2-calendar';
 
-import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
+import { customFullTask, customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController, NavParams } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
@@ -30,7 +30,7 @@ export class DespachosPrPage implements OnInit {
   despachoList:any[] = [];
   deferimentoList:DailyWorkTask[] = [];
 
-  taskList:tasksList[] = [];
+  taskList: customTask[] = [];
 
   taskType: string;
   serialNumber:string;
@@ -190,53 +190,8 @@ export class DespachosPrPage 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) {
+  async openBookMeetingModal(task: customFullTask) {
 
     const doc = this.loadedAttachments[ this.dicIndex];
 
@@ -253,7 +208,7 @@ export class DespachosPrPage implements OnInit {
     }
 
     let classs;
-    if( window.innerWidth <= 800){
+    if( window.innerWidth <= 800) {
       classs = 'book-meeting-modal modal modal-desktop'
     } else  {
       classs = 'modal modal-desktop showAsideOptions'
@@ -271,31 +226,25 @@ export class DespachosPrPage implements OnInit {
   }
 
 
-  async distartExpedientModal() {
+  // async distartExpedientModal() {
 
-    const doc = this.taskList[ this.dicIndex];
+  //   const modal = await this.modalController.create({
+  //     component: DiscartExpedientModalPage,
+  //     componentProps: {
+  //       action: 'complete',
+  //     },
+  //     cssClass: 'discart-expedient-modal',
+  //     backdropDismiss: false
+  //   });
 
-    console.log(doc, this.dicIndex, this.taskList)
+  //   await modal.present();
+  //   modal.onDidDismiss().then(res=>{
+  //     if(res['data']=='close'){
 
-    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'){
-
-      }
-
-    });
-  }
+  //   });
+  // }
 
   docIndex(index: number) {
     this.dicIndex = index;

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

@@ -3,10 +3,9 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { Event } from '../../../../models/event.model';
-import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
-import { AlertService } from 'src/app/services/alert.service';
+import { MenuController, ModalController, PopoverController } from '@ionic/angular';
 import { momentG }  from 'src/plugin/momentG'
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
 import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
@@ -17,7 +16,8 @@ import { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/d
 import { ToastService } from 'src/app/services/toast.service';
 import { DespachoService } from 'src/app/Rules/despacho.service'
 import { Location } from '@angular/common'
-import { customTask, customTaskList, fullTask } from 'src/app/models/dailyworktask.model';
+import { fullTask } from 'src/app/models/dailyworktask.model';
+import { Attachment, AttachmentList } from 'src/app/models/Excludetask';
 
 @Component({
   selector: 'app-despacho',
@@ -191,7 +191,7 @@ export class DespachoPage implements OnInit {
     }
   }
 
-  async arquivar(note:string, documents:any) {
+  async arquivar(note:string, documents: AttachmentList) {
     let body = {
       "serialNumber": this.serialnumber,
       "action": "Arquivo",

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

@@ -1,12 +1,11 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { CalendarComponent } from 'ionic2-calendar';
-import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
+import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
 import { AuthService } from 'src/app/services/auth.service';
 import { NavigationStart, Router } from '@angular/router';
-import { DespachoStore } from 'src/app/store/despacho-store.service';
 import { DespachoPageStore } from 'src/app/store/despachos-page-store.service';
 
 @Component({
@@ -24,7 +23,7 @@ export class DespachosPage implements OnInit {
   despachoList:any[] = [];
   deferimentoList:DailyWorkTask[] = [];
 
-  taskList:tasksList[] = [];
+  taskList:customTask[] = [];
 
   taskType: string;
   serialNumber:string;

src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts

@@ -159,7 +159,7 @@ export class DiplomaAssinarPage implements OnInit {
       "dataFields": {
         "ReviewUserComment": '',
       },
-      "AttachmentList": [],
+      "AttachmentList": {},
     }
 
     const loader = this.toastService.loading()

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

@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
-import { customTask, DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
+import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { formatDate } from '@angular/common';
 import { ModalController, NavParams } from '@ionic/angular';

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

@@ -8,8 +8,6 @@ import { momentG }  from 'src/plugin/momentG';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { Location } from '@angular/common';

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

@@ -19,7 +19,6 @@ import * as _moment from 'moment';
 import * as _rollupMoment from 'moment';
 import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
 import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
-import { MAT_DATE_LOCALE } from '@angular/material/core';
 
 const moment = _rollupMoment || _moment;
 
@@ -124,7 +123,6 @@ export class BookMeetingModalPage implements OnInit {
     private attachmentsService: AttachmentsService,
     private calendarService: EventsService,
     authService: AuthService,
-    private animationController: AnimationController,
     private toastService: ToastService,
     private activatedRoute: ActivatedRoute,
     ) {
@@ -137,17 +135,12 @@ export class BookMeetingModalPage implements OnInit {
       this.eventBody = { BodyType : "1", Text : ""};
       this.postData.Body = this.eventBody;
 
-      /* Initialize 'Subject' with the title of the expedient */
       this.postData.Subject = this.task.Folio;
       this.postData.CalendarName = "Oficial";
-      /* this.postData.StartDate = new Date(); */
-      /* Set + 30minutes to seleted datetime */
-     /*  this.postData.EndDate = new Date(selectedEndDate.setMinutes(new Date().getMinutes() + 30)); */
 
      this.dateControlStart = new FormControl(moment(new Date()));
      this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000)));
 
-
      this.postData.Category = 'Reunião'
     }
 
@@ -264,8 +257,6 @@ export class BookMeetingModalPage implements OnInit {
       },
     }
 
-    console.log(this.postData);
-
     if(this.task.FsId == '8') {
       const loader = this.toastService.loading()
       try {
@@ -314,6 +305,11 @@ export class BookMeetingModalPage implements OnInit {
       }
 
     }
+
+    if(true) {
+      //     
+    }
+
   }
 
   async addParticipants() {
@@ -443,10 +439,6 @@ export class BookMeetingModalPage implements OnInit {
     this.taskParticipantsCc = taskParticipantsCc;
   }
 
-  goToGabinete() {
-    this.router.navigate(['/home/gabinete-digital']);
-  }
-
   setIntervenient(data){
     this.taskParticipants = data;
   }

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -125,26 +125,19 @@ export class ExpedientTaskModalPage implements OnInit {
         Nad: 30,
         Subject: '',
         Message: '',
-        SourceSecFsId: this.task.workflowInstanceDataFields.FsId, //361
-        SourceType: 'DOC', //FOLDER
-        SourceId: this.task.workflowInstanceDataFields.DocID, //FolderId
+        SourceSecFsId: this.task.workflowInstanceDataFields.SourceSecFsID, //361
+        SourceType: this.task.workflowInstanceDataFields.SourceType, //FOLDER
+        SourceId: this.task.workflowInstanceDataFields.SourceID, //FolderId
         DeadlineType: '',
         SubjectTypes: this.selectedTypes,
         NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
 
       };
 
+      console.log('task 123123', this.task)
+      console.log('this.aplicationId', this.aplicationId)
 
-      if(this.aplicationId == 361) {
-        this.dispatchFolder.SourceType = 'FOLDER'
-        this.dispatchFolder.SourceId = this.task.workflowInstanceDataFields.FolderID
-      } else if(this.aplicationId == 8) {
-        this.dispatchFolder.SourceType = 'DOC'
-        this.dispatchFolder.SourceId = this.task.workflowInstanceDataFields.DocId
-      }
-
-
-
+      
       this.postData.DispatchFolder = this.dispatchFolder;
       this.postData.UsersSelected = this.participants;
       /* By Default TypeDeadline should be 'Normal' */
@@ -152,6 +145,8 @@ export class ExpedientTaskModalPage implements OnInit {
       /* Initialize 'Subject' with the title of the expedient */
       this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject;
       this.profile = this.navParams.get('profile');
+
+      console.log(this.postData);
   }
 
   async setAdding(type:  "intervenient" | "CC") {
@@ -159,7 +154,7 @@ export class ExpedientTaskModalPage implements OnInit {
   }
 
   ngOnInit() {
-    console.log(this.postData);
+
 
     this.taskDate = new Date(this.task.taskStartDate);
     if(!this.task.hasOwnProperty('isEvent')) {

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

@@ -20,6 +20,7 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
 import { PermissionService } from 'src/app/OtherService/permission.service';
 import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe';
 import { ExpedientesService } from 'src/app/Rules/expedientes.service';
+import { expedienteTask } from 'src/app/models/dailyworktask.model';
 
 @Component({
   selector: 'app-expediente-detail',
@@ -33,7 +34,7 @@ export class ExpedienteDetailPage implements OnInit {
 
   customDate:any;
 
-  task: any;
+  task: expedienteTask;
   fulltask: any;
   eventsList: Event[];
   serialNumber: string;
@@ -256,6 +257,7 @@ export class ExpedienteDetailPage implements OnInit {
         "AttachmentsProcessLastInstanceID": res.workflowInstanceDataFields.AttachmentsProcessLastInstanceID,
         "InstanceID": res.workflowInstanceDataFields.InstanceID
       }
+
       this.fulltask = res;
 
       let thedate = new Date(this.task.CreateDate);

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

@@ -1,9 +1,7 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { NavigationEnd, NavigationStart, Router } from '@angular/router';
+import { Component, OnInit } from '@angular/core';
+import { NavigationStart, Router } from '@angular/router';
 import { DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { ModalController } from '@ionic/angular';
-import { AlertService } from 'src/app/services/alert.service';
 import { ToastService } from 'src/app/services/toast.service';
 import { ExpedienteStorage } from 'src/app/store/expediente-storage-service.service';
 
@@ -26,8 +24,6 @@ export class ExpedientePage implements OnInit {
   
   constructor(
     private processes:ProcessesService,
-    private modalController: ModalController,
-    private alertService: AlertService,
     private router: Router,
     private toastService: ToastService
     ) {

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts

@@ -18,6 +18,7 @@ import { ToastService } from 'src/app/services/toast.service';
 import { SearchPage } from 'src/app/pages/search/search.page';
 import { SearchDocument } from 'src/app/models/search-document';
 import { Location } from '@angular/common';
+import { AttachmentList } from 'src/app/models/Excludetask';
 
 @Component({
   selector: 'app-expediente-pr',
@@ -340,14 +341,14 @@ export class ExpedientePrPage implements OnInit {
     modal.onDidDismiss().then(res => {
       console.log(res);
       if(res.data){
-        const DocumentToSave = res.data.documents.map((e) => {
+        const DocumentToSave = res.data.documents.map((e:SearchDocument) => {
           return {
             ApplicationId: e.ApplicationType,
             SourceId: e.Id,
           }
         });
 
-        let docs = {
+        let docs: AttachmentList = {
           ProcessInstanceID: "",
           Attachments: DocumentToSave,
         }
@@ -535,6 +536,7 @@ export class ExpedientePrPage implements OnInit {
   }
 
   async openOptions(taskAction?: any) {
+
     const popover = await this.popoverController.create({
       component: OptsExpedientePrPage,
       cssClass: 'exp-options',

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

@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { ActivatedRoute, NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
-import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
+import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController, NavParams } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
@@ -19,8 +19,8 @@ export class PedidosPage implements OnInit {
  parecerList:any[] = [];
  fulltask:any;
 
- parecerListResult:tasksList[] = [];
- deferimentoListResult:tasksList[] = [];
+ parecerListResult:customTask[] = [];
+ deferimentoListResult:customTask[] = [];
 
  deferimentoList:any[] = [];
  taskType: string;

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

@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angu
 import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
-import { customTaskList, DailyWorkTask } from '../../../models/dailyworktask.model';
+import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { formatDate } from '@angular/common';
 import { AlertService } from 'src/app/services/alert.service';
@@ -84,7 +84,7 @@ export class PendentesPage implements OnInit {
     let pendentesList = [];
 
     pendentes.forEach(element => {
-      let task: customTaskList = this.customTaskPipe.transform(element);
+      let task: customTask = this.customTaskPipe.transform(element);
       pendentesList.push(task);
     });
 
@@ -116,7 +116,7 @@ export class PendentesPage implements OnInit {
     }, 2000);
   }
 
-  async viewTaskDetails({ SerialNumber, WorkflowName, activityInstanceName }:customTaskList) {
+  async viewTaskDetails({ SerialNumber, WorkflowName, activityInstanceName }:customTask) {
     if(WorkflowName == 'Despacho') {
       this.router.navigate(['/home/gabinete-digital/despachos',SerialNumber,'gabinete-digital']);
     }

src/app/pages/search/search.page.ts

@@ -10,9 +10,6 @@ import  WordCloud from 'src/plugin/wordcloud2.js';
 import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
 import { PublicationDetailPage } from '../publications/view-publications/publication-detail/publication-detail.page';
 import { DocumentDetailPage } from 'src/app/modals/document-detail/document-detail.page';
-import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
-
-
 
 @Component({
   selector: 'app-search',
@@ -626,30 +623,34 @@ export class SearchPage implements OnInit {
 
   }
   
-  async openExpedientActionsModal(doc: any) {
+  // async openExpedientActionsModal(doc: SearchDocument) {
 
-    let customTask = {
-      serialNumber: doc.SourceId,
-      taskStartDate: doc.CreateDate,
-      isEvent: true,
-      workflowInstanceDataFields: {
-        FsId: doc.ApplicationId,
-        FolderID: null,
-        DocId: doc.SourceId,
-        Subject: doc.SourceName
-      },
-    }
+  //   let customTask: task = {
+  //     serialNumber: doc.SourceId,
+  //     taskStartDate: doc.CreateDate,
+  //     isEvent: true,
+  //     workflowInstanceDataFields: {
+  //       FolderID: , 
+  //       Subject: ,
+  //       SourceSecFsID: , 
+  //       SourceType: ,
+  //       SourceID:  ,
+  //       FolderID: null,
+  //       DocId: doc.SourceId,
+  //       Subject: doc.SourceName,
+  //     },
+  //   }
 
-    const popover = await this.modalController.create({
-      component: OptsExpedientePage,
-      cssClass: 'model aside-modal search-submodal',
-      componentProps: {
-        fulltask: customTask,
-        task: customTask
-      },
-      //translucent: true
-    });
-    return await popover.present();
-  }
+  //   const popover = await this.modalController.create({
+  //     component: OptsExpedientePage,
+  //     cssClass: 'model aside-modal search-submodal',
+  //     componentProps: {
+  //       fulltask: customTask,
+  //       task: customTask
+  //     },
+  //     //translucent: true
+  //   });
+  //   return await popover.present();
+  // }
   
 }