diff --git a/src/app/models/attachment.model.ts b/src/app/models/attachment.model.ts index 80f464544..0ce74ed89 100644 --- a/src/app/models/attachment.model.ts +++ b/src/app/models/attachment.model.ts @@ -31,4 +31,6 @@ export class EventAttachment { Link?: string; SerialNumber?: string; ApplicationId: string; + SourceTitle: string; + } \ No newline at end of file diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index f70564f5a..ab2ce6107 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -70,7 +70,7 @@ export class ViewEventPage implements OnInit { } close(){ - console.log(this.isEventEdited); + /* console.log(this.isEventEdited); */ this.modalController.dismiss(this.isEventEdited); } @@ -78,10 +78,10 @@ export class ViewEventPage implements OnInit { this.eventsService.getEvent(this.eventId).subscribe(res => { this.loadedEvent = res; - console.log(res); + /* console.log(res); */ this.today = new Date(res.StartDate); - console.log(new Date(this.today)); + /* console.log(new Date(this.today)); */ this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); }); } @@ -154,7 +154,7 @@ export class ViewEventPage implements OnInit { viewDocument(sourceId){ this.processes.GetDocumentUrl(sourceId, '8').subscribe(res=>{ - console.log(res); + /* console.log(res); */ const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); const browser = this.iab.create(url,"_blank"); browser.show(); diff --git a/src/app/services/attachments.service.ts b/src/app/services/attachments.service.ts index 6476152e4..9d75b3625 100644 --- a/src/app/services/attachments.service.ts +++ b/src/app/services/attachments.service.ts @@ -71,10 +71,23 @@ export class AttachmentsService { headers: this.headers, } - alert('send'); - - console.log('send', body); return this.http.post(`${geturl}`, body, options); } + deleteEventAttachmentById(attachmentId) { + + let geturl = environment.apiURL + `Attachments/Delete?attachmentId=${attachmentId}`; + + let params = new HttpParams(); + + params = params.set("attachmentId", attachmentId); + + let options = { + headers: this.headers, + params: params + } + + return this.http.post(`${geturl}`, options); + } + } diff --git a/src/app/shared/agenda/edit-event/edit-event.component.html b/src/app/shared/agenda/edit-event/edit-event.component.html index 5f626ebbc..ab5549365 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.html +++ b/src/app/shared/agenda/edit-event/edit-event.component.html @@ -199,15 +199,18 @@
{{document.SourceName}} - webTRIX - K2 - Exchange - File + webTRIX + K2 + Exchange + File +
{{document.Stakeholders}} {{document.CreateDate}}
diff --git a/src/app/shared/agenda/edit-event/edit-event.component.scss b/src/app/shared/agenda/edit-event/edit-event.component.scss index 0f62f6403..f9eea71be 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.scss +++ b/src/app/shared/agenda/edit-event/edit-event.component.scss @@ -185,4 +185,20 @@ ion-content{ -moz-border-radius: 18px; -ms-border-radius: 18px; -o-border-radius: 18px; +} + + +.close-button { + display: none; +} + +.list:hover { + + .app-name { + display: none; + } + + .close-button { + display: block !important; + } } \ No newline at end of file diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts index b1830de52..1c8110988 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.ts +++ b/src/app/shared/agenda/edit-event/edit-event.component.ts @@ -62,8 +62,6 @@ export class EditEventComponent implements OnInit { } } } - - // attendees list if(this.postEvent.Attendees != null) { @@ -186,7 +184,17 @@ export class EditEventComponent implements OnInit { getAttachments(eventId: string){ this.attachmentsService.getAttachmentsById(eventId).subscribe(res=>{ this.loadedEventAttachments = res; + console.log('res', res); }); } + deleteAttachment(attachmentID: string) { + + this.attachmentsService.deleteEventAttachmentById(attachmentID).subscribe( + res=>{ + this.loadedEventAttachments = this.loadedEventAttachments.filter(e=> e.Id.toString() != attachmentID); + }) + + } + } diff --git a/src/app/shared/agenda/new-event/new-event.component.html b/src/app/shared/agenda/new-event/new-event.component.html index 4ecbfdaed..9f723382f 100644 --- a/src/app/shared/agenda/new-event/new-event.component.html +++ b/src/app/shared/agenda/new-event/new-event.component.html @@ -194,13 +194,16 @@{{document.Assunto}} {{document.appName}} +
{{document.EntidadeOrganicaNome}} {{document.Data}}