From de531bc5508a74ef4ad4407aef91d729cb82faf3 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Sat, 10 Jun 2023 12:19:46 +0100
Subject: [PATCH] improve

---
 .../agenda/view-event/view-event.page.html    |  2 --
 src/app/pages/events/events.page.html         |  4 ++--
 src/app/pages/events/events.page.scss         | 15 ++++++++++---
 .../gabinete-digital.page.html                |  4 ++--
 .../gabinete-digital/gabinete-digital.page.ts |  2 +-
 src/app/services/events.service.ts            | 22 +++++++++++++++++++
 version/git-version.ts                        | 10 ++++-----
 7 files changed, 44 insertions(+), 15 deletions(-)

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 0752a6152..b5c64d9a0 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -5,8 +5,6 @@
     </ion-refresher-content>
   </ion-refresher>
 
-  {{ loadedEvent.HasAttachments | json}}
-
   <div class="main-content d-flex height-100" [className]="isModal ? '_main-content d-flex height-100 ma-0 px-20 pt-30 pb-20 background-white' : 'main-content d-flex height-100'">
     <div class="content d-flex flex-column width-100">
       <div class="main-header  d-flex">
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index 75d36f772..b02cb6121 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -96,7 +96,7 @@
                   <ion-item class="item-hover cursor-pointer" lines="none" *ngFor="let event of listToPresent"
                     (click)="goToEvent(event)"
                   >
-                  <div class="d-flex  content-{{sessoStore.user.Profile}}-{{event.CalendarName}}">
+                  <div class="d-flex event-box-content content-{{sessoStore.user.Profile}}-{{event.CalendarName}}">
         
                     <div class="schedule-time">
                       <div *ngIf="!event.IsAllDayEvent" class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
@@ -109,7 +109,7 @@
                     <div class="schedule-details">
                       <div class="description">{{event.Subject}}</div>
                       <div class="location">
-                        <p>{{event.Location}}</p>
+                        {{event.Location}}
                       </div>
                     </div>
                   </div>
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss
index bbdb63e1a..7cf7e218d 100644
--- a/src/app/pages/events/events.page.scss
+++ b/src/app/pages/events/events.page.scss
@@ -437,7 +437,6 @@ ion-toolbar{
         }
         .schedule-date{
           margin-right: 10px;
-          width: 22%;
           color: #797979 !important;
           font-size: 13px;
         }
@@ -449,7 +448,6 @@ ion-toolbar{
           .location{
             font-family: Roboto;
             font-size: 15px;
-            font-weight: bold;
             color: black;
             width: 100%;
 
@@ -458,6 +456,7 @@ ion-toolbar{
             width: 100%;
             font-family: Roboto;
             font-size: 13px;
+            font-weight: bold;
             //color: #0d89d1;
             color: var(--title-text-color)
           }
@@ -641,4 +640,14 @@ ion-title{
     margin-left: 0px !important;
     margin-right: 0px !important;
   }
-}
\ No newline at end of file
+}
+
+
+
+.item-exp {
+  justify-content: flex-start !important;
+}
+
+.event-box-content {
+  justify-content: flex-start !important;
+}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 9582e9fea..36d503ebd 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -114,7 +114,7 @@
 
           <div *ngIf="hideSearchBtn">
             <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
-              <mat-select [(value)]="filterName">
+              <mat-select [(value)]="filterName" (change)="dynamicSearch()">
       
                 <mat-option value="Para hoje" >
                   Para hoje
@@ -159,7 +159,7 @@
                     class=" box-hover ion-no-padding cursor-pointer"
                     *ngFor = "let task of AllProcess"
                     (click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName || task.workflowDisplayName || task.workflowName, task.activityInstanceName)">
-                    <div class="item-wrapper" *ngIf="TaskService.filter(task, filterName)">
+                    <div class="item-wrapper">
                       <div class="item width-100">
                         <div class="item-top-detail">
                           <div class="item-subject">
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 0ff591126..23f253ec9 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -212,7 +212,7 @@ export class GabineteDigitalPage implements OnInit {
         let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
         subject = subject.toLowerCase();
         return subject.includes(this.searchSubject.toLowerCase())
-      })
+      }).filter( task => this.TaskService.filter(task, this.filterName))
 
       
       if(ordinance == this.ordinance) {
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index f8c55c1be..f1c55ee08 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -305,6 +305,28 @@ export class EventsService {
       } else {
         this.hasAnyCalendar = true
       }
+
+
+      (() => {
+        const keys = {}
+
+        for (let e of SessionStore.user.OwnerCalendars) {
+          if(!keys[e.CalendarId]) {
+            keys[e.CalendarId] = e.CalendarId
+          } else {
+            throw(`Calendar ${e.CalendarId} is repeated for user `+ SessionStore.user.FullName);
+          }
+        }
+
+        for (let e of SessionStore.user.SharedCalendars) {
+          if(!keys[e.CalendarId]) {
+            keys[e.CalendarId] = e.CalendarId
+          } else {
+            throw(`Calendar ${e.CalendarId} is repeated for user `+ SessionStore.user.FullName);
+          }
+        }
+      })();
+      
     }
   }
 
diff --git a/version/git-version.ts b/version/git-version.ts
index ce3c56957..8867bb484 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "e57e48d9c",
-  "SHA": "e57e48d9ce538cbaca45e8b38f19ff7d520b4462",
+  "shortSHA": "ab43d697e",
+  "SHA": "ab43d697eacabe1b9ba3063422805328de10e95d",
   "branch": "feature/gabinete-search",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Sat Jun 10 10:26:47 2023 +0100'",
+  "lastCommitTime": "'Sat Jun 10 10:52:13 2023 +0100'",
   "lastCommitMessage": "fix",
-  "lastCommitNumber": "4959",
+  "lastCommitNumber": "4960",
   "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/models/beast-orm.ts\n\tmodified:   src/app/pages/search/search.page.scss\n\tmodified:   src/app/pages/search/search.page.ts\n\tnew file:   src/assets/app.module.ts",
+  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/view-event/view-event.page.html\n\tmodified:   src/app/pages/events/events.page.html\n\tmodified:   src/app/pages/events/events.page.scss\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/services/events.service.ts\n\tmodified:   version/git-version.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file