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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-09-22 15:27:43 +01:00
parent 1df6c308b2 c877fe002b
commit c655d720d5
9 changed files with 250 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/header/header.page.html
+5 -5
View File
@@ -42,7 +42,7 @@
<div title="Perfil" class="div-profile cursor-pointer viewport-font-size " (click)="openProfile()">
<!-- <div *ngIf="this.notificationLength > 0" class="icon-badge">{{notificationLength}}</div> -->
<!-- <div *ngIf="this.NotificationHolderService.notificationList.length > 0" class="icon-badge">{{NotificationHolderService.notificationList.length}}</div> -->
<!-- <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="icon font-45-em" src='assets/images/theme/doneIt/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon font-45-em" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon font-45-em" src='assets/images/theme/gov/icons-profile.svg'></ion-icon> -->
@@ -68,8 +68,8 @@
<div class="profile-text">
<div *ngIf="notificationLength > 0" class="icon-badge" style="right: -6px;top: 38px;top: -6px;">
{{notificationLength}} </div>
<div *ngIf="NotificationHolderService.notificationList.length > 0" class="icon-badge" style="right: -6px;top: 38px;top: -6px;">
{{NotificationHolderService.notificationList.length}} </div>
</div>
</div>
</div>
@@ -230,8 +230,8 @@
</div>
<div class="profile-text">
<div *ngIf="notificationLength > 0" class="icon-badge" style="right: -6px;top: 38px;top: -6px;">
{{notificationLength}} </div>
<div *ngIf="NotificationHolderService.notificationList.length > 0" class="icon-badge" style="right: -6px;top: 38px;top: -6px;">
{{NotificationHolderService.notificationList.length}} </div>
</div>
</div>
src/app/shared/header/header.page.ts
+3 -1
View File
@@ -15,6 +15,7 @@ import { EventTrigger } from 'src/app/services/eventTrigger.service'
import { ActiveTabService } from 'src/app/services/active-tab.service';
import { NotificationsService } from 'src/app/services/notifications.service';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { NotificationHolderService } from 'src/app/store/notification-holder.service';
@Component({
selector: 'app-header',
@@ -57,7 +58,8 @@ export class HeaderPage implements OnInit {
private cdRef: ChangeDetectorRef,
private storageService: StorageService,
private zone: NgZone,
private attachmentService: AttachmentsService
private attachmentService: AttachmentsService,
public NotificationHolderService: NotificationHolderService
) {
this.loggeduser = SessionStore.user;
router.events.subscribe((val) => {