diff --git a/src/app/models/attachment.model.ts b/src/app/models/attachment.model.ts index 996164ee0..f3d459083 100644 --- a/src/app/models/attachment.model.ts +++ b/src/app/models/attachment.model.ts @@ -1,15 +1,15 @@ export class Attachment { Id: number; ParentId: string; - Sources: Sources; Source?: Sources; - SourceId: string; - Description: string; - SourceName: string; - CreateDate: string; - Stakeholders: string; - Link: string; - ApplicationId?: string; + ApplicationId: number + CreateDate: string + Data: null| string + Description:string + Link: null + SourceId: string + SourceName: string + Stakeholders: string //Data: any; } diff --git a/src/app/models/event.model.ts b/src/app/models/event.model.ts index 8f3e88770..11927ec8a 100644 --- a/src/app/models/event.model.ts +++ b/src/app/models/event.model.ts @@ -22,4 +22,27 @@ export class Event{ Categories: string[]; HasAttachments: boolean; // documents?: SearchDocument[] +} + +export class EventToApproveEdit { + "serialNumber": "9296_86" + "Body": "Testando" + "Location": "Testland" + "Subject": "Teste 0123" + "StartDate": "2021-05-12T10:30:00" + "EndDate": "2021-05-12T11:30:00" + "Private": false + "ReviewerComments": "" + "MDName": "Paulo Pinto" + "MDEmail": "paulo.pinto@gabinetedigital.local" + "Agenda": "Oficial" | "Pessoal" + "EventType": "Reunião" + "IsRecurring": false + "IsAllDayEvent": true + "ParticipantsList": { + "EmailAddress": "gilson.manuel@gabinetedigital.local", + "Name": "Gilson Manuel", + "IsRequired": true + }[] + "Message": "Recebeu um novo" } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html index 0959486cd..d7163d6fb 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html @@ -1,9 +1,124 @@ - - - diploma - - - +
+
+
+
+ +
+ {{ task.Folio}} +
+
+ + +
+
+
+
+
+ +

{{customDate}}{{ task.WorkflowName }}

+

{{ task.DeadlineType }}

+ +
+
+
+
+
Intervenientes
+ + +
+

{{interveniente.Name}}

+
+ + +
+
Com conhecimento
+ + +
+

{{c.Name}}

+
+ + +
+
+
Detalhes
+ +

+ +
+
+
+ +
Documentos Anexados
+ + +

{{ attachment.Assunto }}

+

{{ attachment.DocNumber }}

+

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

+ + + +
+
+
+
+ + +
+ + + +
+ +
+
+ +
+ + + + + + + + +

+ +

+

+ +

+ + + + +

+ +

+

+ + + + +

+ +

+

+ +

+ + + + + + + +
+
+ diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss index e69de29bb..860c052db 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss @@ -0,0 +1,236 @@ +@import '~src/function.scss'; +.content{ + padding: 30px 20px 0 20px !important; + margin: 0; + float: left; +} +.color-red{ + font-weight: 500; + color:#d30a0a !important; +} +.btn-size{ + font-size: 18px !important; +} +.main-header{ + font-family: Roboto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background-color: #fff; + overflow:auto; + color:#000; + transform: translate3d(0, 1px, 0); + .header-top{ + width: 360px; + margin: 0px auto; + overflow: auto; + padding: 0 !important; + background: #fff; + .middle{ + padding: 0!important; + float: left; + width: 280px; + margin: 2.5px 0 0 5px; + display: flex; + align-items: center; + + } + .right{ + padding: 0!important; + float: right; + font-size: 25px; + color: #0782c9; + margin: 5px 0 0 0; + } + } + .header-bottom{ + width: 310px; + overflow: auto; + margin: 0 auto; + + .header-bottom-icon{ + width: 30px; + font-size: 25px; + float: left; + padding: 2px; + } + .header-bottom-contacts{ + width: 275px; + font-size: 15px; + color: #797979; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + float: left; + padding: 5px; + margin: 1px; + } + } + + .title{ + font-size: 25px; + overflow: auto; + float: left; + padding-top: 4px; + padding-left: 5px; + } + .div-icon{ + width: 40px; + float: right; + font-size: 35px; + overflow: auto; + padding: 1px; + } +} +ion-item-group{ + margin: 15px; +} +ion-button{ + display: block; + width: 80%; + margin: 20px auto; +} + + +.upper-content{ + font-family: Roboto; + margin-left: 41px; + overflow: auto; + font-size: 18px; + + .label{ + border-radius: 20px; + background: #ffb703; + float: right; + padding: 5px 13.5px 5px 13.5px; + color: #fff; + } + + .button-calendar-type ion-button{ + height: 25px; + } + .content-details{ + font-size: 17px; + .date{ + color: #797979; + } + } +} +.middle-conten{ + .middle-content p{ + font-size: 16px; + } +} +.bottom-content{ + //width: 360px; + margin: 0 auto; + + .bottom-content h3{ + font-size: 16px; + margin: 0 0 0 10px; + } + .attach-document{ + font-size: 15px; + color: #0d89d1; + margin: 5px 5px 5px 10px; + padding: 5px; + float: left; + } + .attach-icon{ + width: 37px; + font-size: 35px; + float: left; + } + .attach-title-item{ + font-size: 18px; + width: 100%; + color:#0d89d1; + padding-bottom: 5px; + } + /* SPAN */ + .span-left{ + float: left; + font-size: 15x; + } + .span-right{ + text-align: right; + float: right; + font-size: 13px; + } +} +.aside-right{ + padding: 30px 20px 0 20px !important; + + .arrow-right{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + + .arrow-right-icon{ + width: 37px; + float: right; + font-size: 35px; + overflow: hidden; + } + } + .buttons{ + display: flex; + flex-wrap: wrap; + justify-content: space-between; + + .btn-ok, .btn-cancel, .btn-delete{ + height: auto !important; + font-size: 16px !important; + font-weight: 600 !important; + width: 100% !important; + margin-bottom: 10px !important; + padding: 15px !important; + } + } + .solid { + display: block; + width: 90%; + border-top: 1px solid #ebebeb; + margin: 0 auto !important; + margin-bottom: 10px !important; + } +} + +@media only screen and (max-width: 800px) { + .content{ + width: 100% !important; + } + .aside-right{ + display: none; + } +} +@media only screen and (min-width: 801px) { + .div-icon{ + display: none; + } + .content{ + width: 65%; + border-right: 1px solid #d8d8d8; + } + + .aside-right{ + width: 35%; + } +} + +@media only screen and (min-width: 1024px){ + .content{ + width: 70%; + } + .aside-right{ + width: 30%; + } +} + +@media only screen and (min-width: 1140px){ + .content{ + width: 75%; + } + .aside-right{ + width: 25%; + } +} diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts index f1db25d58..592324a24 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -1,4 +1,12 @@ import { Component, OnInit } from '@angular/core'; +import { ModalController, NavParams, PopoverController } from '@ionic/angular'; +import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; +import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; +import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; +import { ProcessesService } from 'src/app/services/processes.service'; +import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; +import { momentG } from 'src/plugin/momentG'; +import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page'; @Component({ selector: 'app-diploma', @@ -7,9 +15,194 @@ import { Component, OnInit } from '@angular/core'; }) export class DiplomaPage implements OnInit { - constructor() { } + months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; + days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; + + serialnumber: string; + profile: string; + task: any + fulltask: any + intervenientes: any; + cc: any; + attachments:any; + customDate: any + + constructor( + private navParams: NavParams, + private processes: ProcessesService, + public popoverController: PopoverController, + private modalController: ModalController, + ) { + this.serialnumber = this.navParams.get('serialNumber'); + this.profile = this.navParams.get('profile'); + + this.LoadTaskDetail(this.serialnumber); + } ngOnInit() { } + async openOptions(taskAction?: any) { + const popover = await this.popoverController.create({ + component: OptsExpedientePage, + cssClass: 'exp-options', + componentProps: { + task: this.task, + fulltask: this.fulltask, + taskAction:taskAction, + showEnviarPendentes: false + }, + translucent: true + }); + return await popover.present(); + } + + async LoadTaskDetail(serial: string) { + + this.processes.GetTask(serial).subscribe(res => { + this.task = { + "SerialNumber": res.serialNumber, + "Folio": res.workflowInstanceDataFields.Subject, + "Senders": res.originator.email, + "CreateDate": momentG(new Date(res.taskStartDate),'yyyy-MM-dd HH:mm:ss'), + "DocumentURL": res.workflowInstanceDataFields.ViewerRequest, + "Remetente": res.workflowInstanceDataFields.Sender, + "Note": res.workflowInstanceDataFields.Note, + "FolderId": res.workflowInstanceDataFields.FolderID, + "FsId": '361', + "DocId": res.workflowInstanceDataFields.DispatchDocId, + "WorkflowName": res.workflowDisplayName, + "DeadlineType": res.workflowInstanceDataFields.DeadlineType, + } + + this.fulltask = res; + console.log(this.task); + + console.log('GetTask', res); + + let thedate = new Date(this.task.CreateDate); + this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]); + + this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users=>{ + this.intervenientes = users.filter(user=>{ + return user.Type == 'I'; + }); + this.cc = users.filter(user=>{ + return user.Type == 'CC'; + }); + console.log(users); + + }); + this.getDocumentDetails(this.task.FolderId, '361'); + + }); + + } + + getDocumentDetails(forlderId:string, applicationId:string) { + this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{ + this.attachments = res.Documents; + console.log(res['Documents']); + console.log(this.attachments); + }) + } + + + async openAddNoteModal() { + const modal = await this.modalController.create({ + component: AddNotePage, + componentProps:{ + }, + cssClass: 'emend-message-modal', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss().then(res => { + //this.executado(res.data); + }); + } + + + async openDelegarModal(task: any) { + 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(); + } + + + async openExpedientActionsModal(taskAction: any, task: any) { + //this.modalController.dismiss(); + let classs; + if( window.innerWidth <= 800){ + classs = 'modal modal-desktop' + } else { + classs = 'modal modal-desktop showAsideOptions' + } + const modal = await this.modalController.create({ + component: CreateProcessPage, + componentProps: { + taskAction: taskAction, + task: task, + profile: this.profile, + }, + cssClass: classs, + }); + await modal.present(); + modal.onDidDismiss().then(res=>{ + console.log(res['data']); + if(res['data']=='openDiscart'){ + console.log('open discart'); + + // this.distartExpedientModal(); + + } + + }); + } + + async openBookMeetingModal(task: any) { + 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: BookMeetingModalPage, + componentProps: { + task: this.task, + }, + cssClass: classs, + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + + sendExpedienteToPending(){ + this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ + console.log(res); + this.close(); + }); + } + + close(){ + this.modalController.dismiss(); + } + } 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 e891b127e..486d8b864 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -6,7 +6,7 @@
-
+
@@ -15,9 +15,9 @@ {{ task.Folio}}
- - - +
+ +
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index d2c63d8e2..e5f70536f 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Event } from '../models/event.model'; +import { Event, EventToApproveEdit } from '../models/event.model'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { Observable } from 'rxjs'; import { environment } from 'src/environments/environment'; @@ -223,4 +223,14 @@ export class EventsService { console.log(res); }); } + + postEventToApproveEdit(body: EventToApproveEdit) { + const geturl = environment.apiURL + 'Tasks/EditEventTask'; + + let options = { + headers: this.headers, + }; + + return this.http.post(`${geturl}`, body, options) + } } diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index 824461671..f7f3b4138 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -1,4 +1,4 @@ - +
Diplomas
@@ -7,7 +7,7 @@
- + diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index c6815c43a..f15e408cb 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -28,6 +28,7 @@ constructor( private alertService: AlertService, ) { this.profile = 'mdgpr'; + this.segment = 'validar' } ngOnInit() { @@ -44,8 +45,11 @@ notImplemented(){ } async LoadList(){ - this.diplomasList = new Array(); + + let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); + this.diplomasList = new Array(); + console.log(diplomas); switch (this.segment) { case 'validar': @@ -120,5 +124,4 @@ async viewPedidoDetail(serialNumber:any) { }); } - } diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index 21c3b379b..d5040e88f 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -14,7 +14,7 @@
- + {{ eventProcess.serialNumber }}
@@ -191,7 +191,7 @@
- +

