agenda text change again

This commit is contained in:
Eudes Inácio
2023-08-22 11:52:16 +01:00
parent e8adb78b56
commit cb95084c10
3 changed files with 49 additions and 44 deletions
+1 -1
View File
@@ -196,7 +196,7 @@
</ion-row>
<div style="padding-right: 50px" class="font-16-em text-black align-center cursor-pointer" (click)="changeSegment('Combinado')" [class.active]="segment == 'Combinado' ">
Todos...
Todos
</div>
<div style="padding-right: 50px" class="font-16-em text-black align-center cursor-pointer" (click)="changeSegment('Pessoal')" [class.active]="segment == 'Pessoal' ">
Pessoais
+24 -19
View File
@@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, ChangeDetectorRef } from '@angular/core';
import { AnimationController, ModalController, Platform } from '@ionic/angular';
import { SearchPage } from 'src/app/pages/search/search.page';
import { Router } from '@angular/router';
@@ -51,7 +51,8 @@ export class HeaderPage implements OnInit {
public p: PermissionService,
private eventTriger: EventTrigger,
public ActiveTabService: ActiveTabService,
private notificationService: NotificationsService
private notificationService: NotificationsService,
private cdRef: ChangeDetectorRef
) {
this.loggeduser = SessionStore.user;
router.events.subscribe((val) => {
@@ -61,23 +62,8 @@ export class HeaderPage implements OnInit {
this.showProfileModal = false
});
this.eventTriger.getObservable().subscribe((event) => {
if(event.notification == "recive") {
console.log('header', event.notification)
this.notificationLength++
if(window['headerupdate']) {
window['headerupdate']()
}
} else if(event.notification == "deleted") {
console.log('header', event.notification)
this.notificationLength--
if(window['headerupdate']) {
window['headerupdate']()
}
}
});
this.updateReciveNotification();
this.updateDeleteNotification();
/* this.notificationService.notificationReceived.subscribe(() => {
console.log('header', 'event.notification')
@@ -93,6 +79,25 @@ export class HeaderPage implements OnInit {
}
updateReciveNotification() {
this.eventTriger.getObservable().subscribe((event) => {
if (event.notification == "recive") {
console.log('header', event.notification)
this.notificationLength++
}
});
}
updateDeleteNotification() {
this.eventTriger.getObservable().subscribe((event) => {
if (event.notification == "deleted") {
console.log('header', event.notification)
this.notificationLength--
}
});
}
async notificationLengthData() {
await this.storageservice.get("Notifications").then((value) => {
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "5e069a378",
"SHA": "5e069a37836cfedeceda2b740adb35f388e42189",
"shortSHA": "e8adb78b5",
"SHA": "e8adb78b56cf4a0ac7b11d736d3fe37b35b783e5",
"branch": "developer-prod",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Tue Aug 22 09:18:52 2023 +0100'",
"lastCommitTime": "'Tue Aug 22 09:22:08 2023 +0100'",
"lastCommitMessage": "merge",
"lastCommitNumber": "5198",
"lastCommitNumber": "5199",
"change": "",
"changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/shared/header/header.page.ts",
"changeAuthor": "peter.maquiran"
"changeStatus": "On branch developer-prod\nYour branch is behind 'origin/developer-prod' by 1 commit, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/shared/header/header.page.ts",
"changeAuthor": "eudes.inacio"
}