diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 0818b3d90..93247d8de 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -67,6 +67,10 @@ const routes: Routes = [ { path:':eventId/:caller', loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule), + }, + { + path: 'eventId/:caller', + loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule) } ] }, diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index 98f214cce..fcb3dc779 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -1,4 +1,4 @@ - + - -
-
-
-
- {{loadedEvent.Location}} -
-
- {{loadedEvent.CalendarName}} -
-
-
- -

{{customDate}}

-

das {{loadedEvent.StartDate}} às {{loadedEvent.EndDate}}

-

(Não se repete)

-

Repete

-
-
-
-
- - -

Intervenientes

-
-

{{attendee.Name}}

+ +
+
+
+
+
+
- - - - -

Detalhes

-

{{loadedEvent.Body.Text}}

-
-
-
- -
- -

Documentos Anexados

+
+ {{loadedEvent.Subject}} +
+
+ + +
+
+
+
+
+

{{loadedEvent.Location}}{{loadedEvent.CalendarName}}

+
+
+ +

{{customDate}}

+

das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}

+

(Não se repete)

+

Repete

+
+
+
+
+
Intervenientes
- -

{{attach.SourceName}}

-

{{attach.Stakeholders}}{{ attach.CreateDate | date: 'dd-MM-yy' }}

-
-
- + +
+

{{attendee.Name}}

+
+
+ +
Detalhes
+ + +

+
+
+
+ +
+ +

Documentos Anexados

+ + +

{{attach.SourceName}}

+

{{attach.Stakeholders}}{{ attach.CreateDate | date: 'dd-MM-yy' }}

+
+
+
+
+
+
+
+ +
+ +
\ No newline at end of file diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss index ba5e0870f..c74dbf83b 100644 --- a/src/app/pages/agenda/view-event/view-event.page.scss +++ b/src/app/pages/agenda/view-event/view-event.page.scss @@ -1,9 +1,9 @@ ion-content{ --background:transparent; - --padding-top:0px; + /* --padding-top:0px; --padding-start: 20px; --padding-end: 20px; - font-size: 18px; + font-size: 18px; */ } ion-menu{ --height: 225px; @@ -13,19 +13,13 @@ ion-menu{ --opacity: 1; } .main-header{ - width: 100%; /* 400px */ - height: 100%; font-family: Roboto; - border-top-left-radius: 25px; - border-top-right-radius: 25px; background-color: #fff; overflow:hidden; - padding: 30px 0px 0px 0px; color:#000; transform: translate3d(0, 1px, 0); .title-content{ - padding: 0px 20px; margin: 0px auto; overflow: auto; background: #fff; @@ -37,10 +31,10 @@ ion-menu{ overflow: hidden; } .middle{ - width: 230px; + //width: 230px; padding: 0!important; float: left; - margin: 2.5px 0 0 0; + //margin: 2.5px 0 0 0; } .header-icon-right{ width: 45px; @@ -74,13 +68,16 @@ ion-menu{ } .main-content{ - width: 100%; /* 400px */ - height: 100%; font-family: Roboto; margin: 0 auto; background-color: #fff; overflow:auto; - padding: 15px 0px 0 0px; + + .content{ + padding: 30px 20px 0 20px !important; + margin: 0; + float: left; + } .upper-content{ margin-left: 50px; @@ -92,6 +89,14 @@ ion-menu{ margin: 0 auto; padding: 0; overflow: auto; + + .label{ + border-radius: 20px; + background: #ffb703; + float: right; + padding: 5px 13.5px 5px 13.5px; + color: #fff; + } } .location-detail{ @@ -188,4 +193,41 @@ ion-menu{ font-size: 13px; } } + } + .aside-right{ + padding: 30px 20px 0 20px !important; + + .arrow-right{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + + .arrow-right-icon{ + width: 37px; + float: right; + font-size: 35px; + overflow: hidden; + } + } + .buttons{ + display: flex; + flex-wrap: wrap; + justify-content: space-between; + + .btn-ok, .btn-cancel, .btn-delete{ + height: auto !important; + font-size: 16px !important; + font-weight: 600 !important; + width: 100% !important; + margin-bottom: 10px !important; + padding: 15px !important; + } + } + .solid { + display: block; + width: 90%; + border-top: 1px solid #ebebeb; + margin: 0 auto !important; + margin-bottom: 10px !important; + } } \ No newline at end of file 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 3ccb997eb..c854e5c77 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 @@ -56,9 +56,8 @@
-
+
-