From 3386c3e22c2da126763c22818ba862cc4dd6fa65 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 30 Aug 2023 18:43:48 +0100
Subject: [PATCH] merge

---
 src/app/pages/agenda/edit-event/edit-event.page.ts |  2 +-
 .../shared/agenda/edit-event/edit-event.page.ts    |  2 +-
 .../shared/agenda/event-list/event-list.page.html  |  2 +-
 version/git-version.ts                             | 14 +++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index f2d7f6e59..96cc5f8a3 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -354,7 +354,7 @@ export class EditEventPage implements OnInit {
     this.runValidation()
 
     if(this.Form.invalid) return false;
-    if(this.selectedRecurringType != '-1'){
+    if(this.selectedRecurringType != '-1') {
       this.postEvent.EventRecurrence.Type = this.selectedRecurringType;
     }
 
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index 0b83278d3..0d68bda7f 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -223,7 +223,7 @@ export class EditEventPage implements OnInit {
       participantes: new FormControl(this.taskParticipants, [
         // Validators.required
       ]),
-      Date: new FormControl( new Date(this._postEvent.StartDate).toLocaleString('pt') < new Date(this._postEvent.EndDate).toLocaleString('pt')? 'ok': null,[
+      Date: new FormControl( true,[
         Validators.required
       ]),
 
diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html
index cabad5bec..53506cdc8 100644
--- a/src/app/shared/agenda/event-list/event-list.page.html
+++ b/src/app/shared/agenda/event-list/event-list.page.html
@@ -4,7 +4,7 @@
       <div class="flex-grow-1">Eventos para Aprovação</div>
       <div (click)="refreshing()">
         <button title="Atualizar" class="btn-no-color" >
-          <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
+          <ion-icon class=" font-45-em" src="assets/images/theme/gov/icon-reload.svg"></ion-icon>
         </button>
       </div>
     </div>
diff --git a/version/git-version.ts b/version/git-version.ts
index 914a2c4f7..49e84fc9f 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "f472d5ac0",
-  "SHA": "f472d5ac0b3819bb8239a0b3512a53eff32df19b",
+  "shortSHA": "64e463ab6",
+  "SHA": "64e463ab6f5bb8852b42054e895dbdc45dff457e",
   "branch": "developer-prod",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Wed Aug 30 17:14:59 2023 +0100'",
-  "lastCommitMessage": "merge",
-  "lastCommitNumber": "5244",
-  "change": "",
-  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/services/task.service.ts\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified:   workspace.code-workspace",
+  "lastCommitTime": "'Wed Aug 30 17:53:02 2023 +0100'",
+  "lastCommitMessage": "icons changes",
+  "lastCommitNumber": "5245",
+  "change": "diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts\nindex e1ee282ff..fc644bfbc 100644\n--- a/src/app/modals/create-process/create-process.page.ts\n+++ b/src/app/modals/create-process/create-process.page.ts\n@@ -105,6 +105,12 @@ export class CreateProcessPage implements OnInit {\n     this.task = this.navParams.get('task');\n     this.fulltask = this.navParams.get('fulltask');\n \n+\n+    console.log('this.fulltask', this.fulltask)\n+\n+\n+    this.documents = this.fulltask.Documents\n+\n     if (this.task.SerialNumber) {\n       this.task.serialNumber = this.task.SerialNumber\n     }",
+  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.html\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified:   src/app/modals/create-process/create-process.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file