diff --git a/src/app/models/attachment.model.ts b/src/app/models/attachment.model.ts index 0ce74ed89..996164ee0 100644 --- a/src/app/models/attachment.model.ts +++ b/src/app/models/attachment.model.ts @@ -9,6 +9,7 @@ export class Attachment { CreateDate: string; Stakeholders: string; Link: string; + ApplicationId?: string; //Data: any; } diff --git a/src/app/models/event.model.ts b/src/app/models/event.model.ts index 46961931d..8f3e88770 100644 --- a/src/app/models/event.model.ts +++ b/src/app/models/event.model.ts @@ -3,6 +3,7 @@ import { EventPerson } from './eventperson.model'; import { SearchDocument } from './search-document'; export class Event{ + ParentId?: string; EventId: string; Subject: string; Body: EventBody; diff --git a/src/app/models/task.ts b/src/app/models/task.ts new file mode 100644 index 000000000..05169b5c3 --- /dev/null +++ b/src/app/models/task.ts @@ -0,0 +1,26 @@ +export class ProcessTask { + SerialNumber: string + actions: string; + formURL: string + originator: { + email: string, + manager: string, + displayName: "", + fqn: string, + username: string + } + serialNumber: string + taskStartDate: string + workflowDisplayName: string + workflowID: number + workflowInstanceDataFields: { + FsId: string, + MessageId: string, + UserId: string, + DocId: string, + ViewerRequest: string, + } + workflowInstanceFolio: string + workflowInstanceID: number + workflowName: string +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index e12d6b828..453ca0df4 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -79,6 +79,7 @@ export class ExpedientTaskModalPage implements OnInit { SourceId: this.task.workflowInstanceDataFields.DocId, }; + this.postData.DispatchFolder = this.dispatchFolder; this.postData.UsersSelected = this.participants; /* By Default TypeDeadline should be 'Normal' */ @@ -95,10 +96,16 @@ export class ExpedientTaskModalPage implements OnInit { } ngOnInit() { + this.taskDate = new Date(this.task.taskStartDate); - this.getAttachments(); + if(!this.task.hasOwnProperty('isEvent')) { + // if not + this.getAttachments(); + } + this.getSubjectType(); + } close(){ @@ -106,17 +113,17 @@ export class ExpedientTaskModalPage implements OnInit { this.modalController.dismiss(null); } - getSubjectType(){ + getSubjectType() { this.processes.GetSubjectType().subscribe(res=>{ console.log(res); this.subjectTypes = res; }); } - cancelTask(){ + cancelTask() { this.modalController.dismiss(null); } - saveTask(){ + saveTask() { let attendees = this.taskParticipants.concat(this.taskParticipantsCc); attendees = attendees.map(function(val) { @@ -126,8 +133,8 @@ export class ExpedientTaskModalPage implements OnInit { }; }) - if(this.taskParticipants.length > 0){ - switch (this.taskType){ + if(this.taskParticipants.length > 0) { + switch (this.taskType) { case '0': this.postData = { DistributionType: "Paralelo", @@ -138,7 +145,7 @@ export class ExpedientTaskModalPage implements OnInit { UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } - console.log(this.postData); + console.log('this.postData', this.postData, this.taskType); this.processes.postDespatcho(this.postData); break; case '1': @@ -168,23 +175,26 @@ export class ExpedientTaskModalPage implements OnInit { this.processes.postDeferimento(this.postData); break; } + + this.modalController.dismiss('openDiscart'); /* this.distartExpedientModal(); this.close(); */ } - else{ + else { this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes."); } } - getAttachments(){ + + getAttachments() { this.attachmentsService.getAttachmentsBySerial(this.task.serialNumber).subscribe(res=>{ this.loadedAttachments = res; console.log(res); }); } - async addParticipants(){ + async addParticipants() { /* console.log('HERES'); */ @@ -227,7 +237,7 @@ export class ExpedientTaskModalPage implements OnInit { } } - async addParticipantsCc(){ + async addParticipantsCc() { this.adding = "CC"; this.contacts = this.taskParticipantsCc; @@ -268,7 +278,7 @@ export class ExpedientTaskModalPage implements OnInit { } - async distartExpedientModal(){ + async distartExpedientModal() { const modal = await this.modalController.create({ component: DiscartExpedientModalPage, componentProps: { @@ -290,7 +300,7 @@ export class ExpedientTaskModalPage implements OnInit { }); } - async setContact(data:EventPerson[]){ + async setContact(data:EventPerson[]) { if(this.adding == "intervenient"){ this.taskParticipants = data; @@ -301,15 +311,15 @@ export class ExpedientTaskModalPage implements OnInit { } - async setIntervenient(data){ + async setIntervenient(data) { this.taskParticipants = data; } - async setIntervenientCC(data){ + async setIntervenientCC(data) { this.taskParticipantsCc = data; } - async closeComponent(){ + async closeComponent() { this.showAttendees = false; } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 52b42de7a..2aad1425e 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -14,6 +14,7 @@ import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.p import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { momentG } from 'src/plugin/momentG' import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; +import { ProcessTask } from 'src/app/models/task'; @Component({ selector: 'app-expediente-detail', @@ -84,6 +85,9 @@ export class ExpedienteDetailPage implements OnInit { "FsId": res.workflowInstanceDataFields.FsId, "DocId": res.workflowInstanceDataFields.DocId, } + + console.log('task', this.fulltask); + this.fulltask = res; console.log('GetTask', res); diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index afecd9c80..580be3e54 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -6,19 +6,19 @@ - + Efectuar Despacho - + Pedido de Parecer - + Pedido de Deferimento - + Marcar reunião @@ -30,7 +30,7 @@ Editar -