{{customDate}}
+das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}
+(Não se repete)
+diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html
index c07224699..ff474f0f3 100644
--- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html
+++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html
@@ -1,24 +1,34 @@
- {{loadedEvent.workflowInstanceDataFields.Location}} {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'fullDate'}} das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}} (Não se repete) {{customDate}} das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}} (Não se repete) {{loadedEvent.workflowInstanceDataFields.Body}} MINEC, MINFIN13/04/2020 Receita por Natureza OAPR - GTI13/04/2020Intervenientes
@@ -31,17 +41,20 @@
Documentos
+
+ Lei do Orçamento Geral do Estado
-
{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}
{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}
@@ -50,7 +50,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 4c7daf5b6..b611fab86 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 @@ -12,18 +12,30 @@ ion-item-sliding{ margin-bottom: 10px; overflow: auto; } -.content-Oficial{ +.content-mdgpr-Oficial{ width: 340px; border-radius: 5px; border-right: 5px solid #99e47b; overflow: auto; } -.content-Pessoal{ +.content-mdgpr-Pessoal{ width: 340px; border-radius: 5px; border-right: 5px solid #958bfc; overflow: auto; } +.content-pr-Oficial{ + width: 340px; + border-radius: 5px; + border-right: 5px solid #ffb703; + overflow: auto; +} +.content-pr-Pessoal{ + width: 340px; + border-radius: 5px; + border-right: 5px solid #f05d5e; + overflow: auto; +} .approve-event-time{ float: left; 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 c43aaa086..3066515fc 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 @@ -40,7 +40,6 @@ export class EventListPage implements OnInit { LoadToApproveEvents(){ this.showLoader = true; - console.log(this.showLoader); this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{ this.showLoader = false; diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.scss b/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.scss index e69de29bb..5e0ed3224 100644 --- a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.scss @@ -0,0 +1,29 @@ +ion-header{ + padding: 20px 20px 0px 20px; +} +ion-content{ + --padding-top: 20px; + --padding-start: 15px; + --padding-end: 20px; +} + +.container-footer{ + margin:0 auto; + overflow: auto; +} +.button-cancel { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #e0e9ee; + --color: #061b52; + margin:10px; + } + .button-save { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #42b9fe; + --color:#ffffff; + margin:10px; + } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index 3b872a33a..7653c3cb7 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -2,8 +2,9 @@