From ab9f73b621501789e67a4ac5fadf53389fea98b7 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 9 Apr 2021 10:33:19 +0100
Subject: [PATCH 1/4] 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)"
       ></app-new-event>
+
       <!-- Edit -->
       <app-edit-event  *ngIf="mobileComponent.showEditEvent"
         [taskParticipants]="taskParticipants"
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 3a2c9a228..669c41f1a 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -1060,6 +1060,7 @@ export class AgendaPage implements OnInit {
   }
 
   async clearPostEvent(){
+    alert('postEvent');
     this.postEvent = false;
   }
 
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index 92ee11744..5ce556a7a 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -14,196 +14,194 @@
       </ion-header>
       </div>
       <ion-item-sliding class="overflow-y-auto">
-      
   
-          <div class="px-20">
-            <div class="ion-item-container width-100">
-              <ion-input  placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
-            </div>
-            <div class="container-div width-100">
-              <div class="ion-item-class-2">
-                <div class="ion-icon-class">
-                  <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
-                </div>
-                <div class="ion-input-class">
-                  <ion-input placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
-                </div>
-              </div>
-              <!-- Error messages -->
-              <!-- <span class="error ion-padding" >
-                Campo obrigatório
-              </span> -->
-          
-            </div>
-          
-            <div class="container-div width-100">
-              <div class="ion-item-class-2">
-                <div class="ion-icon-class">
-                  <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
-                </div>
-                <div class="ion-input-class">
-                  <ion-select disabled  placeholder="Selecione agenda"
-                  selectedText="{{postEvent.CalendarName}}" 
-                  [(ngModel)]="postEvent.CalendarName" 
-                  interface="action-sheet" Cancel-text="Cancelar" 
-                  required>
-                    <ion-select-option value="Oficial">Oficial</ion-select-option>
-                    <ion-select-option value="Pessoal">Pessoal</ion-select-option>
-                  </ion-select>
-                </div>
-              </div>
-            </div>
-      
-            <div class="container-div width-100">
-              <div class="ion-item-class-2">
-                <div class="ion-icon-class">
-                  <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
-                </div>
-                <div class="ion-input-class">
-                  <ion-select  placeholder="Selecione tipo" 
-                  [(ngModel)]="postEvent.Categories[0]"
-                  selectedText="{{postEvent.Categories[0]}}"
-                  interface="action-sheet" 
-                  Cancel-text="Cancelar" required>
-                    <ion-select-option value="Reunião">Reunião</ion-select-option>
-                    <ion-select-option value="Viagem">Viagem</ion-select-option>
-                    <ion-select-option value="Conferência">Conferência</ion-select-option>
-                    <ion-select-option value="Encontro">Encontro</ion-select-option>
-                  </ion-select>
-                </div>
-              </div>
-            </div>
-          
-            <div class="container-div width-100">
-              <div class="ion-item-class-2 width-100">
-                <div class="ion-icon-class">
-                  <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
-                </div>
-                <div class="ion-input-class width-100">
-                  <ion-datetime 
-                    placeholder="Início"
-                    [(ngModel)]="postEvent.StartDate"
-                    displayFormat="D MMM YYYY H:mm"
-                    minuteValues="0,15,30,45"
-                    monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-                    min="2018" 
-                    max="2022" 
-                  >
-                  </ion-datetime>
-                  <!-- <ion-input placeholder="Data início" [(ngModel)]="postData.StartDate"></ion-input> -->
-                </div>
-              </div>
-            </div>
-            
-            <div class="container-div width-100">
-              <div class="ion-item-class-2">
-                <div class="ion-icon-class">
-                  <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
-                </div>
-                <div class="ion-input-class">
-                  <ion-datetime 
-                    placeholder="Fim"
-                    [(ngModel)]="postEvent.EndDate"
-                    displayFormat="D MMM YYYY H:mm"
-                    minuteValues="0,15,30,45"
-                    monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-                    min="2018" 
-                    max="2022" 
-                  >
-                  </ion-datetime>
-                  <!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
-                </div>
-              </div>
-            </div>
-            
-            <div class="container-div width-100">
-              <div class="ion-item-class-2">
-                <div class="ion-icon-class">
-                  <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
-                </div>
-                <div class="ion-input-class">
-                  <ion-select placeholder="Selecione repetição" 
-                  [(ngModel)]="postEvent.IsRecurring"
-                  selectedText="{{isRecurring}}" 
-                  interface="action-sheet" 
-                  Cancel-text="Cancelar" required>
-                    <ion-select-option value="false">Não se repete</ion-select-option>
-                    <ion-select-option value="true">Repete</ion-select-option>
-                  </ion-select>
-                </div>
-              </div>
-            </div>
-            
-            <div class="width-100">
-    
-              <div class="container-div width-50">
-                <div class="ion-item-class-2">
-                  <div class="ion-icon-class">
-                    <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
-                  </div>
-                  <div class="ion-input-class-no-height d-flex">
-                    <div class="list-people flex-grow-1">
-                      <ion-item lines="none">
-                        <ion-list>
-                          <ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
-                          <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
-                        </ion-list>
-                      </ion-item>
-                    </div>
-                    <div class="add-people">
-                      <ion-icon (click)="addParticipants()" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
-                    </div>
-                  </div>
-                </div>
-              </div>
-
-              <div class="container-div width-50">
-                <div class="ion-item-class-2">
-                  <div class="ion-icon-class">
-                    <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
-                  </div>
-                  <div class="ion-input-class-no-height d-flex">
-                    <div class="list-people flex-grow-1">
-                      <ion-item lines="none">
-                        <ion-list>
-                          <ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
-                          <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
-                        </ion-list>
-                      </ion-item>
-                    </div>
-                    <div class="add-people">
-                      <ion-icon (click)="addParticipantsCC()" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
-                    </div>
-                  </div>
-                </div>
-              </div>
-    
-            </div>
+        <div class="px-20">
+          <div class="ion-item-container width-100">
+            <ion-input  placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
           </div>
