Merge branch 'feature/agenda-api-peter' into feature/agenda-new-api-eudes

This commit is contained in:
Eudes Inácio
2024-06-18 12:28:53 +01:00
10 changed files with 183 additions and 135 deletions
+2 -1
View File
@@ -221,7 +221,6 @@ export class AgendaPage implements OnInit {
this.sharedCalendar = this.AgendaDataRepositoryService.getShareCalendarItemsLive().pipe(
map(data => data.sort((a, b) => {
console.log('Raw data:', data); // Debug line
const priorityA = rolePriorities[a.roleId] || Infinity;
const priorityB = rolePriorities[b.roleId] || Infinity;
return priorityA - priorityB;
@@ -336,6 +335,8 @@ export class AgendaPage implements OnInit {
this.calendar.currentDate = new Date();
this.AgendaDataRepositoryService.getSharedCalendar()
try {
this.myCal.update();
this.myCal.loadEvents();
+1 -1
View File
@@ -26,7 +26,7 @@
<div class="main-content justify-center d-flex height-100">
<div class="box-container width-100 d-flex mx-20 overflow-hidden" style="padding: 0px;overflow: hidden;">
<ion-progress-bar type="indeterminate" *ngIf="loadingAllTask || TaskService.showLoaderNum != 0"></ion-progress-bar>
<ion-progress-bar type="indeterminate" *ngIf="loadingAllTask"></ion-progress-bar>
<div class="px-20 pb-20 container-filters">
<p class="time ion-text-left font-18-em">{{customDate}}</p>
<div class="filters-box wrap d-flex float-left">
-1
View File
@@ -179,7 +179,6 @@ export class LoginPage implements OnInit {
await this.AgendaDataRepositoryService.clearSharedCalendar()
await this.AgendaDataRepositoryService.createOwnCalendar()
this.RochetChatConnectorService.logout();
this.clearStoreService.clear();
this.ChatSystemService.clearChat();