mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 05:16:07 +00:00
Merge branch 'bugfix/clear-session' into develop_bitOut
This commit is contained in:
@@ -154,7 +154,7 @@
|
|||||||
|
|
||||||
<calendar
|
<calendar
|
||||||
class="calendar-component"
|
class="calendar-component"
|
||||||
[eventSource]="listToPresent"
|
[eventSource]="CalendarStore.eventSource"
|
||||||
[calendarMode]="calendar.mode"
|
[calendarMode]="calendar.mode"
|
||||||
[currentDate]="calendar.currentDate"
|
[currentDate]="calendar.currentDate"
|
||||||
(onEventSelected)="onEventSelected($event)"
|
(onEventSelected)="onEventSelected($event)"
|
||||||
|
|||||||
@@ -206,6 +206,8 @@ export class AgendaPage implements OnInit {
|
|||||||
|
|
||||||
this.CalendarStore.ResetList([])
|
this.CalendarStore.ResetList([])
|
||||||
|
|
||||||
|
this.listToPresent = []
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
if (this.loggeduser.Profile == 'MDGPR') {
|
if (this.loggeduser.Profile == 'MDGPR') {
|
||||||
|
|||||||
@@ -205,15 +205,6 @@
|
|||||||
</div>
|
</div>
|
||||||
{{last ? scrollToBottom() : ''}}
|
{{last ? scrollToBottom() : ''}}
|
||||||
</div>
|
</div>
|
||||||
<!-- <div *ngIf="msg.file">
|
|
||||||
<div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
|
|
||||||
<ion-label class="info-meeting-small">{{msg.u.name ?? ""}} criou esta reunião</ion-label><br />
|
|
||||||
<button (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
|
|
||||||
<ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
|
|
||||||
<ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
|
|
||||||
</div>
|
|
||||||
{{last ? scrollToBottom() : ''}}
|
|
||||||
</div> -->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ion-fab horizontal="end" vertical="bottom" slot="fixed">
|
<ion-fab horizontal="end" vertical="bottom" slot="fixed">
|
||||||
|
|||||||
Reference in New Issue
Block a user