Fix

.gitignore

@@ -42,3 +42,4 @@ src/app/architect/
 src/environments/environment.e2e.ts
 .env
 platforms_
+_platforms

src/app/modals/create-process/create-process.page.ts

@@ -6,7 +6,6 @@ import { Participant } from 'src/app/models/participant.model';
 import { Folder } from 'src/app/models/folder.model';
 import { AuthService } from 'src/app/services/auth.service';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { environment } from 'src/environments/environment';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 import { SearchDocument } from 'src/app/models/search-document';
@@ -20,6 +19,7 @@ import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-pick
 import { PermissionService } from 'src/app/OtherService/permission.service';
 import { DespachoService } from 'src/app/Rules/despacho.service';
 import { PedidoService } from 'src/app/Rules/pedido.service'
+import { fullTask } from 'src/app/models/dailyworktask.model';
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -50,7 +50,7 @@ export class CreateProcessPage implements OnInit {
   ];
   taskType:string;
   task: any;
-  fulltask: any
+  fulltask: fullTask;
 
   taskParticipants: any = [];
   taskParticipantsCc: any = [];
@@ -121,7 +121,7 @@ export class CreateProcessPage implements OnInit {
       let SourceType;
       let SourceSecFsId;
 
-      if(this.task.workflowInstanceDataFields.FolderID || this.task.FolderId) {
+      if(this.task.workflowInstanceDataFields.FolderID || this.task.FolderId || this.task.FolderID) {
         SourceId = this.task.workflowInstanceDataFields.FolderID
         SourceType =  'FOLDER'
         SourceSecFsId = 361

src/app/models/dailyworktask.model.ts

@@ -28,6 +28,7 @@ export class fullTask {
     workflowID: number;
     totalDocuments: any;
     workflowInstanceDataFields: {
+        DispatchNumber: any,
         AttachmentsProcessLastInstanceId: number,
         Sender: string,
         ViewerRequest: string,
@@ -66,9 +67,19 @@ export class fullTask {
     workflowName: string
 }
 
-export class tasksList extends fullTask{}
+export class customFullTask {
+    serialNumber: string;
+    taskStartDate: string;
+    isEvent: true;
+    workflowInstanceDataFields: {
+      FsId: string,
+      FolderID: number,
+      DocId: number,
+      Subject: string
+    }
+}
 
-export class customTaskList {
+export class customTask {
     SerialNumber: string
     Folio : string
     Senders: string
@@ -82,5 +93,3 @@ export class customTaskList {
     activityInstanceName  : string
     Status : string
 }
-
-export class customTask extends  customTaskList{}

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';

src/app/pages/chat/group-messages/group-messages.page.scss

@@ -22,7 +22,7 @@
            .middle{
             padding: 0!important;
             float: left;
-            width: 280px;
+            width:calc(100% - 77px);
             margin: 2.5px 0 0 5px;
           }
           .right{
@@ -60,6 +60,10 @@
 
         .title{
           font-size: 25px;
+          white-space: nowrap;
+          overflow: hidden !important;
+          text-overflow: ellipsis !important;
+          float: left;
         }
         .div-icon{
           width: 40px;

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

@@ -184,6 +184,7 @@ export class GroupMessagesPage implements OnInit, AfterViewChecked {
     });
     return await popover.present();
   }
+
   async addContacts(){
     console.log(this.members);
 

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

@@ -75,8 +75,8 @@
 <ion-footer>
   <div class="container width-100 d-flex">
     <div>
-      <button class="btn-no-color"> <!-- (click)="openChatOptions()" -->
+      <button class="btn-no-color" (click)="openChatOptions()">
-        <ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
+        <ion-icon class="chat-icon-options" src="assets/images/icons-add-new-event.svg"></ion-icon>
       </button>
     </div>
     <div class="width-70">

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

@@ -29,7 +29,7 @@
            .middle{
             padding: 0!important;
             float: left;
-            width: 280px;
+            width:calc(100% - 77px);
             margin: 2.5px 0 0 5px;
             display: flex;
             align-items: center;
@@ -70,7 +70,9 @@
 
         .title{
           font-size: 25px;
-          overflow: auto;
+          white-space: nowrap;
+          overflow: hidden !important;
+          text-overflow: ellipsis !important;
           float: left;
         }
         .div-icon{
@@ -154,14 +156,15 @@
  .container{
    justify-content: center;
    justify-content: space-evenly;
+   align-items: center;
 
  }
 
  .chat-icon-options{
    display:block !important;
-   font-size: 25px;
+   font-size: 35px;
    float: right !important;
-   margin-top: 10px;
+   margin-top: 5px;
  }
 
  .chat-icon-send{

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

@@ -29,6 +29,7 @@ export class MessagesPage implements OnInit, AfterViewChecked {
   dmUsers:any;
   roomId:string;
   el:any;
+  members:any;
 
   connection  = connection
 
@@ -117,6 +118,7 @@ export class MessagesPage implements OnInit, AfterViewChecked {
   getChatMembers() {
     this.showLoader = true;
     this.chatService.getMembers(this.roomId).subscribe(res=> {
+      this.members = res['members'];
       this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username)
       console.log(res);
       console.log(this.dmUsers);
@@ -150,11 +152,18 @@ export class MessagesPage implements OnInit, AfterViewChecked {
     modal.onDidDismiss();
   }
 
-async openChatOptions(ev?: any) {
+  async openChatOptions(ev?: any) {
+    console.log(this.members);
+
     const popover = await this.popoverController.create({
       component: ChatOptionsPopoverPage,
       cssClass: 'chat-options-popover',
       event: ev,
+      componentProps: {
+        room: this.roomId,
+        members: this.members,
+        eventSelectedDate: new Date(),
+      },
       translucent: true
     });
     return await popover.present();

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;
@@ -236,7 +236,7 @@ export class DespachosPrPage implements OnInit {
     });
   }
 
-  async openBookMeetingModal(task: any) {
+  async openBookMeetingModal(task: customFullTask) {
 
     const doc = this.loadedAttachments[ this.dicIndex];
 
@@ -271,31 +271,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 { MenuController, ModalController, PopoverController } from '@ionic/angular';
-import { AlertService } from 'src/app/services/alert.service';
 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,7 @@ 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';
 
 @Component({
   selector: 'app-despacho',

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

@@ -1,6 +1,6 @@
 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';
@@ -24,7 +24,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/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/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[] = [];
+ parecerListResult:customTask[] = [];
- deferimentoListResult:tasksList[] = [];
+ 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/pipes/custom-task.pipe.ts

@@ -1,12 +1,12 @@
 import { Pipe, PipeTransform } from '@angular/core';
-import { customTaskList } from '../models/dailyworktask.model';
+import { customTask } from '../models/dailyworktask.model';
 
 @Pipe({
   name: 'customTask'
 })
 export class CustomTaskPipe implements PipeTransform {
 
-  transform(fullTask): customTaskList {
+  transform(fullTask): customTask {
 
     let date = new Date(fullTask.taskStartDate);
     date.setMonth(date.getMonth() + 1);

src/app/services/socket/synchro.service.ts

@@ -73,7 +73,6 @@ export class SynchroService {
   }
 
 	private onmessage = async (event: any)=> {
-    // alert('message')
     this.callback()
 	}
 

src/app/shared/chat/group-messages/group-messages.page.scss

@@ -19,7 +19,7 @@
            .middle{
             padding: 0!important;
             float: left;
-            width: 280px;
+            width:calc(100% - 77px);
             margin: 2.5px 0 0 5px;
           }
           .right{
@@ -55,6 +55,10 @@
 
         .title{
           font-size: 25px;
+          white-space: nowrap;
+          overflow: hidden !important;
+          text-overflow: ellipsis !important;
+          float: left;
         }
         .div-icon{
           width: 40px;

src/app/shared/chat/messages/messages.page.scss

@@ -22,7 +22,7 @@
            .middle{
             //padding: 0!important;
             float: left;
-            width: 280px;
+            width:calc(100% - 77px);
             margin: 2px 0 0 5px;
             display: flex;
             align-items: center;
@@ -63,7 +63,9 @@
 
         .title{
           font-size: 25px;
-          overflow: auto;
+          white-space: nowrap;
+          overflow: hidden !important;
+          text-overflow: ellipsis !important;
           float: left;
         }
         .div-icon{

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

@@ -11,6 +11,7 @@ import { ProfileComponent } from '../../headers/header-no-search/profile/profile
 import { ContactsPage } from '../new-group/contacts/contacts.page';
 import { Router } from '@angular/router';
 import { connection } from 'src/app/services/socket/synchro.service';
+import { ChatOptionsFeaturesPage } from 'src/app/modals/chat-options-features/chat-options-features.page';
 
 @Component({
   selector: 'app-messages',
@@ -50,20 +51,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
 
-
+    this.connection.callback = this.load
-
-    this.connection.callback = function() {
-      this.chatService.getRoomMessages(this.roomId).subscribe(async res => {
-
-        if (res == 502) {
-
-        } else if (res != 200) {
-          this.messages = res['messages'].reverse();
-          console.log(this.messages);
-        }
-      });
-    }
-
 
    /*  this.dm = this.navParams.get('dm'); */
   }
@@ -71,6 +59,17 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     this.load();
 
     //throw new Error('Method not implemented.');
+
+
+    this.chatService.getRoomMessages(this.roomId).subscribe(async res => {
+
+      if (res == 502) {
+
+      } else if (res != 200) {
+        this.messages = res['messages'].reverse();
+        console.log(this.messages);
+      }
+    });
   }
 
   ngOnInit() {
@@ -98,7 +97,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
 
-  load(){
+  load = ()=>{
     this.checktimeOut = true;
     this.serverLongPull();
     this.getChatMembers();
@@ -191,7 +190,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
   }
 
   openSendMessageOptions(ev?:any){
-    if(window.innerWidth <= 1024){
+    if(window.innerWidth < 701){
       console.log('mobile');
       this.openChatOptions(ev);
     }
@@ -289,22 +288,10 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
       return enterAnimation(baseEl).direction('reverse');
     }
 
-
-    /* const popover = await this.popoverController.create({
-      component: MessagesOptionsPage,
-      componentProps: {
-        roomId: this.dm._id,
-      },
-      cssClass: 'messages-options',
-      event: ev,
-      translucent: true,
-    });
-    return await popover.present(); */
-
     const modal = await this.modalController.create({
       enterAnimation,
       leaveAnimation,
-      component: ChatOptionsPopoverPage,
+      component: ChatOptionsFeaturesPage,
       cssClass: 'model profile-modal search-submodal',
       componentProps: {
         roomId: this.roomId,
@@ -314,36 +301,35 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
   }
 
   async serverLongPull() {
-    
     this.chatService.getRoomMessages(this.roomId).subscribe(async res => {
 
-    if (res == 502) {
+      if (res == 502) {
-      // Connection timeout
+        // Connection timeout
-      // happens when the connection was pending for too long
+        // happens when the connection was pending for too long
-      // let's reconnect
+        // let's reconnect
-      await this.serverLongPull();
+        // await this.serverLongPull();
-    } else if (res != 200) {
+      } else if (res != 200) {
-      // Show Error
+        // Show Error
-      //showMessage(response.statusText);
+        //showMessage(response.statusText);
-      //this.loadMessages()
+        //this.loadMessages()
-      this.messages = res['messages'].reverse();
+        this.messages = res['messages'].reverse();
-      console.log(this.messages);
+        console.log(this.messages);
-      // Reconnect in one second
+        // Reconnect in one second
-      if(this.route.url != "/home/chat"){
+        if(this.route.url != "/home/chat"){
-        console.log("Timer message stop")
+          console.log("Timer message stop")
-      } else {
+        } else {
-         await new Promise(resolve => setTimeout(resolve, 1000));
+           //await new Promise(resolve => setTimeout(resolve, 1000));
-        await this.serverLongPull();
+          // await this.serverLongPull();
-        console.log('Timer message running')
+          console.log('Timer message running')
-      }
+        }
   
-    } else {
+      } else {
-      // Got message
+        // Got message
-      //let message = await response.text();
+        //let message = await response.text();
-      //this.loadMessages()
+        //this.loadMessages()
-      await this.serverLongPull();
+        //await this.serverLongPull();
-    }
+      }
-  });
+    });
   }
 
 }

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

@@ -1,6 +1,6 @@
 import { Component, OnInit} from '@angular/core';
 
-import { customTaskList} from '../../../models/dailyworktask.model';
+import { customTask} from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 
 import { AuthService } from 'src/app/services/auth.service';
@@ -69,7 +69,7 @@ constructor (
 
     despachosPr.forEach( (element, index) => {
 
-      let task: customTaskList = this.customTaskPipe.transform(element);
+      let task: customTask = this.customTaskPipe.transform(element);
 
       despachoList.push(task);
     });
@@ -100,7 +100,7 @@ constructor (
     }, 1000);
   }
 
-  goToDespacho({ SerialNumber } :customTaskList) {
+  goToDespacho({ SerialNumber } :customTask) {
     this.router.navigate(['/home/gabinete-digital/despachos-pr',SerialNumber,'gabinete-digital']);
   }
 

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

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { customTaskList, DailyWorkTask, fullTask, tasksList } from '../../../models/dailyworktask.model';
+import { customTask, DailyWorkTask, fullTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { NavigationStart, Router } from '@angular/router';
 import { DespachoStore } from 'src/app/store/despacho-store.service';
@@ -39,7 +39,7 @@ export class DespachosPage implements OnInit {
     });
  }
 
-  goToDespacho({ SerialNumber } :customTaskList) {
+  goToDespacho({ SerialNumber } : customTask) {
     this.router.navigate(['/home/gabinete-digital/despachos',SerialNumber,'gabinete-digital']);
   }
 

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

@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { ActivatedRoute, NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angular/router';
-import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
+import { 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';

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts

@@ -1,6 +1,6 @@
 import { Component, EventEmitter, OnInit, Output } from '@angular/core';
 import { NavigationStart, Router } from '@angular/router';
-import { customTaskList, DailyWorkTask } 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';
@@ -67,7 +67,7 @@ export class ExpedientesPrPage implements OnInit {
       this.taskslist = [];
       let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
       res.forEach(element => {
-        let task: customTaskList = this.customTaskPipe.transform(element);
+        let task: customTask = this.customTaskPipe.transform(element);
         this.taskslist.push(task);
       });
       this.expedienteprstore.reset(this.taskslist);

src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { customTaskList } from 'src/app/models/dailyworktask.model';
+import { customTask } from 'src/app/models/dailyworktask.model';
 
 @Component({
   selector: 'app-task-list',
@@ -8,9 +8,9 @@ import { customTaskList } from 'src/app/models/dailyworktask.model';
 })
 export class TaskListPage implements OnInit {
 
-  @Input() taskList: customTaskList[] = [];
+  @Input() taskList: customTask[] = [];
   @Input() skeletonLoader: boolean = false
-  @Output() viewTaskDetail = new EventEmitter<customTaskList>();
+  @Output() viewTaskDetail = new EventEmitter<customTask>();
   
   constructor() {
     console.log('taskList', this.taskList)

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

@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angu
 import { NavigationStart, Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
-import { customTaskList, 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';
@@ -24,8 +24,8 @@ export class PedidosPage implements OnInit {
   parecerList:any[] = [];
   fulltask:any;
 
-  parecerListResult:tasksList[] = [];
+  parecerListResult:customTask[] = [];
-  deferimentoListResult:tasksList[] = [];
+  deferimentoListResult:customTask[] = [];
 
   deferimentoList:any[] = [];
   taskType: string;
@@ -90,7 +90,7 @@ export class PedidosPage implements OnInit {
 
        allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").forEach(element => {
 
-        let task: customTaskList = this.customTaskPipe.transform(element);
+        let task: customTask = this.customTaskPipe.transform(element);
         this.parecerList.push(task);
       });
       this.pedidosstore.resetparecer(this.parecerList);
@@ -107,7 +107,7 @@ export class PedidosPage implements OnInit {
         let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active")
 
         res.forEach(element => {
-          let task: customTaskList = this.customTaskPipe.transform(element);
+          let task: customTask = this.customTaskPipe.transform(element);
           this.deferimentoList.push(task);
         });
         this.pedidosstore.resetdeferimento(this.deferimentoList);

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

@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { NavigationStart, Router } from '@angular/router';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
-import { customTaskList} from '../../../models/dailyworktask.model';
+import { customTask} from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { AuthService } from 'src/app/services/auth.service';
 import { PendentesStore } from 'src/app/store/pendestes-store.service';
@@ -55,7 +55,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);
     });
 
@@ -79,7 +79,7 @@ export class PendentesPage implements OnInit {
 
   }
 
-  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/shared/popover/despachos-options/despachos-options.page.ts

@@ -8,6 +8,7 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.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 { ToastService } from 'src/app/services/toast.service';
+import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
 
 
 @Component({
@@ -17,9 +18,9 @@ import { ToastService } from 'src/app/services/toast.service';
 })
 export class DespachosOptionsPage implements OnInit {
 
-  task: any;
+  task: customTask
-  fulltask: any;
+  fulltask: fullTask;
-  serialnumber: string;
+  serialNumber: string;
 
   constructor(private activateRoute: ActivatedRoute,
     private processes: ProcessesService,
@@ -31,6 +32,9 @@ export class DespachosOptionsPage implements OnInit {
     ) { 
       this.task = this.navParams.get('task')
       this.fulltask = this.navParams.get('fulltask')
+
+
+      this.serialNumber = this.task.SerialNumber
     }
 
   ngOnInit() {
@@ -141,7 +145,7 @@ export class DespachosOptionsPage implements OnInit {
 
   async generateDiploma(note:string, documents:any){
     let body = { 
-      "serialNumber": this.serialnumber, 
+      "serialNumber": this.serialNumber, 
       "action": "Reencaminhar",
       "ActionTypeId": 99999839,
       "dataFields": {
@@ -165,6 +169,8 @@ export class DespachosOptionsPage implements OnInit {
   }
 
   async openAddNoteModal(actionName:string) {
+
+    alert('AddNotePage')
     this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
@@ -174,7 +180,8 @@ export class DespachosOptionsPage implements OnInit {
     }
     const modal = await this.modalController.create({
       component: AddNotePage,
-      componentProps:{
+      componentProps: {
+        showAttachmentBtn: true
       },
       cssClass: classs,
       backdropDismiss: true
@@ -220,7 +227,7 @@ export class DespachosOptionsPage implements OnInit {
 
   async arquivar(note:string, documents:any) {
     let body = { 
-      "serialNumber": this.serialnumber, 
+      "serialNumber": this.serialNumber, 
       "action": "Arquivo",
       "ActionTypeId": 95,
       "dataFields": {
@@ -247,7 +254,7 @@ export class DespachosOptionsPage implements OnInit {
 
   async executado(note:string, documents:any){
     let body = { 
-      "serialNumber": this.serialnumber, 
+      "serialNumber": this.serialNumber, 
       "action": "Conhecimento",
       "ActionTypeId": 104,
       "dataFields": {
@@ -274,7 +281,7 @@ export class DespachosOptionsPage implements OnInit {
  
   async reexecutar(note:string, documents:any){
     let body = { 
-      "serialNumber": this.serialnumber, 
+      "serialNumber": this.serialNumber, 
       "action": "Reexecutar",
       "ActionTypeId": 100000010,
       "dataFields": {

src/app/store/despachos-page-store.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { localstoreService } from './localstore.service'
 import { AES, enc, SHA1 }  from  'crypto-js'
-import { customTaskList } from '../models/dailyworktask.model';
+import { customTask } from '../models/dailyworktask.model';
 
 @Injectable({
   providedIn: 'root'
@@ -27,7 +27,7 @@ export class DespachosPageStoreService {
 
   }
 
-  get list(): customTaskList[] {
+  get list(): customTask[] {
     return this._list || []
   }
 

src/global.scss

@@ -429,7 +429,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
 }
 
 .modal-width-100-width-background, .modal-desktop {
-    padding-top: 76px;
+    padding-top: 67px;
     .modal-wrapper {
         width: 100%  !important;
         height: 99%  !important;