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

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,13 +1,11 @@
 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';
@@ -57,17 +55,6 @@ 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() {

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

@@ -170,7 +170,6 @@ export class DespachosOptionsPage implements OnInit {
 
   async openAddNoteModal(actionName:string) {
 
-    alert('AddNotePage')
     this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){

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

@@ -24,12 +24,10 @@
     </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>
 

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 { ActivatedRoute, Router } from '@angular/router';
 import { ModalController, PopoverController } from '@ionic/angular';
-import { AlertService } from 'src/app/services/alert.service';
 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 () {
@@ -90,7 +93,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();
     },()=>{
@@ -169,7 +172,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 +205,8 @@ export class DespachosPrOptionsPage implements OnInit {
     }
     const modal = await this.modalController.create({
       component: AddNotePage,
-      componentProps:{
+      componentProps: {
+        showAttachmentBtn: true
       },
       cssClass: classs,
       backdropDismiss: true
@@ -250,7 +254,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 +280,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 +306,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": {
@@ -326,7 +330,6 @@ export class DespachosPrOptionsPage implements OnInit {
 
   goBack() {
     this.location.back()
-    this.cancle()
   }
 
   cancle() {

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