{{document.SourceName}} Correspondencia diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 6211c102c..8b506fc33 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -2,12 +2,13 @@ import { Component, OnInit } from '@angular/core'; import { AlertController, ModalController, NavParams } from '@ionic/angular'; import { Attachment } from 'src/app/models/attachment.model'; import { EventPerson } from 'src/app/models/eventperson.model'; +import { SearchDocument } from 'src/app/models/search-document'; import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page'; import { SearchPage } from 'src/app/pages/search/search.page'; 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 { Event } from '../../../models/event.model'; +import { Event, EventToApproveEdit } from '../../../models/event.model'; @Component({ @@ -18,9 +19,11 @@ import { Event } from '../../../models/event.model'; export class EditEventToApproveComponent implements OnInit { serialNumber: string - loadedAttachments:any + loadedAttachments: Attachment[] + eventProcess = { + serialNumber: "", taskStartDate: "", workflowInstanceDataFields:{ Body: "", @@ -30,11 +33,87 @@ export class EditEventToApproveComponent implements OnInit { EndDate: '', Location: '', Subject: '', - InstanceId: '' + InstanceId: '', + EventType: '', + StartDate: '', + MDEmail: '', + MDName: '', + IsAllDayEvent: '', + Message: '' } } - show =false + // event ={ + // "serialNumber":"9073_118", + // "originator":{ + // "email":"gilson.manuel@gabinetedigital.local", + // "manager":"", + // "displayName":"", + // "fqn":"K2:GABINETEDIGITAL\\gilson.manuel", + // "username":"GABINETEDIGITAL\\gilson.manuel" + // }, + // "actions":null, + // "workflowInstanceFolio":"Final do sprint", + // "taskStartDate":"4/30/2021 9:06:48 AM", + // "workflowID":4365, + // "workflowInstanceID":9073, + // "workflowName":"MDGPR\\Agenda Oficial MDGPR", + // "workflowDisplayName":"Agenda Oficial MDGPR", + // "formURL":"http://bpmdev.gabinetedigital.local/Runtime/Runtime/Form/Exchange+Calendar+Meeting+Approval/?SerialNo=9073_118", + // "workflowInstanceDataFields": { + // "Body":"Será fechado o sprint 1 - 26 Abr - 30 Abr", + // "Location":"Equilibrium - Sala de reuniões", + // "Subject":"Final do sprint", + // "StartDate":"2021-04-30T15:00:00", + // "EndDate":"2021-04-30T15:30:00", + // "Participants":"gilson.manuel@gabinetedigital.local;tiago.kayaya@gabinetedigital.local;solange.vandunem@gabinetedigital.local", + // "CC":"", + // "ReviewerComments":"teste", + // "Role":0, + // "MDName":"Paulo Pinto", + // "MDEmail":"paulo.pinto@gabinetedigital.local", + // "PREmail":"", + // "OriginatorComments":"", + // "Status":"Active", + // "TimeZone":"W. Central Africa Standard Time", + // "Agenda":"Oficial", + // "EventType":"Reunião", + // "EventID":"", + // "IsRecurring":false, + // "ParticipantsList":[ + // { + // "$type":null, + // "EmailAddress":"gilson.manuel@gabinetedigital.local", + // "Name":"Gilson Manuel", + // "IsRequired":true + // }, + // { + // "$type":null, + // "EmailAddress":"tiago.kayaya@gabinetedigital.local", + // "Name":"Tiago Kayaya", + // "IsRequired":true + // }, + // { + // "$type":null, + // "EmailAddress":"solange.vandunem@gabinetedigital.local", + // "Name":"Solange Van-Dúnem", + // "IsRequired":true + // } + // ], + // "EventOrganizer":"{\"$type\":\"Gabinete.k2RESTidentifier_EventPerson, Gabinete, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null\",\"EmailAddress\":\"agenda.mdgpr@gabinetedigital.local\",\"Name\":\"Agenda do Ministro e Director do Gabinete do PR\",\"IsRequired\":true}", + // "CreateEvent":"", + // "IsAllDayEvent":false, + // "SerializedItem":"{\"$type\":\"GabineteDigitalV4.k2RESTidentifier_NotificationData[], GabineteDigitalV4, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null\",\"$values\":[{\"$type\":\"GabineteDigitalV4.k2RESTidentifier_NotificationData, GabineteDigitalV4, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null\",\"Service\":\"gabinete-digital\",\"Object\":\"event-list\",\"idObject\":\"9073_118\"}]}", + // "MDwxUserID":261, + // "DeserializedItem":"{\"$type\":\"GabineteDigitalV4.k2RESTidentifier_NotificationData, GabineteDigitalV4, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null\",\"Service\":\"gabinete-digital\",\"Object\":\"event-list\",\"idObject\":\"9073_118\"}", + // "Message":"Foi actualizado o", + // "InstanceId":"R0RfR0FCSU5FVEVESUdJVEFMXGdpbHNvbi5tYW51ZWxfMjAyMS0wNC0zMCAwODowNDoyN1o=", + // "For Each Result":"", + // "For Each Index":0 + // } + // } + + show = false postEvent: Event; isRecurring:string; @@ -78,7 +157,6 @@ export class EditEventToApproveComponent implements OnInit { const result = await this.processes.GetTask(this.serialNumber).subscribe( result =>{ this.eventProcess = result - console.log('this.eventProcess', this.eventProcess); console.log(this.eventProcess.workflowInstanceDataFields.Subject) @@ -114,7 +192,7 @@ export class EditEventToApproveComponent implements OnInit { } this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => { - if(e.IsRequired){ + if(e.IsRequired) { this.taskParticipants.push(e); } else { this.taskParticipantsCc.push(e); @@ -139,10 +217,55 @@ export class EditEventToApproveComponent implements OnInit { this.modalController.dismiss(); } - save() { + save() { + this.taskParticipantsCc.forEach(e=>{ + e.IsRequired = false + }) + this.eventProcess.workflowInstanceDataFields.ParticipantsList = this.taskParticipants.concat(this.taskParticipantsCc) + this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e=>{ + + if(e.hasOwnProperty('$type')) { + delete e.$type + } + }) + + + + const event: any = { + Agenda: this.eventProcess.workflowInstanceDataFields.Agenda, + Body: this.eventProcess.workflowInstanceDataFields.Body, + EndDate: this.eventProcess.workflowInstanceDataFields.EndDate, + EventType: this.eventProcess.workflowInstanceDataFields.EventType, + IsAllDayEvent: this.eventProcess.workflowInstanceDataFields.IsAllDayEvent, + IsRecurring: this.eventProcess.workflowInstanceDataFields.IsRecurring, + Location: this.eventProcess.workflowInstanceDataFields.Location, + Subject: this.eventProcess.workflowInstanceDataFields.Subject, + serialNumber: this.eventProcess.serialNumber, + StartDate: this.eventProcess.workflowInstanceDataFields.StartDate, + MDEmail: this.eventProcess.workflowInstanceDataFields.MDEmail, + MDName: this.eventProcess.workflowInstanceDataFields.MDName, + Message: this.eventProcess.workflowInstanceDataFields.Message, + ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList, + Private: false, + ReviewerComments: '' + } + + this.eventsService.postEventToApproveEdit(event).subscribe() + + + this.loadedAttachments.forEach((document:any)=>{ + if(document['action'] == 'add'){ + this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{}); + } else if(document['action'] == 'delete') { + this.attachmentsService.deleteEventAttachmentById(document).subscribe( res=>{}) + } + + }) + + alert('save') } async openAttendees() { @@ -206,17 +329,22 @@ export class EditEventToApproveComponent implements OnInit { async getAttachments() { - this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise(); - console.log(this.loadedAttachments) + let result: any = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise(); + + result.forEach((e)=>{ + e.action = false + }) + + this.loadedAttachments = result + + console.log('this.loadedAttachments', this.loadedAttachments, result) } - deleteAttachment(attachmentID: string) { + deleteAttachment(attachment: Attachment) { + + this.attachmentsService.deleteEventAttachmentById(attachment.Id).subscribe( res=>{}) - this.attachmentsService.deleteEventAttachmentById(attachmentID).subscribe( - res=>{ - this.loadedAttachments = this.loadedAttachments.filter(e=> e.Id.toString() != attachmentID); - }) } async getDoc() { @@ -233,24 +361,31 @@ export class EditEventToApproveComponent implements OnInit { modal.onDidDismiss().then( async (res)=>{ if(res){ - const data = res.data; + const data: SearchDocument = res.data.selected; - //data.selected - const DocumentToSave = { - SourceTitle: data.selected.Assunto, + const DocumentToSave: any = { + SourceTitle: data.Assunto, ParentId: this.InstanceId, Source: '1', - SourceId: data.selected.Id, - ApplicationId: data.selected.ApplicationType.toString(), + SourceId: data.Id, + ApplicationId: data.ApplicationType.toString(), Id: '', Link: '', - SerialNumber: '' + SerialNumber: '', + action: 'add', + CreateDate: data.Data, + Data: data.Data, + Description: data.DocTypeDesc, + SourceName: data.Assunto, + Stakeholders: data.EntidadeOrganicaNome, }; - await this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(()=>{ - this.getAttachments(); - }); + this.loadedAttachments.push(DocumentToSave) + + // await this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(()=>{ + // this.getAttachments(); + // }); } }); }