peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

change variable

Browse Source
This commit is contained in:
Lorito Tiago
2023-10-19 15:58:55 +01:00
parent 26b894ed1c
commit 791a0b2fb7
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/App/App.xcodeproj/project.pbxproj
+2 -2
View File
@@ -390,7 +390,7 @@
CODE_SIGN_ENTITLEMENTS = App/App.entitlements; CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 61; CURRENT_PROJECT_VERSION = 63;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 94BRNM2LSS; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 94BRNM2LSS;
INFOPLIST_FILE = App/Info.plist; INFOPLIST_FILE = App/Info.plist;
@@ -419,7 +419,7 @@
CODE_SIGN_ENTITLEMENTS = App/App.entitlements; CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 61; CURRENT_PROJECT_VERSION = 63;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 94BRNM2LSS; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 94BRNM2LSS;
INFOPLIST_FILE = App/Info.plist; INFOPLIST_FILE = App/Info.plist;
src/app/pages/chat/chat.page.ts
+1 -1
View File
@@ -200,7 +200,7 @@ export class ChatPage implements OnInit {
if (this.firstEnter) { if (this.firstEnter) {
this.firstEnter = false this.firstEnter = false
let delay = this.RouteService.history.find((item) => { let delay = this.RouteService.liveHistory.find((item) => {
return ['/home/publications', '/home/agenda', '/home/gabinete', '/home/events'].filter(x => { return ['/home/publications', '/home/agenda', '/home/gabinete', '/home/events'].filter(x => {
return item.includes(x) return item.includes(x)
}).length >= 1 }).length >= 1
src/app/services/route.service.ts
+11 -9
View File
@@ -9,6 +9,7 @@ import { Location } from '@angular/common'
export class RouteService { export class RouteService {
history: any = []; history: any = [];
liveHistory = [];
constructor( constructor(
private router: Router, private router: Router,
@@ -23,8 +24,9 @@ export class RouteService {
const lastRoute = this.history.slice(-1) const lastRoute = this.history.slice(-1)
if(event.url != lastRoute) { if (event.url != lastRoute) {
this.history.push(event.url) this.history.push(event.url)
this.liveHistory.push(event.url)
this.reduceHistory() this.reduceHistory()
} }
@@ -37,16 +39,16 @@ export class RouteService {
/** /**
* @param url [string] incase no history to go back */ * @param url [string] incase no history to go back */
goBack(url = null) { goBack(url = null) {
if(this.history.length >= 2) { if (this.history.length >= 2) {
this.history.pop(); this.history.pop();
const url = this.history.pop(); const url = this.history.pop();
this.goTo(url) this.goTo(url)
} else if(url) { } else if (url) {
this.goTo(url) this.goTo(url)
} }
@@ -58,13 +60,13 @@ export class RouteService {
queryParams: this.queryParams(url) queryParams: this.queryParams(url)
} }
const urlObject = new URL('http://localhost:8100'+url); const urlObject = new URL('http://localhost:8100' + url);
this.router.navigate([urlObject.pathname], navigationExtras); this.router.navigate([urlObject.pathname], navigationExtras);
} }
reduceHistory() { reduceHistory() {
if(this.history.length >= 15) { if (this.history.length >= 15) {
this.history = this.history.slice(5, this.history.length) this.history = this.history.slice(5, this.history.length)
} }
this.LocalstoreService.set('history', this.history) this.LocalstoreService.set('history', this.history)
@@ -73,7 +75,7 @@ export class RouteService {
queryParams(url) { queryParams(url) {
const urlObject = new URL('http://localhost:8100'+url); const urlObject = new URL('http://localhost:8100' + url);
const paramsString = urlObject.search; const paramsString = urlObject.search;
let searchParams: any = new URLSearchParams(paramsString); let searchParams: any = new URLSearchParams(paramsString);
@@ -83,7 +85,7 @@ export class RouteService {
params[key] = value params[key] = value
} }
return params return params
} }