diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index d0111b029..d43507fdc 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -1,4 +1,4 @@ - +
@@ -7,7 +7,7 @@
- + Seu calendário @@ -25,7 +25,7 @@ -
+
@@ -33,7 +33,7 @@ -
+

{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}

{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}

@@ -54,7 +54,7 @@ -
+

{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}

{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}

diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.scss b/src/app/pages/gabinete-digital/event-list/event-list.page.scss index de6e94ceb..b5dbc6081 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.scss +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.scss @@ -1,7 +1,11 @@ + +:host{ + padding: 30px 20px 0 20px !important; + margin: 0; +} .header-content{ + margin: 0 !important; overflow: auto; - margin: 0 auto; - padding-top: 25px; } .header-icon-left{ width: 36px; @@ -10,10 +14,10 @@ float: left; } .header-title{ - width: 300px; + //width: 300px; font-family: Roboto; font-size: 25px; - margin: 0 5px 0 5px; + //margin: 0 5px 0 5px; padding: 0; color:#000; float: left; @@ -22,7 +26,7 @@ ion-item-sliding{ margin-top: 5px; } .Rectangle { - width: 360px; + //width: 360px; border-radius: 15px; box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); border: solid 1px #e9e9e9; @@ -32,26 +36,24 @@ ion-item-sliding{ margin-bottom: 10px; overflow: auto; } -.content-mdgpr-Oficial{ - width: 340px; +.content-pr-Oficial{ + background-color: var(--white); border-radius: 5px; border-right: 5px solid #99e47b; overflow: auto; } -.content-mdgpr-Pessoal{ - width: 340px; +.content-pr-Pessoal{ + background-color: var(--white); border-radius: 5px; border-right: 5px solid #958bfc; overflow: auto; } -.content-pr-Oficial{ - width: 340px; +.content-mdgpr-Oficial{ border-radius: 5px; border-right: 5px solid #ffb703; overflow: auto; } -.content-pr-Pessoal{ - width: 340px; +.content-mdgpr-Pessoal{ border-radius: 5px; border-right: 5px solid #f05d5e; overflow: auto; @@ -78,7 +80,7 @@ ion-item-sliding{ margin-left: 10px; } .approve-event-detail p{ - width: 250px; + //width: 250px; font-family: Roboto; font-size: 13px; font-weight: normal; @@ -91,7 +93,7 @@ ion-item-sliding{ padding: 0; } .approve-event-detail h3{ - width: 250px; + //width: 250px; font-family: Roboto; font-size: 15px; font-weight: bold; diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 9f683ff49..c3fb15702 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -13,7 +13,7 @@ import { NavigationEnd, Router } from '@angular/router'; styleUrls: ['./event-list.page.scss'], }) export class EventListPage implements OnInit { - segment:string; + profile:string; showLoader: boolean; eventsPRList: any; eventsMDGPRList: any; @@ -29,11 +29,11 @@ export class EventListPage implements OnInit { private router: Router, private navParams: NavParams, ) { } -S + ngOnInit() { - this.segment = this.navParams.get('segment'); + this.profile = this.navParams.get('profile'); /* console.log(this.navParams.get('md')); */ - console.log(this.segment); + console.log(this.profile); this.LoadToApproveEvents(); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index e6d2c8bbb..c3ee3e6d9 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -164,7 +164,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ const modal = await this.modalController.create({ component: EventListPage, componentProps:{ - segment: profile, + profile: profile, }, cssClass: classs, backdropDismiss: false diff --git a/src/app/shared/agenda/event-list/event-list.component.html b/src/app/shared/agenda/event-list/event-list.component.html index 833d84d2a..4eba898ba 100644 --- a/src/app/shared/agenda/event-list/event-list.component.html +++ b/src/app/shared/agenda/event-list/event-list.component.html @@ -1,7 +1,7 @@
- +