diff --git a/src/app/modals/delegar/delegar.page.html b/src/app/modals/delegar/delegar.page.html index 5fada7d6e..6a6fca364 100644 --- a/src/app/modals/delegar/delegar.page.html +++ b/src/app/modals/delegar/delegar.page.html @@ -36,7 +36,7 @@
- +
diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index 26a24aede..c0724dc1a 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { ModalController, NavParams } from '@ionic/angular'; +import { AlertController, ModalController, NavParams } from '@ionic/angular'; import { Event } from 'src/app/models/event.model' import { EventBody } from 'src/app/models/eventbody.model'; import { ProcessesService } from 'src/app/services/processes.service'; @@ -10,6 +10,7 @@ import { AttachmentsService } from 'src/app/services/attachments.service'; import { AddParticipantsModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page'; import { AddParticipantsCcModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page'; import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; +import { AlertService } from 'src/app/services/alert.service'; @Component({ selector: 'app-delegar', @@ -18,6 +19,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar }) export class DelegarPage implements OnInit { task: any; + note:string; taskParticipants: EventPerson[] = []; taskParticipantsCc: EventPerson[] = []; @@ -29,7 +31,7 @@ export class DelegarPage implements OnInit { postData: Event; eventBody: EventBody; - eventAttendees: EventPerson[]; + eventAttendees: EventPerson; formLocationSatus: boolean = false; showAttendees= false; @@ -41,6 +43,8 @@ export class DelegarPage implements OnInit { private processes:ProcessesService, private attachmentsService: AttachmentsService, private calendarService: EventsService, + public alertController: AlertController, + private alertService: AlertService, ) { this.task = this.navParams.get('task'); this.postData = new Event(); @@ -73,47 +77,30 @@ export class DelegarPage implements OnInit { this.modalController.dismiss(null); } - saveTask(){ - - // issue12323423 - let Attendees = this.taskParticipants.concat(this.taskParticipantsCc); - - this.eventBody={ - BodyType: '1', - Text: this.postData.Body.Text, + async saveTask(){ + if(this.taskParticipants.length > 1){ + this.alertService.presentErrorMessage("Selecione apenas um destinatário"); } - this.postData = { - EventId: '', - Subject: this.postData.Subject, - Body: this.eventBody, - Location: this.postData.Location, - CalendarId: '', - CalendarName: this.postData.CalendarName, - StartDate: this.postData.StartDate, - EndDate: this.postData.EndDate, - EventType: 'Reunião', - Attendees: Attendees, - IsMeeting: false, - IsRecurring: false, - AppointmentState: 0, - TimeZone: 'UTC', - Organizer: null, - Categories: null, - HasAttachments: true, + else{ + let body = { + "SerialNumber": this.task.SerialNumber, + "DispatchDocId": this.task.DocId, + "FolderID": this.task.FolderId, + "Subject": this.task.Folio, + "Comment": this.note, + "DelegatedUserEmail": this.taskParticipants[0].EmailAddress, + } + console.log(body); + this.processes.DelegateTask(body).subscribe(res=>{ + console.log(res); + }); + this.close(); } - console.log(this.postData); - - if(this.task.FsId == '8'){ - this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId); - this.distartExpedientModal(); - } - else if(this.task.FsId == '361'){ - this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId); - } - this.close(); } async addParticipants(){ + console.log('HERE'); + this.adding = "intervenient"; if(window.innerWidth <= 800){ const modal = await this.modalController.create({ @@ -128,7 +115,7 @@ export class DelegarPage implements OnInit { await modal.present(); modal.onDidDismiss().then((res) => { - this.taskParticipants = res.data; + /* this.taskParticipants = res.data; let newattendees: EventPerson[] = res['data']; if(newattendees != null){ newattendees.forEach(newattendee => { @@ -138,12 +125,13 @@ export class DelegarPage implements OnInit { "IsRequired": true }; if(this.eventAttendees == null){ - this.eventAttendees = new Array(); + this.eventAttendees = null; } - this.eventAttendees.push(att); + this.eventAttendees = att; + console.log(att); + }); - } - this.postData.Attendees = this.eventAttendees; + } */ }); } else { this.showAttendees = true; @@ -172,10 +160,8 @@ export class DelegarPage implements OnInit { } } - dynamicSetIntervenient({taskParticipants, taskParticipantsCc}){ - + dynamicSetIntervenient({taskParticipants}){ this.taskParticipants = taskParticipants; - this.taskParticipantsCc = taskParticipantsCc; } } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index c4f4618c2..ca732da2e 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -263,24 +263,6 @@ export class DespachoPage implements OnInit { modal.onDidDismiss(); } - async viewEventDetail(eventId: any) { - console.log(this.profile); - - const modal = await this.modalController.create({ - component: ViewEventPage, - componentProps: { - eventId: eventId, - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss().then((res) => { - if (res) { - } - }); - } async distartExpedientModal(){ console.log(this.fulltask); const modal = await this.modalController.create({ diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index 9c36e3dc1..019ac7eed 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -106,7 +106,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index ddbf1fb9a..ae182b391 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -15,6 +15,7 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart import { ExpedientTaskModalPage } from '../../expediente/expedient-task-modal/expedient-task-modal.page'; import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page'; import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; +import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; @Component({ selector: 'app-pedido', @@ -101,7 +102,7 @@ export class PedidoPage implements OnInit { "Note": res.workflowInstanceDataFields.Note, "FolderId": res.workflowInstanceDataFields.FolderID, "FsId": '361', - "DocId": res.workflowInstanceDataFields.DocIdDiferimento, + "DocId": res.workflowInstanceDataFields.DocIdDeferimento, "WorkflowName": res.workflowDisplayName, "DeadlineType": res.workflowInstanceDataFields.DeadlineType, } @@ -180,10 +181,6 @@ export class PedidoPage implements OnInit { this.processes.PostTaskAction(body); } - delegar(){ - - } - sendExpedienteToPending(){ this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ console.log(res); @@ -305,4 +302,26 @@ export class PedidoPage implements OnInit { }); } + + async openDelegarModal(task: any) { + console.log(task); + + let classs; + if( window.innerWidth <= 800){ + classs = 'book-meeting-modal modal modal-desktop' + } else { + classs = 'modal modal-desktop showAsideOptions' + } + const modal = await this.modalController.create({ + component: DelegarPage, + componentProps: { + task: this.task, + }, + cssClass: classs, + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + } diff --git a/src/app/services/alert.service.ts b/src/app/services/alert.service.ts index 7ffa4a2c2..9952f17e2 100644 --- a/src/app/services/alert.service.ts +++ b/src/app/services/alert.service.ts @@ -19,4 +19,18 @@ export class AlertService { await alert.present(); } + async presentErrorMessage(message:string) { + const alert = await this.alertController.create({ + cssClass: 'my-custom-class', + header: 'Mensagem de erro', + message: message, + }); + + await alert.present(); + + setTimeout(()=>{ + alert.dismiss(); + }, 2500); + } + } diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 44304a6ed..55f591124 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -62,6 +62,15 @@ export class ProcessesService { return this.http.post(`${geturl}`,'', options); } + DelegateTask(body:any){ + const geturl = environment.apiURL + 'Tasks/DelegateTask'; + + let options = { + headers: this.headers, + }; + return this.http.post(`${geturl}`, body, options); + } + GetTaskParticipants(folderId:string): Observable{ const geturl = environment.apiURL + 'Processes/GetUsersInDispash'; let params = new HttpParams();