mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
fix login
This commit is contained in:
@@ -233,11 +233,13 @@ export class EventsPage implements OnInit {
|
|||||||
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||||
this.storage.get('events').then((events: any[] = []) => {
|
this.storage.get('events').then((events: any[] = []) => {
|
||||||
//
|
//
|
||||||
let todayEvents = new Array()
|
|
||||||
this.listToPresent = events
|
if(Array.isArray(events)) {
|
||||||
this.totalEvent = this.listToPresent.length
|
this.listToPresent = events
|
||||||
this.currentEvent = this.listToPresent[0].Subject
|
this.totalEvent = this.listToPresent.length
|
||||||
this.currentHoursMinutes = this.listToPresent[0].StartDate
|
this.currentEvent = this.listToPresent[0].Subject
|
||||||
|
this.currentHoursMinutes = this.listToPresent[0].StartDate
|
||||||
|
}
|
||||||
//
|
//
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
|
|
||||||
<!-- HEADER-->
|
<!-- HEADER-->
|
||||||
<ion-header class="ion-no-border header-main d-md-flex">
|
<ion-header class="ion-no-border header-main d-md-flex">
|
||||||
|
|
||||||
<div *ngIf="select" class="btn-close d-none d-lg-flex cursor-pointer font-35" (click)="close()">
|
<div *ngIf="select" class="btn-close d-none d-lg-flex cursor-pointer font-35" (click)="close()">
|
||||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
|
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
|
||||||
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
|
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ export class SearchPage implements OnInit {
|
|||||||
|
|
||||||
this.windowWidth = window.innerWidth
|
this.windowWidth = window.innerWidth
|
||||||
|
|
||||||
window['dynamicSearch'] = (search:string) =>{
|
window['dynamicSearch'] = (search:string) => {
|
||||||
this.searchSubject = search;
|
this.searchSubject = search;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -168,7 +168,7 @@ export class SearchPage implements OnInit {
|
|||||||
|
|
||||||
this.search.mostSeachWord("15").subscribe(res=>{
|
this.search.mostSeachWord("15").subscribe(res=>{
|
||||||
|
|
||||||
const container = document.querySelector('.seach-wrapper');
|
console.log('LOAD LIST');
|
||||||
|
|
||||||
const highest= res[0].Hits;
|
const highest= res[0].Hits;
|
||||||
const lowest = res[res.length-1].Hits;
|
const lowest = res[res.length-1].Hits;
|
||||||
@@ -191,12 +191,11 @@ export class SearchPage implements OnInit {
|
|||||||
});
|
});
|
||||||
|
|
||||||
this.list = list
|
this.list = list
|
||||||
|
console.log('set list')
|
||||||
|
|
||||||
|
|
||||||
const elem = document.documentElement.querySelector('.most-searched-word-container');
|
const elem = document.documentElement.querySelector('.most-searched-word-container');
|
||||||
|
|
||||||
setTimeout(()=>{
|
setTimeout(() => {
|
||||||
WordCloud(
|
WordCloud(
|
||||||
elem,
|
elem,
|
||||||
{
|
{
|
||||||
@@ -205,7 +204,8 @@ export class SearchPage implements OnInit {
|
|||||||
gridSize: 15
|
gridSize: 15
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
},300)
|
console.log('set visualy')
|
||||||
|
}, 300)
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ export class HeaderPage implements OnInit {
|
|||||||
async dynamicSearch() {
|
async dynamicSearch() {
|
||||||
|
|
||||||
if(window['dynamicSearch']) {
|
if(window['dynamicSearch']) {
|
||||||
window['dynamicSearch']()
|
window['dynamicSearch'](this.searchSubject)
|
||||||
} else {
|
} else {
|
||||||
setTimeout(()=>{
|
setTimeout(()=>{
|
||||||
this.dynamicSearch()
|
this.dynamicSearch()
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
import { versionData } from '../../version/git-version'
|
import { versionData } from '../../version/git-version'
|
||||||
export const environment = {
|
export const environment = {
|
||||||
//apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
|
//apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
|
||||||
//apiURL: 'https://gd-api.oapr.gov.ao/api/',
|
apiURL: 'https://gd-api.oapr.gov.ao/api/',
|
||||||
apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
|
//apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
|
||||||
// apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
|
// apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
|
||||||
// apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
|
// apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
|
||||||
// apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',
|
// apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',
|
||||||
//apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',
|
apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',
|
||||||
//apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',
|
apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',
|
||||||
apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
|
//apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
|
||||||
apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
|
//apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
|
||||||
production: true,
|
production: true,
|
||||||
domain: 'paulo.pinto@gabinetedigital.local',
|
domain: 'paulo.pinto@gabinetedigital.local',
|
||||||
defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto@gabinetedigital.local
|
defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto@gabinetedigital.local
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "fcc8bc6b7",
|
"shortSHA": "0e5b739df",
|
||||||
"SHA": "fcc8bc6b74ab3eca00dc78400c7bb2d1a8ab40bd",
|
"SHA": "0e5b739df5ede20a0b22df48ec861ec4c2921f6b",
|
||||||
"branch": "develop_bitOut-fix",
|
"branch": "develop_bitOut-fix",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Tue Jan 3 21:08:49 2023 +0100'",
|
"lastCommitTime": "'Tue Jan 3 22:04:33 2023 +0100'",
|
||||||
"lastCommitMessage": "improve",
|
"lastCommitMessage": "src/app/guards/auth.guard.ts",
|
||||||
"lastCommitNumber": "4607",
|
"lastCommitNumber": "4608",
|
||||||
"change": "",
|
"change": "",
|
||||||
"changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/guards/auth.guard.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/environments/environment.ts",
|
"changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/search/search.page.html\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/environments/environment.ts",
|
||||||
"changeAuthor": "peter.maquiran"
|
"changeAuthor": "peter.maquiran"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user