diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html index bebdb558f..37dd1e50f 100644 --- a/src/app/modals/profile/profile.page.html +++ b/src/app/modals/profile/profile.page.html @@ -40,17 +40,22 @@
- + +
-

{{item.dateInit}}

-

{{item.dateEnd}}

+

{{item.dateInit}}

+

{{item.dateEnd}}

-

{{item.Location}}

-

{{item.alert}}

+

{{item.Location}}

+

{{item.alert}}

+

{{item.desc}}

-
+
+
+
+
diff --git a/src/app/modals/profile/profile.page.scss b/src/app/modals/profile/profile.page.scss index c64fbe321..00bbc3115 100644 --- a/src/app/modals/profile/profile.page.scss +++ b/src/app/modals/profile/profile.page.scss @@ -96,14 +96,39 @@ ion-list{ .approve-event-detail{ width: calc(100% - 115px) !important; float: left; + #profile-title{ + width: 250px; + } } - .notification-label{ + .notification-label-MD-official{ float: right; width: 5px; height: 100%; border-radius: 0% 100% 100% 0%; background-color: #ffb703; } + .notification-label-MD-pessoal{ + float: right; + width: 5px; + height: 100%; + border-radius: 0% 100% 100% 0%; + background-color: #ff0303; + } + + .notification-label-PR-official{ + float: right; + width: 5px; + height: 100%; + border-radius: 0% 100% 100% 0%; + background-color: #03d838; + } + .notification-label-PR-pessoal{ + float: right; + width: 5px; + height: 100%; + border-radius: 0% 100% 100% 0%; + background-color: #8b0ae0; + } } } diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index 192dccbc4..285353b74 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -72,10 +72,11 @@ export class ProfilePage implements OnInit { IdObject: payload.IdObject, FolderId: payload.FolderId, desc: payload.desc, - dateInit: payload.dateInit, - dateEnd: payload.dateEnd, + dateInit: this.getFormatedTime(payload.dateInit), + dateEnd: this.getFormatedTime(payload.dateEnd), Location: payload.Location, TypeAgenda: payload.TypeAgenda, + Role: payload.Role, Status: payload.Status } } else { @@ -87,10 +88,11 @@ export class ProfilePage implements OnInit { IdObject: element.IdObject, FolderId: element.FolderId, desc: element.desc, - dateInit: element.dateInit, - dateEnd: element.dateEnd, + dateInit: this.getFormatedTime(element.dateInit), + dateEnd: this.getFormatedTime(element.dateEnd), Location: element.Location, TypeAgenda: element.TypeAgenda, + Role: element.Role, Status: element.Status } } @@ -107,7 +109,18 @@ export class ProfilePage implements OnInit { console.log('Timer badge count') } + getFormatedTime(dateString){ + var date = new Date(dateString); + var hours = date.getHours() > 12 ? date.getHours() - 12 : date.getHours(); + var am_pm = date.getHours() >= 12 ? "pm" : "am"; + var minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes(); + let time = hours + ":" + minutes /* + " " + am_pm */; + console.log('Formate',time) + return time; + } + notificatinsRoutes = (index, Service, Object, IdObject, FolderId) => { + this.deleteNotification(index); if (Service === "agenda") { this.zone.run(() => this.router.navigate(['/home/agenda', IdObject, 'agenda'])); } @@ -115,7 +128,8 @@ export class ProfilePage implements OnInit { this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', IdObject, 'gabinete-digital'])); } else if (Service === "gabinete-digital" && Object === "event-list") { - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event', IdObject, 'gabinete-digital'])); + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',IdObject, 'gabinete-digital'])); + } else if (Service === "gabinete-digital" && Object === "despachos") { this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', IdObject, 'gabinete-digital'], { replaceUrl: true })); @@ -153,7 +167,7 @@ export class ProfilePage implements OnInit { this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', IdObject, 'gabinete-digital'])); } - this.deleteNotification(index); + } @@ -162,10 +176,6 @@ export class ProfilePage implements OnInit { console.log("Delete notification first stata", this.notificationdata) this.notificationdata = this.notificationdata.filter(item=>item.index !=index ); - if(typeof(this.notificationdata) != 'object' ) { - console.log('=_+_+_+_+_+_+_+_+_+_++_+_+_+_+_+_+_+_+_+_+_+_ not an object') - } - this.storageservice.store("Notifications",JSON.stringify(this.notificationdata)).then(() =>{ this.storageservice.get("Notifications").then((value) =>{ console.log("notfication state", value, ) diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index 906b4cc32..6ae9b2db6 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -231,8 +231,8 @@ export class NotificationsService { else if (data.Service === "gabinete-digital" && data.Object === "expediente") { this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente',data.IdObject,'gabinete-digital'])); } - else if (data.Service === "gabinete-digital" && data.Object === "event-list") { - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',data.IdObject, 'gabinete-digital'])); + else if (data.Service === "agenda" && data.Object === "event-list") { + this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event',data.IdObject, 'agenda'])); }else if (data.Service === "gabinete-digital" && data.Object === "despachos") { this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos',data.IdObject,'gabinete-digital'],{replaceUrl: true})); diff --git a/src/app/services/storage.service.ts b/src/app/services/storage.service.ts index 95ba38c25..7bfd08526 100644 --- a/src/app/services/storage.service.ts +++ b/src/app/services/storage.service.ts @@ -16,7 +16,11 @@ const { Storage } = Plugins; */ // Get the value async get(key: string) { const ret = await this.storage.get(key).then((val) => { return val; }); - return JSON.parse(unescape(atob(ret))); + try { + return JSON.parse(unescape(atob(ret))); + } catch (error) { + return unescape(atob(ret)) + } } async remove(key: string){ diff --git a/src/assets/images/icons-nav-accoes-active.svg b/src/assets/images/icons-nav-accoes-active.svg new file mode 100644 index 000000000..2d12457f3 --- /dev/null +++ b/src/assets/images/icons-nav-accoes-active.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-nav-agenda-active.svg b/src/assets/images/icons-nav-agenda-active.svg new file mode 100644 index 000000000..c1a5e00b6 --- /dev/null +++ b/src/assets/images/icons-nav-agenda-active.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +