mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 05:16:07 +00:00
Remove notification foreground
This commit is contained in:
@@ -34,7 +34,7 @@
|
|||||||
<ion-list>
|
<ion-list>
|
||||||
<div class="item cursor-pointer ion-no-padding ion-no-margin" lines="none"
|
<div class="item cursor-pointer ion-no-padding ion-no-margin" lines="none"
|
||||||
*ngFor = "let item of notificationdata; let i = index"
|
*ngFor = "let item of notificationdata; let i = index"
|
||||||
(click)="notificatinsRoutes(item.Service,item.Object,item.IdObject,item.FolderId)"
|
(click)="notificatinsRoutes(item.index,item.Service,item.Object,item.IdObject,item.FolderId)"
|
||||||
>
|
>
|
||||||
<div class="item-content width-100">
|
<div class="item-content width-100">
|
||||||
<div class="notification-item">
|
<div class="notification-item">
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import { LocalstoreService } from 'src/app/store/localstore.service';
|
|||||||
import { EditProfilePage } from './edit-profile/edit-profile.page';
|
import { EditProfilePage } from './edit-profile/edit-profile.page';
|
||||||
import { JsonStore } from '../../services/jsonStore.service';
|
import { JsonStore } from '../../services/jsonStore.service';
|
||||||
import { StorageService } from '../../services/storage.service';
|
import { StorageService } from '../../services/storage.service';
|
||||||
|
import { NotificationsService } from '../../services/notifications.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-profile',
|
selector: 'app-profile',
|
||||||
@@ -30,6 +31,7 @@ export class ProfilePage implements OnInit {
|
|||||||
private jsonstore: JsonStore,
|
private jsonstore: JsonStore,
|
||||||
private storageservice: StorageService,
|
private storageservice: StorageService,
|
||||||
private zone: NgZone,
|
private zone: NgZone,
|
||||||
|
private notificationservice: NotificationsService
|
||||||
) {
|
) {
|
||||||
|
|
||||||
this.loggeduser = authService.ValidatedUser;
|
this.loggeduser = authService.ValidatedUser;
|
||||||
@@ -43,10 +45,11 @@ export class ProfilePage implements OnInit {
|
|||||||
this.storageservice.get("Notifications").then((value) => {
|
this.storageservice.get("Notifications").then((value) => {
|
||||||
|
|
||||||
var data = JSON.parse(value);
|
var data = JSON.parse(value);
|
||||||
data.forEach(element => {
|
data.forEach((element, i) => {
|
||||||
console.log("ARaaAA", element)
|
console.log("ARaaAA", element)
|
||||||
var payload = JSON.parse(element.payload)
|
var payload = JSON.parse(element.payload)
|
||||||
let notificationObject = {
|
let notificationObject = {
|
||||||
|
index: i,
|
||||||
alert: element.alert,
|
alert: element.alert,
|
||||||
Service: payload.Service,
|
Service: payload.Service,
|
||||||
Object: payload.Object,
|
Object: payload.Object,
|
||||||
@@ -75,7 +78,7 @@ export class ProfilePage implements OnInit {
|
|||||||
|
|
||||||
notImplemented() { }
|
notImplemented() { }
|
||||||
|
|
||||||
notificatinsRoutes = (Service,Object,IdObject,FolderId) => {
|
notificatinsRoutes = (index, Service, Object, IdObject, FolderId) => {
|
||||||
if (Service === "agenda") {
|
if (Service === "agenda") {
|
||||||
this.zone.run(() => this.router.navigate(['/home/agenda', IdObject, 'agenda']));
|
this.zone.run(() => this.router.navigate(['/home/agenda', IdObject, 'agenda']));
|
||||||
}
|
}
|
||||||
@@ -125,6 +128,18 @@ export class ProfilePage implements OnInit {
|
|||||||
else if (Service === "gabinete-digital" && Object === "expedientes-pr") {
|
else if (Service === "gabinete-digital" && Object === "expedientes-pr") {
|
||||||
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', IdObject, 'gabinete-digital']));
|
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', IdObject, 'gabinete-digital']));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const indexx = this.notificationdata.indexOf(index, 0);
|
||||||
|
if (indexx > -1) {
|
||||||
|
this.notificationdata.splice(index, 1);
|
||||||
|
console.log('This notificatio', this.notificationdata);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.notificationservice.removeDepartment(index);
|
||||||
|
console.log('This notificatio 2', this.notificationdata);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
logout() {
|
logout() {
|
||||||
|
|||||||
@@ -165,6 +165,16 @@ export class NotificationsService {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
removeDepartment(index): void {
|
||||||
|
/* this.DataArray[this.DataArray.findIndex(item => item.index == index)];
|
||||||
|
this.DataArray.splice( this.DataArray.findIndex(item => item.indexOf(index.to) === 'William'),1); */
|
||||||
|
const indexx = this.DataArray.indexOf(index, 0);
|
||||||
|
if (indexx > -1) {
|
||||||
|
this.DataArray.splice(index, 1);
|
||||||
|
console.log('This notificatio', this.DataArray);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async onReceviNotification() {
|
async onReceviNotification() {
|
||||||
|
|
||||||
if(window['WLAuthorizationManager']) {
|
if(window['WLAuthorizationManager']) {
|
||||||
@@ -185,6 +195,7 @@ export class NotificationsService {
|
|||||||
var notificationReceived = (message) => {
|
var notificationReceived = (message) => {
|
||||||
//this.jsonstore.createCollection('Notifications',message);
|
//this.jsonstore.createCollection('Notifications',message);
|
||||||
this.DataArray.push(message)
|
this.DataArray.push(message)
|
||||||
|
console.log("On ReceiveNotification", message)
|
||||||
this.storageService.store("Notifications",JSON.stringify(this.DataArray))
|
this.storageService.store("Notifications",JSON.stringify(this.DataArray))
|
||||||
|
|
||||||
console.log(message);
|
console.log(message);
|
||||||
@@ -196,7 +207,9 @@ export class NotificationsService {
|
|||||||
if(message.actionName){
|
if(message.actionName){
|
||||||
this.notificatinsRoutes(data);
|
this.notificatinsRoutes(data);
|
||||||
} else {
|
} else {
|
||||||
this.toastService.notificationMessage(message.alert,this.notificatinsRoutes, data);
|
/* this.toastService.notificationMessage(message.alert,this.notificatinsRoutes, data); */
|
||||||
|
//this.notificatinsRoutes(data);
|
||||||
|
console.log(data)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,6 +18,12 @@ const { Storage } = Plugins; */
|
|||||||
const ret = await this.storage.get(key).then((val) => { return val; });
|
const ret = await this.storage.get(key).then((val) => { return val; });
|
||||||
return JSON.parse(unescape(atob(ret)));
|
return JSON.parse(unescape(atob(ret)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async remove(key: string){
|
||||||
|
await this.storage.remove(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
// Get the value
|
// Get the value
|
||||||
async get(storageKey: string) {
|
async get(storageKey: string) {
|
||||||
|
|||||||
Reference in New Issue
Block a user