Merge with peter changes

This commit is contained in:
Eudes Inácio
2021-08-30 15:00:44 +01:00
37 changed files with 560 additions and 208 deletions
+7 -1
View File
@@ -77,8 +77,14 @@
</div>
<div class="div-profile d-flex cursor-pointer" (click)="openProfile()">
<ion-icon class="icon" src='assets/images/icons-profile.svg'></ion-icon>
<ion-label class="profile-text">{{profileLabel(loggeduser.Profile)}}</ion-label>
<div class="profile-text">
<ion-label>{{profileLabel(loggeduser.Profile)}}</ion-label>
<div *ngIf="this.notificationLength > 0 && !production" class="icon-badge" style="right: -18px;top: -9px;" >{{this.notificationLength}}</div>
</div>
</div>
</div>
</div>
+5 -3
View File
@@ -7,6 +7,7 @@ import { ProfilePage } from 'src/app/modals/profile/profile.page';
import { StorageService } from '../../services/storage.service';
import { SessionStore } from 'src/app/store/session.service';
import { NotificationsService } from '../../services/notifications.service';
import { environment } from 'src/environments/environment';
@Component({
selector: 'app-header',
@@ -24,6 +25,8 @@ export class HeaderPage implements OnInit {
notificationLength: 0;
SessionStore = SessionStore
production = environment.production
constructor(
private router: Router,
private modalController: ModalController,
@@ -46,8 +49,6 @@ export class HeaderPage implements OnInit {
} else {
this.UpdateNotificationCount();
}
}
@@ -154,7 +155,8 @@ export class HeaderPage implements OnInit {
componentProps: {
}
});
return await modal.present();
await modal.present();
}
async dynamicSearch() {