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

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-11-08 20:53:27 +01:00
parent a8f0ae2a22 2c549931e5
commit 809c8d2726
107 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss
+1 -1
View File
@@ -152,7 +152,7 @@ ion-item{
font-family: Roboto;
font-size: 12pt;
font-weight: 700;
color: #0d89d1;
color: var(--title-text-color);
padding-left: 3px;
.subject{
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
+1 -1
View File
@@ -142,7 +142,7 @@ ion-item{
font-family: Roboto;
font-size: 12pt;
font-weight: 700;
color: #0d89d1;
color: var(--title-text-color);
padding-left: 3px;
.subject{
src/app/pages/gabinete-digital/diplomas/diplomas.page.scss
+1 -1
View File
@@ -132,7 +132,7 @@ ion-item{
font-family: Roboto;
font-size: 12pt;
font-weight: 700;
color: #0d89d1;
color: var(--title-text-color);
padding-left: 3px;
.subject{
src/app/pages/gabinete-digital/pedidos/pedidos.page.scss
+1 -1
View File
@@ -130,7 +130,7 @@ ion-item{
font-family: Roboto;
font-size: 12pt;
font-weight: 700;
color: #0d89d1;
color: var(--title-text-color);
padding-left: 3px;
.subject{
src/app/pages/gabinete-digital/pendentes/pendentes.page.scss
+1 -1
View File
@@ -132,7 +132,7 @@ ion-item{
font-family: Roboto;
font-size: 12pt;
font-weight: 700;
color: #0d89d1;
color: var(--title-text-color);
padding-left: 3px;
.subject{
src/app/pages/search/search.page.scss
+4 -4
View File
@@ -88,7 +88,7 @@ ion-slide{
padding: 0px;
margin: 0px;
font-family: Roboto;
color: #0d89d1;
color: var(--title-text-color);;
font-size: 15px;
text-align: center;
}
@@ -154,7 +154,7 @@ ion-slide{
.order-labal{
font-family: Roboto;
font-size: 15px;
color: #0d89d1;
color: var(--title-text-color);
margin-left: 20px;
}
}
@@ -184,7 +184,7 @@ ion-slide{
width: 100%;
font-family: Roboto;
font-size: 15px;
color: #0d89d1;
color: var(--title-text-color);
line-height: 1.67;
}
span{
@@ -194,7 +194,7 @@ ion-slide{
color: #797979;
}
.app-name{
background: #42b9f2;
background: var(--font-awesome);
border-radius: 18px;
text-align: center;
display: flex;
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss
+1 -1
View File
@@ -136,7 +136,7 @@ ion-item{
font-family: Roboto;
font-size: 12pt;
font-weight: 700;
color: #0d89d1;
color: var(--title-text-color);
padding-left: 3px;
.subject{
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
+1 -1
View File
@@ -121,7 +121,7 @@
font-family: Roboto;
font-size: 12pt;
font-weight: 700;
color: #0d89d1;
color: var(--title-text-color);
padding-left: 3px;
.subject{
src/app/shared/header/header.page.ts
+22 -12
View File
@@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, ViewChild } from '@angular/core';
import { AnimationController, ModalController, Platform } from '@ionic/angular';
import { SearchPage } from 'src/app/pages/search/search.page';
import { Router } from '@angular/router';
@@ -10,6 +10,7 @@ import { SessionStore } from 'src/app/store/session.service';
import { environment } from 'src/environments/environment';
import { EventTrigger } from '../../services/eventTrigger.service';
import { ThemeService } from '../../services/theme.service';
import { interval } from 'rxjs';
@Component({
selector: 'app-header',
@@ -48,7 +49,21 @@ export class HeaderPage implements OnInit {
ngOnInit() {
this.hideSearch();
this.notificationLengthData();
this.notificationLengthData();
this.eventrigger.getObservable().subscribe((data) => {
if (data.notification === "delete" || "recive") {
setInterval(()=>
{
this.notificationLengthData();
console.log('SETTIMEOUT')
}, 1000);
//clearInterval(timer)
console.log('Current badge: ', this.notificationLength)
console.log('Deleted notification', data)
}
})
/* if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
console.log('Notifications not supported')
@@ -58,13 +73,8 @@ export class HeaderPage implements OnInit {
} */
}
ionViewWillEnter() {
this.eventrigger.getObservable().subscribe((data) => {
if (data.notification == "delete" || "recive") {
this.notificationLengthData();
console.log('Deleted notification', data)
}
})
update() {
}
/* UpdateNotificationCount() {
@@ -78,15 +88,15 @@ export class HeaderPage implements OnInit {
)
} */
notificationLengthData() {
this.storageservice.get("Notifications").then((value) => {
async notificationLengthData() {
await this.storageservice.get("Notifications").then((value) => {
console.log("Init get store", value)
/* var data = JSON.parse(value); */
this.notificationLength = value.length;
})
console.log('Timer badge count')
console.log('Timer badge count', this.notificationLength)
}
hideSearch() {