{{event.StartDate | date: 'HH:mm'}}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 50cf79432..b05e9340f 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -63,6 +63,7 @@ export class EventsPage implements OnInit {
@Output() openExpedientListPage: EventEmitter
= new EventEmitter();
loggeduser: LoginUserRespose;
+ sessoStore = SessionStore;
constructor(
private eventService: EventsService,
@@ -155,56 +156,16 @@ export class EventsPage implements OnInit {
let month = date.getMonth() + 1;
let start = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
let end = date.getFullYear() + "-" + month + "-" + date.getDate() + " 23:59:59";
-
- 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) {
+ if(SessionStore.user) {
- let onwEvent:any = await this.eventService.getAllOwnEvents(start, end).catch((error) => {
- console.error(error)
- })
- this.listToPresent = onwEvent;
- this.totalEvent = onwEvent.length;
- this.showLoader = false;
- } else {
-
- }
-
+ let onwEvent:any = await this.eventService.getAllOwnEvents(start, end).catch((error) => {
+ console.error(error)
+ })
+ this.listToPresent = onwEvent;
+ this.totalEvent = onwEvent.length;
+ this.showLoader = false;
+ } else {
+
}
}
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 077d22dff..9a1538c88 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -143,7 +143,7 @@ export class LoginPage implements OnInit {
} else {
- this.sqliteservice.deleteAllTables();
+
this.RochetChatConnectorService.logout();
this.clearStoreService.clear();
this.ChatSystemService.clearChat();