This commit is contained in:
Peter Maquiran
2022-12-30 14:31:19 +01:00
parent 88d948c5e0
commit e5b7032a18
11 changed files with 75 additions and 29 deletions
+1
View File
@@ -967,6 +967,7 @@ export class AgendaPage implements OnInit {
responseArray.push(event)
});
this.storage.set('agendaResponse',responseArray).then(() => {
})
@@ -104,10 +104,12 @@ export class NewEventPage implements OnInit {
this.taskParticipants = this.navParams.get('attendees');
if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
this.CalendarName = 'Meu calendario'
} else {
this.CalendarName = this.eventService.calendarNamesAry[0]
if(!this.CalendarName) {
if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
this.CalendarName = 'Meu calendario';
} else if(this.eventService.calendarNamesAry.length == 1 ) {
this.CalendarName = this.eventService.calendarNamesAry[0]
}
}
}
@@ -584,7 +584,7 @@ export class GabineteDigitalPage implements OnInit {
})();
(async()=>{
(async() => {
if(!this.loadProcess['parecerespareceresPr']) {
try {
+6 -4
View File
@@ -17,7 +17,7 @@ import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
import { ChatService } from 'src/app/services/chat.service';
import { Platform } from '@ionic/angular';
import { FirstEnterService } from '../../services/first-enter.service';
import { Storage } from '@ionic/storage';
@Component({
selector: 'app-login',
templateUrl: './login.page.html',
@@ -52,7 +52,8 @@ export class LoginPage implements OnInit {
public ChatSystemService: ChatSystemService,
private ChatService: ChatService,
private platform: Platform,
private FirstEnterService: FirstEnterService
private FirstEnterService: FirstEnterService,
private storage:Storage,
) {
console.log('constructor')
}
@@ -136,7 +137,7 @@ export class LoginPage implements OnInit {
}
this.changeProfileService.runLogin();
this.getToken();
// this.getToken();
SessionStore.setInativity(true);
this.goback();
@@ -151,6 +152,7 @@ export class LoginPage implements OnInit {
window.localStorage.clear();
await MessageModel.deleteAll();
await DeleteMessageModel.deleteAll();
this.storage.clear();
await this.authService.SetSession(attempt, this.userattempt);
this.changeProfileService.run();
@@ -162,7 +164,7 @@ export class LoginPage implements OnInit {
this.ChatSystemService.loadChat();
}
this.getToken();
// this.getToken();
if(!this.platform.is('desktop') && !this.platform.is('mobileweb')) {
if(this.sessionStore.hasPin) {