diff --git a/src/app/models/event.model.ts b/src/app/models/event.model.ts index a60028ad6..2ce647677 100644 --- a/src/app/models/event.model.ts +++ b/src/app/models/event.model.ts @@ -1,3 +1,4 @@ +import { Attachment } from './attachment.model'; import { EventBody } from './eventbody.model'; import { EventPerson } from './eventperson.model'; @@ -31,6 +32,7 @@ export class Event{ HasAttachments: boolean; EventRecurrence: EventRecurrence; Name?: string + Attachments?: Attachment[]; /* public Event(){ this.EventRecurrence = new EventRecurrence(); diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index 3ba915a0c..4c6f67a76 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -80,7 +80,7 @@
{{attach.SourceName}} 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 f57b304c4..242beef54 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -26,7 +26,6 @@ export class ViewEventPage implements OnInit { isEventEdited: boolean; eventBody: EventBody; loadedAttachments:any; - loadedEventAttachments: Attachment[]; pageId: string; showLoader: boolean; @@ -91,7 +90,6 @@ export class ViewEventPage implements OnInit { ngOnInit() { this.loadEvent(); - this.getAttachments(); window.onresize = (event) => { @@ -183,7 +181,6 @@ export class ViewEventPage implements OnInit { setTimeout(() => { /* this.loadEvent(); */ this.loadEvent() - this.getAttachments(); }, 250); this.isEventEdited = true; } @@ -191,22 +188,6 @@ export class ViewEventPage implements OnInit { } - getAttachments() { - const loader = this.toastService.loading() - - try { - this.attachmentsService.getAttachmentsById(this.eventId).subscribe(res=>{ - this.loadedAttachments = res; - console.log(res); - }); - } catch (error) { - - } - finally { - loader.remove() - } - - } async editEventDetail() { @@ -227,7 +208,6 @@ export class ViewEventPage implements OnInit { setTimeout(() => { /* this.loadEvent(); */ this.loadEvent() - this.getAttachments(); }, 250); this.isEventEdited = true; } @@ -261,7 +241,6 @@ export class ViewEventPage implements OnInit { setTimeout(() => { /* this.loadEvent(); */ this.loadEvent() - this.getAttachments(); }, 250); this.isEventEdited = true; } 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 f816d66ae..be905a8f3 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -77,10 +77,10 @@
{{attach.SourceName}} diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index a04ef85cf..4a9c0f6fd 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -22,7 +22,6 @@ export class ViewEventPage implements OnInit { isEventEdited: boolean; eventBody: EventBody; loadedAttachments:any; - loadedEventAttachments: Attachment[]; pageId: string; showLoader: boolean; @@ -44,7 +43,6 @@ export class ViewEventPage implements OnInit { constructor( private eventsService: EventsService, - private attachmentsService: AttachmentsService, public alertController: AlertController, private iab: InAppBrowser, private processes: ProcessesService, @@ -96,7 +94,6 @@ export class ViewEventPage implements OnInit { this.loadedEvent = res; this.today = new Date(res.StartDate); this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); - this.getAttachments(this.loadedEvent.EventId); }, (error)=> { console.log('errer', ) @@ -142,12 +139,6 @@ export class ViewEventPage implements OnInit { } - getAttachments(eventId){ - this.attachmentsService.getAttachmentsById(eventId).subscribe(res=>{ - this.loadedAttachments = res; - console.log(res); - }); - } async editEvent() { this.viewEventDetailDismiss.emit({ diff --git a/src/app/store/chat/chat-message.service.ts b/src/app/store/chat/chat-message.service.ts index e9e5fe84d..0ae5cf854 100644 --- a/src/app/store/chat/chat-message.service.ts +++ b/src/app/store/chat/chat-message.service.ts @@ -13,7 +13,7 @@ export class ChatMessageService { constructor() { - this.keyName = ('chat'+SHA1(this.constructor.name)).toString() + this.keyName = (SHA1('chat'+this.constructor.name)).toString() setTimeout(()=> { let restore = localstoreService.get(this.keyName, {}) diff --git a/src/app/store/chat/chat-user.service.ts b/src/app/store/chat/chat-user.service.ts index e18ce4ad5..af9876222 100644 --- a/src/app/store/chat/chat-user.service.ts +++ b/src/app/store/chat/chat-user.service.ts @@ -14,7 +14,7 @@ export class ChatUserService { constructor() { - this.keyName = ('chat'+SHA1(this.constructor.name)).toString() + this.keyName = (SHA1('chat'+this.constructor.name)).toString() setTimeout(()=> { let restore = localstoreService.get(this.keyName, {}) diff --git a/src/app/store/localstore.service.ts b/src/app/store/localstore.service.ts index bdf55dab8..548c1e7cb 100644 --- a/src/app/store/localstore.service.ts +++ b/src/app/store/localstore.service.ts @@ -6,7 +6,7 @@ import { AES, enc, SHA1 } from 'crypto-js' }) export class LocalstoreService { - private prefix = 'v14-' + private prefix = 'v15-' constructor() {