mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 12:37:53 +00:00
NOtification colors of agenda status solved
This commit is contained in:
+1
-1
@@ -3,7 +3,7 @@
|
|||||||
<name>gabinete digital</name>
|
<name>gabinete digital</name>
|
||||||
<description>An awesome Ionic/Cordova app.</description>
|
<description>An awesome Ionic/Cordova app.</description>
|
||||||
<author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>
|
<author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>
|
||||||
<content src="index.html" />
|
<content original-src="index.html" src="http://localhost:8100" />
|
||||||
<access origin="*" />
|
<access origin="*" />
|
||||||
<allow-navigation href="http://*/*" />
|
<allow-navigation href="http://*/*" />
|
||||||
<allow-navigation href="https://*/*" />
|
<allow-navigation href="https://*/*" />
|
||||||
|
|||||||
@@ -36,7 +36,7 @@
|
|||||||
*ngFor = "let item of notificationdata; let i = index"
|
*ngFor = "let item of notificationdata; let i = index"
|
||||||
(click)="notificatinsRoutes(item.index,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-conten-{{item.Service}}-{{item.TypeAgenda}}-{{item.Role}}">
|
||||||
<div class="notification-item">
|
<div class="notification-item">
|
||||||
<img class="notification-icon" slot="end" *ngIf = "item.Service == 'agenda'" src="assets/images/icons-default-agenda.svg" >
|
<img class="notification-icon" slot="end" *ngIf = "item.Service == 'agenda'" src="assets/images/icons-default-agenda.svg" >
|
||||||
<img class="notification-icon" slot="end" *ngIf = "item.Service == 'gabinete-digital'" src="assets/images/icons-correspondencias.svg" >
|
<img class="notification-icon" slot="end" *ngIf = "item.Service == 'gabinete-digital'" src="assets/images/icons-correspondencias.svg" >
|
||||||
@@ -52,10 +52,10 @@
|
|||||||
<h3 id="profile-title">{{item.alert}}</h3>
|
<h3 id="profile-title">{{item.alert}}</h3>
|
||||||
<p *ngIf = "item.Service != 'agenda'">{{item.desc}}</p>
|
<p *ngIf = "item.Service != 'agenda'">{{item.desc}}</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="notification-label-MD-official" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'official' && item.Role == '100000011'" ></div>
|
<!-- <div class="notification-label-MD-official" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'official' && item.Role == '100000011'" ></div>
|
||||||
<div class="notification-label-MD-pessoal" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'pessoal' && item.Role == '100000011'" ></div>
|
<div class="notification-label-MD-pessoal" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'pessoal' && item.Role == '100000011'" ></div>
|
||||||
<div class="notification-label-PR-official" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'official' && item.Role == '100000014'" ></div>
|
<div class="notification-label-PR-official" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'official' && item.Role == '100000014'" ></div>
|
||||||
<div class="notification-label-PR-pessoal" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'pessoal' && item.Role == '100000014'" ></div>
|
<div class="notification-label-PR-pessoal" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'pessoal' && item.Role == '100000014'" ></div> -->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ ion-list{
|
|||||||
background-color: transparent !important;
|
background-color: transparent !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.notifications-content{
|
.notifications-content{
|
||||||
padding: 0px 20px;
|
padding: 0px 20px;
|
||||||
.item{
|
.item{
|
||||||
@@ -115,6 +116,13 @@ ion-list{
|
|||||||
background-color: #ff0303;
|
background-color: #ff0303;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.item-conten{
|
||||||
|
border-right: 5px solid var(--notificationtypeagenda);
|
||||||
|
border-radius: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.notification-label-PR-official{
|
.notification-label-PR-official{
|
||||||
float: right;
|
float: right;
|
||||||
width: 5px;
|
width: 5px;
|
||||||
|
|||||||
@@ -23,6 +23,14 @@ export class ProfilePage implements OnInit {
|
|||||||
notificationdata: any[] = [];
|
notificationdata: any[] = [];
|
||||||
DataArray: Array<Object> = [];
|
DataArray: Array<Object> = [];
|
||||||
|
|
||||||
|
service: "agenda";
|
||||||
|
typeagenda: "official";
|
||||||
|
typeagenda2: "pessoal";
|
||||||
|
pr: "100000014";
|
||||||
|
md: "100000011";
|
||||||
|
date:"60:20";
|
||||||
|
location: "Gabinete";
|
||||||
|
|
||||||
constructor(private modalController: ModalController,
|
constructor(private modalController: ModalController,
|
||||||
private authService: AuthService,
|
private authService: AuthService,
|
||||||
private animationController: AnimationController,
|
private animationController: AnimationController,
|
||||||
@@ -58,7 +66,6 @@ export class ProfilePage implements OnInit {
|
|||||||
notImplemented() { }
|
notImplemented() { }
|
||||||
|
|
||||||
async getNotificationData(){
|
async getNotificationData(){
|
||||||
this.notificationservice.tempClearArray();
|
|
||||||
this.storageservice.get("Notifications").then((value) => {
|
this.storageservice.get("Notifications").then((value) => {
|
||||||
console.log("Init get store", value)
|
console.log("Init get store", value)
|
||||||
|
|
||||||
@@ -114,6 +121,18 @@ export class ProfilePage implements OnInit {
|
|||||||
console.log('Timer badge count')
|
console.log('Timer badge count')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
typeAgendaColor(service,typeagenda,role){
|
||||||
|
if (service == "agenda" && typeagenda == "oficial" && role == "100000011"){
|
||||||
|
document.body.style.setProperty(`--notificationtypeagenda`, "#ffb703");
|
||||||
|
} else if( service == "agenda" && typeagenda == "pessoal" && role == "100000011"){
|
||||||
|
document.body.style.setProperty(`--notificationtypeagenda`, "#ff0303");
|
||||||
|
} else if (service == "agenda" && typeagenda == "oficial" && role == "100000014"){
|
||||||
|
document.body.style.setProperty(`--notificationtypeagenda`, "#03d838");
|
||||||
|
} else if (service == "agenda" && typeagenda == "oficial" && role == "100000014"){
|
||||||
|
document.body.style.setProperty(`--notificationtypeagenda`, "#8b0ae0");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
getFormatedTime(dateString){
|
getFormatedTime(dateString){
|
||||||
var date = new Date(dateString);
|
var date = new Date(dateString);
|
||||||
var hours = date.getHours() > 12 ? date.getHours() - 12 : date.getHours();
|
var hours = date.getHours() > 12 ? date.getHours() - 12 : date.getHours();
|
||||||
@@ -172,6 +191,7 @@ export class ProfilePage implements OnInit {
|
|||||||
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']));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.notificationservice.tempClearArray();
|
||||||
this.deleteNotification(index);
|
this.deleteNotification(index);
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -736,6 +736,10 @@ app-header-no-search .ion-toolbar{
|
|||||||
--color3: #0782C9;
|
--color3: #0782C9;
|
||||||
--color4: #0782c9f0;
|
--color4: #0782c9f0;
|
||||||
--color5: #45BAFF;
|
--color5: #45BAFF;
|
||||||
|
--notificationtypeagenda: #f7f5f2;
|
||||||
|
--notificationtypeagenda2: #f7f5f2;
|
||||||
|
--notificationtypeagenda3: #f7f5f2;
|
||||||
|
--notificationtypeagenda4: #f7f5f2;
|
||||||
}
|
}
|
||||||
|
|
||||||
body, .blue-background{ background: var(--color) !important;}
|
body, .blue-background{ background: var(--color) !important;}
|
||||||
|
|||||||
@@ -402,6 +402,26 @@ $app-theme: mat-light-theme((
|
|||||||
overflow: auto;
|
overflow: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.item-conten-agenda-oficial-100000011 {
|
||||||
|
border-radius: 5px;
|
||||||
|
border-right: 5px solid #ffb703;
|
||||||
|
}
|
||||||
|
|
||||||
|
.item-conten-agenda-pessoal-100000011 {
|
||||||
|
border-radius: 5px;
|
||||||
|
border-right: 5px solid #ff0303;
|
||||||
|
}
|
||||||
|
|
||||||
|
.item-conten-agenda-oficial-100000014 {
|
||||||
|
border-radius: 5px;
|
||||||
|
border-right: 5px solid #03d838;
|
||||||
|
}
|
||||||
|
|
||||||
|
.item-conten-agenda, .item-conten-pessoal, .item-conten-100000014 {
|
||||||
|
border-radius: 5px;
|
||||||
|
border-right: 5px solid #8b0ae0;
|
||||||
|
}
|
||||||
|
|
||||||
.approve-event-time{
|
.approve-event-time{
|
||||||
width: 33px;
|
width: 33px;
|
||||||
float: left;
|
float: left;
|
||||||
|
|||||||
Reference in New Issue
Block a user