improve

src/app/guards/login.guard.ts

@@ -19,7 +19,7 @@ export class LoginGuard implements CanActivate {
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
       
-      console.log('hire inactinity!', state.url)
+      console.log('hire login!', state.url)
 
       if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) {
         // enter app

src/app/home/home.page.ts

@@ -151,13 +151,13 @@ export class HomePage implements OnInit {
 
     this.updateList()
 
-    /* var myWorker = new Worker(new URL('./nice.worker.js', import.meta.url));
+    // var myWorker = new Worker(new URL('./nice.worker.js', import.meta.url));
 
-    myWorker.onmessage = function (oEvent) {
-      console.log('Worker said : ' + oEvent.data);
-    }
+    // myWorker.onmessage = function (oEvent) {
+    //   console.log('Worker said : ' + oEvent.data);
+    // }
 
-    myWorker.postMessage('ali'); */
+    // myWorker.postMessage('ali');
     this.clearTabButtonSelection();
 
   }

src/app/home/nice.worker.js

@@ -1,5 +1,41 @@
-/* postMessage("I\'m working before postMessage(\'ali\').");
+const { interval } = require("rxjs");
+
+postMessage("I\'m working before postMessage(\'ali\').");
 
 onmessage = function(oEvent) {
   postMessage('Hi ' + oEvent.data);
-}; */
+
+  let request = new XMLHttpRequest();
+  //request.setRequestHeader('Authorization', 'Bearer ' + token);
+  request.onreadystatechange = () => {
+    if (request.readyState === 4) {
+        let result = JSON.parse(request.responseText);
+        // call app back
+        postMessage({
+            name: 'getDataResponse',
+            data: result
+        });
+    }
+  }
+  request.open('GET', "https://api.agify.io/?name=michael", true);
+  request.send();
+
+};
+
+
+// setInterval(() => {
+//   let request = new XMLHttpRequest();
+//   request.onreadystatechange = () => {
+//     if (request.readyState === 4) {
+//         let result = JSON.parse(request.responseText);
+//         // call app back
+//         postMessage({
+//             name: 'getDataResponse',
+//             data: result
+//         });
+//     }
+// }
+// request.open('GET', "https://api.agify.io/?name=michael", true);
+// request.send();
+
+// }, 500)

src/app/modals/profile/profile.page.ts

@@ -203,7 +203,12 @@ export class ProfilePage implements OnInit {
   }
 
   logout() {
-    this.authService.logout();
+    SessionStore.setInativity(false)
+    SessionStore.setUrlBeforeInactivity(this.router.url);
+    setTimeout(() => {
+      // alert('logout')
+      this.router.navigateByUrl('/', { replaceUrl: true });
+    }, 100)
   }
 
   async editProfile() {

src/app/pages/agenda/agenda.page.ts

@@ -967,6 +967,7 @@ export class AgendaPage implements OnInit {
           responseArray.push(event)
 
         });
+
       this.storage.set('agendaResponse',responseArray).then(() => {
         
       })

src/app/pages/agenda/new-event/new-event.page.ts

@@ -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]
+      }
     }
 
   }

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -584,7 +584,7 @@ export class GabineteDigitalPage implements OnInit {
   
     })();
 
-    (async()=>{
+    (async() => {
 
       if(!this.loadProcess['parecerespareceresPr']) {
         try {

src/app/pages/login/login.page.ts

@@ -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) {

src/app/services/auth.service.ts

@@ -211,8 +211,6 @@ export class AuthService {
 
     logout() {
 
-      localStorage.removeItem('userChat');
-
       SessionStore.setInativity(false)
       SessionStore.setUrlBeforeInactivity(this.router.url);
       setTimeout(() => {

src/app/shared/agenda/new-event/new-event.page.ts

@@ -136,11 +136,13 @@ export class NewEventPage implements OnInit {
   }
 
   ngOnInit() {
-    
-    // this.roundTimeQuarterHour();
 
     if(!this.CalendarName) {
-      this.CalendarName = this.loggeduser.Profile;
+      if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
+        this.CalendarName = 'Meu calendario';
+      } else if(this.eventService.calendarNamesAry.length == 1 ) {
+        this.CalendarName = this.eventService.calendarNamesAry[0]
+      }
     }
 
     this.getRecurrenceTypes();

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "6f3c88b57",
-  "SHA": "6f3c88b57cd5eb8871015f092bf67fe0c8fcd257",
+  "shortSHA": "88d948c5e",
+  "SHA": "88d948c5e07c1cc622bc277725dd8dfb3d9721fd",
   "branch": "develop_bitOut-fix",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Thu Dec 29 15:31:54 2022 +0100'",
-  "lastCommitMessage": "save",
-  "lastCommitNumber": "4593",
+  "lastCommitTime": "'Fri Dec 30 10:57:21 2022 +0100'",
+  "lastCommitMessage": "clear storage on build",
+  "lastCommitNumber": "4594",
   "change": "",
-  "changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   package-lock.json\n\tmodified:   package.json\n\tmodified:   src/app/models/beast-orm.ts",
+  "changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/guards/login.guard.ts\n\tmodified:   src/app/home/home.page.ts\n\tmodified:   src/app/home/nice.worker.js\n\tmodified:   src/app/modals/profile/profile.page.ts\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/pages/login/login.page.ts\n\tmodified:   src/app/services/auth.service.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.ts",
   "changeAuthor": "peter.maquiran"
 }