-          
-          <div class="container-div width-100 pb-20">
-            <div class="ion-item-class-2 d-flex">
+          <div class="container-div width-100">
+            <div class="ion-item-class-2">
               <div class="ion-icon-class">
-                <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
+                <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
               </div>
-              <div class="ion-input-class-no-height width-100">
-                <ion-textarea placeholder="Detalhes" [(ngModel)]="postEvent.Body.Text" rows="6" cols="20"></ion-textarea>
+              <div class="ion-input-class">
+                <ion-input placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
               </div>
             </div>
-            
-            <div hidden class="ion-item-container-no-border">
-              <ion-label>
-                <div class="attach-icon">
-                  <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
-                </div>
-                <div class="attach-document">
-                  <ion-label>Anexar Documentos</ion-label>
-                </div> 
-              </ion-label>
-            </div>
-            
+            <!-- Error messages -->
+            <!-- <span class="error ion-padding" >
+              Campo obrigatório
+            </span> -->
+        
           </div>
         
+          <div class="container-div width-100">
+            <div class="ion-item-class-2">
+              <div class="ion-icon-class">
+                <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+              </div>
+              <div class="ion-input-class">
+                <ion-select disabled  placeholder="Selecione agenda"
+                selectedText="{{postEvent.CalendarName}}" 
+                [(ngModel)]="postEvent.CalendarName" 
+                interface="action-sheet" Cancel-text="Cancelar" 
+                required>
+                  <ion-select-option value="Oficial">Oficial</ion-select-option>
+                  <ion-select-option value="Pessoal">Pessoal</ion-select-option>
+                </ion-select>
+              </div>
+            </div>
+          </div>
+    
+          <div class="container-div width-100">
+            <div class="ion-item-class-2">
+              <div class="ion-icon-class">
+                <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+              </div>
+              <div class="ion-input-class">
+                <ion-select  placeholder="Selecione tipo" 
+                [(ngModel)]="postEvent.Categories[0]"
+                selectedText="{{postEvent.Categories[0]}}"
+                interface="action-sheet" 
+                Cancel-text="Cancelar" required>
+                  <ion-select-option value="Reunião">Reunião</ion-select-option>
+                  <ion-select-option value="Viagem">Viagem</ion-select-option>
+                  <ion-select-option value="Conferência">Conferência</ion-select-option>
+                  <ion-select-option value="Encontro">Encontro</ion-select-option>
+                </ion-select>
+              </div>
+            </div>
+          </div>
+        
+          <div class="container-div width-100">
+            <div class="ion-item-class-2 width-100">
+              <div class="ion-icon-class">
+                <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+              </div>
+              <div class="ion-input-class width-100">
+                <ion-datetime 
+                  placeholder="Início"
+                  [(ngModel)]="postEvent.StartDate"
+                  displayFormat="D MMM YYYY H:mm"
+                  minuteValues="0,15,30,45"
+                  monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
+                  min="2018" 
+                  max="2022" 
+                >
+                </ion-datetime>
+                <!-- <ion-input placeholder="Data início" [(ngModel)]="postData.StartDate"></ion-input> -->
+              </div>
+            </div>
+          </div>
+          
+          <div class="container-div width-100">
+            <div class="ion-item-class-2">
+              <div class="ion-icon-class">
+                <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+              </div>
+              <div class="ion-input-class">
+                <ion-datetime 
+                  placeholder="Fim"
+                  [(ngModel)]="postEvent.EndDate"
+                  displayFormat="D MMM YYYY H:mm"
+                  minuteValues="0,15,30,45"
+                  monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
+                  min="2018" 
+                  max="2022" 
+                >
+                </ion-datetime>
+                <!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
+              </div>
+            </div>
+          </div>
+          
+          <div class="container-div width-100">
+            <div class="ion-item-class-2">
+              <div class="ion-icon-class">
+                <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
+              </div>
+              <div class="ion-input-class">
+                <ion-select placeholder="Selecione repetição" 
+                [(ngModel)]="postEvent.IsRecurring"
+                selectedText="{{isRecurring}}" 
+                interface="action-sheet" 
+                Cancel-text="Cancelar" required>
+                  <ion-select-option value="false">Não se repete</ion-select-option>
+                  <ion-select-option value="true">Repete</ion-select-option>
+                </ion-select>
+              </div>
+            </div>
+          </div>
+          
+          <div class="width-100">
+  
+            <div class="container-div width-50">
+              <div class="ion-item-class-2">
+                <div class="ion-icon-class">
+                  <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
+                </div>
+                <div class="ion-input-class-no-height d-flex">
+                  <div class="list-people flex-grow-1">
+                    <ion-item lines="none">
+                      <ion-list>
+                        <ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
+                        <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
+                      </ion-list>
+                    </ion-item>
+                  </div>
+                  <div class="add-people">
+                    <ion-icon (click)="addParticipants()" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div class="container-div width-50">
+              <div class="ion-item-class-2">
+                <div class="ion-icon-class">
+                  <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
+                </div>
+                <div class="ion-input-class-no-height d-flex">
+                  <div class="list-people flex-grow-1">
+                    <ion-item lines="none">
+                      <ion-list>
+                        <ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
+                        <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
+                      </ion-list>
+                    </ion-item>
+                  </div>
+                  <div class="add-people">
+                    <ion-icon (click)="addParticipantsCC()" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                  </div>
+                </div>
+              </div>
+            </div>
+  
+          </div>
+        </div>
+        
+        <div class="container-div width-100 pb-20">
+          <div class="ion-item-class-2 d-flex">
+            <div class="ion-icon-class">
+              <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
+            </div>
+            <div class="ion-input-class-no-height width-100">
+              <ion-textarea placeholder="Detalhes" [(ngModel)]="postEvent.Body.Text" rows="6" cols="20"></ion-textarea>
+            </div>
+          </div>
+          
+          <div hidden class="ion-item-container-no-border">
+            <ion-label>
+              <div class="attach-icon">
+                <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
+              </div>
+              <div class="attach-document">
+                <ion-label>Anexar Documentos</ion-label>
+              </div> 
+            </ion-label>
+          </div>
+          
+        </div>
 
         <div hidden>
           <ion-item>
