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

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

@@ -12,6 +12,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
 import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
+import { EventToApproveEdit } from 'src/app/models/event.model';
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -83,7 +84,7 @@ export class EditEventToApprovePage implements OnInit {
       StartDate: '',
       MDEmail: '',
       MDName: '',
-      IsAllDayEvent: '',
+      IsAllDayEvent: false,
       Message: ''
     }
   }
@@ -280,7 +281,7 @@ export class EditEventToApprovePage implements OnInit {
       }
     })
 
-    const event: any = {
+    const event: EventToApproveEdit = {
       SerialNumber: this.eventProcess.serialNumber,
       Body: this.eventProcess.workflowInstanceDataFields.Body,
       Location: this.eventProcess.workflowInstanceDataFields.Location,
@@ -288,6 +289,7 @@ export class EditEventToApprovePage implements OnInit {
       StartDate: this.eventProcess.workflowInstanceDataFields.StartDate,
       EndDate: this.eventProcess.workflowInstanceDataFields.EndDate,
       ReviewUserComment: '',
+      Agenda: this.eventProcess.workflowInstanceDataFields.Agenda,
       MDName: this.eventProcess.workflowInstanceDataFields.MDName,
       MDEmail: this.eventProcess.workflowInstanceDataFields.MDEmail,
       IsAllDayEvent: this.eventProcess.workflowInstanceDataFields.IsAllDayEvent,

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

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { AlertController, ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { AlertController, ModalController, PopoverController } from '@ionic/angular';
 import { Attachment } from 'src/app/models/attachment.model';
 import { EventBody } from 'src/app/models/eventbody.model';
 import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -7,8 +7,6 @@ import { EventsService } from 'src/app/services/events.service';
 import { Event } from 'src/app/models/event.model';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
-import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 import { OptsExpedientePage } from '../../popover/opts-expediente/opts-expediente.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-event.page';

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

@@ -1,15 +1,14 @@
 import { AfterViewChecked, Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core';
-import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular';
-import { Status } from 'src/app/models/chat/status.model';
+import { AnimationController, ModalController, PopoverController } from '@ionic/angular';
 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 { 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';
-import { ProfileComponent } from '../../headers/header-no-search/profile/profile.page';
 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({
@@ -34,6 +33,9 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
   @Input() roomId:string;
   @Input() showMessages:string;
 
+
+  connection  = connection
+  
   constructor(
     public popoverController: PopoverController,
     private modalController: ModalController,
@@ -80,7 +82,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
 
-  load(){
+  load = ()=>{
     this.checktimeOut = true;
     this.serverLongPull();
     this.getChatMembers();
@@ -104,7 +106,9 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     }
   }
 
-  sendMessage(){
+  sendMessage() {
+
+    this.connection.$send({})
 
     let body = {
       "message":

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/edit-event-to-approve/edit-event.page.ts

@@ -1,7 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { FormControl } from '@angular/forms';
 import { AlertController, AnimationController, ModalController, NavParams } 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';
@@ -11,7 +9,7 @@ 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 { Event, EventToApproveEdit } from '../../../models/event.model';
 import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
 import { NavigationExtras, Router } from '@angular/router';
 
@@ -71,7 +69,6 @@ export class EditEventToApproveComponent implements OnInit {
       Body: "",
       OccurrenceType: '',
       LastOccurrence: '',
-      IsRecurring: false,
       ParticipantsList: [],
       Agenda: '',
       EndDate: '',
@@ -82,8 +79,9 @@ export class EditEventToApproveComponent implements OnInit {
       StartDate: '',
       MDEmail: '',
       MDName: '',
-      IsAllDayEvent: '',
-      Message: ''
+      IsAllDayEvent: false,
+      Message: '',
+      IsRecurring: false
     }
   }
 
@@ -235,7 +233,7 @@ export class EditEventToApproveComponent implements OnInit {
       }
     })
 
-    const event: any = {
+    const event: EventToApproveEdit = {
       SerialNumber: this.eventProcess.serialNumber,
       Body: this.eventProcess.workflowInstanceDataFields.Body,
       Location: this.eventProcess.workflowInstanceDataFields.Location,
@@ -247,6 +245,7 @@ export class EditEventToApproveComponent implements OnInit {
       MDEmail: this.eventProcess.workflowInstanceDataFields.MDEmail,
       IsAllDayEvent: this.eventProcess.workflowInstanceDataFields.IsAllDayEvent,
       Status: null,
+      Agenda: this.eventProcess.workflowInstanceDataFields.Agenda,
       EventType: this.eventProcess.workflowInstanceDataFields.EventType,
       IsRecurring: this.eventProcess.workflowInstanceDataFields.IsRecurring,
       Message: this.eventProcess.workflowInstanceDataFields.Message,

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[] = [];
-  deferimentoListResult:tasksList[] = [];
+  parecerListResult:customTask[] = [];
+  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/header/header.page.html

@@ -11,6 +11,7 @@
       <img src='assets/images/logo-no-bg.png' alt='logo'>
     </div>
     <div class="div-profile cursor-pointer" (click)="openProfile()">
+      <div *ngIf="this.notificationLength > 0" class="icon-badge" >{{this.notificationLength}}</div>
       <ion-icon class="icon" src='assets/images/icons-profile.svg'></ion-icon>
       <ion-label class="profile-text">{{loggeduser.Profile}}</ion-label>
     </div>

src/app/shared/header/header.page.scss

@@ -39,6 +39,19 @@
     border: none !important;
   }
 
+  .icon-badge {
+    background-color: red;
+    font-size: 12px;
+    color: white;
+    text-align: center;
+    width:20px;
+    height:20px;
+    border-radius: 35%;
+    position: absolute; /* changed */
+    top: 5px; /* changed */
+    right: 27px; /* changed */
+}
+
   .profile-text{
     font-size: 20px;
     font-weight: 300;

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

@@ -6,6 +6,8 @@ import { ProfileComponent } from '../headers/header-no-search/profile/profile.pa
 import { AuthService } from 'src/app/services/auth.service';
 import { User } from 'src/app/models/user.model';
 import { ProfilePage } from 'src/app/modals/profile/profile.page';
+import { StorageService } from '../../services/storage.service';
+import { NotificationsService } from '../../services/notifications.service'
 
 @Component({
   selector: 'app-header',
@@ -15,29 +17,51 @@ import { ProfilePage } from 'src/app/modals/profile/profile.page';
 export class HeaderPage implements OnInit {
 
   searchSubject: string = '';
-  showSearch=false;
+  showSearch = false;
   loggeduser: User;
-  hideSearchBtn:boolean = false;
+  hideSearchBtn: boolean = false;
+  notificationdata: any[] = [];
+  DataArray: Array<object> = [];
+  notificationLength: 0;
+
 
   constructor(
     private router: Router,
     private modalController: ModalController,
     private animationController: AnimationController,
+    private storageservice: StorageService,
+    private notificatioservice: NotificationsService,
     authService: AuthService
-    ) {
-      this.loggeduser = authService.ValidatedUser;
-      router.events.subscribe((val) => {
-        this.showSearch=false;
-        //this.modalController.dismiss();
-      });
-   }
+  ) {
+    this.loggeduser = authService.ValidatedUser;
+    router.events.subscribe((val) => {
+      this.showSearch = false;
+      //this.modalController.dismiss();
+    });
+  }
 
   ngOnInit() {
     this.hideSearch();
+    this.notificationLengthData();
+    
+
   }
 
-  hideSearch(){
-    if(this.router.url == '/home/events' || this.router.url == '/home/chat'){
+  async notificationLengthData() {
+    this.storageservice.get("Notifications").then((value) => {
+      console.log("Init get store", value)
+
+      var data = JSON.parse(value);
+      this.notificationLength = data.length;
+    })
+
+    await new Promise(resolve => setTimeout(resolve, 10000))
+    await this.notificationLengthData()
+    console.log('Timer badge count')
+  }
+
+  hideSearch() {
+    if (this.router.url == '/home/events' || this.router.url == '/home/chat') {
       this.hideSearchBtn = true;
     }
   }
@@ -49,7 +73,7 @@ export class HeaderPage implements OnInit {
   async openSearch() {
 
     let classs, showSearchInput, type;
-    if(window.innerWidth < 1366) {
+    if (window.innerWidth < 1366) {
       classs = 'modal modal-width-100'
       showSearchInput = true
     } else {
@@ -59,7 +83,7 @@ export class HeaderPage implements OnInit {
 
 
 
-    if(window.location.pathname.startsWith('/home/agenda')) {
+    if (window.location.pathname.startsWith('/home/agenda')) {
       type = "Agenda"
     } else if (window.location.pathname.startsWith('/home/gabinete-digital')) {
       type = "AccoesPresidenciais & ArquivoDespachoElect"
@@ -80,7 +104,7 @@ export class HeaderPage implements OnInit {
     return await modal.present();
   }
 
-  changeRoute(path){
+  changeRoute(path) {
     this.router.navigateByUrl(path)
   }
 
@@ -122,28 +146,28 @@ export class HeaderPage implements OnInit {
     return await modal.present();
   }
 
-  async dynamicSearch(){
+  async dynamicSearch() {
     window['dynamicSearch'](this.searchSubject)
   }
 
 
-  async closeSearch(){
+  async closeSearch() {
     this.modalController.dismiss()
   }
 
-    /**
-    * @description set empty value to searchSubject
-    */
-   clearSearchInput(){
+  /**
+  * @description set empty value to searchSubject
+  */
+  clearSearchInput() {
     this.searchSubject = "";
     window['dynamicSearch'](this.searchSubject)
-   }
+  }
 
-   async basicSearch() {
+  async basicSearch() {
     window['searchTriger']()
-   }
+  }
 
-   profileLabel(text) {
+  profileLabel(text) {
     if (text == 'MDGPR') {
       return 'MD'
     } else if (text == 'PR') {

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;
-  fulltask: any;
-  serialnumber: string;
+  task: customTask
+  fulltask: fullTask;
+  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,7 @@ export class DespachosOptionsPage implements OnInit {
   }
 
   async openAddNoteModal(actionName:string) {
+
     this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
@@ -174,7 +179,8 @@ export class DespachosOptionsPage implements OnInit {
     }
     const modal = await this.modalController.create({
       component: AddNotePage,
-      componentProps:{
+      componentProps: {
+        showAttachmentBtn: true
       },
       cssClass: classs,
       backdropDismiss: true
@@ -220,7 +226,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 +253,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 +280,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/shared/popover/despachos-pr-options/despachos-pr-options.page.html

@@ -24,17 +24,15 @@
     </div>
     <div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
       <div class="flex-grow-1">
-        <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
-        <div class="solid"></div>
-        <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+        <button (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído</button>
+        <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
+        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
-        <div hidden class="solid"></div>
-        <button hidden class="btn-cancel" shape="round" >Delegar</button>
       </div>
     </div>
 
     <div class="solid"></div>
-    <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
+    <button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button>
   </div>
 
 </ion-content>

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts

@@ -1,11 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { AttachmentsService } from 'src/app/services/attachments.service';
-import { EventsService } from 'src/app/services/events.service';
-import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
-import { AlertService } from 'src/app/services/alert.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ModalController, PopoverController } from '@ionic/angular';
 import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
 import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
@@ -25,7 +21,7 @@ export class DespachosPrOptionsPage implements OnInit {
 
   task: any;
   fulltask: any;
-  serialnumber: string;
+  serialNumber: string;
   profile: string
 
   constructor(private activateRoute: ActivatedRoute,
@@ -45,10 +41,17 @@ export class DespachosPrOptionsPage implements OnInit {
 
     this.activatedRoute.queryParams.subscribe(params => {
       if(params["serialNumber"]) {
-        this.serialnumber = params["serialNumber"];
+        this.serialNumber = params["serialNumber"];
         console.log(params["serialNumber"]);
       }
     });
+
+    if(this.task.serialNumber) {
+      this.serialNumber = this.task.serialNumber
+    } else if(this.task.SerialNumber) {
+      this.serialNumber = this.task.SerialNumber
+    }
+
   }
 
   close () {
@@ -82,6 +85,8 @@ export class DespachosPrOptionsPage implements OnInit {
         
         this.distartExpedientModal();
 
+      } else {
+        this.goBack()
       }
 
       this.popoverController.dismiss('close')
@@ -90,7 +95,7 @@ export class DespachosPrOptionsPage implements OnInit {
   }
 
   sendExpedienteToPending() {
-    this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
+    this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{
       console.log(res);
       this.close();
     },()=>{
@@ -144,7 +149,8 @@ export class DespachosPrOptionsPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss()
+
   }
   
   async openDelegarModal(task: any) {
@@ -169,7 +175,7 @@ export class DespachosPrOptionsPage implements OnInit {
 
   async generateDiploma(note:string, documents:any) {
     let body = { 
-      "serialNumber": this.serialnumber, 
+      "serialNumber": this.serialNumber, 
       "action": "Reencaminhar",
       "ActionTypeId": 99999839,
       "dataFields": {
@@ -202,7 +208,8 @@ export class DespachosPrOptionsPage implements OnInit {
     }
     const modal = await this.modalController.create({
       component: AddNotePage,
-      componentProps:{
+      componentProps: {
+        showAttachmentBtn: true
       },
       cssClass: classs,
       backdropDismiss: true
@@ -250,7 +257,7 @@ export class DespachosPrOptionsPage implements OnInit {
 
   async arquivar(note:string, documents:any){
     let body = { 
-      "serialNumber": this.serialnumber, 
+      "serialNumber": this.serialNumber, 
       "action": "Arquivo",
       "ActionTypeId": 95,
       "dataFields": {
@@ -276,7 +283,7 @@ export class DespachosPrOptionsPage implements OnInit {
 
   async executado(note:string, documents:any){
     let body = { 
-      "serialNumber": this.serialnumber, 
+      "serialNumber": this.serialNumber, 
       "action": "Conhecimento",
       "ActionTypeId": 104,
       "dataFields": {
@@ -302,7 +309,7 @@ export class DespachosPrOptionsPage implements OnInit {
   
   async reexecutar(note:string, documents:any){
     let body = { 
-      "serialNumber": this.serialnumber, 
+      "serialNumber": this.serialNumber, 
       "action": "Reexecutar",
       "ActionTypeId": 100000010,
       "dataFields": {
@@ -322,23 +329,14 @@ export class DespachosPrOptionsPage implements OnInit {
     }     finally {
       loader.remove()
     }
-
   }
 
-
   goBack() {
-
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "despachospr": true,
-    //   }
-    // };
-    
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-
-    this.location.back()
-
+    this.router.navigate(['/home/gabinete-digital/despachos-pr'])
   }
 
+  cancle() {
+    this.popoverController.dismiss()
+  }
 
 }

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts

@@ -61,6 +61,10 @@ export class OptsExpedientePrPage implements OnInit {
     if(this.task.Status != 'Pending'){
       this.showEnviarPendentes = true;
     }
+
+
+    console.log('OptsExpedientePrPage ---- ', this.task);
+
   }
 
   ngOnInit() {
@@ -86,6 +90,7 @@ export class OptsExpedientePrPage implements OnInit {
     const modal = await this.modalController.create({
       component: AddNotePage,
       componentProps:{
+        showAttachmentBtn: false,
       },
       cssClass: classs,
       backdropDismiss: true
@@ -271,7 +276,6 @@ export class OptsExpedientePrPage implements OnInit {
         task: task,
         profile: this.profile,
         fulltask: this.fulltask,
-        aplicationId: 361
       },
       cssClass: classs,
     });

src/app/shared/popover/opts-expediente/opts-expediente.page.ts

@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
+import { customTask, expedienteTask, fullTask } from 'src/app/models/dailyworktask.model';
 import { SearchDocument } from 'src/app/models/search-document';
 import { PermissionService } from 'src/app/OtherService/permission.service';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
@@ -19,7 +20,8 @@ import { ToastService } from 'src/app/services/toast.service';
   styleUrls: ['./opts-expediente.page.scss'],
 })
 export class OptsExpedientePage implements OnInit {
-  task:any;
+
+  task: expedienteTask
   fulltask: any;
   profile:string;
   caller:string;
@@ -42,7 +44,7 @@ export class OptsExpedientePage implements OnInit {
     this.task = this.navParams.get('task');
     this.fulltask = this.navParams.get('fulltask');
 
-    if(this.task.Status != 'Pending'){
+    if(this.task.Status != 'Pending') {
       this.showEnviarPendentes = true;
     }
   }
@@ -214,7 +216,7 @@ export class OptsExpedientePage implements OnInit {
 
   async sendToReview(note:string, documents:any) {
     let body = {
-      "serialNumber": this.task.serialnumber || this.task.SerialNumber,
+      "serialNumber": this.task.SerialNumber,
       "action": "Retificar",
       "ActionTypeId": 99999877,
       "dataFields": {
@@ -248,7 +250,7 @@ export class OptsExpedientePage implements OnInit {
 
   async approve(note:string, documents:any){
     let body = {
-      "serialNumber": this.task.serialnumber || this.task.SerialNumber,
+      "serialNumber": this.task.SerialNumber,
       "action": "Aprovar",
       "ActionTypeId": 100000004 ,
       "dataFields": {

src/app/shared/popover/request-options/request-options.page.html

@@ -38,7 +38,8 @@
       <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
     </div>
   </div>
-  <div *ngIf="task.WorkflowName == 'Pedido de Parecer'">
+  
+  <div *ngIf="task.WorkflowName == 'Pedido de Parecer' || task.WorkflowName == 'Pedido de Parecer do Presidente' ">
     <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Parecer'">
       <button (click)="openDarParecer(task)" class="btn-cancel" shape="round" >Dar o meu Parecer</button>
       <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>

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

@@ -196,6 +196,7 @@ export class RequestOptionsPage implements OnInit {
     const modal = await this.modalController.create({
       component: AddNotePage,
       componentProps:{
+        showAttachmentBtn: true,
       },
       cssClass: classs,
       backdropDismiss: true

src/app/shared/popover/searched-document-options/searched-document-options.page.ts

@@ -1,12 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
 import { ModalController, NavParams, PopoverController } from '@ionic/angular';
-import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting/document-set-up-meeting.page';
-import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage';
 import { PermissionService } from 'src/app/OtherService/permission.service';
-import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
-import { ProcessesService } from 'src/app/services/processes.service';
-import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
   selector: 'app-searched-document-options',