mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 13:26:08 +00:00
bug refresh init solved
This commit is contained in:
@@ -64,7 +64,7 @@
|
|||||||
<ion-item class="item-hover cursor-pointer" lines="none" *ngFor="let event of listToPresent"
|
<ion-item class="item-hover cursor-pointer" lines="none" *ngFor="let event of listToPresent"
|
||||||
(click)="goToEvent(event)"
|
(click)="goToEvent(event)"
|
||||||
>
|
>
|
||||||
<div class="d-flex content-{{loggeduser.Profile}}-{{event.CalendarName}}">
|
<div class="d-flex content-{{sessoStore.user.Profile}}-{{event.CalendarName}}">
|
||||||
|
|
||||||
<div class="schedule-time">
|
<div class="schedule-time">
|
||||||
<div *ngIf="!event.IsAllDayEvent" class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
|
<div *ngIf="!event.IsAllDayEvent" class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ export class EventsPage implements OnInit {
|
|||||||
@Output() openExpedientListPage: EventEmitter<any> = new EventEmitter<any>();
|
@Output() openExpedientListPage: EventEmitter<any> = new EventEmitter<any>();
|
||||||
|
|
||||||
loggeduser: LoginUserRespose;
|
loggeduser: LoginUserRespose;
|
||||||
|
sessoStore = SessionStore;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private eventService: EventsService,
|
private eventService: EventsService,
|
||||||
@@ -155,56 +156,16 @@ export class EventsPage implements OnInit {
|
|||||||
let month = date.getMonth() + 1;
|
let month = date.getMonth() + 1;
|
||||||
let start = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
|
let start = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
|
||||||
let end = date.getFullYear() + "-" + month + "-" + date.getDate() + " 23:59:59";
|
let end = date.getFullYear() + "-" + month + "-" + date.getDate() + " 23:59:59";
|
||||||
|
if(SessionStore.user) {
|
||||||
if (this.loggeduser.Profile == 'MDGPR') {
|
|
||||||
|
|
||||||
let mdOficialEvents = await this.eventService.getAllMdOficialEvents(start, end).toPromise();
|
|
||||||
let mdPessoalEvents = await this.eventService.getAllMdPessoalEvents(start, end).toPromise();
|
|
||||||
|
|
||||||
const list = mdOficialEvents.concat(mdPessoalEvents);
|
|
||||||
|
|
||||||
this.addEventToDb(list);
|
|
||||||
this.listToPresent = list
|
|
||||||
|
|
||||||
if (list.length > 0) {
|
|
||||||
this.currentEvent = list[0].Subject;
|
|
||||||
this.currentHoursMinutes = list[0].StartDate;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.totalEvent = list.length;
|
|
||||||
this.showLoader = false;
|
|
||||||
|
|
||||||
}
|
|
||||||
else if (this.loggeduser.Profile == 'PR') {
|
|
||||||
|
|
||||||
let prOficialEvents = await this.eventService.getAllPrOficialEvents(start, end).toPromise();
|
|
||||||
let prPessoalEvents = await this.eventService.getAllPrPessoalEvents(start, end).toPromise();
|
|
||||||
|
|
||||||
const list = prOficialEvents.concat(prPessoalEvents);
|
|
||||||
this.addEventToDb(list);
|
|
||||||
if (list.length > 0) {
|
|
||||||
this.currentEvent = list[0].Subject;
|
|
||||||
this.currentHoursMinutes = list[0].StartDate;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.listToPresent = list;
|
|
||||||
this.totalEvent = list.length;
|
|
||||||
this.showLoader = false;
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
if(this.loggeduser.OwnerCalendars.length >= 1) {
|
|
||||||
|
|
||||||
let onwEvent:any = await this.eventService.getAllOwnEvents(start, end).catch((error) => {
|
let onwEvent:any = await this.eventService.getAllOwnEvents(start, end).catch((error) => {
|
||||||
console.error(error)
|
console.error(error)
|
||||||
})
|
})
|
||||||
this.listToPresent = onwEvent;
|
this.listToPresent = onwEvent;
|
||||||
this.totalEvent = onwEvent.length;
|
this.totalEvent = onwEvent.length;
|
||||||
this.showLoader = false;
|
this.showLoader = false;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ export class LoginPage implements OnInit {
|
|||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
this.sqliteservice.deleteAllTables();
|
|
||||||
this.RochetChatConnectorService.logout();
|
this.RochetChatConnectorService.logout();
|
||||||
this.clearStoreService.clear();
|
this.clearStoreService.clear();
|
||||||
this.ChatSystemService.clearChat();
|
this.ChatSystemService.clearChat();
|
||||||
|
|||||||
Reference in New Issue
Block a user