From 91713760ecbfb516633722dd772de2dcd89d62b4 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 9 Apr 2021 10:09:33 +0100 Subject: [PATCH 01/11] save --- .../approve-event-modal.page.html | 2 +- .../pages/agenda/view-event/view-event.page.html | 13 +++++++++---- .../approve-event-modal.page.html | 5 +++-- 3 files changed, 13 insertions(+), 7 deletions(-) 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 12689f63c..37f1e01c5 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 @@ -39,7 +39,7 @@
- {{loadedEvent.workflowInstanceDataFields.Location}} + 11{{loadedEvent.workflowInstanceDataFields.Location}}
{{loadedEvent.workflowInstanceDataFields.Agenda}} 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 8980a1bc8..61abd4fa6 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -31,8 +31,12 @@ {{loadedEvent.Subject}}
- - + +
@@ -75,9 +79,10 @@
Documentos Anexados
- - +

{{attach.SourceName}}

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

diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html index 5bf3fe573..1c47242a0 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html @@ -60,10 +60,11 @@

{{loadedEvent.workflowInstanceDataFields.Participants}}

Detalhes
- -

{{loadedEvent.workflowInstanceDataFields.Body}}

+ +
+
From 073d929a858160bf25f3c9f297417855626917e9 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 9 Apr 2021 10:17:09 +0100 Subject: [PATCH 02/11] save --- .../approve-event-modal.page.html | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html index 1c47242a0..6a0847123 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html @@ -1,7 +1,9 @@
- +
@@ -55,10 +57,13 @@
-
Intervenientes
- -

{{loadedEvent.workflowInstanceDataFields.Participants}}

-
+
+
Intervenientes
+
+ {{att.Name}} +
+
+
Detalhes
From ab9f73b621501789e67a4ac5fadf53389fea98b7 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 9 Apr 2021 10:33:19 +0100 Subject: [PATCH 03/11] Improve agenda edit event --- src/app/pages/agenda/agenda.page.html | 1 + src/app/pages/agenda/agenda.page.ts | 1 + .../agenda/edit-event/edit-event.page.html | 362 +++++++++--------- .../agenda/new-event/new-event.component.ts | 10 +- 4 files changed, 190 insertions(+), 184 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 24c136bd3..5ddd3daa6 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -372,6 +372,7 @@ (setIntervenient)="setIntervenient($event)" (setIntervenientCC)="setIntervenientCC($event)" > +
- -
-
- -
-
-
-
- -
-
- -
-
- - - -
- -
-
-
- -
-
- - Oficial - Pessoal - -
-
-
- -
-
-
- -
-
- - Reunião - Viagem - Conferência - Encontro - -
-
-
- -
-
-
- -
-
- - - -
-
-
- -
-
-
- -
-
- - - -
-
-
- -
-
-
- -
-
- - Não se repete - Repete - -
-
-
- -
- -
-
-
- -
-
-
- - - Adicionar intervenientes - {{participant.Name}} - - -
-
- -
-
-
-
- -
-
-
- -
-
-
- - - Adicionar intervenientes - {{participant.Name}} - - -
-
- -
-
-
-
- -
+
+
+
- -
-
+
+
- +
-
- +
+
- - - + + +
+
+
+
+ +
+
+ + Oficial + Pessoal + +
+
+
+ +
+
+
+ +
+
+ + Reunião + Viagem + Conferência + Encontro + +
+
+
+ +
+
+
+ +
+
+ + + +
+
+
+ +
+
+
+ +
+
+ + + +
+
+
+ +
+
+
+ +
+
+ + Não se repete + Repete + +
+
+
+ +
+ +
+
+
+ +
+
+
+ + + Adicionar intervenientes + {{participant.Name}} + + +
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+ + + Adicionar intervenientes + {{participant.Name}} + + +
+
+ +
+
+
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+ + + +