mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 21:35:50 +00:00
merge
This commit is contained in:
@@ -9,6 +9,7 @@ import { DomSanitizer } from "@angular/platform-browser";
|
||||
import { EventPerson } from 'src/app/models/eventperson.model';
|
||||
import { removeDuplicate } from 'src/plugin/removeDuplicate.js';
|
||||
import { Storage } from '@ionic/storage';
|
||||
import { environment } from 'src/environments/environment';
|
||||
|
||||
// showTimeline
|
||||
import { setHours, setMinutes } from 'date-fns';
|
||||
@@ -33,6 +34,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
|
||||
import { BackgroundService } from 'src/app/services/background.service';
|
||||
import { ThemeService } from 'src/app/services/theme.service'
|
||||
import { SessionStore } from 'src/app/store/session.service';
|
||||
import { PermissionService } from 'src/app/services/permission.service';
|
||||
|
||||
|
||||
@Component({
|
||||
@@ -166,6 +168,7 @@ export class AgendaPage implements OnInit {
|
||||
array = []
|
||||
|
||||
sessionStore = SessionStore;
|
||||
environment
|
||||
|
||||
constructor(
|
||||
private alertCtrl: AlertController,
|
||||
@@ -183,7 +186,8 @@ export class AgendaPage implements OnInit {
|
||||
private platform: Platform,
|
||||
private backgroundservice: BackgroundService,
|
||||
public ThemeService: ThemeService,
|
||||
private storage:Storage
|
||||
private storage:Storage,
|
||||
public p: PermissionService
|
||||
) {
|
||||
|
||||
this.dateAdapter.setLocale('es');
|
||||
@@ -204,6 +208,8 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
this.CalendarStore.ResetList([])
|
||||
|
||||
this.listToPresent = []
|
||||
|
||||
})
|
||||
|
||||
if (this.loggeduser.Profile == 'MDGPR') {
|
||||
@@ -251,9 +257,7 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
ngOnInit() {
|
||||
|
||||
//this.getFromDB();
|
||||
|
||||
setTimeout(() =>{
|
||||
setTimeout(() => {
|
||||
const pathname = window.location.pathname
|
||||
let realoadCounter = 0
|
||||
this.router.events.forEach((event) => {
|
||||
@@ -348,7 +352,7 @@ export class AgendaPage implements OnInit {
|
||||
// calendar change date
|
||||
this.eventSelectedDate = new Date(ev);
|
||||
|
||||
this.updateEventListBox()
|
||||
this.updateEventListBox();
|
||||
|
||||
};
|
||||
|
||||
@@ -1478,7 +1482,7 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
|
||||
// THIS LINE
|
||||
this.updateEventListBox()
|
||||
this.updateEventListBox();
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user