mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
bugs solved
This commit is contained in:
@@ -51,8 +51,7 @@
|
|||||||
</ion-buttons>
|
</ion-buttons>
|
||||||
</div>
|
</div>
|
||||||
<div class="line"></div>
|
<div class="line"></div>
|
||||||
<ion-label (click)="asyncNotification()" *ngIf="notificationdata">{{notificationdata.length}} novas notificações</ion-label>
|
<ion-label (click)="asyncNotification()" *ngIf="notificationdata">{{notificationStatus}}</ion-label>
|
||||||
<ion-label (click)="asyncNotification()" *ngIf="!notificationdata">0 novas notificações</ion-label>
|
|
||||||
</div>
|
</div>
|
||||||
</ion-header>
|
</ion-header>
|
||||||
|
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ export class ProfilePage implements OnInit {
|
|||||||
location: "Gabinete";
|
location: "Gabinete";
|
||||||
isProfileOpen = false
|
isProfileOpen = false
|
||||||
hideImage = false
|
hideImage = false
|
||||||
|
notificationStatus = '';
|
||||||
|
|
||||||
constructor(private modalController: ModalController,
|
constructor(private modalController: ModalController,
|
||||||
private authService: AuthService,
|
private authService: AuthService,
|
||||||
@@ -117,7 +118,11 @@ export class ProfilePage implements OnInit {
|
|||||||
});
|
});
|
||||||
this.notificationdata = this.DataArray
|
this.notificationdata = this.DataArray
|
||||||
}).catch((error) => {
|
}).catch((error) => {
|
||||||
|
if(!error) {
|
||||||
|
this.notificationStatus = this.notificationdata.length + " novas notificações";
|
||||||
|
} else {
|
||||||
console.error('storage getnotification: ',error)
|
console.error('storage getnotification: ',error)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
/* await new Promise(resolve => setTimeout(resolve, 1000));
|
/* await new Promise(resolve => setTimeout(resolve, 1000));
|
||||||
await this.getNotificationData(); */
|
await this.getNotificationData(); */
|
||||||
|
|||||||
@@ -225,7 +225,12 @@ export class AuthService {
|
|||||||
this.storageService.get(AuthConnstants.AUTH).then(res=>{
|
this.storageService.get(AuthConnstants.AUTH).then(res=>{
|
||||||
this.userData$.next(res);
|
this.userData$.next(res);
|
||||||
}).catch((error) => {
|
}).catch((error) => {
|
||||||
|
if(!error) {
|
||||||
|
|
||||||
|
} else {
|
||||||
console.error('storage getuserdata',error)
|
console.error('storage getuserdata',error)
|
||||||
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -48,15 +48,6 @@ export class NotificationsService {
|
|||||||
/* private eventTriger: Events, */
|
/* private eventTriger: Events, */
|
||||||
/* private fcm: FCM */) {
|
/* private fcm: FCM */) {
|
||||||
|
|
||||||
this.storageService.get("Notifications").then((value) => {
|
|
||||||
|
|
||||||
}).catch((error)=>{
|
|
||||||
console.error('storage getnotification',error)
|
|
||||||
}).catch(() => {
|
|
||||||
|
|
||||||
this.storageService.store("Notifications", [])
|
|
||||||
})
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
registerCallback(type: string, funx: Function, object: any = {}) {
|
registerCallback(type: string, funx: Function, object: any = {}) {
|
||||||
|
|||||||
@@ -80,9 +80,13 @@ export class HeaderPage implements OnInit {
|
|||||||
/* var data = JSON.parse(value); */
|
/* var data = JSON.parse(value); */
|
||||||
this.notificationLength = value.length;
|
this.notificationLength = value.length;
|
||||||
|
|
||||||
|
}).catch((error) => {
|
||||||
|
if(!error) {
|
||||||
|
this.notificationLength = 0;
|
||||||
|
} else {
|
||||||
|
console.error('header storage get notification', error)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
hideSearch() {
|
hideSearch() {
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user