diff --git a/src/app/pages/events/attachments/attachments.page.ts b/src/app/pages/events/attachments/attachments.page.ts index 054eabf90..27bf95b81 100644 --- a/src/app/pages/events/attachments/attachments.page.ts +++ b/src/app/pages/events/attachments/attachments.page.ts @@ -27,7 +27,7 @@ export class AttachmentsPage implements OnInit { loadAttachments(eventid:string) { - this.attachamentsService.getEventAttachments(eventid).subscribe(attachments => { + this.attachamentsService.getAttachmentsById(eventid).subscribe(attachments => { this.loadedEventAttachments = attachments; this.pageId = eventid; }); diff --git a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts index c81f3c34b..eeaa26845 100644 --- a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts +++ b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts @@ -177,6 +177,10 @@ export class EventDetailModalPage implements OnInit { /* this.attachamentsService.getEventAttachments(this.pageId).subscribe(attachments => { this.loadedEventAttachments = attachments; }); */ + this.attachamentsService.getAttachmentsById(this.pageId).subscribe(res => { + console.log(res); + + }); } async viewDocument(documenturl:string) { diff --git a/src/app/pages/events/event-detail/event-detail.page.ts b/src/app/pages/events/event-detail/event-detail.page.ts index 54ac057e5..34f214407 100644 --- a/src/app/pages/events/event-detail/event-detail.page.ts +++ b/src/app/pages/events/event-detail/event-detail.page.ts @@ -186,10 +186,12 @@ export class EventDetailPage implements OnInit { loadAttachments() { - console.log(this.pageId); + /* console.log(this.pageId); */ - this.attachamentsService.getEventAttachments(this.pageId).subscribe(attachments => { - this.loadedEventAttachments = attachments; + this.attachamentsService.getAttachmentsById(this.pageId).subscribe(res => { + this.loadedEventAttachments = res; + console.log(res); + }); } async viewDocument(documenturl:string) diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 34977d280..089c779be 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -36,7 +36,7 @@ export class BookMeetingModalPage implements OnInit { ) { this.task = this.navParams.get('task'); this.postData = new Event(); - this.eventBody = new EventBody; + this.eventBody = { BodyType : "1", Text : ""}; this.postData.Body = this.eventBody; /* Initialize 'Subject' with the title of the expedient */ @@ -63,7 +63,7 @@ export class BookMeetingModalPage implements OnInit { } saveTask(){ this.eventBody={ - BodyType: '0', + BodyType: '1', Text: this.postData.Body.Text, } this.postData = { @@ -89,7 +89,7 @@ export class BookMeetingModalPage implements OnInit { this.processes.FindTaskDocId(this.task.SerialNumber).subscribe(res =>{ if(res){ - this.calendarService.postExpedientEvent(res, this.postData, "md"); + this.calendarService.postExpedientEvent(res, this.postData, "md",this.task.SerialNumber); } }); this.distartExpedientModal(); @@ -100,8 +100,9 @@ export class BookMeetingModalPage implements OnInit { const modal = await this.modalController.create({ component: AddParticipantsModalPage, componentProps: { + eventPersons: this.eventAttendees }, - cssClass: 'add-participants-modal', + cssClass: 'book-meeting-modal', backdropDismiss: false }); @@ -110,8 +111,6 @@ export class BookMeetingModalPage implements OnInit { modal.onDidDismiss().then((res) => { this.taskParticipants = res.data; let newattendees: EventPerson[] = res['data']; - - if (newattendees != null) { newattendees.forEach(newattendee => { @@ -135,6 +134,7 @@ export class BookMeetingModalPage implements OnInit { const modal = await this.modalController.create({ component: AddParticipantsCcModalPage, componentProps: { + eventPersons: this.eventAttendees }, cssClass: 'add-participants-cc-modal', backdropDismiss: 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 8e0268bb2..99de79eb7 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 @@ -57,7 +57,7 @@ export class ExpedienteDetailPage implements OnInit { "DocumentURL": result.formURL } this.fulltask = result; - console.log(result); + /* console.log(result); */ }); } @@ -66,14 +66,15 @@ export class ExpedienteDetailPage implements OnInit { { if (this.eventsList == null) { - this.attachments.getAttachments(2, serial).subscribe(result => { - result.forEach(att =>{ - if (this.eventsList == null) - { + this.attachments.getAttachmentsBySerial(serial).subscribe(res => { + console.log(res); + res.forEach(att =>{ + if (this.eventsList == null){ this.eventsList = new Array(); } this.events.getEvent(att.ParentId).subscribe(event => { this.eventsList.push(event); + console.log(this.eventsList); }); }); }); diff --git a/src/app/services/attachments.service.ts b/src/app/services/attachments.service.ts index 5ec4cf12d..09d99702a 100644 --- a/src/app/services/attachments.service.ts +++ b/src/app/services/attachments.service.ts @@ -20,11 +20,11 @@ export class AttachmentsService { this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); } - getEventAttachments(eventid: string): Observable{ + getAttachmentsBySerial(serialNumber: string): Observable{ let geturl = environment.apiURL + 'attachments/GetAttachments'; let params = new HttpParams(); - params = params.set("ParentId", eventid); + params = params.set("SerialNumber", serialNumber); let options = { headers: this.headers, @@ -45,6 +45,20 @@ export class AttachmentsService { params: params }; + return this.http.get(`${geturl}`, options); + } + getAttachmentsById(eventId: string): Observable{ + let geturl = environment.apiURL + 'attachments/GetAttachmentsByEventId'; + let params = new HttpParams(); + + params = params.set("ParentId", eventId); + /* params = params.set("SourceId", sourceid); */ + + let options = { + headers: this.headers, + params: params + }; + return this.http.get(`${geturl}`, options); } } diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 1d1ff2b87..e0be9c7e9 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -178,7 +178,7 @@ export class EventsService { deleteEvent(eventid:string, deletemode:number) { - const puturl = environment.apiURL + 'calendar/PostEvent'; + const puturl = environment.apiURL + 'calendar/DeleteEvent'; let params = new HttpParams(); params = params.set("EventId", eventid); @@ -191,11 +191,12 @@ export class EventsService { return this.http.delete(`${puturl}`, options) } - postExpedientEvent(docId:any, body:any, sharedagenda:string){ + postExpedientEvent(docId:any, body:any, sharedagenda:string, serialNumber:any){ const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente'); let params = new HttpParams(); params = params.set("DocId", docId); + params = params.set("SerialNumber", serialNumber); let options = { headers: this.headers,