mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 12:37:53 +00:00
change tab activation code to app component
This commit is contained in:
@@ -9,6 +9,7 @@ import { Storage } from '@ionic/storage';
|
|||||||
import { register } from 'swiper/element/bundle';
|
import { register } from 'swiper/element/bundle';
|
||||||
import { DomSanitizer } from '@angular/platform-browser';
|
import { DomSanitizer } from '@angular/platform-browser';
|
||||||
import { ScreenOrientation } from "@ionic-native/screen-orientation/ngx";
|
import { ScreenOrientation } from "@ionic-native/screen-orientation/ngx";
|
||||||
|
import { SessionStore } from './store/session.service';
|
||||||
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
||||||
parse: {
|
parse: {
|
||||||
dateInput: "YYYY-MMMM-DD HH:mm"
|
dateInput: "YYYY-MMMM-DD HH:mm"
|
||||||
@@ -31,6 +32,8 @@ register();
|
|||||||
]
|
]
|
||||||
})
|
})
|
||||||
export class AppComponent {
|
export class AppComponent {
|
||||||
|
tabIsActive = true
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private platform: Platform,
|
private platform: Platform,
|
||||||
private statusBar: StatusBar,
|
private statusBar: StatusBar,
|
||||||
@@ -67,6 +70,27 @@ export class AppComponent {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
window.addEventListener('focus', (event) => {
|
||||||
|
if (!this.tabIsActive) {
|
||||||
|
this.tabIsActive = true
|
||||||
|
const data = SessionStore.getDataFromLocalStorage();
|
||||||
|
|
||||||
|
if (!data?.user?.Authorization && SessionStore?.user?.Authorization) {
|
||||||
|
window.location.reload();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (window['all-process-gabinete']) {
|
||||||
|
window['all-process-gabinete']()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
window.addEventListener('blur', (event) => {
|
||||||
|
this.tabIsActive = false
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* requestPermission() {
|
/* requestPermission() {
|
||||||
|
|||||||
@@ -43,26 +43,6 @@ export class AuthService {
|
|||||||
private errorHandler: ErrorHandler,
|
private errorHandler: ErrorHandler,
|
||||||
private platform: Platform,) {
|
private platform: Platform,) {
|
||||||
|
|
||||||
|
|
||||||
window.addEventListener('focus', (event) => {
|
|
||||||
if (!this.tabIsActive) {
|
|
||||||
this.tabIsActive = true
|
|
||||||
const data = SessionStore.getDataFromLocalStorage();
|
|
||||||
|
|
||||||
if (!data?.user?.Authorization && SessionStore?.user?.Authorization) {
|
|
||||||
window.location.reload();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (window['all-process-gabinete']) {
|
|
||||||
window['all-process-gabinete']()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
window.addEventListener('blur', (event) => {
|
|
||||||
this.tabIsActive = false
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async login(user: UserForm, { saveSession = true }): Promise<UserSession> {
|
async login(user: UserForm, { saveSession = true }): Promise<UserSession> {
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "5c18f281b",
|
"shortSHA": "b2d19879a",
|
||||||
"SHA": "5c18f281bc053ecb7db47fbeb4355aa40634dcac",
|
"SHA": "b2d19879a713ab018e36ba2a1385ff9c28364469",
|
||||||
"branch": "feature/login-v2",
|
"branch": "feature/login-v2",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Wed Nov 6 10:38:58 2024 +0100'",
|
"lastCommitTime": "'Wed Nov 6 10:43:19 2024 +0100'",
|
||||||
"lastCommitMessage": "change login v1 to v2",
|
"lastCommitMessage": "fix gabinete error text",
|
||||||
"lastCommitNumber": "6128",
|
"lastCommitNumber": "6129",
|
||||||
"changeStatus": "On branch feature/login-v2\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts\n\tmodified: version/git-version.ts",
|
"changeStatus": "On branch feature/login-v2\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/app.component.ts\n\tmodified: src/app/services/auth.service.ts",
|
||||||
"changeAuthor": "peter.maquiran"
|
"changeAuthor": "peter.maquiran"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user