diff --git a/src/app/shared/agenda/new-event/new-event.component.ts b/src/app/shared/agenda/new-event/new-event.component.ts
index d209102ce..293dcf94a 100644
--- a/src/app/shared/agenda/new-event/new-event.component.ts
+++ b/src/app/shared/agenda/new-event/new-event.component.ts
@@ -116,10 +116,10 @@ export class NewEventPage implements OnInit {
     
     this.postEvent.Attendees = this.taskParticipants;
     
-    if(this.profile=='mdgpr'){
+    if(this.profile=='mdgpr') {
       this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe();
     }
-    else if(this.profile=='pr'){
+    else if(this.profile=='pr') {
       this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).subscribe();
     }
     
@@ -134,6 +134,9 @@ export class NewEventPage implements OnInit {
 
 
   async addParticipants() {
+
+    this.saveTemporaryData();
+
     this.openAttendeesComponent.emit({
       type: "intervenient"
     });
@@ -142,6 +145,9 @@ export class NewEventPage implements OnInit {
   }
 
   async addParticipantsCc() {
+
+    this.saveTemporaryData();
+    
     this.openAttendeesComponent.emit({
       type: "CC"
     });

From 439ac302ebbb82ffc1be646db5f0de2f06bb63d9 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 9 Apr 2021 10:44:54 +0100
Subject: [PATCH 2/4] Update gitignore file

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 5f038d25c..4cf0a4c62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,7 @@ npm-debug.log*
 # Custom
 /android
 /package-lock.json
+
+
+src/app/architect/
+src/environments/environment.e2e.ts
\ No newline at end of file

From 717b531e219f50a8e73ed2188514bffc39836139 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 9 Apr 2021 11:12:07 +0100
Subject: [PATCH 3/4] Add text holder

---
 .../expedient-task-modal/expedient-task-modal.page.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index 1585f5692..b416942c5 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -56,7 +56,7 @@
             <div class="list-people">
               <ion-item lines="none">
                 <ion-list>
-                  <ion-label *ngIf="!taskParticipants && taskParticipants.length >= 1" class="list-people-title">Adicionar intervenientes</ion-label>
+                  <ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
                   <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                 </ion-list>
               </ion-item>
@@ -77,7 +77,7 @@
             <div class="list-people">
               <ion-item lines="none">
                 <ion-list>
-                  <ion-label *ngIf="!taskParticipantsCc && taskParticipantsCc.length >= 1" class="list-people-title">Com conhecimento</ion-label>
+                  <ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Com conhecimento</ion-label>
                   <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
                 </ion-list>
               </ion-item>

From e8ba2b64268282412a2d5acb09527f31c62d1156 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 9 Apr 2021 11:24:54 +0100
Subject: [PATCH 4/4] Remove commit

---
 src/app/pages/agenda/agenda.page.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 669c41f1a..3a2c9a228 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -1060,7 +1060,6 @@ export class AgendaPage implements OnInit {
   }
 
   async clearPostEvent(){
-    alert('postEvent');
     this.postEvent = false;
   }