From f84e8fe25cba96dc7e1271e1923079b3b6bd2ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Mon, 23 Aug 2021 17:34:12 +0100 Subject: [PATCH] NOtification colors of agenda status solved --- config.xml | 2 +- src/app/modals/profile/profile.page.html | 6 +++--- src/app/modals/profile/profile.page.scss | 8 ++++++++ src/app/modals/profile/profile.page.ts | 22 +++++++++++++++++++++- src/global.scss | 4 ++++ src/theme/variables.scss | 20 ++++++++++++++++++++ 6 files changed, 57 insertions(+), 5 deletions(-) diff --git a/config.xml b/config.xml index 97d2fb38d..7b18d7926 100644 --- a/config.xml +++ b/config.xml @@ -3,7 +3,7 @@ gabinete digital An awesome Ionic/Cordova app. Ionic Framework Team - + diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html index 37dd1e50f..bc73f7e72 100644 --- a/src/app/modals/profile/profile.page.html +++ b/src/app/modals/profile/profile.page.html @@ -36,7 +36,7 @@ *ngFor = "let item of notificationdata; let i = index" (click)="notificatinsRoutes(item.index,item.Service,item.Object,item.IdObject,item.FolderId)" > -
+
@@ -52,10 +52,10 @@

{{item.alert}}

{{item.desc}}

-
+
diff --git a/src/app/modals/profile/profile.page.scss b/src/app/modals/profile/profile.page.scss index 00bbc3115..7ec24baa5 100644 --- a/src/app/modals/profile/profile.page.scss +++ b/src/app/modals/profile/profile.page.scss @@ -63,6 +63,7 @@ ion-list{ background-color: transparent !important; } + .notifications-content{ padding: 0px 20px; .item{ @@ -115,6 +116,13 @@ ion-list{ background-color: #ff0303; } + .item-conten{ + border-right: 5px solid var(--notificationtypeagenda); + border-radius: 5px; + } + + + .notification-label-PR-official{ float: right; width: 5px; diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index f122c2f4c..a40a4e2e5 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -23,6 +23,14 @@ export class ProfilePage implements OnInit { notificationdata: any[] = []; DataArray: Array = []; + service: "agenda"; + typeagenda: "official"; + typeagenda2: "pessoal"; + pr: "100000014"; + md: "100000011"; + date:"60:20"; + location: "Gabinete"; + constructor(private modalController: ModalController, private authService: AuthService, private animationController: AnimationController, @@ -58,7 +66,6 @@ export class ProfilePage implements OnInit { notImplemented() { } async getNotificationData(){ - this.notificationservice.tempClearArray(); this.storageservice.get("Notifications").then((value) => { console.log("Init get store", value) @@ -114,6 +121,18 @@ export class ProfilePage implements OnInit { 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){ var date = new Date(dateString); 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.notificationservice.tempClearArray(); this.deleteNotification(index); diff --git a/src/global.scss b/src/global.scss index 2810984a5..444d76438 100644 --- a/src/global.scss +++ b/src/global.scss @@ -736,6 +736,10 @@ app-header-no-search .ion-toolbar{ --color3: #0782C9; --color4: #0782c9f0; --color5: #45BAFF; + --notificationtypeagenda: #f7f5f2; + --notificationtypeagenda2: #f7f5f2; + --notificationtypeagenda3: #f7f5f2; + --notificationtypeagenda4: #f7f5f2; } body, .blue-background{ background: var(--color) !important;} diff --git a/src/theme/variables.scss b/src/theme/variables.scss index b79a3d724..c8ee5391d 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -402,6 +402,26 @@ $app-theme: mat-light-theme(( 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{ width: 33px; float: left;