diff --git a/src/app/models/agenda/AgendaEventList.ts b/src/app/models/agenda/AgendaEventList.ts index 1667eb464..5698c013d 100644 --- a/src/app/models/agenda/AgendaEventList.ts +++ b/src/app/models/agenda/AgendaEventList.ts @@ -29,6 +29,7 @@ export interface CustomCalendarEvent { end: Date id: string event: EventList + profile?: any } diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 3c6c84bee..de650867c 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -248,7 +248,6 @@
-
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 0abdea4dd..4bdc16d28 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -582,6 +582,34 @@ td.monthview-primary-with-event { } +.myCalendar { + .content--Oficial { + border-radius: 5px; + border-right: 5px solid #ffb703; + overflow: auto; + } + .content--Pessoal { + border-radius: 5px; + border-right: 5px solid #f05d5e; + overflow: auto; + } +} + +.sharedCalendar { + .content-Oficial{ + width: 85%; + float: left; + border-left: 4px solid #cab0dc; + padding: 0 0 0 12px; + } + .content-Pessoal{ + width: 85%; + float: left; + border-left: 4px solid #cbeecb; + padding: 0 0 0 12px; + } +} + .calendar-border{ background: #ebebeb; margin: 13px 20px; diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 87db5a9e4..66c6e6ec0 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -808,8 +808,6 @@ export class AgendaPage implements OnInit { this.addEventToDB(response, "md"); let eventsList = response; - - console.log('response', response); this.CalendarStore.removeRange(startTime, endTime, 'md') @@ -820,7 +818,7 @@ export class AgendaPage implements OnInit { this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) - console.log('this.TimelineMDList', this.TimelineMDList); + // console.log('this.TimelineMDList', this.TimelineMDList); this.myCal.update(); this.myCal.loadEvents(); diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts index 99f6f8bd5..e694d91e9 100644 --- a/src/app/services/agenda/list-box.service.ts +++ b/src/app/services/agenda/list-box.service.ts @@ -179,6 +179,7 @@ export class ListBoxService { end: new Date(element.endTime), id: element.id, event: element.event, + profile: profile }); }); diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts index 6d9bdd4cd..61c16a9e4 100644 --- a/src/app/services/chat/chat-system.service.ts +++ b/src/app/services/chat/chat-system.service.ts @@ -290,7 +290,6 @@ export class ChatSystemService { * @description subscribe all room */ subscribeToRoom() { - console.log("=====>>subscribeToRoom<<====="); for (const id in this.dm) { this.defaultSubtribe(id)