diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 53794d8fd..229d22fdb 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -95,7 +95,12 @@ export class ViewEventPage implements OnInit { goBack() { this.activatedRoute.paramMap.subscribe(params => { - this.router.navigate(['/home',params["params"].caller]); + if(params["params"].caller == 'expediente'){ + window.history.back(); + } + else{ + this.router.navigate(['/home',params["params"].caller]); + } }); /* this.activatedRoute.queryParams.subscribe(params => { diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 3bf8869fb..a8193c345 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -72,29 +72,27 @@
-

Eventos Associados

+
Eventos Associados
-
- - + + - -
-
-

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

-

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

-
-
-

{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}} | {{event.Location}}

-

{{event.StartDate | date: 'd/M/yy' }} | {{event.Location}}

-

{{event.Subject}}

-
-
-
-
+
+
+
{{event.StartDate | date: 'HH:mm'}}
+
{{event.EndDate | date: 'HH:mm'}}
+
+
+
{{event.Location}}
+
{{event.Subject}}
+
+
+ + +
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss index e16af5cfe..15ada0551 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss @@ -197,6 +197,86 @@ ion-button{ } } + +.content-items{ + .item-exp{ + overflow: auto; + padding-top: 5px; + padding-bottom: 5px; + } + ion-list{ + padding: 0px; + margin: 0px; + .d-flex{ + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + } + ion-item{ + padding-bottom: 5px; + margin-top: 5px; + border-bottom: 1px solid #ebebeb; + display: flex; + justify-content: space-between; + align-items: center; + .schedule-time{ + margin-right: 10px; + .time-start{ + color: #797979 !important; + font-family: Roboto; + font-size: 13px; + } + .time-end{ + color: #797979 !important; + font-family: Roboto; + font-size: 13px; + } + } + .schedule-date{ + margin-right: 10px; + width: 22%; + color: #797979 !important; + font-size: 13px; + } + .schedule-details{ + display: flex; + flex-wrap: wrap; + align-items: center; + width: 100%; + .location{ + font-family: Roboto; + font-size: 13px; + color: black; + width: 100%; + + } + .description{ + font-family: Roboto; + font-size: 15px; + font-weight: bold; + color: #0d89d1; + } + } + .color{ + width: 5px; + height: 40px; + border-top-right-radius: 5px; + border-bottom-right-radius: 5px; + background-color: #f05d5e; + } + } + ion-item:last-child{ + border-bottom: unset !important; + padding-bottom: unset !important; + } + } + +} + + + + @media only screen and (max-width: 800px) { .content{ width: 100% !important; diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 619d247c8..afa3def5c 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -115,6 +115,7 @@ export class ExpedienteDetailPage implements OnInit { this.router.navigate(['/home/gabinete-digital'], navigationExtras); } break; + } }); } @@ -320,6 +321,10 @@ export class ExpedienteDetailPage implements OnInit { modal.onDidDismiss(); } + goToEvent(eventId:any){ + this.router.navigate(['/home/events', eventId, 'expediente']); + } + async viewEventDetail(eventId: any) { console.log(this.profile);