From 119f4df39d56f36d4b81373849b0de65514f2649 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 30 Aug 2023 13:53:15 +0100
Subject: [PATCH 1/6] header

---
 src/app/modals/profile/profile.page.scss |  1 +
 version/git-version.ts                   | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app/modals/profile/profile.page.scss b/src/app/modals/profile/profile.page.scss
index 148df11d2..29909cc5f 100644
--- a/src/app/modals/profile/profile.page.scss
+++ b/src/app/modals/profile/profile.page.scss
@@ -86,6 +86,7 @@
   border-radius: 50%;
   margin: 0 auto;
   border-color: transparent !important;
+  object-fit: cover;
 }
 
 .icon {
diff --git a/version/git-version.ts b/version/git-version.ts
index aa9727709..fbb8d708f 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "ae105eaf0",
-  "SHA": "ae105eaf0eada7785fb08d6bbca3338b999decf7",
+  "shortSHA": "8030e4e53",
+  "SHA": "8030e4e53f9ac007e7ae79f316c11e74a9359e61",
   "branch": "developer-prod",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Tue Aug 29 16:45:29 2023 +0100'",
+  "lastCommitTime": "'Tue Aug 29 16:57:01 2023 +0100'",
   "lastCommitMessage": "merge",
-  "lastCommitNumber": "5233",
-  "change": "",
-  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.scss\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/services/agenda/list-box.service.ts",
+  "lastCommitNumber": "5234",
+  "change": "diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.scss b/src/app/modals/profile/edit-profile/edit-profile.page.scss\nindex b3a81fcf2..5cc7061c9 100644\n--- a/src/app/modals/profile/edit-profile/edit-profile.page.scss\n+++ b/src/app/modals/profile/edit-profile/edit-profile.page.scss\n@@ -146,6 +146,7 @@\n   border-radius: 50%;\n   margin: 0 auto;\n   border-color: transparent !important;\n+  object-fit: cover;\n }\n \n .ion-icon-class-theme {\ndiff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts\nindex ab1e7e563..1a99f56fc 100644\n--- a/src/app/pages/agenda/agenda.module.ts\n+++ b/src/app/pages/agenda/agenda.module.ts\n@@ -14,7 +14,7 @@ import localeDe from '@angular/common/locales/pt';\n \n registerLocaleData(localeDe);\n \n-import { CalendarModule, DateAdapter } from 'angular-calendar';\n+\n import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';\n \n import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';\n@@ -51,10 +51,6 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'\n     FormsModule,\n     IonicModule,\n     /*  */\n-    CalendarModule.forRoot({\n-      provide: DateAdapter,\n-      useFactory: adapterFactory\n-    }),\n \n     AgendaPageRoutingModule,\n     NgCalendarModule,\ndiff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html\nindex f6afc0046..d3ae8b0ea 100644\n--- a/src/app/pages/agenda/agenda.page.html\n+++ b/src/app/pages/agenda/agenda.page.html\n@@ -44,8 +44,7 @@\n                     <ion-icon *ngIf=\"ThemeService.currentTheme == 'doneIt' \"  slot=\"icon-only\"  src=\"assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-right.svg\"></ion-icon>\n                   </div>\n \n-\n-                  <div style=\"\n+                  <div *ngIf=\"SessionStore.user.RoleID !== 100000014\" style=\"\n                   padding-bottom: 10px;\n                   padding-left: 10px;\n                   padding-right: 10px;\n@@ -140,7 +139,7 @@\n                 </thead>\n               </table>\n \n-              <div class=\"calendar-conteiner-height overflow-hidden\" [style.height]=\"height\">\n+              <div class=\"calendar-conteiner-height overflow-hidden\" [style.height]=\"listBoxService.height\">\n                 <calendar\n                     class=\"calendar-component\"\n                     [eventSource]=\"listToPresent\"\n@@ -169,7 +168,7 @@\n                   <div [className]=\"currentDayEventDisplayBorder(view.dates, row*7+col)\" class=\"d-flex justify-center align-center\" [class.with-event]=\"view.dates[row*7+col].events.length\">\n \n                     <div class=\"day\">\n-                      <div class=\"number\"> {{ view.dates[row*7+col].label }}</div>\n+                      <div class=\"number\" [attr.date]=\"view.dates[row*7+col].label\" > {{ view.dates[row*7+col].label }}</div>\n                     </div>\n \n                   </div>\n@@ -186,7 +185,7 @@\n           <div class=\"calendar-title-container px-20 d-flex\">\n \n             <ion-row class=\"timeline-date align-center pr-10\">\n-              <button class=\"no-color\"  *ngIf=\"showCalendar\" (click)=\"height='0px';showCalendar=false\">\n+              <button class=\"no-color\"  *ngIf=\"showCalendar\" (click)=\"listBoxService.height='0px';showCalendar=false\">\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'default' \" class=\"collaps  font-25\" src=\"assets/images/icons-collaps-up.svg\" ></ion-icon>\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'gov' \" class=\"collaps  font-25\" src=\"assets/images/theme/gov/icons-collaps-up.svg\" ></ion-icon>\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'doneIt' \"  class=\"collaps  font-25\"  src=\"assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-up.svg\"></ion-icon>\n@@ -199,7 +198,7 @@\n             </ion-row>\n \n             <div style=\"padding-right: 50px\" class=\"font-16-em text-black align-center cursor-pointer\" (click)=\"changeSegment('Combinado')\" [class.active]=\"segment == 'Combinado' \">\n-              Todos...\n+              Todos\n             </div>\n             <div style=\"padding-right: 50px\" class=\"font-16-em text-black align-center cursor-pointer\"  (click)=\"changeSegment('Pessoal')\" [class.active]=\"segment == 'Pessoal' \">\n               Pessoais\n@@ -218,45 +217,42 @@\n           <div class=\"timeline-container height-100 d-flex pt-10 pl-20 filter-{{segment}}\"  >\n \n             <div  class=\"ss-timeline timeline-mobile flex-grow-1 pr-10  text-black height-100 width-100 overflow-y-auto\" >\n-              <div class=\"timeline-date align-center\" *ngIf=\"isSelectedDayHasEvent && hasEventToday\">\n+              <!-- <div class=\"timeline-date align-center\" *ngIf=\"isSelectedDayHasEvent && hasEventToday\">\n                 <span >Hoje,&nbsp;</span> {{ timelineDate }}\n-              </div>\n+              </div> -->\n \n-              <div *ngFor=\"let events of TimelineMDList | keyvalue; \" >\n+              <div *ngFor=\"let events of TimelineMDList \" >\n \n                 <div  class=\"EventListBox-container\" >\n-                  <div class=\"day \" [class.dayShow]=\"isSelectedDayHasEvent && hasEventToday\" >\n-                    {{ TimelineDay(events.key)}} <div style=\"text-transform: capitalize; display: inline;\">{{ viewTitle }}</div>\n-                  </div>\n-\n-                  <div *ngFor=\"let event of events.value\" class=\"EventListBox mb-10\"  >\n-\n-                    <div class=\"d-flex content-{{event.profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 \" (click)=\"eventClicked(event)\"\n-                      *ngIf=\"viewEventMonth <= dateMonth(event) \">\n \n-                      <div class=\"schedule-time\" *ngIf=\"!event.event.IsAllDayEvent\">\n+                  <div  class=\"EventListBox mb-10\"  >\n \n-                        <div *ngIf=\"event.startMany && !event.middle\" class=\"time-start labelb\">Início</div>\n-                        <div *ngIf=\"event.endMany && !event.middle \" class=\"time-end labelb\">Fim</div>\n+                    <div class=\" content-{{events.profile}}-{{events.calendarName}} mt-10 cursor-pointer width-100 \" \n+                      (click)=\"eventClicked(events)\">\n \n-                        <div *ngIf=\"!(event.endMany && !event.middle) && !event.middle\" class=\"time-start\">{{event.event.StartDate | date: 'HH:mm'}}</div>\n-                        <div *ngIf=\"!(event.startMany && !event.middle) && !event.middle\" class=\"time-end\"> {{event.event.EndDate | date: 'HH:mm'}} </div>\n+                      <div class=\"schedule-time\" >\n \n-                        <div *ngIf=\"event.middle\" class=\"time-start\"> Todo </div>\n-                        <div *ngIf=\"event.middle\" class=\"time-end text-center\"> o dia </div>\n+                        <div  class=\"time-start\">\n+                          <ion-icon slot=\"start\" src=\"assets/images/icons-calendar.svg\"></ion-icon>\n+                          Início\n+                          {{ events.startTime | date: 'dd-MM-yyyy HH:mm' }}\n+                        </div>\n+                        <div  class=\"time-end\">\n+                          <ion-icon slot=\"start\" src=\"assets/images/icons-calendar.svg\"></ion-icon>\n+                          Fim\n+                          {{ events.endTime | date: 'dd-MM-yyyy HH:mm' }}\n+                        </div>\n \n                       </div>\n-                      <div class=\"schedule-time\" *ngIf=\"event.event.IsAllDayEvent\">\n-                        <div class=\"time-start\">Todo </div>\n-                        <div class=\"time-end text-center\">o dia</div>\n-                      </div>\n                       <div class=\"schedule-details\">\n+                        <div class=\"location\">\n+                          <ion-icon slot=\"start\" src=\"assets/images/icons-location.svg\"></ion-icon>\n+                          {{events.event.Location}}\n+                        </div>\n                         <div class=\"description\">\n-                          <p class=\"m-0\">{{event.event.Subject}}</p>\n+                          <p class=\"m-0\">{{events.event.Subject}}</p>\n                         </div>\n-                        <div class=\"location\">{{event.event.Location}}</div>\n-                        <div class=\"font-13 calendar-owner\"*ngIf=\"eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'\">{{SessionStore.user.FullName}} </div>\n-                        <ng-template #other_content>{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}</ng-template>\n+                        <!-- <div class=\"font-13 calendar-owner\"*ngIf=\"eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'\">{{SessionStore.user.FullName}} </div> -->\n                       </div>\n                     </div>\n \ndiff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss\nindex 3418faa07..47da5c979 100644\n--- a/src/app/pages/agenda/agenda.page.scss\n+++ b/src/app/pages/agenda/agenda.page.scss\n@@ -490,12 +490,12 @@ td.monthview-primary-with-event {\n     margin-right: 10px;\n     min-width: 33px;\n     .time-start{\n-      color: #797979 !important;\n+      color: black !important;\n       font-family: Roboto;\n       font-size: rem(13);\n     }\n     .time-end{\n-      color: #797979 !important;\n+      color: black !important;\n       font-family: Roboto;\n       font-size: rem(13);\n     }\ndiff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts\nindex 28b94df19..320c4eba6 100644\n--- a/src/app/pages/agenda/agenda.page.ts\n+++ b/src/app/pages/agenda/agenda.page.ts\n@@ -176,7 +176,7 @@ export class AgendaPage implements OnInit {\n     public eventService: EventsService,\n     private router: Router,\n     private dateAdapter: DateAdapter<any>,\n-    private listBoxService: ListBoxService,\n+    public listBoxService: ListBoxService,\n     private changeProfileService: ChangeProfileService,\n     private backgroundservice: BackgroundService,\n     public ThemeService: ThemeService,\n@@ -274,6 +274,7 @@ export class AgendaPage implements OnInit {\n             this.updateEventListBox()\n           }\n           realoadCounter++;\n+          this.weekToShow()\n         }\n       });\n   \n@@ -290,14 +291,12 @@ export class AgendaPage implements OnInit {\n     }, 1000)\n   }\n \n-  height = 'unset'\n-\n   weekToShow() {\n \n     setTimeout(() => {\n       try {\n         let weekNum = 0;\n-\n+  \n         function Week(a) {\n           for(let b of a.querySelectorAll('td')) {\n             if(!b.className.includes('text-muted')) {\n@@ -315,7 +314,11 @@ export class AgendaPage implements OnInit {\n         } \n     \n         this.showCalendar = true\n-        this.height = (weekNum * dayBoxHeight) +'px'\n+        this.listBoxService.height = (weekNum * dayBoxHeight) +'px'\n+  \n+        if(dayBoxHeight == 0) {\n+          this.weekToShow()\n+        }\n       } catch (e) {\n         setTimeout(()=> {\n           this.weekToShow()\n@@ -336,15 +339,11 @@ export class AgendaPage implements OnInit {\n \n   //Go to the next view of the calendar month/week/day\n   next() {\n-    this.myCal.slideNext();\n-    this.myCal.loadEvents();\n-    this.myCal.update();\n+    this.addOneMonth();\n   }\n   //Go to the previous view of the calendar\n   back() {\n-    this.myCal.slidePrev();\n-    this.myCal.loadEvents();\n-    this.myCal.update();\n+    this.previewsMonth();\n   }\n \n   //Shows the title of your view\n@@ -705,23 +704,22 @@ export class AgendaPage implements OnInit {\n   updateEventListBox() {\n \n     const selectedCalendarIds = this.getSelectedAgendaCalendars();\n-    this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds)\n+    //this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds);\n \n     this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n \n-    const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt');\n-    if(this.TimelineMDList[selectedDay]) {\n-      this.hasEventToday = true\n-    } else {\n-      this.hasEventToday = false\n-    }\n+    // const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt');\n+    // if(this.TimelineMDList[selectedDay]) {\n+    //   this.hasEventToday = true\n+    // } else {\n+    //   this.hasEventToday = false\n+    // }\n \n \n     this.isSelectedDayHasEvent = momentG(new Date(), 'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate, 'dd MMMM yyyy', 'pt');\n \n   }\n \n-\n   changeYear = (year) => {\n     const a = this.calendar.currentDate\n \n@@ -769,13 +767,44 @@ export class AgendaPage implements OnInit {\n     }\n   }\n \n+  addOneMonth() {\n+\n+    // const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr td[class*=\"monthview-primary-with-event\"]')\n+    const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr div[date=\"1\"]')\n+    if(firstEventThatHasEvent) {\n+      firstEventThatHasEvent.click()\n+    }\n+\n+    try {\n+      this.myCal.slideNext();\n+      this.myCal.loadEvents();\n+      this.myCal.update();\n+    } catch (e) { }\n+  }\n+\n+\n+  previewsMonth() {\n+\n+    // const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr td[class*=\"monthview-primary-with-event\"]')\n+    const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr div[date=\"1\"]')\n+    if(firstEventThatHasEvent) {\n+      firstEventThatHasEvent.click()\n+    }\n+\n+    try {\n+      this.myCal.slidePrev();\n+      this.myCal.loadEvents();\n+      this.myCal.update();\n+    } catch (e) { }\n+  }\n+\n \n   get viewEventMonth() {\n     return this.viewDate.getMonth()\n   }\n \n   dateMonth(event: any) {\n-    return new Date(event.start).getMonth()\n+    return new Date(event.startTime).getMonth()\n   }\n \n   eventListVisible(event) {\ndiff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts\nindex 4673ecb8d..275531c46 100644\n--- a/src/app/services/agenda/list-box.service.ts\n+++ b/src/app/services/agenda/list-box.service.ts\n@@ -7,6 +7,8 @@ import { DateService } from '../date.service';\n })\n export class ListBoxService {\n \n+\theight = 'unset'\n+\n \tconstructor(\n     \tprivate dateService: DateService\n \t){}\n@@ -16,16 +18,37 @@ export class ListBoxService {\n \t\treturn eventSource.filter((e) => e.profile == profile)\n \t}\n \n-\tgetEventInsideRange(eventSource: EventListStore[], rangeStartDate, randEndDate) {\n+\tgetEventInsideRange(eventSource: EventListStore[], rangeStartDate, randEndDate, selectedDate) {\n \t\treturn eventSource.filter((e)=> {\n-\t\t\tif(new Date(rangeStartDate).getTime() <= new Date(e.startTime).getTime() &&\n-\t\t\t\t\tnew Date(randEndDate).getTime() >= new Date(e.endTime).getTime()) { \n+\t\t\tif (new Date(selectedDate).getMonth() == new Date(e.startTime).getMonth() &&  new Date(selectedDate).getFullYear() == new Date(e.startTime).getFullYear() ||\n+\t\t\tnew Date(selectedDate).getMonth() == new Date(e.endTime).getMonth() &&  new Date(selectedDate).getFullYear() == new Date(e.startTime).getFullYear()) {\n+\t\t\t\treturn true\n+\t\t\t} else if(new Date(rangeStartDate).getTime() >= new Date(e.startTime).getTime() &&\n+\t\t\t\t\tnew Date(randEndDate).getTime() <= new Date(e.endTime).getTime()) {\n+\t\t\t\treturn true\n+\t\t\t}\n+\t\t\treturn false\n+\t\t})\n+\t}\n+\n+\tgetEventFromCurrentDate(eventSource: EventListStore[], selectedDate) {\n+\t\treturn eventSource.filter((e) => {\n+\t\t\tif (new Date(selectedDate).getTime() <= new Date(e.startTime).getTime() ||  new Date(selectedDate).getTime() <= new Date(e.endTime).getTime() ) {\n \t\t\t\treturn true\n \t\t\t}\n \t\t\treturn false\n \t\t})\n \t}\n \n+\n+\tsortArrayISODate(eventSource: EventListStore[]): any[] {\n+\n+\t\treturn eventSource.sort((a,b) => \n+\t\t  new Date(b.startTime).getTime() \n+\t\t  - \n+\t\t  new Date(a.startTime).getTime())\n+\t  }\n+\n \tfilterSegment(eventSource: EventListStore[], segment): EventListStore[] {\n \t\t\n \t\treturn eventSource.filter( data => data.calendarName == segment)\n@@ -33,7 +56,7 @@ export class ListBoxService {\n \n \tdaysBetween(){ }\n \n-\tlist(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all', rangeStartDate, randEndDate, {segment = 'Combinado', selectedDate= null}) {\n+\tlist(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all', rangeStartDate, randEndDate, {segment = 'Combinado', selectedDate}) {\n \n \t\t// // filter range\n \t\t// if(selectedDate) {\n@@ -48,15 +71,11 @@ export class ListBoxService {\n \t\t\teventSource = this.filterSegment(eventSource, segment) \n \t\t}\n     \n-\t\t// if(profile != 'all') {\n-\t\t// \teventSource = this.filterProfile(eventSource, profile)\n-\t\t// }\n-\n-    \tlet newStracture:CustomCalendarEvent[];\n-\n-\t\tnewStracture = this.encapsulation(eventSource);\n+\t\teventSource =  this.getEventInsideRange(eventSource, rangeStartDate, randEndDate, selectedDate)\n+\t\teventSource = this.getEventFromCurrentDate(eventSource, selectedDate)\n+\t\teventSource  = this.sortArrayISODate(eventSource).reverse()\n \n-\t\treturn this.display(newStracture, selectedDate)\n+\t\treturn eventSource\n \t}\n \n \tdisplay(list: CustomCalendarEvent[], selectedDate) {\ndiff --git a/src/assets/images/theme/gov/icons-add.svg b/src/assets/images/theme/gov/icons-add.svg\nindex 7881dd435..f67b1e5b6 100644\n--- a/src/assets/images/theme/gov/icons-add.svg\n+++ b/src/assets/images/theme/gov/icons-add.svg\n@@ -1,7 +1,7 @@\n-<svg width=\"35\" height=\"35\" viewBox=\"0 0 35 35\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n-<path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M7 7H18V8H7V7Z\" fill=\"white\"/>\n-<path d=\"M10.5 9C11.3284 9 12 8.32843 12 7.5C12 6.67157 11.3284 6 10.5 6C9.67157 6 9 6.67157 9 7.5C9 8.32843 9.67157 9 10.5 9Z\" fill=\"white\"/>\n+<svg width=\"35\" height=\"35\" viewBox=\"0 0 35 35\" fill=\"black\" xmlns=\"http://www.w3.org/2000/svg\">\n+<path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M7 7H18V8H7V7Z\" fill=\"black\"/>\n+<path d=\"M10.5 9C11.3284 9 12 8.32843 12 7.5C12 6.67157 11.3284 6 10.5 6C9.67157 6 9 6.67157 9 7.5C9 8.32843 9.67157 9 10.5 9Z\" fill=\"black\"/>\n <path d=\"M17.5 35C27.165 35 35 27.165 35 17.5C35 7.83502 27.165 0 17.5 0C7.83502 0 0 7.83502 0 17.5C0 27.165 7.83502 35 17.5 35Z\" fill=\"#FFB81C\"/>\n-<path d=\"M19 11C19 10.4477 18.5523 10 18 10C17.4477 10 17 10.4477 17 11V24C17 24.5523 17.4477 25 18 25C18.5523 25 19 24.5523 19 24V11Z\" fill=\"white\"/>\n-<path d=\"M24.5 18.5C25.0523 18.5 25.5 18.0523 25.5 17.5C25.5 16.9477 25.0523 16.5 24.5 16.5H11.5C10.9477 16.5 10.5 16.9477 10.5 17.5C10.5 18.0523 10.9477 18.5 11.5 18.5H24.5Z\" fill=\"white\"/>\n+<path d=\"M19 11C19 10.4477 18.5523 10 18 10C17.4477 10 17 10.4477 17 11V24C17 24.5523 17.4477 25 18 25C18.5523 25 19 24.5523 19 24V11Z\" fill=\"black\"/>\n+<path d=\"M24.5 18.5C25.0523 18.5 25.5 18.0523 25.5 17.5C25.5 16.9477 25.0523 16.5 24.5 16.5H11.5C10.9477 16.5 10.5 16.9477 10.5 17.5C10.5 18.0523 10.9477 18.5 11.5 18.5H24.5Z\" fill=\"black\"/>\n </svg>\ndiff --git a/workspace.code-workspace b/workspace.code-workspace\nindex 07d71037b..73623083b 100644\n--- a/workspace.code-workspace\n+++ b/workspace.code-workspace\n@@ -8,6 +8,7 @@\n         \"cSpell.words\": [\n             \"Chatmessage\"\n \t\t],\n-\t\t\"nuxt.isNuxtApp\": false\n+\t\t\"nuxt.isNuxtApp\": false,\n+\t\t\"svg.preview.background\": \"editor\"\n     }\n }\n\\ No newline at end of file",
+  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/profile/profile.page.scss\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/profile/edit-profile/edit-profile.page.scss\n\tmodified:   src/app/pages/agenda/agenda.module.ts\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.scss\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/services/agenda/list-box.service.ts\n\tmodified:   src/assets/images/theme/gov/icons-add.svg\n\tmodified:   workspace.code-workspace",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 2d8107fc61265f346825a46a5557a009da0ff7f7 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 30 Aug 2023 13:55:39 +0100
Subject: [PATCH 2/6] change icons

---
 .../profile/edit-profile/edit-profile.page.scss    |  1 +
 src/assets/images/theme/gov/icons-add.svg          | 10 +++++-----
 version/git-version.ts                             | 14 +++++++-------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.scss b/src/app/modals/profile/edit-profile/edit-profile.page.scss
index b3a81fcf2..5cc7061c9 100644
--- a/src/app/modals/profile/edit-profile/edit-profile.page.scss
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.scss
@@ -146,6 +146,7 @@
   border-radius: 50%;
   margin: 0 auto;
   border-color: transparent !important;
+  object-fit: cover;
 }
 
 .ion-icon-class-theme {
diff --git a/src/assets/images/theme/gov/icons-add.svg b/src/assets/images/theme/gov/icons-add.svg
index 7881dd435..f67b1e5b6 100644
--- a/src/assets/images/theme/gov/icons-add.svg
+++ b/src/assets/images/theme/gov/icons-add.svg
@@ -1,7 +1,7 @@
-<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 7H18V8H7V7Z" fill="white"/>
-<path d="M10.5 9C11.3284 9 12 8.32843 12 7.5C12 6.67157 11.3284 6 10.5 6C9.67157 6 9 6.67157 9 7.5C9 8.32843 9.67157 9 10.5 9Z" fill="white"/>
+<svg width="35" height="35" viewBox="0 0 35 35" fill="black" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 7H18V8H7V7Z" fill="black"/>
+<path d="M10.5 9C11.3284 9 12 8.32843 12 7.5C12 6.67157 11.3284 6 10.5 6C9.67157 6 9 6.67157 9 7.5C9 8.32843 9.67157 9 10.5 9Z" fill="black"/>
 <path d="M17.5 35C27.165 35 35 27.165 35 17.5C35 7.83502 27.165 0 17.5 0C7.83502 0 0 7.83502 0 17.5C0 27.165 7.83502 35 17.5 35Z" fill="#FFB81C"/>
-<path d="M19 11C19 10.4477 18.5523 10 18 10C17.4477 10 17 10.4477 17 11V24C17 24.5523 17.4477 25 18 25C18.5523 25 19 24.5523 19 24V11Z" fill="white"/>
-<path d="M24.5 18.5C25.0523 18.5 25.5 18.0523 25.5 17.5C25.5 16.9477 25.0523 16.5 24.5 16.5H11.5C10.9477 16.5 10.5 16.9477 10.5 17.5C10.5 18.0523 10.9477 18.5 11.5 18.5H24.5Z" fill="white"/>
+<path d="M19 11C19 10.4477 18.5523 10 18 10C17.4477 10 17 10.4477 17 11V24C17 24.5523 17.4477 25 18 25C18.5523 25 19 24.5523 19 24V11Z" fill="black"/>
+<path d="M24.5 18.5C25.0523 18.5 25.5 18.0523 25.5 17.5C25.5 16.9477 25.0523 16.5 24.5 16.5H11.5C10.9477 16.5 10.5 16.9477 10.5 17.5C10.5 18.0523 10.9477 18.5 11.5 18.5H24.5Z" fill="black"/>
 </svg>
diff --git a/version/git-version.ts b/version/git-version.ts
index fbb8d708f..9e2b43a32 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "8030e4e53",
-  "SHA": "8030e4e53f9ac007e7ae79f316c11e74a9359e61",
+  "shortSHA": "119f4df39",
+  "SHA": "119f4df39d56f36d4b81373849b0de65514f2649",
   "branch": "developer-prod",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Tue Aug 29 16:57:01 2023 +0100'",
-  "lastCommitMessage": "merge",
-  "lastCommitNumber": "5234",
-  "change": "diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.scss b/src/app/modals/profile/edit-profile/edit-profile.page.scss\nindex b3a81fcf2..5cc7061c9 100644\n--- a/src/app/modals/profile/edit-profile/edit-profile.page.scss\n+++ b/src/app/modals/profile/edit-profile/edit-profile.page.scss\n@@ -146,6 +146,7 @@\n   border-radius: 50%;\n   margin: 0 auto;\n   border-color: transparent !important;\n+  object-fit: cover;\n }\n \n .ion-icon-class-theme {\ndiff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts\nindex ab1e7e563..1a99f56fc 100644\n--- a/src/app/pages/agenda/agenda.module.ts\n+++ b/src/app/pages/agenda/agenda.module.ts\n@@ -14,7 +14,7 @@ import localeDe from '@angular/common/locales/pt';\n \n registerLocaleData(localeDe);\n \n-import { CalendarModule, DateAdapter } from 'angular-calendar';\n+\n import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';\n \n import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';\n@@ -51,10 +51,6 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'\n     FormsModule,\n     IonicModule,\n     /*  */\n-    CalendarModule.forRoot({\n-      provide: DateAdapter,\n-      useFactory: adapterFactory\n-    }),\n \n     AgendaPageRoutingModule,\n     NgCalendarModule,\ndiff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html\nindex f6afc0046..d3ae8b0ea 100644\n--- a/src/app/pages/agenda/agenda.page.html\n+++ b/src/app/pages/agenda/agenda.page.html\n@@ -44,8 +44,7 @@\n                     <ion-icon *ngIf=\"ThemeService.currentTheme == 'doneIt' \"  slot=\"icon-only\"  src=\"assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-right.svg\"></ion-icon>\n                   </div>\n \n-\n-                  <div style=\"\n+                  <div *ngIf=\"SessionStore.user.RoleID !== 100000014\" style=\"\n                   padding-bottom: 10px;\n                   padding-left: 10px;\n                   padding-right: 10px;\n@@ -140,7 +139,7 @@\n                 </thead>\n               </table>\n \n-              <div class=\"calendar-conteiner-height overflow-hidden\" [style.height]=\"height\">\n+              <div class=\"calendar-conteiner-height overflow-hidden\" [style.height]=\"listBoxService.height\">\n                 <calendar\n                     class=\"calendar-component\"\n                     [eventSource]=\"listToPresent\"\n@@ -169,7 +168,7 @@\n                   <div [className]=\"currentDayEventDisplayBorder(view.dates, row*7+col)\" class=\"d-flex justify-center align-center\" [class.with-event]=\"view.dates[row*7+col].events.length\">\n \n                     <div class=\"day\">\n-                      <div class=\"number\"> {{ view.dates[row*7+col].label }}</div>\n+                      <div class=\"number\" [attr.date]=\"view.dates[row*7+col].label\" > {{ view.dates[row*7+col].label }}</div>\n                     </div>\n \n                   </div>\n@@ -186,7 +185,7 @@\n           <div class=\"calendar-title-container px-20 d-flex\">\n \n             <ion-row class=\"timeline-date align-center pr-10\">\n-              <button class=\"no-color\"  *ngIf=\"showCalendar\" (click)=\"height='0px';showCalendar=false\">\n+              <button class=\"no-color\"  *ngIf=\"showCalendar\" (click)=\"listBoxService.height='0px';showCalendar=false\">\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'default' \" class=\"collaps  font-25\" src=\"assets/images/icons-collaps-up.svg\" ></ion-icon>\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'gov' \" class=\"collaps  font-25\" src=\"assets/images/theme/gov/icons-collaps-up.svg\" ></ion-icon>\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'doneIt' \"  class=\"collaps  font-25\"  src=\"assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-up.svg\"></ion-icon>\n@@ -199,7 +198,7 @@\n             </ion-row>\n \n             <div style=\"padding-right: 50px\" class=\"font-16-em text-black align-center cursor-pointer\" (click)=\"changeSegment('Combinado')\" [class.active]=\"segment == 'Combinado' \">\n-              Todos...\n+              Todos\n             </div>\n             <div style=\"padding-right: 50px\" class=\"font-16-em text-black align-center cursor-pointer\"  (click)=\"changeSegment('Pessoal')\" [class.active]=\"segment == 'Pessoal' \">\n               Pessoais\n@@ -218,45 +217,42 @@\n           <div class=\"timeline-container height-100 d-flex pt-10 pl-20 filter-{{segment}}\"  >\n \n             <div  class=\"ss-timeline timeline-mobile flex-grow-1 pr-10  text-black height-100 width-100 overflow-y-auto\" >\n-              <div class=\"timeline-date align-center\" *ngIf=\"isSelectedDayHasEvent && hasEventToday\">\n+              <!-- <div class=\"timeline-date align-center\" *ngIf=\"isSelectedDayHasEvent && hasEventToday\">\n                 <span >Hoje,&nbsp;</span> {{ timelineDate }}\n-              </div>\n+              </div> -->\n \n-              <div *ngFor=\"let events of TimelineMDList | keyvalue; \" >\n+              <div *ngFor=\"let events of TimelineMDList \" >\n \n                 <div  class=\"EventListBox-container\" >\n-                  <div class=\"day \" [class.dayShow]=\"isSelectedDayHasEvent && hasEventToday\" >\n-                    {{ TimelineDay(events.key)}} <div style=\"text-transform: capitalize; display: inline;\">{{ viewTitle }}</div>\n-                  </div>\n-\n-                  <div *ngFor=\"let event of events.value\" class=\"EventListBox mb-10\"  >\n-\n-                    <div class=\"d-flex content-{{event.profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 \" (click)=\"eventClicked(event)\"\n-                      *ngIf=\"viewEventMonth <= dateMonth(event) \">\n \n-                      <div class=\"schedule-time\" *ngIf=\"!event.event.IsAllDayEvent\">\n+                  <div  class=\"EventListBox mb-10\"  >\n \n-                        <div *ngIf=\"event.startMany && !event.middle\" class=\"time-start labelb\">Início</div>\n-                        <div *ngIf=\"event.endMany && !event.middle \" class=\"time-end labelb\">Fim</div>\n+                    <div class=\" content-{{events.profile}}-{{events.calendarName}} mt-10 cursor-pointer width-100 \" \n+                      (click)=\"eventClicked(events)\">\n \n-                        <div *ngIf=\"!(event.endMany && !event.middle) && !event.middle\" class=\"time-start\">{{event.event.StartDate | date: 'HH:mm'}}</div>\n-                        <div *ngIf=\"!(event.startMany && !event.middle) && !event.middle\" class=\"time-end\"> {{event.event.EndDate | date: 'HH:mm'}} </div>\n+                      <div class=\"schedule-time\" >\n \n-                        <div *ngIf=\"event.middle\" class=\"time-start\"> Todo </div>\n-                        <div *ngIf=\"event.middle\" class=\"time-end text-center\"> o dia </div>\n+                        <div  class=\"time-start\">\n+                          <ion-icon slot=\"start\" src=\"assets/images/icons-calendar.svg\"></ion-icon>\n+                          Início\n+                          {{ events.startTime | date: 'dd-MM-yyyy HH:mm' }}\n+                        </div>\n+                        <div  class=\"time-end\">\n+                          <ion-icon slot=\"start\" src=\"assets/images/icons-calendar.svg\"></ion-icon>\n+                          Fim\n+                          {{ events.endTime | date: 'dd-MM-yyyy HH:mm' }}\n+                        </div>\n \n                       </div>\n-                      <div class=\"schedule-time\" *ngIf=\"event.event.IsAllDayEvent\">\n-                        <div class=\"time-start\">Todo </div>\n-                        <div class=\"time-end text-center\">o dia</div>\n-                      </div>\n                       <div class=\"schedule-details\">\n+                        <div class=\"location\">\n+                          <ion-icon slot=\"start\" src=\"assets/images/icons-location.svg\"></ion-icon>\n+                          {{events.event.Location}}\n+                        </div>\n                         <div class=\"description\">\n-                          <p class=\"m-0\">{{event.event.Subject}}</p>\n+                          <p class=\"m-0\">{{events.event.Subject}}</p>\n                         </div>\n-                        <div class=\"location\">{{event.event.Location}}</div>\n-                        <div class=\"font-13 calendar-owner\"*ngIf=\"eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'\">{{SessionStore.user.FullName}} </div>\n-                        <ng-template #other_content>{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}</ng-template>\n+                        <!-- <div class=\"font-13 calendar-owner\"*ngIf=\"eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'\">{{SessionStore.user.FullName}} </div> -->\n                       </div>\n                     </div>\n \ndiff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss\nindex 3418faa07..47da5c979 100644\n--- a/src/app/pages/agenda/agenda.page.scss\n+++ b/src/app/pages/agenda/agenda.page.scss\n@@ -490,12 +490,12 @@ td.monthview-primary-with-event {\n     margin-right: 10px;\n     min-width: 33px;\n     .time-start{\n-      color: #797979 !important;\n+      color: black !important;\n       font-family: Roboto;\n       font-size: rem(13);\n     }\n     .time-end{\n-      color: #797979 !important;\n+      color: black !important;\n       font-family: Roboto;\n       font-size: rem(13);\n     }\ndiff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts\nindex 28b94df19..320c4eba6 100644\n--- a/src/app/pages/agenda/agenda.page.ts\n+++ b/src/app/pages/agenda/agenda.page.ts\n@@ -176,7 +176,7 @@ export class AgendaPage implements OnInit {\n     public eventService: EventsService,\n     private router: Router,\n     private dateAdapter: DateAdapter<any>,\n-    private listBoxService: ListBoxService,\n+    public listBoxService: ListBoxService,\n     private changeProfileService: ChangeProfileService,\n     private backgroundservice: BackgroundService,\n     public ThemeService: ThemeService,\n@@ -274,6 +274,7 @@ export class AgendaPage implements OnInit {\n             this.updateEventListBox()\n           }\n           realoadCounter++;\n+          this.weekToShow()\n         }\n       });\n   \n@@ -290,14 +291,12 @@ export class AgendaPage implements OnInit {\n     }, 1000)\n   }\n \n-  height = 'unset'\n-\n   weekToShow() {\n \n     setTimeout(() => {\n       try {\n         let weekNum = 0;\n-\n+  \n         function Week(a) {\n           for(let b of a.querySelectorAll('td')) {\n             if(!b.className.includes('text-muted')) {\n@@ -315,7 +314,11 @@ export class AgendaPage implements OnInit {\n         } \n     \n         this.showCalendar = true\n-        this.height = (weekNum * dayBoxHeight) +'px'\n+        this.listBoxService.height = (weekNum * dayBoxHeight) +'px'\n+  \n+        if(dayBoxHeight == 0) {\n+          this.weekToShow()\n+        }\n       } catch (e) {\n         setTimeout(()=> {\n           this.weekToShow()\n@@ -336,15 +339,11 @@ export class AgendaPage implements OnInit {\n \n   //Go to the next view of the calendar month/week/day\n   next() {\n-    this.myCal.slideNext();\n-    this.myCal.loadEvents();\n-    this.myCal.update();\n+    this.addOneMonth();\n   }\n   //Go to the previous view of the calendar\n   back() {\n-    this.myCal.slidePrev();\n-    this.myCal.loadEvents();\n-    this.myCal.update();\n+    this.previewsMonth();\n   }\n \n   //Shows the title of your view\n@@ -705,23 +704,22 @@ export class AgendaPage implements OnInit {\n   updateEventListBox() {\n \n     const selectedCalendarIds = this.getSelectedAgendaCalendars();\n-    this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds)\n+    //this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds);\n \n     this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n \n-    const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt');\n-    if(this.TimelineMDList[selectedDay]) {\n-      this.hasEventToday = true\n-    } else {\n-      this.hasEventToday = false\n-    }\n+    // const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt');\n+    // if(this.TimelineMDList[selectedDay]) {\n+    //   this.hasEventToday = true\n+    // } else {\n+    //   this.hasEventToday = false\n+    // }\n \n \n     this.isSelectedDayHasEvent = momentG(new Date(), 'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate, 'dd MMMM yyyy', 'pt');\n \n   }\n \n-\n   changeYear = (year) => {\n     const a = this.calendar.currentDate\n \n@@ -769,13 +767,44 @@ export class AgendaPage implements OnInit {\n     }\n   }\n \n+  addOneMonth() {\n+\n+    // const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr td[class*=\"monthview-primary-with-event\"]')\n+    const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr div[date=\"1\"]')\n+    if(firstEventThatHasEvent) {\n+      firstEventThatHasEvent.click()\n+    }\n+\n+    try {\n+      this.myCal.slideNext();\n+      this.myCal.loadEvents();\n+      this.myCal.update();\n+    } catch (e) { }\n+  }\n+\n+\n+  previewsMonth() {\n+\n+    // const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr td[class*=\"monthview-primary-with-event\"]')\n+    const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr div[date=\"1\"]')\n+    if(firstEventThatHasEvent) {\n+      firstEventThatHasEvent.click()\n+    }\n+\n+    try {\n+      this.myCal.slidePrev();\n+      this.myCal.loadEvents();\n+      this.myCal.update();\n+    } catch (e) { }\n+  }\n+\n \n   get viewEventMonth() {\n     return this.viewDate.getMonth()\n   }\n \n   dateMonth(event: any) {\n-    return new Date(event.start).getMonth()\n+    return new Date(event.startTime).getMonth()\n   }\n \n   eventListVisible(event) {\ndiff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts\nindex 4673ecb8d..275531c46 100644\n--- a/src/app/services/agenda/list-box.service.ts\n+++ b/src/app/services/agenda/list-box.service.ts\n@@ -7,6 +7,8 @@ import { DateService } from '../date.service';\n })\n export class ListBoxService {\n \n+\theight = 'unset'\n+\n \tconstructor(\n     \tprivate dateService: DateService\n \t){}\n@@ -16,16 +18,37 @@ export class ListBoxService {\n \t\treturn eventSource.filter((e) => e.profile == profile)\n \t}\n \n-\tgetEventInsideRange(eventSource: EventListStore[], rangeStartDate, randEndDate) {\n+\tgetEventInsideRange(eventSource: EventListStore[], rangeStartDate, randEndDate, selectedDate) {\n \t\treturn eventSource.filter((e)=> {\n-\t\t\tif(new Date(rangeStartDate).getTime() <= new Date(e.startTime).getTime() &&\n-\t\t\t\t\tnew Date(randEndDate).getTime() >= new Date(e.endTime).getTime()) { \n+\t\t\tif (new Date(selectedDate).getMonth() == new Date(e.startTime).getMonth() &&  new Date(selectedDate).getFullYear() == new Date(e.startTime).getFullYear() ||\n+\t\t\tnew Date(selectedDate).getMonth() == new Date(e.endTime).getMonth() &&  new Date(selectedDate).getFullYear() == new Date(e.startTime).getFullYear()) {\n+\t\t\t\treturn true\n+\t\t\t} else if(new Date(rangeStartDate).getTime() >= new Date(e.startTime).getTime() &&\n+\t\t\t\t\tnew Date(randEndDate).getTime() <= new Date(e.endTime).getTime()) {\n+\t\t\t\treturn true\n+\t\t\t}\n+\t\t\treturn false\n+\t\t})\n+\t}\n+\n+\tgetEventFromCurrentDate(eventSource: EventListStore[], selectedDate) {\n+\t\treturn eventSource.filter((e) => {\n+\t\t\tif (new Date(selectedDate).getTime() <= new Date(e.startTime).getTime() ||  new Date(selectedDate).getTime() <= new Date(e.endTime).getTime() ) {\n \t\t\t\treturn true\n \t\t\t}\n \t\t\treturn false\n \t\t})\n \t}\n \n+\n+\tsortArrayISODate(eventSource: EventListStore[]): any[] {\n+\n+\t\treturn eventSource.sort((a,b) => \n+\t\t  new Date(b.startTime).getTime() \n+\t\t  - \n+\t\t  new Date(a.startTime).getTime())\n+\t  }\n+\n \tfilterSegment(eventSource: EventListStore[], segment): EventListStore[] {\n \t\t\n \t\treturn eventSource.filter( data => data.calendarName == segment)\n@@ -33,7 +56,7 @@ export class ListBoxService {\n \n \tdaysBetween(){ }\n \n-\tlist(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all', rangeStartDate, randEndDate, {segment = 'Combinado', selectedDate= null}) {\n+\tlist(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all', rangeStartDate, randEndDate, {segment = 'Combinado', selectedDate}) {\n \n \t\t// // filter range\n \t\t// if(selectedDate) {\n@@ -48,15 +71,11 @@ export class ListBoxService {\n \t\t\teventSource = this.filterSegment(eventSource, segment) \n \t\t}\n     \n-\t\t// if(profile != 'all') {\n-\t\t// \teventSource = this.filterProfile(eventSource, profile)\n-\t\t// }\n-\n-    \tlet newStracture:CustomCalendarEvent[];\n-\n-\t\tnewStracture = this.encapsulation(eventSource);\n+\t\teventSource =  this.getEventInsideRange(eventSource, rangeStartDate, randEndDate, selectedDate)\n+\t\teventSource = this.getEventFromCurrentDate(eventSource, selectedDate)\n+\t\teventSource  = this.sortArrayISODate(eventSource).reverse()\n \n-\t\treturn this.display(newStracture, selectedDate)\n+\t\treturn eventSource\n \t}\n \n \tdisplay(list: CustomCalendarEvent[], selectedDate) {\ndiff --git a/src/assets/images/theme/gov/icons-add.svg b/src/assets/images/theme/gov/icons-add.svg\nindex 7881dd435..f67b1e5b6 100644\n--- a/src/assets/images/theme/gov/icons-add.svg\n+++ b/src/assets/images/theme/gov/icons-add.svg\n@@ -1,7 +1,7 @@\n-<svg width=\"35\" height=\"35\" viewBox=\"0 0 35 35\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n-<path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M7 7H18V8H7V7Z\" fill=\"white\"/>\n-<path d=\"M10.5 9C11.3284 9 12 8.32843 12 7.5C12 6.67157 11.3284 6 10.5 6C9.67157 6 9 6.67157 9 7.5C9 8.32843 9.67157 9 10.5 9Z\" fill=\"white\"/>\n+<svg width=\"35\" height=\"35\" viewBox=\"0 0 35 35\" fill=\"black\" xmlns=\"http://www.w3.org/2000/svg\">\n+<path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M7 7H18V8H7V7Z\" fill=\"black\"/>\n+<path d=\"M10.5 9C11.3284 9 12 8.32843 12 7.5C12 6.67157 11.3284 6 10.5 6C9.67157 6 9 6.67157 9 7.5C9 8.32843 9.67157 9 10.5 9Z\" fill=\"black\"/>\n <path d=\"M17.5 35C27.165 35 35 27.165 35 17.5C35 7.83502 27.165 0 17.5 0C7.83502 0 0 7.83502 0 17.5C0 27.165 7.83502 35 17.5 35Z\" fill=\"#FFB81C\"/>\n-<path d=\"M19 11C19 10.4477 18.5523 10 18 10C17.4477 10 17 10.4477 17 11V24C17 24.5523 17.4477 25 18 25C18.5523 25 19 24.5523 19 24V11Z\" fill=\"white\"/>\n-<path d=\"M24.5 18.5C25.0523 18.5 25.5 18.0523 25.5 17.5C25.5 16.9477 25.0523 16.5 24.5 16.5H11.5C10.9477 16.5 10.5 16.9477 10.5 17.5C10.5 18.0523 10.9477 18.5 11.5 18.5H24.5Z\" fill=\"white\"/>\n+<path d=\"M19 11C19 10.4477 18.5523 10 18 10C17.4477 10 17 10.4477 17 11V24C17 24.5523 17.4477 25 18 25C18.5523 25 19 24.5523 19 24V11Z\" fill=\"black\"/>\n+<path d=\"M24.5 18.5C25.0523 18.5 25.5 18.0523 25.5 17.5C25.5 16.9477 25.0523 16.5 24.5 16.5H11.5C10.9477 16.5 10.5 16.9477 10.5 17.5C10.5 18.0523 10.9477 18.5 11.5 18.5H24.5Z\" fill=\"black\"/>\n </svg>\ndiff --git a/workspace.code-workspace b/workspace.code-workspace\nindex 07d71037b..73623083b 100644\n--- a/workspace.code-workspace\n+++ b/workspace.code-workspace\n@@ -8,6 +8,7 @@\n         \"cSpell.words\": [\n             \"Chatmessage\"\n \t\t],\n-\t\t\"nuxt.isNuxtApp\": false\n+\t\t\"nuxt.isNuxtApp\": false,\n+\t\t\"svg.preview.background\": \"editor\"\n     }\n }\n\\ No newline at end of file",
-  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/profile/profile.page.scss\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/profile/edit-profile/edit-profile.page.scss\n\tmodified:   src/app/pages/agenda/agenda.module.ts\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.scss\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/services/agenda/list-box.service.ts\n\tmodified:   src/assets/images/theme/gov/icons-add.svg\n\tmodified:   workspace.code-workspace",
+  "lastCommitTime": "'Wed Aug 30 13:53:15 2023 +0100'",
+  "lastCommitMessage": "header",
+  "lastCommitNumber": "5235",
+  "change": "diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts\nindex ab1e7e563..1a99f56fc 100644\n--- a/src/app/pages/agenda/agenda.module.ts\n+++ b/src/app/pages/agenda/agenda.module.ts\n@@ -14,7 +14,7 @@ import localeDe from '@angular/common/locales/pt';\n \n registerLocaleData(localeDe);\n \n-import { CalendarModule, DateAdapter } from 'angular-calendar';\n+\n import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';\n \n import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';\n@@ -51,10 +51,6 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'\n     FormsModule,\n     IonicModule,\n     /*  */\n-    CalendarModule.forRoot({\n-      provide: DateAdapter,\n-      useFactory: adapterFactory\n-    }),\n \n     AgendaPageRoutingModule,\n     NgCalendarModule,\ndiff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html\nindex f6afc0046..d3ae8b0ea 100644\n--- a/src/app/pages/agenda/agenda.page.html\n+++ b/src/app/pages/agenda/agenda.page.html\n@@ -44,8 +44,7 @@\n                     <ion-icon *ngIf=\"ThemeService.currentTheme == 'doneIt' \"  slot=\"icon-only\"  src=\"assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-right.svg\"></ion-icon>\n                   </div>\n \n-\n-                  <div style=\"\n+                  <div *ngIf=\"SessionStore.user.RoleID !== 100000014\" style=\"\n                   padding-bottom: 10px;\n                   padding-left: 10px;\n                   padding-right: 10px;\n@@ -140,7 +139,7 @@\n                 </thead>\n               </table>\n \n-              <div class=\"calendar-conteiner-height overflow-hidden\" [style.height]=\"height\">\n+              <div class=\"calendar-conteiner-height overflow-hidden\" [style.height]=\"listBoxService.height\">\n                 <calendar\n                     class=\"calendar-component\"\n                     [eventSource]=\"listToPresent\"\n@@ -169,7 +168,7 @@\n                   <div [className]=\"currentDayEventDisplayBorder(view.dates, row*7+col)\" class=\"d-flex justify-center align-center\" [class.with-event]=\"view.dates[row*7+col].events.length\">\n \n                     <div class=\"day\">\n-                      <div class=\"number\"> {{ view.dates[row*7+col].label }}</div>\n+                      <div class=\"number\" [attr.date]=\"view.dates[row*7+col].label\" > {{ view.dates[row*7+col].label }}</div>\n                     </div>\n \n                   </div>\n@@ -186,7 +185,7 @@\n           <div class=\"calendar-title-container px-20 d-flex\">\n \n             <ion-row class=\"timeline-date align-center pr-10\">\n-              <button class=\"no-color\"  *ngIf=\"showCalendar\" (click)=\"height='0px';showCalendar=false\">\n+              <button class=\"no-color\"  *ngIf=\"showCalendar\" (click)=\"listBoxService.height='0px';showCalendar=false\">\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'default' \" class=\"collaps  font-25\" src=\"assets/images/icons-collaps-up.svg\" ></ion-icon>\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'gov' \" class=\"collaps  font-25\" src=\"assets/images/theme/gov/icons-collaps-up.svg\" ></ion-icon>\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'doneIt' \"  class=\"collaps  font-25\"  src=\"assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-up.svg\"></ion-icon>\n@@ -199,7 +198,7 @@\n             </ion-row>\n \n             <div style=\"padding-right: 50px\" class=\"font-16-em text-black align-center cursor-pointer\" (click)=\"changeSegment('Combinado')\" [class.active]=\"segment == 'Combinado' \">\n-              Todos...\n+              Todos\n             </div>\n             <div style=\"padding-right: 50px\" class=\"font-16-em text-black align-center cursor-pointer\"  (click)=\"changeSegment('Pessoal')\" [class.active]=\"segment == 'Pessoal' \">\n               Pessoais\n@@ -218,45 +217,42 @@\n           <div class=\"timeline-container height-100 d-flex pt-10 pl-20 filter-{{segment}}\"  >\n \n             <div  class=\"ss-timeline timeline-mobile flex-grow-1 pr-10  text-black height-100 width-100 overflow-y-auto\" >\n-              <div class=\"timeline-date align-center\" *ngIf=\"isSelectedDayHasEvent && hasEventToday\">\n+              <!-- <div class=\"timeline-date align-center\" *ngIf=\"isSelectedDayHasEvent && hasEventToday\">\n                 <span >Hoje,&nbsp;</span> {{ timelineDate }}\n-              </div>\n+              </div> -->\n \n-              <div *ngFor=\"let events of TimelineMDList | keyvalue; \" >\n+              <div *ngFor=\"let events of TimelineMDList \" >\n \n                 <div  class=\"EventListBox-container\" >\n-                  <div class=\"day \" [class.dayShow]=\"isSelectedDayHasEvent && hasEventToday\" >\n-                    {{ TimelineDay(events.key)}} <div style=\"text-transform: capitalize; display: inline;\">{{ viewTitle }}</div>\n-                  </div>\n-\n-                  <div *ngFor=\"let event of events.value\" class=\"EventListBox mb-10\"  >\n-\n-                    <div class=\"d-flex content-{{event.profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 \" (click)=\"eventClicked(event)\"\n-                      *ngIf=\"viewEventMonth <= dateMonth(event) \">\n \n-                      <div class=\"schedule-time\" *ngIf=\"!event.event.IsAllDayEvent\">\n+                  <div  class=\"EventListBox mb-10\"  >\n \n-                        <div *ngIf=\"event.startMany && !event.middle\" class=\"time-start labelb\">Início</div>\n-                        <div *ngIf=\"event.endMany && !event.middle \" class=\"time-end labelb\">Fim</div>\n+                    <div class=\" content-{{events.profile}}-{{events.calendarName}} mt-10 cursor-pointer width-100 \" \n+                      (click)=\"eventClicked(events)\">\n \n-                        <div *ngIf=\"!(event.endMany && !event.middle) && !event.middle\" class=\"time-start\">{{event.event.StartDate | date: 'HH:mm'}}</div>\n-                        <div *ngIf=\"!(event.startMany && !event.middle) && !event.middle\" class=\"time-end\"> {{event.event.EndDate | date: 'HH:mm'}} </div>\n+                      <div class=\"schedule-time\" >\n \n-                        <div *ngIf=\"event.middle\" class=\"time-start\"> Todo </div>\n-                        <div *ngIf=\"event.middle\" class=\"time-end text-center\"> o dia </div>\n+                        <div  class=\"time-start\">\n+                          <ion-icon slot=\"start\" src=\"assets/images/icons-calendar.svg\"></ion-icon>\n+                          Início\n+                          {{ events.startTime | date: 'dd-MM-yyyy HH:mm' }}\n+                        </div>\n+                        <div  class=\"time-end\">\n+                          <ion-icon slot=\"start\" src=\"assets/images/icons-calendar.svg\"></ion-icon>\n+                          Fim\n+                          {{ events.endTime | date: 'dd-MM-yyyy HH:mm' }}\n+                        </div>\n \n                       </div>\n-                      <div class=\"schedule-time\" *ngIf=\"event.event.IsAllDayEvent\">\n-                        <div class=\"time-start\">Todo </div>\n-                        <div class=\"time-end text-center\">o dia</div>\n-                      </div>\n                       <div class=\"schedule-details\">\n+                        <div class=\"location\">\n+                          <ion-icon slot=\"start\" src=\"assets/images/icons-location.svg\"></ion-icon>\n+                          {{events.event.Location}}\n+                        </div>\n                         <div class=\"description\">\n-                          <p class=\"m-0\">{{event.event.Subject}}</p>\n+                          <p class=\"m-0\">{{events.event.Subject}}</p>\n                         </div>\n-                        <div class=\"location\">{{event.event.Location}}</div>\n-                        <div class=\"font-13 calendar-owner\"*ngIf=\"eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'\">{{SessionStore.user.FullName}} </div>\n-                        <ng-template #other_content>{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}</ng-template>\n+                        <!-- <div class=\"font-13 calendar-owner\"*ngIf=\"eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'\">{{SessionStore.user.FullName}} </div> -->\n                       </div>\n                     </div>\n \ndiff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss\nindex 3418faa07..47da5c979 100644\n--- a/src/app/pages/agenda/agenda.page.scss\n+++ b/src/app/pages/agenda/agenda.page.scss\n@@ -490,12 +490,12 @@ td.monthview-primary-with-event {\n     margin-right: 10px;\n     min-width: 33px;\n     .time-start{\n-      color: #797979 !important;\n+      color: black !important;\n       font-family: Roboto;\n       font-size: rem(13);\n     }\n     .time-end{\n-      color: #797979 !important;\n+      color: black !important;\n       font-family: Roboto;\n       font-size: rem(13);\n     }\ndiff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts\nindex 28b94df19..320c4eba6 100644\n--- a/src/app/pages/agenda/agenda.page.ts\n+++ b/src/app/pages/agenda/agenda.page.ts\n@@ -176,7 +176,7 @@ export class AgendaPage implements OnInit {\n     public eventService: EventsService,\n     private router: Router,\n     private dateAdapter: DateAdapter<any>,\n-    private listBoxService: ListBoxService,\n+    public listBoxService: ListBoxService,\n     private changeProfileService: ChangeProfileService,\n     private backgroundservice: BackgroundService,\n     public ThemeService: ThemeService,\n@@ -274,6 +274,7 @@ export class AgendaPage implements OnInit {\n             this.updateEventListBox()\n           }\n           realoadCounter++;\n+          this.weekToShow()\n         }\n       });\n   \n@@ -290,14 +291,12 @@ export class AgendaPage implements OnInit {\n     }, 1000)\n   }\n \n-  height = 'unset'\n-\n   weekToShow() {\n \n     setTimeout(() => {\n       try {\n         let weekNum = 0;\n-\n+  \n         function Week(a) {\n           for(let b of a.querySelectorAll('td')) {\n             if(!b.className.includes('text-muted')) {\n@@ -315,7 +314,11 @@ export class AgendaPage implements OnInit {\n         } \n     \n         this.showCalendar = true\n-        this.height = (weekNum * dayBoxHeight) +'px'\n+        this.listBoxService.height = (weekNum * dayBoxHeight) +'px'\n+  \n+        if(dayBoxHeight == 0) {\n+          this.weekToShow()\n+        }\n       } catch (e) {\n         setTimeout(()=> {\n           this.weekToShow()\n@@ -336,15 +339,11 @@ export class AgendaPage implements OnInit {\n \n   //Go to the next view of the calendar month/week/day\n   next() {\n-    this.myCal.slideNext();\n-    this.myCal.loadEvents();\n-    this.myCal.update();\n+    this.addOneMonth();\n   }\n   //Go to the previous view of the calendar\n   back() {\n-    this.myCal.slidePrev();\n-    this.myCal.loadEvents();\n-    this.myCal.update();\n+    this.previewsMonth();\n   }\n \n   //Shows the title of your view\n@@ -705,23 +704,22 @@ export class AgendaPage implements OnInit {\n   updateEventListBox() {\n \n     const selectedCalendarIds = this.getSelectedAgendaCalendars();\n-    this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds)\n+    //this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds);\n \n     this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n \n-    const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt');\n-    if(this.TimelineMDList[selectedDay]) {\n-      this.hasEventToday = true\n-    } else {\n-      this.hasEventToday = false\n-    }\n+    // const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt');\n+    // if(this.TimelineMDList[selectedDay]) {\n+    //   this.hasEventToday = true\n+    // } else {\n+    //   this.hasEventToday = false\n+    // }\n \n \n     this.isSelectedDayHasEvent = momentG(new Date(), 'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate, 'dd MMMM yyyy', 'pt');\n \n   }\n \n-\n   changeYear = (year) => {\n     const a = this.calendar.currentDate\n \n@@ -769,13 +767,44 @@ export class AgendaPage implements OnInit {\n     }\n   }\n \n+  addOneMonth() {\n+\n+    // const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr td[class*=\"monthview-primary-with-event\"]')\n+    const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr div[date=\"1\"]')\n+    if(firstEventThatHasEvent) {\n+      firstEventThatHasEvent.click()\n+    }\n+\n+    try {\n+      this.myCal.slideNext();\n+      this.myCal.loadEvents();\n+      this.myCal.update();\n+    } catch (e) { }\n+  }\n+\n+\n+  previewsMonth() {\n+\n+    // const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr td[class*=\"monthview-primary-with-event\"]')\n+    const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr div[date=\"1\"]')\n+    if(firstEventThatHasEvent) {\n+      firstEventThatHasEvent.click()\n+    }\n+\n+    try {\n+      this.myCal.slidePrev();\n+      this.myCal.loadEvents();\n+      this.myCal.update();\n+    } catch (e) { }\n+  }\n+\n \n   get viewEventMonth() {\n     return this.viewDate.getMonth()\n   }\n \n   dateMonth(event: any) {\n-    return new Date(event.start).getMonth()\n+    return new Date(event.startTime).getMonth()\n   }\n \n   eventListVisible(event) {\ndiff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts\nindex 4673ecb8d..275531c46 100644\n--- a/src/app/services/agenda/list-box.service.ts\n+++ b/src/app/services/agenda/list-box.service.ts\n@@ -7,6 +7,8 @@ import { DateService } from '../date.service';\n })\n export class ListBoxService {\n \n+\theight = 'unset'\n+\n \tconstructor(\n     \tprivate dateService: DateService\n \t){}\n@@ -16,16 +18,37 @@ export class ListBoxService {\n \t\treturn eventSource.filter((e) => e.profile == profile)\n \t}\n \n-\tgetEventInsideRange(eventSource: EventListStore[], rangeStartDate, randEndDate) {\n+\tgetEventInsideRange(eventSource: EventListStore[], rangeStartDate, randEndDate, selectedDate) {\n \t\treturn eventSource.filter((e)=> {\n-\t\t\tif(new Date(rangeStartDate).getTime() <= new Date(e.startTime).getTime() &&\n-\t\t\t\t\tnew Date(randEndDate).getTime() >= new Date(e.endTime).getTime()) { \n+\t\t\tif (new Date(selectedDate).getMonth() == new Date(e.startTime).getMonth() &&  new Date(selectedDate).getFullYear() == new Date(e.startTime).getFullYear() ||\n+\t\t\tnew Date(selectedDate).getMonth() == new Date(e.endTime).getMonth() &&  new Date(selectedDate).getFullYear() == new Date(e.startTime).getFullYear()) {\n+\t\t\t\treturn true\n+\t\t\t} else if(new Date(rangeStartDate).getTime() >= new Date(e.startTime).getTime() &&\n+\t\t\t\t\tnew Date(randEndDate).getTime() <= new Date(e.endTime).getTime()) {\n+\t\t\t\treturn true\n+\t\t\t}\n+\t\t\treturn false\n+\t\t})\n+\t}\n+\n+\tgetEventFromCurrentDate(eventSource: EventListStore[], selectedDate) {\n+\t\treturn eventSource.filter((e) => {\n+\t\t\tif (new Date(selectedDate).getTime() <= new Date(e.startTime).getTime() ||  new Date(selectedDate).getTime() <= new Date(e.endTime).getTime() ) {\n \t\t\t\treturn true\n \t\t\t}\n \t\t\treturn false\n \t\t})\n \t}\n \n+\n+\tsortArrayISODate(eventSource: EventListStore[]): any[] {\n+\n+\t\treturn eventSource.sort((a,b) => \n+\t\t  new Date(b.startTime).getTime() \n+\t\t  - \n+\t\t  new Date(a.startTime).getTime())\n+\t  }\n+\n \tfilterSegment(eventSource: EventListStore[], segment): EventListStore[] {\n \t\t\n \t\treturn eventSource.filter( data => data.calendarName == segment)\n@@ -33,7 +56,7 @@ export class ListBoxService {\n \n \tdaysBetween(){ }\n \n-\tlist(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all', rangeStartDate, randEndDate, {segment = 'Combinado', selectedDate= null}) {\n+\tlist(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all', rangeStartDate, randEndDate, {segment = 'Combinado', selectedDate}) {\n \n \t\t// // filter range\n \t\t// if(selectedDate) {\n@@ -48,15 +71,11 @@ export class ListBoxService {\n \t\t\teventSource = this.filterSegment(eventSource, segment) \n \t\t}\n     \n-\t\t// if(profile != 'all') {\n-\t\t// \teventSource = this.filterProfile(eventSource, profile)\n-\t\t// }\n-\n-    \tlet newStracture:CustomCalendarEvent[];\n-\n-\t\tnewStracture = this.encapsulation(eventSource);\n+\t\teventSource =  this.getEventInsideRange(eventSource, rangeStartDate, randEndDate, selectedDate)\n+\t\teventSource = this.getEventFromCurrentDate(eventSource, selectedDate)\n+\t\teventSource  = this.sortArrayISODate(eventSource).reverse()\n \n-\t\treturn this.display(newStracture, selectedDate)\n+\t\treturn eventSource\n \t}\n \n \tdisplay(list: CustomCalendarEvent[], selectedDate) {\ndiff --git a/workspace.code-workspace b/workspace.code-workspace\nindex 07d71037b..73623083b 100644\n--- a/workspace.code-workspace\n+++ b/workspace.code-workspace\n@@ -8,6 +8,7 @@\n         \"cSpell.words\": [\n             \"Chatmessage\"\n \t\t],\n-\t\t\"nuxt.isNuxtApp\": false\n+\t\t\"nuxt.isNuxtApp\": false,\n+\t\t\"svg.preview.background\": \"editor\"\n     }\n }\n\\ No newline at end of file",
+  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/profile/edit-profile/edit-profile.page.scss\n\tmodified:   src/assets/images/theme/gov/icons-add.svg\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/pages/agenda/agenda.module.ts\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.scss\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/services/agenda/list-box.service.ts\n\tmodified:   workspace.code-workspace",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 1b9f5a25cb0229cdb51b82ee43aa9d5cbff75bb7 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 30 Aug 2023 14:18:05 +0100
Subject: [PATCH 3/6] agenda drop down calendar

---
 src/app/pages/agenda/agenda.page.html       |  4 ++--
 src/app/pages/agenda/agenda.page.ts         | 13 ++++++++-----
 src/app/services/agenda/list-box.service.ts |  2 ++
 version/git-version.ts                      | 14 +++++++-------
 workspace.code-workspace                    |  3 +++
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index f6afc0046..e90d977ee 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -140,7 +140,7 @@
                 </thead>
               </table>
 
-              <div class="calendar-conteiner-height overflow-hidden" [style.height]="height">
+              <div class="calendar-conteiner-height overflow-hidden" [style.height]="listBoxService.height">
                 <calendar
                     class="calendar-component"
                     [eventSource]="listToPresent"
@@ -186,7 +186,7 @@
           <div class="calendar-title-container px-20 d-flex">
 
             <ion-row class="timeline-date align-center pr-10">
-              <button class="no-color"  *ngIf="showCalendar" (click)="height='0px';showCalendar=false">
+              <button class="no-color"  *ngIf="showCalendar" (click)="listBoxService.height='0px';showCalendar=false">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps  font-25" src="assets/images/icons-collaps-up.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps  font-25" src="assets/images/theme/gov/icons-collaps-up.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "  class="collaps  font-25"  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-up.svg"></ion-icon>
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 28b94df19..74d32527a 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -176,7 +176,7 @@ export class AgendaPage implements OnInit {
     public eventService: EventsService,
     private router: Router,
     private dateAdapter: DateAdapter<any>,
-    private listBoxService: ListBoxService,
+    public listBoxService: ListBoxService,
     private changeProfileService: ChangeProfileService,
     private backgroundservice: BackgroundService,
     public ThemeService: ThemeService,
@@ -274,6 +274,7 @@ export class AgendaPage implements OnInit {
             this.updateEventListBox()
           }
           realoadCounter++;
+          this.weekToShow()
         }
       });
   
@@ -290,14 +291,12 @@ export class AgendaPage implements OnInit {
     }, 1000)
   }
 
-  height = 'unset'
-
   weekToShow() {
 
     setTimeout(() => {
       try {
         let weekNum = 0;
-
+  
         function Week(a) {
           for(let b of a.querySelectorAll('td')) {
             if(!b.className.includes('text-muted')) {
@@ -315,7 +314,11 @@ export class AgendaPage implements OnInit {
         } 
     
         this.showCalendar = true
-        this.height = (weekNum * dayBoxHeight) +'px'
+        this.listBoxService.height = (weekNum * dayBoxHeight) +'px'
+  
+        if(dayBoxHeight == 0) {
+          this.weekToShow()
+        }
       } catch (e) {
         setTimeout(()=> {
           this.weekToShow()
diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts
index 4673ecb8d..5b9747fca 100644
--- a/src/app/services/agenda/list-box.service.ts
+++ b/src/app/services/agenda/list-box.service.ts
@@ -7,6 +7,8 @@ import { DateService } from '../date.service';
 })
 export class ListBoxService {
 
+	height = "unset"
+	
 	constructor(
     	private dateService: DateService
 	){}
diff --git a/version/git-version.ts b/version/git-version.ts
index 9e2b43a32..b53f6954b 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "119f4df39",
-  "SHA": "119f4df39d56f36d4b81373849b0de65514f2649",
+  "shortSHA": "2d8107fc6",
+  "SHA": "2d8107fc61265f346825a46a5557a009da0ff7f7",
   "branch": "developer-prod",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Wed Aug 30 13:53:15 2023 +0100'",
-  "lastCommitMessage": "header",
-  "lastCommitNumber": "5235",
-  "change": "diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts\nindex ab1e7e563..1a99f56fc 100644\n--- a/src/app/pages/agenda/agenda.module.ts\n+++ b/src/app/pages/agenda/agenda.module.ts\n@@ -14,7 +14,7 @@ import localeDe from '@angular/common/locales/pt';\n \n registerLocaleData(localeDe);\n \n-import { CalendarModule, DateAdapter } from 'angular-calendar';\n+\n import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';\n \n import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';\n@@ -51,10 +51,6 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'\n     FormsModule,\n     IonicModule,\n     /*  */\n-    CalendarModule.forRoot({\n-      provide: DateAdapter,\n-      useFactory: adapterFactory\n-    }),\n \n     AgendaPageRoutingModule,\n     NgCalendarModule,\ndiff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html\nindex f6afc0046..d3ae8b0ea 100644\n--- a/src/app/pages/agenda/agenda.page.html\n+++ b/src/app/pages/agenda/agenda.page.html\n@@ -44,8 +44,7 @@\n                     <ion-icon *ngIf=\"ThemeService.currentTheme == 'doneIt' \"  slot=\"icon-only\"  src=\"assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-right.svg\"></ion-icon>\n                   </div>\n \n-\n-                  <div style=\"\n+                  <div *ngIf=\"SessionStore.user.RoleID !== 100000014\" style=\"\n                   padding-bottom: 10px;\n                   padding-left: 10px;\n                   padding-right: 10px;\n@@ -140,7 +139,7 @@\n                 </thead>\n               </table>\n \n-              <div class=\"calendar-conteiner-height overflow-hidden\" [style.height]=\"height\">\n+              <div class=\"calendar-conteiner-height overflow-hidden\" [style.height]=\"listBoxService.height\">\n                 <calendar\n                     class=\"calendar-component\"\n                     [eventSource]=\"listToPresent\"\n@@ -169,7 +168,7 @@\n                   <div [className]=\"currentDayEventDisplayBorder(view.dates, row*7+col)\" class=\"d-flex justify-center align-center\" [class.with-event]=\"view.dates[row*7+col].events.length\">\n \n                     <div class=\"day\">\n-                      <div class=\"number\"> {{ view.dates[row*7+col].label }}</div>\n+                      <div class=\"number\" [attr.date]=\"view.dates[row*7+col].label\" > {{ view.dates[row*7+col].label }}</div>\n                     </div>\n \n                   </div>\n@@ -186,7 +185,7 @@\n           <div class=\"calendar-title-container px-20 d-flex\">\n \n             <ion-row class=\"timeline-date align-center pr-10\">\n-              <button class=\"no-color\"  *ngIf=\"showCalendar\" (click)=\"height='0px';showCalendar=false\">\n+              <button class=\"no-color\"  *ngIf=\"showCalendar\" (click)=\"listBoxService.height='0px';showCalendar=false\">\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'default' \" class=\"collaps  font-25\" src=\"assets/images/icons-collaps-up.svg\" ></ion-icon>\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'gov' \" class=\"collaps  font-25\" src=\"assets/images/theme/gov/icons-collaps-up.svg\" ></ion-icon>\n                 <ion-icon *ngIf=\"ThemeService.currentTheme == 'doneIt' \"  class=\"collaps  font-25\"  src=\"assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-up.svg\"></ion-icon>\n@@ -199,7 +198,7 @@\n             </ion-row>\n \n             <div style=\"padding-right: 50px\" class=\"font-16-em text-black align-center cursor-pointer\" (click)=\"changeSegment('Combinado')\" [class.active]=\"segment == 'Combinado' \">\n-              Todos...\n+              Todos\n             </div>\n             <div style=\"padding-right: 50px\" class=\"font-16-em text-black align-center cursor-pointer\"  (click)=\"changeSegment('Pessoal')\" [class.active]=\"segment == 'Pessoal' \">\n               Pessoais\n@@ -218,45 +217,42 @@\n           <div class=\"timeline-container height-100 d-flex pt-10 pl-20 filter-{{segment}}\"  >\n \n             <div  class=\"ss-timeline timeline-mobile flex-grow-1 pr-10  text-black height-100 width-100 overflow-y-auto\" >\n-              <div class=\"timeline-date align-center\" *ngIf=\"isSelectedDayHasEvent && hasEventToday\">\n+              <!-- <div class=\"timeline-date align-center\" *ngIf=\"isSelectedDayHasEvent && hasEventToday\">\n                 <span >Hoje,&nbsp;</span> {{ timelineDate }}\n-              </div>\n+              </div> -->\n \n-              <div *ngFor=\"let events of TimelineMDList | keyvalue; \" >\n+              <div *ngFor=\"let events of TimelineMDList \" >\n \n                 <div  class=\"EventListBox-container\" >\n-                  <div class=\"day \" [class.dayShow]=\"isSelectedDayHasEvent && hasEventToday\" >\n-                    {{ TimelineDay(events.key)}} <div style=\"text-transform: capitalize; display: inline;\">{{ viewTitle }}</div>\n-                  </div>\n-\n-                  <div *ngFor=\"let event of events.value\" class=\"EventListBox mb-10\"  >\n-\n-                    <div class=\"d-flex content-{{event.profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 \" (click)=\"eventClicked(event)\"\n-                      *ngIf=\"viewEventMonth <= dateMonth(event) \">\n \n-                      <div class=\"schedule-time\" *ngIf=\"!event.event.IsAllDayEvent\">\n+                  <div  class=\"EventListBox mb-10\"  >\n \n-                        <div *ngIf=\"event.startMany && !event.middle\" class=\"time-start labelb\">Início</div>\n-                        <div *ngIf=\"event.endMany && !event.middle \" class=\"time-end labelb\">Fim</div>\n+                    <div class=\" content-{{events.profile}}-{{events.calendarName}} mt-10 cursor-pointer width-100 \" \n+                      (click)=\"eventClicked(events)\">\n \n-                        <div *ngIf=\"!(event.endMany && !event.middle) && !event.middle\" class=\"time-start\">{{event.event.StartDate | date: 'HH:mm'}}</div>\n-                        <div *ngIf=\"!(event.startMany && !event.middle) && !event.middle\" class=\"time-end\"> {{event.event.EndDate | date: 'HH:mm'}} </div>\n+                      <div class=\"schedule-time\" >\n \n-                        <div *ngIf=\"event.middle\" class=\"time-start\"> Todo </div>\n-                        <div *ngIf=\"event.middle\" class=\"time-end text-center\"> o dia </div>\n+                        <div  class=\"time-start\">\n+                          <ion-icon slot=\"start\" src=\"assets/images/icons-calendar.svg\"></ion-icon>\n+                          Início\n+                          {{ events.startTime | date: 'dd-MM-yyyy HH:mm' }}\n+                        </div>\n+                        <div  class=\"time-end\">\n+                          <ion-icon slot=\"start\" src=\"assets/images/icons-calendar.svg\"></ion-icon>\n+                          Fim\n+                          {{ events.endTime | date: 'dd-MM-yyyy HH:mm' }}\n+                        </div>\n \n                       </div>\n-                      <div class=\"schedule-time\" *ngIf=\"event.event.IsAllDayEvent\">\n-                        <div class=\"time-start\">Todo </div>\n-                        <div class=\"time-end text-center\">o dia</div>\n-                      </div>\n                       <div class=\"schedule-details\">\n+                        <div class=\"location\">\n+                          <ion-icon slot=\"start\" src=\"assets/images/icons-location.svg\"></ion-icon>\n+                          {{events.event.Location}}\n+                        </div>\n                         <div class=\"description\">\n-                          <p class=\"m-0\">{{event.event.Subject}}</p>\n+                          <p class=\"m-0\">{{events.event.Subject}}</p>\n                         </div>\n-                        <div class=\"location\">{{event.event.Location}}</div>\n-                        <div class=\"font-13 calendar-owner\"*ngIf=\"eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'\">{{SessionStore.user.FullName}} </div>\n-                        <ng-template #other_content>{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}</ng-template>\n+                        <!-- <div class=\"font-13 calendar-owner\"*ngIf=\"eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'\">{{SessionStore.user.FullName}} </div> -->\n                       </div>\n                     </div>\n \ndiff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss\nindex 3418faa07..47da5c979 100644\n--- a/src/app/pages/agenda/agenda.page.scss\n+++ b/src/app/pages/agenda/agenda.page.scss\n@@ -490,12 +490,12 @@ td.monthview-primary-with-event {\n     margin-right: 10px;\n     min-width: 33px;\n     .time-start{\n-      color: #797979 !important;\n+      color: black !important;\n       font-family: Roboto;\n       font-size: rem(13);\n     }\n     .time-end{\n-      color: #797979 !important;\n+      color: black !important;\n       font-family: Roboto;\n       font-size: rem(13);\n     }\ndiff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts\nindex 28b94df19..320c4eba6 100644\n--- a/src/app/pages/agenda/agenda.page.ts\n+++ b/src/app/pages/agenda/agenda.page.ts\n@@ -176,7 +176,7 @@ export class AgendaPage implements OnInit {\n     public eventService: EventsService,\n     private router: Router,\n     private dateAdapter: DateAdapter<any>,\n-    private listBoxService: ListBoxService,\n+    public listBoxService: ListBoxService,\n     private changeProfileService: ChangeProfileService,\n     private backgroundservice: BackgroundService,\n     public ThemeService: ThemeService,\n@@ -274,6 +274,7 @@ export class AgendaPage implements OnInit {\n             this.updateEventListBox()\n           }\n           realoadCounter++;\n+          this.weekToShow()\n         }\n       });\n   \n@@ -290,14 +291,12 @@ export class AgendaPage implements OnInit {\n     }, 1000)\n   }\n \n-  height = 'unset'\n-\n   weekToShow() {\n \n     setTimeout(() => {\n       try {\n         let weekNum = 0;\n-\n+  \n         function Week(a) {\n           for(let b of a.querySelectorAll('td')) {\n             if(!b.className.includes('text-muted')) {\n@@ -315,7 +314,11 @@ export class AgendaPage implements OnInit {\n         } \n     \n         this.showCalendar = true\n-        this.height = (weekNum * dayBoxHeight) +'px'\n+        this.listBoxService.height = (weekNum * dayBoxHeight) +'px'\n+  \n+        if(dayBoxHeight == 0) {\n+          this.weekToShow()\n+        }\n       } catch (e) {\n         setTimeout(()=> {\n           this.weekToShow()\n@@ -336,15 +339,11 @@ export class AgendaPage implements OnInit {\n \n   //Go to the next view of the calendar month/week/day\n   next() {\n-    this.myCal.slideNext();\n-    this.myCal.loadEvents();\n-    this.myCal.update();\n+    this.addOneMonth();\n   }\n   //Go to the previous view of the calendar\n   back() {\n-    this.myCal.slidePrev();\n-    this.myCal.loadEvents();\n-    this.myCal.update();\n+    this.previewsMonth();\n   }\n \n   //Shows the title of your view\n@@ -705,23 +704,22 @@ export class AgendaPage implements OnInit {\n   updateEventListBox() {\n \n     const selectedCalendarIds = this.getSelectedAgendaCalendars();\n-    this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds)\n+    //this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds);\n \n     this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n \n-    const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt');\n-    if(this.TimelineMDList[selectedDay]) {\n-      this.hasEventToday = true\n-    } else {\n-      this.hasEventToday = false\n-    }\n+    // const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt');\n+    // if(this.TimelineMDList[selectedDay]) {\n+    //   this.hasEventToday = true\n+    // } else {\n+    //   this.hasEventToday = false\n+    // }\n \n \n     this.isSelectedDayHasEvent = momentG(new Date(), 'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate, 'dd MMMM yyyy', 'pt');\n \n   }\n \n-\n   changeYear = (year) => {\n     const a = this.calendar.currentDate\n \n@@ -769,13 +767,44 @@ export class AgendaPage implements OnInit {\n     }\n   }\n \n+  addOneMonth() {\n+\n+    // const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr td[class*=\"monthview-primary-with-event\"]')\n+    const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr div[date=\"1\"]')\n+    if(firstEventThatHasEvent) {\n+      firstEventThatHasEvent.click()\n+    }\n+\n+    try {\n+      this.myCal.slideNext();\n+      this.myCal.loadEvents();\n+      this.myCal.update();\n+    } catch (e) { }\n+  }\n+\n+\n+  previewsMonth() {\n+\n+    // const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr td[class*=\"monthview-primary-with-event\"]')\n+    const firstEventThatHasEvent: HTMLElement = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr div[date=\"1\"]')\n+    if(firstEventThatHasEvent) {\n+      firstEventThatHasEvent.click()\n+    }\n+\n+    try {\n+      this.myCal.slidePrev();\n+      this.myCal.loadEvents();\n+      this.myCal.update();\n+    } catch (e) { }\n+  }\n+\n \n   get viewEventMonth() {\n     return this.viewDate.getMonth()\n   }\n \n   dateMonth(event: any) {\n-    return new Date(event.start).getMonth()\n+    return new Date(event.startTime).getMonth()\n   }\n \n   eventListVisible(event) {\ndiff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts\nindex 4673ecb8d..275531c46 100644\n--- a/src/app/services/agenda/list-box.service.ts\n+++ b/src/app/services/agenda/list-box.service.ts\n@@ -7,6 +7,8 @@ import { DateService } from '../date.service';\n })\n export class ListBoxService {\n \n+\theight = 'unset'\n+\n \tconstructor(\n     \tprivate dateService: DateService\n \t){}\n@@ -16,16 +18,37 @@ export class ListBoxService {\n \t\treturn eventSource.filter((e) => e.profile == profile)\n \t}\n \n-\tgetEventInsideRange(eventSource: EventListStore[], rangeStartDate, randEndDate) {\n+\tgetEventInsideRange(eventSource: EventListStore[], rangeStartDate, randEndDate, selectedDate) {\n \t\treturn eventSource.filter((e)=> {\n-\t\t\tif(new Date(rangeStartDate).getTime() <= new Date(e.startTime).getTime() &&\n-\t\t\t\t\tnew Date(randEndDate).getTime() >= new Date(e.endTime).getTime()) { \n+\t\t\tif (new Date(selectedDate).getMonth() == new Date(e.startTime).getMonth() &&  new Date(selectedDate).getFullYear() == new Date(e.startTime).getFullYear() ||\n+\t\t\tnew Date(selectedDate).getMonth() == new Date(e.endTime).getMonth() &&  new Date(selectedDate).getFullYear() == new Date(e.startTime).getFullYear()) {\n+\t\t\t\treturn true\n+\t\t\t} else if(new Date(rangeStartDate).getTime() >= new Date(e.startTime).getTime() &&\n+\t\t\t\t\tnew Date(randEndDate).getTime() <= new Date(e.endTime).getTime()) {\n+\t\t\t\treturn true\n+\t\t\t}\n+\t\t\treturn false\n+\t\t})\n+\t}\n+\n+\tgetEventFromCurrentDate(eventSource: EventListStore[], selectedDate) {\n+\t\treturn eventSource.filter((e) => {\n+\t\t\tif (new Date(selectedDate).getTime() <= new Date(e.startTime).getTime() ||  new Date(selectedDate).getTime() <= new Date(e.endTime).getTime() ) {\n \t\t\t\treturn true\n \t\t\t}\n \t\t\treturn false\n \t\t})\n \t}\n \n+\n+\tsortArrayISODate(eventSource: EventListStore[]): any[] {\n+\n+\t\treturn eventSource.sort((a,b) => \n+\t\t  new Date(b.startTime).getTime() \n+\t\t  - \n+\t\t  new Date(a.startTime).getTime())\n+\t  }\n+\n \tfilterSegment(eventSource: EventListStore[], segment): EventListStore[] {\n \t\t\n \t\treturn eventSource.filter( data => data.calendarName == segment)\n@@ -33,7 +56,7 @@ export class ListBoxService {\n \n \tdaysBetween(){ }\n \n-\tlist(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all', rangeStartDate, randEndDate, {segment = 'Combinado', selectedDate= null}) {\n+\tlist(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all', rangeStartDate, randEndDate, {segment = 'Combinado', selectedDate}) {\n \n \t\t// // filter range\n \t\t// if(selectedDate) {\n@@ -48,15 +71,11 @@ export class ListBoxService {\n \t\t\teventSource = this.filterSegment(eventSource, segment) \n \t\t}\n     \n-\t\t// if(profile != 'all') {\n-\t\t// \teventSource = this.filterProfile(eventSource, profile)\n-\t\t// }\n-\n-    \tlet newStracture:CustomCalendarEvent[];\n-\n-\t\tnewStracture = this.encapsulation(eventSource);\n+\t\teventSource =  this.getEventInsideRange(eventSource, rangeStartDate, randEndDate, selectedDate)\n+\t\teventSource = this.getEventFromCurrentDate(eventSource, selectedDate)\n+\t\teventSource  = this.sortArrayISODate(eventSource).reverse()\n \n-\t\treturn this.display(newStracture, selectedDate)\n+\t\treturn eventSource\n \t}\n \n \tdisplay(list: CustomCalendarEvent[], selectedDate) {\ndiff --git a/workspace.code-workspace b/workspace.code-workspace\nindex 07d71037b..73623083b 100644\n--- a/workspace.code-workspace\n+++ b/workspace.code-workspace\n@@ -8,6 +8,7 @@\n         \"cSpell.words\": [\n             \"Chatmessage\"\n \t\t],\n-\t\t\"nuxt.isNuxtApp\": false\n+\t\t\"nuxt.isNuxtApp\": false,\n+\t\t\"svg.preview.background\": \"editor\"\n     }\n }\n\\ No newline at end of file",
-  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/profile/edit-profile/edit-profile.page.scss\n\tmodified:   src/assets/images/theme/gov/icons-add.svg\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/pages/agenda/agenda.module.ts\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.scss\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/services/agenda/list-box.service.ts\n\tmodified:   workspace.code-workspace",
+  "lastCommitTime": "'Wed Aug 30 13:55:39 2023 +0100'",
+  "lastCommitMessage": "change icons",
+  "lastCommitNumber": "5236",
+  "change": "",
+  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/services/agenda/list-box.service.ts\n\tmodified:   workspace.code-workspace",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file
diff --git a/workspace.code-workspace b/workspace.code-workspace
index 07d71037b..65a75eafa 100644
--- a/workspace.code-workspace
+++ b/workspace.code-workspace
@@ -2,6 +2,9 @@
     "folders": [
 		{
 			"path": "."
+		},
+		{
+			"path": "../srccccccccccccc/src"
 		}
 	],
     "settings": {

From 7ee834558ce74ba7341b794ce916853ce0ffdd39 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 30 Aug 2023 14:39:27 +0100
Subject: [PATCH 4/6] improve action on mobile

---
 .../edit-action/edit-action.page.html         | 39 ++++---------------
 .../edit-action/edit-action.page.ts           | 35 +++++++++--------
 version/git-version.ts                        | 12 +++---
 3 files changed, 32 insertions(+), 54 deletions(-)

diff --git a/src/app/pages/publications/edit-action/edit-action.page.html b/src/app/pages/publications/edit-action/edit-action.page.html
index 3572ad8b9..4aa50f747 100644
--- a/src/app/pages/publications/edit-action/edit-action.page.html
+++ b/src/app/pages/publications/edit-action/edit-action.page.html
@@ -20,30 +20,18 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
-        <div class="ion-input-class flex-grow-1">
-          <ion-datetime
-            class="d-block d-md-none"
-            [(ngModel)]="folder.DateBegin"
-            placeholder="Início"
-            displayFormat="D MMM YYYY H:mm"
-            minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
-            monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-            min="{{minDate}}"
-            max="2025">
-          </ion-datetime>
+        <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
 
-
-          <mat-form-field appearance="none" class="width-100 date-hour-picker d-none  d-md-block">
+          <mat-form-field appearance="none" class="width-100 date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="picker1"
               placeholder="Choose a date*"
-              [formControl]="folder.DateBegin"
-              [disabled]="disabled"
+              [(ngModel)]="folder.DateBegin"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1
               [showSpinners]="showSpinners"
               [showSeconds]="showSeconds"
-              [stepHour]="stepHour" [stepMinute]="stepMinute"
+              [stepHour]="1" [stepMinute]="12"
               [stepSecond]="stepSecond"
               [touchUi]="touchUi">
             </ngx-mat-datetime-picker>
@@ -58,30 +46,19 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
-        <div class="ion-input-class d-flex flex-grow-1">
-          <ion-datetime
-            class="flex-grow-1 d-block d-md-none"
-            [(ngModel)]="folder.DateEnd"
-            placeholder="Fim"
-            displayFormat="D MMM YYYY H:mm"
-            minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
-            monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-            min="{{minDate}}"
-            max="2025">
-          </ion-datetime>
+        <div class="ion-input-class d-flex flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
 
-          <mat-form-field class="width-100 date-hour-picker d-none d-md-block">
+          <mat-form-field class="width-100 date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="fim"
               placeholder="Choose a date*"
-              [formControl]="folder.DateEnd"
+              [(ngModel)]="folder.DateEnd"
               [min]="maxDate"
-              [disabled]="disabled"
             >
             <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #fim
               [showSpinners]="showSpinners"
               [showSeconds]="showSeconds"
-              [stepHour]="stepHour" [stepMinute]="stepMinute"
+              [stepHour]="1" [stepMinute]="15"
               [stepSecond]="stepSecond"
               [touchUi]="touchUi">
             </ngx-mat-datetime-picker>
diff --git a/src/app/pages/publications/edit-action/edit-action.page.ts b/src/app/pages/publications/edit-action/edit-action.page.ts
index 23465dc22..e94c27dbf 100644
--- a/src/app/pages/publications/edit-action/edit-action.page.ts
+++ b/src/app/pages/publications/edit-action/edit-action.page.ts
@@ -6,11 +6,28 @@ import { PublicationFolder } from 'src/app/models/publicationfolder';
 import { PublicationsService } from 'src/app/services/publications.service';
 import { ToastService } from 'src/app/services/toast.service';
 import { HttpErrorHandle} from 'src/app/services/http-error-handle.service';
+import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
+
+const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
+  parse: {
+    dateInput: "YYYY-MMMM-DD HH:mm"
+  },
+  display: {
+    dateInput: "DD MMM YYYY H:mm",
+    monthYearLabel: "MMM YYYY",
+    dateA11yLabel: "LL",
+    monthYearA11yLabel: "MMMM YYYY"
+  }
+}
 
 @Component({
   selector: 'app-edit-action',
   templateUrl: './edit-action.page.html',
   styleUrls: ['./edit-action.page.scss'],
+  providers: [
+    { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS },
+  ]
 })
 export class EditActionPage implements OnInit {
 
@@ -28,8 +45,6 @@ export class EditActionPage implements OnInit {
   public stepHour = 1;
   public stepMinute = 15;
   public stepSecond = 5;
-  public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
-  public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
   currentDate = new Date();
   
   folder: PublicationFolder;
@@ -71,26 +86,12 @@ export class EditActionPage implements OnInit {
   getPublicationDetail() {
     this.publicationsService.GetPresidentialAction(this.folderId).subscribe( res => {
       this.folder = res;
-      
-      this.dateControlStart = new FormControl(moment(new Date(this.folder.DateBegin)));
-      this.dateControlEnd = new FormControl(moment(new Date(this.folder.DateEnd)));
 
     });
   }
 
   get dateValid() {
-    var validado: boolean;
-
-    if (window.innerWidth <= 800) {
-      if ((this.folder.DateBegin < this.folder.DateEnd) && (new Date(this.folder.DateBegin).getTime() > this.currentDate.getTime())) {
-        validado = true;
-      }else{
-        validado = false;
-      }
-      return validado == true ? ['ok']: [];
-    } else {
-      return ['ok']
-    }
+    return new Date(this.folder.DateBegin).getTime() < new Date(this.folder.DateEnd).getTime()? 'ok': null
   }
 
   runValidation() {
diff --git a/version/git-version.ts b/version/git-version.ts
index b53f6954b..2bbfe1157 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "2d8107fc6",
-  "SHA": "2d8107fc61265f346825a46a5557a009da0ff7f7",
+  "shortSHA": "1b9f5a25c",
+  "SHA": "1b9f5a25cb0229cdb51b82ee43aa9d5cbff75bb7",
   "branch": "developer-prod",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Wed Aug 30 13:55:39 2023 +0100'",
-  "lastCommitMessage": "change icons",
-  "lastCommitNumber": "5236",
+  "lastCommitTime": "'Wed Aug 30 14:18:05 2023 +0100'",
+  "lastCommitMessage": "agenda drop down calendar",
+  "lastCommitNumber": "5237",
   "change": "",
-  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/services/agenda/list-box.service.ts\n\tmodified:   workspace.code-workspace",
+  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/publications/edit-action/edit-action.page.html\n\tmodified:   src/app/pages/publications/edit-action/edit-action.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 0379b722cf410a9a53b892b968d6ef44a0dafedf Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 30 Aug 2023 17:11:31 +0100
Subject: [PATCH 5/6] change icons

---
 .../gabinete-digital.page.html                |  2 +-
 .../pages/publications/publications.page.html |  2 +-
 .../agenda/view-event/view-event.page.scss    |  2 +-
 .../view-publications.page.html               |  2 +-
 .../theme/gov/icons-chat-record-audio.svg     | 10 ++--
 src/assets/icon/theme/gov/icons-chat-send.svg |  8 ++--
 .../gov/icons-most-searched-words-open.svg    |  8 ++--
 src/assets/images/icons-menu.svg              | 15 ------
 src/assets/images/icons-nav-agenda-active.svg | 48 -------------------
 .../images/icons-profile-calendar-md.svg      |  6 ---
 src/assets/images/icons-received-event.svg    | 14 +++---
 .../theme/gov/advance-search-show-modal.svg   |  8 ++--
 src/assets/images/theme/gov/icon-reload.svg   |  4 ++
 .../gov/icons-arrow-circle-arrow-right.svg    |  2 +-
 .../images/theme/gov/icons-attach-doc.svg     |  6 +--
 .../theme/gov/icons-chat-new-conversation.svg |  6 +--
 .../images/theme/gov/icons-chat-new-group.svg |  8 ++--
 ...audio.svg => icons-chat-record-audio1.svg} |  6 ++-
 .../images/theme/gov/icons-chat-send.svg      |  8 ++--
 .../images/theme/gov/icons-collaps-down.svg   |  5 +-
 .../images/theme/gov/icons-collaps-up.svg     | 10 +++-
 src/assets/images/theme/gov/icons-edit.svg    | 10 ++--
 .../images/theme/gov/icons-received-event.svg | 14 +++---
 .../images/theme/gov/icons-search-close.svg   |  8 ++--
 src/assets/images/theme/gov/icons-search.svg  |  8 ++--
 src/theme/variables.scss                      |  6 ++-
 version/git-version.ts                        | 12 ++---
 27 files changed, 94 insertions(+), 144 deletions(-)
 delete mode 100644 src/assets/images/icons-menu.svg
 delete mode 100644 src/assets/images/icons-nav-agenda-active.svg
 delete mode 100644 src/assets/images/icons-profile-calendar-md.svg
 create mode 100644 src/assets/images/theme/gov/icon-reload.svg
 rename src/assets/images/theme/gov/{icons-chat-record-audio.svg => icons-chat-record-audio1.svg} (87%)

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 58b4d666d..9c0d83882 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -58,7 +58,7 @@
         </div>
         <button title="Atualizar" *ngIf="hideRefreshBtn && TaskService.loadCount" class="btn-no-color btn-refresh"
           (click)="doRefreshAside()">
-          <ion-icon 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 *ngIf="!hideRefreshBtn" class="title-icons">
 
diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html
index f9a0d1615..4bbde9b92 100644
--- a/src/app/pages/publications/publications.page.html
+++ b/src/app/pages/publications/publications.page.html
@@ -28,7 +28,7 @@
                 <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="icon-only" src='assets/images/theme/{{ThemeService.currentTheme}}/icons-add.svg'></ion-icon>
               </button>
               <button title="Atualizar"  class="btn-no-color" (click)="refreshing()">
-                <ion-icon slot="icon-only" class="title-icon font-awesome" name="reload-circle" title="Actualizar"></ion-icon>
+                <ion-icon class=" font-45-em" src="assets/images/theme/gov/icon-reload.svg"></ion-icon>
               </button>
             </div>
           </div>
diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss
index cc6e8fc44..46cff50d9 100644
--- a/src/app/shared/agenda/view-event/view-event.page.scss
+++ b/src/app/shared/agenda/view-event/view-event.page.scss
@@ -117,7 +117,7 @@ ion-content{
             background: var(--label-bg-color);
             float: right !important;
             padding: 5px 13.5px 5px 13.5px;
-            color: #fff;
+            color:  black;
             font-size: rem(14);
           }
         }
diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html
index 83c670c64..42cc46118 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.html
+++ b/src/app/shared/publication/view-publications/view-publications.page.html
@@ -16,7 +16,7 @@
             <ion-icon class="delete"  src='assets/images/theme/gov/icons-delete.svg'></ion-icon>
           </button>
           <button class="btn-no-color cursor-pointer" (click)="doRefresh($event)">
-           <ion-icon 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/src/assets/icon/theme/gov/icons-chat-record-audio.svg b/src/assets/icon/theme/gov/icons-chat-record-audio.svg
index 6e90079a1..3b6693b3d 100644
--- a/src/assets/icon/theme/gov/icons-chat-record-audio.svg
+++ b/src/assets/icon/theme/gov/icons-chat-record-audio.svg
@@ -1,8 +1,8 @@
 <svg width="45" height="45" viewBox="0 0 45 45" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M22.5 45C34.9264 45 45 34.9264 45 22.5C45 10.0736 34.9264 0 22.5 0C10.0736 0 0 10.0736 0 22.5C0 34.9264 10.0736 45 22.5 45Z" fill="#FFB81C"/>
-<path d="M27.7273 12.7273C27.7273 9.56419 25.1631 7 22 7C18.8369 7 16.2727 9.56419 16.2727 12.7273V20.9091C16.2727 24.0722 18.8369 26.6364 22 26.6364C25.1631 26.6364 27.7273 24.0722 27.7273 20.9091V12.7273Z" stroke="white" stroke-width="2"/>
-<path d="M26.0909 11.9091H24.4545C23.5508 11.9091 22.8182 12.6417 22.8182 13.5455C22.8182 14.4492 23.5508 15.1818 24.4545 15.1818H26.0909C26.9946 15.1818 27.7273 14.4492 27.7273 13.5455C27.7273 12.6417 26.9946 11.9091 26.0909 11.9091Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M21.1818 29.9091H22.8182V36.4545H21.1818V29.9091Z" fill="white"/>
-<path d="M26.9091 36.4546H17.0909C16.639 36.4546 16.2727 36.8209 16.2727 37.2727C16.2727 37.7246 16.639 38.0909 17.0909 38.0909H26.9091C27.3609 38.0909 27.7273 37.7246 27.7273 37.2727C27.7273 36.8209 27.3609 36.4546 26.9091 36.4546Z" fill="white"/>
-<path d="M31 19.2727C31 25.3731 28.7778 29.9091 22 29.9091C15.2222 29.9091 13 25.3731 13 19.2727" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M27.7273 12.7273C27.7273 9.56419 25.1631 7 22 7C18.8369 7 16.2727 9.56419 16.2727 12.7273V20.9091C16.2727 24.0722 18.8369 26.6364 22 26.6364C25.1631 26.6364 27.7273 24.0722 27.7273 20.9091V12.7273Z" stroke="black" stroke-width="2"/>
+<path d="M26.0909 11.9091H24.4545C23.5508 11.9091 22.8182 12.6417 22.8182 13.5455C22.8182 14.4492 23.5508 15.1818 24.4545 15.1818H26.0909C26.9946 15.1818 27.7273 14.4492 27.7273 13.5455C27.7273 12.6417 26.9946 11.9091 26.0909 11.9091Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.1818 29.9091H22.8182V36.4545H21.1818V29.9091Z" fill="black"/>
+<path d="M26.9091 36.4546H17.0909C16.639 36.4546 16.2727 36.8209 16.2727 37.2727C16.2727 37.7246 16.639 38.0909 17.0909 38.0909H26.9091C27.3609 38.0909 27.7273 37.7246 27.7273 37.2727C27.7273 36.8209 27.3609 36.4546 26.9091 36.4546Z" fill="black"/>
+<path d="M31 19.2727C31 25.3731 28.7778 29.9091 22 29.9091C15.2222 29.9091 13 25.3731 13 19.2727" stroke="black" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/icon/theme/gov/icons-chat-send.svg b/src/assets/icon/theme/gov/icons-chat-send.svg
index ab4457c38..341923384 100644
--- a/src/assets/icon/theme/gov/icons-chat-send.svg
+++ b/src/assets/icon/theme/gov/icons-chat-send.svg
@@ -1,7 +1,7 @@
 <svg width="45" height="45" viewBox="0 0 45 45" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9 9H23V10H9V9Z" fill="white"/>
-<path d="M14 12C15.1046 12 16 11.1046 16 10C16 8.89543 15.1046 8 14 8C12.8954 8 12 8.89543 12 10C12 11.1046 12.8954 12 14 12Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 9H23V10H9V9Z" fill="black"/>
+<path d="M14 12C15.1046 12 16 11.1046 16 10C16 8.89543 15.1046 8 14 8C12.8954 8 12 8.89543 12 10C12 11.1046 12.8954 12 14 12Z" fill="black"/>
 <path d="M22.5 45C34.9264 45 45 34.9264 45 22.5C45 10.0736 34.9264 0 22.5 0C10.0736 0 0 10.0736 0 22.5C0 34.9264 10.0736 45 22.5 45Z" fill="#FFB81C"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34 22L12 30L16 22L12 14L34 22Z" stroke="white" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16 21H33V23H16V21Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34 22L12 30L16 22L12 14L34 22Z" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 21H33V23H16V21Z" fill="black"/>
 </svg>
diff --git a/src/assets/icon/theme/gov/icons-most-searched-words-open.svg b/src/assets/icon/theme/gov/icons-most-searched-words-open.svg
index f26180425..0f6762a85 100644
--- a/src/assets/icon/theme/gov/icons-most-searched-words-open.svg
+++ b/src/assets/icon/theme/gov/icons-most-searched-words-open.svg
@@ -1,7 +1,7 @@
 <svg width="45" height="45" viewBox="0 0 45 45" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M22.5 45C34.9264 45 45 34.9264 45 22.5C45 10.0736 34.9264 0 22.5 0C10.0736 0 0 10.0736 0 22.5C0 34.9264 10.0736 45 22.5 45Z" fill="#FFB81C"/>
-<path d="M24.714 25.428C28.422 25.428 31.428 22.422 31.428 18.714C31.428 15.006 28.422 12 24.714 12C21.006 12 18 15.006 18 18.714C18 22.422 21.006 25.428 24.714 25.428Z" stroke="white" stroke-width="2"/>
-<path d="M29.857 23.857L34.357 28.357" stroke="white" stroke-width="2" stroke-linecap="round"/>
-<path d="M16.857 27.857C16.857 27.3047 16.4093 26.857 15.857 26.857C15.3047 26.857 14.857 27.3047 14.857 27.857V33.857C14.857 34.4093 15.3047 34.857 15.857 34.857C16.4093 34.857 16.857 34.4093 16.857 33.857V27.857Z" fill="white"/>
-<path d="M18.857 29.857H12.857C12.3047 29.857 11.857 30.3047 11.857 30.857C11.857 31.4093 12.3047 31.857 12.857 31.857H18.857C19.4093 31.857 19.857 31.4093 19.857 30.857C19.857 30.3047 19.4093 29.857 18.857 29.857Z" fill="white"/>
+<path d="M24.714 25.428C28.422 25.428 31.428 22.422 31.428 18.714C31.428 15.006 28.422 12 24.714 12C21.006 12 18 15.006 18 18.714C18 22.422 21.006 25.428 24.714 25.428Z" stroke="black" stroke-width="2"/>
+<path d="M29.857 23.857L34.357 28.357" stroke="black" stroke-width="2" stroke-linecap="round"/>
+<path d="M16.857 27.857C16.857 27.3047 16.4093 26.857 15.857 26.857C15.3047 26.857 14.857 27.3047 14.857 27.857V33.857C14.857 34.4093 15.3047 34.857 15.857 34.857C16.4093 34.857 16.857 34.4093 16.857 33.857V27.857Z" fill="black"/>
+<path d="M18.857 29.857H12.857C12.3047 29.857 11.857 30.3047 11.857 30.857C11.857 31.4093 12.3047 31.857 12.857 31.857H18.857C19.4093 31.857 19.857 31.4093 19.857 30.857C19.857 30.3047 19.4093 29.857 18.857 29.857Z" fill="black"/>
 </svg>
diff --git a/src/assets/images/icons-menu.svg b/src/assets/images/icons-menu.svg
deleted file mode 100644
index b56583239..000000000
--- a/src/assets/images/icons-menu.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 25 25">
-    <g fill="none" fill-rule="evenodd">
-        <g fill="#42B9FE">
-            <g>
-                <g>
-                    <g transform="translate(-355 -114) translate(0 84) translate(0 25) translate(355 5)">
-                        <circle cx="12.5" cy="12.5" r="2.5"/>
-                        <circle cx="12.5" cy="5.5" r="2.5"/>
-                        <circle cx="12.5" cy="19.5" r="2.5"/>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/src/assets/images/icons-nav-agenda-active.svg b/src/assets/images/icons-nav-agenda-active.svg
deleted file mode 100644
index 351f44834..000000000
--- a/src/assets/images/icons-nav-agenda-active.svg
+++ /dev/null
@@ -1,48 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="35" height="35" viewBox="0 0 35 35">
-    <defs>
-        <linearGradient id="dqrp73f7qc" x1="50%" x2="50%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#80C2FF"/>
-            <stop offset="99.962%" stop-color="#0085FF"/>
-        </linearGradient>
-        <linearGradient id="70ojnupnmf" x1="50%" x2="50%" y1="0%" y2="100%">
-            <stop offset="0%" stop-color="#FFEFBB"/>
-            <stop offset="100%" stop-color="#FFC200"/>
-        </linearGradient>
-        <filter id="p7hjmzg55a" width="117.4%" height="120%" x="-8.7%" y="-5%" filterUnits="objectBoundingBox">
-            <feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/>
-            <feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation=".5"/>
-            <feComposite in="shadowBlurOuter1" in2="SourceAlpha" operator="out" result="shadowBlurOuter1"/>
-            <feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.187390734 0"/>
-        </filter>
-        <filter id="ap0wf93zpd" width="125%" height="128.6%" x="-12.5%" y="-7.1%" filterUnits="objectBoundingBox">
-            <feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/>
-            <feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation=".5"/>
-            <feComposite in="shadowBlurOuter1" in2="SourceAlpha" operator="out" result="shadowBlurOuter1"/>
-            <feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.187390734 0"/>
-        </filter>
-        <path id="7nmw8qqr9b" d="M14.5 19.1c1.404 0 2.75-.208 3.993-.59.666-.206 4.252 1.758 4.853 1.459.607-.302-1.77-2.867-1.243-3.253C24.493 14.966 26 12.404 26 9.55 26 4.276 20.851 0 14.5 0S3 4.276 3 9.55c0 5.275 5.149 9.55 11.5 9.55z"/>
-        <path id="xu6zub6ewe" d="M8 25.37c.977 0 1.913-.146 2.778-.414.463-.143 2.958 1.232 3.376 1.022.422-.21-1.232-2.006-.865-2.277C14.951 22.476 16 20.683 16 18.685c0-1.552-.633-2.98-1.695-4.115C12.841 13.006 10.561 12 8 12c-4.418 0-8 2.993-8 6.685 0 1.037.282 2.018.786 2.894C2.077 23.822 4.822 25.37 8 25.37z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <g>
-            <g>
-                <g>
-                    <g>
-                        <g>
-                            <g>
-                                <g transform="translate(-30 -471) translate(20 248) translate(0 210) translate(10 10) translate(0 3) translate(5 5)">
-                                    <use fill="#000" filter="url(#p7hjmzg55a)" xlink:href="#7nmw8qqr9b"/>
-                                    <path fill="url(#dqrp73f7qc)" stroke="#EBEBEB" stroke-linejoin="square" stroke-opacity=".194" d="M14.5.5c3.05 0 5.813 1.022 7.812 2.682C24.275 4.812 25.5 7.06 25.5 9.55c0 2.698-1.437 5.111-3.692 6.763-.066 1.374.22 1.842.51 2.307.17.273.342.545.467.782-.413.145-1.28-.44-1.758-.634-1.178-.478-2.317-.848-2.68-.737-1.199.369-2.495.57-3.847.57-3.05 0-5.813-1.022-7.812-2.682C4.725 14.289 3.5 12.04 3.5 9.55c0-2.49 1.225-4.738 3.188-6.368C8.688 1.522 11.45.5 14.5.5z"/>
-                                </g>
-                                <g transform="translate(-30 -471) translate(20 248) translate(0 210) translate(10 10) translate(0 3) translate(5 5) matrix(-1 0 0 1 16 0)">
-                                    <use fill="#000" filter="url(#ap0wf93zpd)" xlink:href="#xu6zub6ewe"/>
-                                    <path fill="url(#70ojnupnmf)" stroke="#EBEBEB" stroke-linejoin="square" stroke-opacity=".194" d="M8 12.5c2.41 0 4.56.938 5.94 2.412.974 1.04 1.56 2.349 1.56 3.773 0 1.842-.979 3.487-2.508 4.614-.152 1.023.008 1.308.19 1.608.14.225.26.421.355.587-.296-.022-.819-.446-.939-.495-.868-.355-1.702-.602-1.968-.52-.82.253-1.705.392-2.63.392-1.477 0-2.856-.353-4.02-.965-1.186-.623-2.15-1.515-2.76-2.576-.46-.8-.72-1.697-.72-2.645 0-1.7.834-3.232 2.164-4.343C4.029 13.2 5.917 12.5 8 12.5z"/>
-                                </g>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/src/assets/images/icons-profile-calendar-md.svg b/src/assets/images/icons-profile-calendar-md.svg
deleted file mode 100644
index 50467ae8d..000000000
--- a/src/assets/images/icons-profile-calendar-md.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 7H18V8H7V7Z" fill="white"/>
-<path d="M10.5 9C11.3284 9 12 8.32843 12 7.5C12 6.67157 11.3284 6 10.5 6C9.67157 6 9 6.67157 9 7.5C9 8.32843 9.67157 9 10.5 9Z" fill="white"/>
-<path d="M34.5 17.5C34.5 26.8888 26.8888 34.5 17.5 34.5C8.11116 34.5 0.5 26.8888 0.5 17.5C0.5 8.11116 8.11116 0.5 17.5 0.5C26.8888 0.5 34.5 8.11116 34.5 17.5Z" fill="white" stroke="#F05D5E"/>
-<path d="M9.46143 10.9141L13.4126 20.7754L17.3638 10.9141H19.4307V23H17.8369V18.2935L17.9863 13.2134L14.0186 23H12.7983L8.83887 13.2383L8.99658 18.2935V23H7.40283V10.9141H9.46143ZM22.2446 23V10.9141H25.6562C26.7077 10.9141 27.6374 11.1465 28.4453 11.6113C29.2533 12.0762 29.8758 12.7375 30.313 13.5952C30.7557 14.453 30.9798 15.438 30.9854 16.5503V17.3223C30.9854 18.4622 30.764 19.4611 30.3213 20.3188C29.8841 21.1766 29.256 21.8351 28.437 22.2944C27.6235 22.7537 26.6745 22.9889 25.5898 23H22.2446ZM23.8384 12.2256V21.6968H25.5151C26.7437 21.6968 27.6982 21.3149 28.3789 20.5513C29.0651 19.7876 29.4082 18.7002 29.4082 17.2891V16.5835C29.4082 15.2111 29.0845 14.1458 28.437 13.3877C27.7951 12.624 26.882 12.2367 25.6978 12.2256H23.8384Z" fill="black"/>
-</svg>
diff --git a/src/assets/images/icons-received-event.svg b/src/assets/images/icons-received-event.svg
index 28399319e..b1261e0b8 100644
--- a/src/assets/images/icons-received-event.svg
+++ b/src/assets/images/icons-received-event.svg
@@ -4,17 +4,17 @@
             <g>
                 <g>
                     <g transform="translate(-290 -109) translate(0 109) translate(290)">
-                        <path fill="#FFF" d="M7 7H18V8H7z"/>
-                        <circle cx="10.5" cy="7.5" r="1.5" fill="#FFF"/>
+                        <path fill="black" d="M7 7H18V8H7z"/>
+                        <circle cx="10.5" cy="7.5" r="1.5" fill="black"/>
                         <g fill="#42B9FE">
                             <circle cx="17.5" cy="17.5" r="17.5"/>
                         </g>
                     </g>
-                    <path stroke="#FFF" stroke-linejoin="round" stroke-width="2" d="M8 16L17.5 20 27 16 27 27 8 27z" transform="translate(-290 -109) translate(0 109) translate(290)"/>
-                    <path stroke="#FFF" stroke-linejoin="round" stroke-width="2" d="M10.5 17L10.5 7 24.5 7 24.5 17" transform="translate(-290 -109) translate(0 109) translate(290)"/>
-                    <path stroke="#FFF" stroke-width="2" d="M8 16L10.5 13.5" transform="translate(-290 -109) translate(0 109) translate(290)"/>
-                    <path stroke="#FFF" stroke-width="2" d="M24.5 16L27 13.5" transform="translate(-290 -109) translate(0 109) translate(290) matrix(-1 0 0 1 51.5 0)"/>
-                    <path fill="#FFF" d="M17.5 15.25L15.443 16.332 15.836 14.041 14.171 12.418 16.471 12.084 17.5 10 18.529 12.084 20.829 12.418 19.164 14.041 19.557 16.332z" transform="translate(-290 -109) translate(0 109) translate(290)"/>
+                    <path stroke="black" stroke-linejoin="round" stroke-width="2" d="M8 16L17.5 20 27 16 27 27 8 27z" transform="translate(-290 -109) translate(0 109) translate(290)"/>
+                    <path stroke="black" stroke-linejoin="round" stroke-width="2" d="M10.5 17L10.5 7 24.5 7 24.5 17" transform="translate(-290 -109) translate(0 109) translate(290)"/>
+                    <path stroke="black" stroke-width="2" d="M8 16L10.5 13.5" transform="translate(-290 -109) translate(0 109) translate(290)"/>
+                    <path stroke="black" stroke-width="2" d="M24.5 16L27 13.5" transform="translate(-290 -109) translate(0 109) translate(290) matrix(-1 0 0 1 51.5 0)"/>
+                    <path fill="black" d="M17.5 15.25L15.443 16.332 15.836 14.041 14.171 12.418 16.471 12.084 17.5 10 18.529 12.084 20.829 12.418 19.164 14.041 19.557 16.332z" transform="translate(-290 -109) translate(0 109) translate(290)"/>
                 </g>
             </g>
         </g>
diff --git a/src/assets/images/theme/gov/advance-search-show-modal.svg b/src/assets/images/theme/gov/advance-search-show-modal.svg
index f26180425..0f6762a85 100644
--- a/src/assets/images/theme/gov/advance-search-show-modal.svg
+++ b/src/assets/images/theme/gov/advance-search-show-modal.svg
@@ -1,7 +1,7 @@
 <svg width="45" height="45" viewBox="0 0 45 45" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M22.5 45C34.9264 45 45 34.9264 45 22.5C45 10.0736 34.9264 0 22.5 0C10.0736 0 0 10.0736 0 22.5C0 34.9264 10.0736 45 22.5 45Z" fill="#FFB81C"/>
-<path d="M24.714 25.428C28.422 25.428 31.428 22.422 31.428 18.714C31.428 15.006 28.422 12 24.714 12C21.006 12 18 15.006 18 18.714C18 22.422 21.006 25.428 24.714 25.428Z" stroke="white" stroke-width="2"/>
-<path d="M29.857 23.857L34.357 28.357" stroke="white" stroke-width="2" stroke-linecap="round"/>
-<path d="M16.857 27.857C16.857 27.3047 16.4093 26.857 15.857 26.857C15.3047 26.857 14.857 27.3047 14.857 27.857V33.857C14.857 34.4093 15.3047 34.857 15.857 34.857C16.4093 34.857 16.857 34.4093 16.857 33.857V27.857Z" fill="white"/>
-<path d="M18.857 29.857H12.857C12.3047 29.857 11.857 30.3047 11.857 30.857C11.857 31.4093 12.3047 31.857 12.857 31.857H18.857C19.4093 31.857 19.857 31.4093 19.857 30.857C19.857 30.3047 19.4093 29.857 18.857 29.857Z" fill="white"/>
+<path d="M24.714 25.428C28.422 25.428 31.428 22.422 31.428 18.714C31.428 15.006 28.422 12 24.714 12C21.006 12 18 15.006 18 18.714C18 22.422 21.006 25.428 24.714 25.428Z" stroke="black" stroke-width="2"/>
+<path d="M29.857 23.857L34.357 28.357" stroke="black" stroke-width="2" stroke-linecap="round"/>
+<path d="M16.857 27.857C16.857 27.3047 16.4093 26.857 15.857 26.857C15.3047 26.857 14.857 27.3047 14.857 27.857V33.857C14.857 34.4093 15.3047 34.857 15.857 34.857C16.4093 34.857 16.857 34.4093 16.857 33.857V27.857Z" fill="black"/>
+<path d="M18.857 29.857H12.857C12.3047 29.857 11.857 30.3047 11.857 30.857C11.857 31.4093 12.3047 31.857 12.857 31.857H18.857C19.4093 31.857 19.857 31.4093 19.857 30.857C19.857 30.3047 19.4093 29.857 18.857 29.857Z" fill="black"/>
 </svg>
diff --git a/src/assets/images/theme/gov/icon-reload.svg b/src/assets/images/theme/gov/icon-reload.svg
new file mode 100644
index 000000000..174629823
--- /dev/null
+++ b/src/assets/images/theme/gov/icon-reload.svg
@@ -0,0 +1,4 @@
+<svg width="416" height="416" viewBox="0 0 416 416" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="85" y="49" width="251" height="311" fill="black"/>
+<path d="M208 0C93.31 0 0 93.31 0 208C0 322.69 93.31 416 208 416C322.69 416 416 322.69 416 208C416 93.31 322.69 0 208 0ZM328 182.15C328 184.436 327.092 186.629 325.475 188.245C323.859 189.862 321.666 190.77 319.38 190.77H259.84C258.135 190.773 256.467 190.269 255.048 189.322C253.629 188.376 252.524 187.029 251.871 185.453C251.219 183.878 251.049 182.144 251.384 180.471C251.718 178.799 252.542 177.264 253.75 176.06L275.92 153.89L270.32 147.38C260.303 136.981 247.866 129.226 234.119 124.809C220.373 120.392 205.746 119.45 191.547 122.068C177.348 124.685 164.018 130.781 152.75 139.809C141.483 148.837 132.628 160.517 126.977 173.804C121.326 187.091 119.056 201.571 120.37 215.95C121.684 230.328 126.54 244.157 134.504 256.201C142.469 268.244 153.294 278.126 166.011 284.963C178.728 291.8 192.941 295.379 207.38 295.38C225.45 295.363 243.072 289.756 257.828 279.326C272.585 268.897 283.753 254.158 289.8 237.13C290.501 235.147 291.585 233.321 292.991 231.758C294.397 230.194 296.098 228.922 297.995 228.015C299.893 227.108 301.95 226.584 304.05 226.473C306.151 226.361 308.252 226.664 310.235 227.365C312.218 228.066 314.044 229.15 315.607 230.556C317.171 231.962 318.443 233.663 319.35 235.56C320.256 237.458 320.781 239.515 320.892 241.615C321.004 243.716 320.701 245.817 320 247.8C312.707 268.438 299.882 286.675 282.925 300.517C265.968 314.358 245.532 323.272 223.851 326.284C202.171 329.296 180.079 326.29 159.991 317.595C139.903 308.9 122.592 294.85 109.95 276.981C97.3076 259.112 89.8206 238.112 88.3073 216.275C86.7939 194.439 91.3123 172.606 101.369 153.164C111.425 133.722 126.633 117.418 145.329 106.035C164.025 94.6522 185.491 88.6276 207.38 88.62C223.535 88.5583 239.531 91.8048 254.383 98.1595C269.236 104.514 282.629 113.843 293.74 125.57L294.3 126.19L298.61 131.19L313.29 116.51C314.072 115.71 315.005 115.074 316.035 114.638C317.065 114.202 318.171 113.975 319.29 113.97C320.428 113.961 321.557 114.177 322.611 114.607C323.665 115.037 324.623 115.671 325.431 116.474C326.238 117.277 326.878 118.231 327.314 119.283C327.75 120.334 327.973 121.462 327.97 122.6L328 182.15Z" fill="#FFB81C"/>
+</svg>
diff --git a/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg b/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg
index 7773657f0..e45c347bb 100644
--- a/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg
+++ b/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg
@@ -1,4 +1,4 @@
 <svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M17.5 35C27.165 35 35 27.165 35 17.5C35 7.83502 27.165 0 17.5 0C7.83502 0 0 7.83502 0 17.5C0 27.165 7.83502 35 17.5 35Z" fill="#FFB81C"/>
-<path d="M14 9L23 18L14 27" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 9L23 18L14 27" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/theme/gov/icons-attach-doc.svg b/src/assets/images/theme/gov/icons-attach-doc.svg
index 249413b3e..261e27856 100644
--- a/src/assets/images/theme/gov/icons-attach-doc.svg
+++ b/src/assets/images/theme/gov/icons-attach-doc.svg
@@ -1,6 +1,6 @@
 <svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 7H18V8H7V7Z" fill="white"/>
-<path d="M10.5 9C11.3284 9 12 8.32843 12 7.5C12 6.67157 11.3284 6 10.5 6C9.67157 6 9 6.67157 9 7.5C9 8.32843 9.67157 9 10.5 9Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 7H18V8H7V7Z" fill="black"/>
+<path d="M10.5 9C11.3284 9 12 8.32843 12 7.5C12 6.67157 11.3284 6 10.5 6C9.67157 6 9 6.67157 9 7.5C9 8.32843 9.67157 9 10.5 9Z" fill="black"/>
 <path d="M17.5 35C27.165 35 35 27.165 35 17.5C35 7.83502 27.165 0 17.5 0C7.83502 0 0 7.83502 0 17.5C0 27.165 7.83502 35 17.5 35Z" fill="#FFB81C"/>
-<path d="M23 15.535V21.553C23 23.615 21.663 26 18 26C14.337 26 13 23.615 13 21.553V12.684C13 10.228 14.071 9 16.214 9C18.357 9 19.429 10.228 19.429 12.684V19.387C19.476 20.462 19 21 18 21C17 21 16.524 20.462 16.571 19.387V15.535" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M23 15.535V21.553C23 23.615 21.663 26 18 26C14.337 26 13 23.615 13 21.553V12.684C13 10.228 14.071 9 16.214 9C18.357 9 19.429 10.228 19.429 12.684V19.387C19.476 20.462 19 21 18 21C17 21 16.524 20.462 16.571 19.387V15.535" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/theme/gov/icons-chat-new-conversation.svg b/src/assets/images/theme/gov/icons-chat-new-conversation.svg
index 5503bda7d..149a478ff 100644
--- a/src/assets/images/theme/gov/icons-chat-new-conversation.svg
+++ b/src/assets/images/theme/gov/icons-chat-new-conversation.svg
@@ -1,6 +1,6 @@
 <svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M17.5 35C27.165 35 35 27.165 35 17.5C35 7.83502 27.165 0 17.5 0C7.83502 0 0 7.83502 0 17.5C0 27.165 7.83502 35 17.5 35Z" fill="#FFB81C"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.5 9C16.896 9 18.84 10.943 18.84 13.34V13.423C18.84 14.79 18.207 16.009 17.218 16.805C20.016 17.903 22 20.649 22 23.863C22 28.046 7 28.046 7 23.863C7 20.649 8.984 17.903 11.783 16.803C10.793 16.009 10.161 14.79 10.161 13.423V13.339C10.16 10.943 12.104 9 14.5 9Z" stroke="white" stroke-width="2" stroke-linejoin="round"/>
-<path d="M27 7C27 6.44772 26.5523 6 26 6C25.4477 6 25 6.44772 25 7V13C25 13.5523 25.4477 14 26 14C26.5523 14 27 13.5523 27 13V7Z" fill="white"/>
-<path d="M29 9H23C22.4477 9 22 9.44772 22 10C22 10.5523 22.4477 11 23 11H29C29.5523 11 30 10.5523 30 10C30 9.44772 29.5523 9 29 9Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.5 9C16.896 9 18.84 10.943 18.84 13.34V13.423C18.84 14.79 18.207 16.009 17.218 16.805C20.016 17.903 22 20.649 22 23.863C22 28.046 7 28.046 7 23.863C7 20.649 8.984 17.903 11.783 16.803C10.793 16.009 10.161 14.79 10.161 13.423V13.339C10.16 10.943 12.104 9 14.5 9Z" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M27 7C27 6.44772 26.5523 6 26 6C25.4477 6 25 6.44772 25 7V13C25 13.5523 25.4477 14 26 14C26.5523 14 27 13.5523 27 13V7Z" fill="black"/>
+<path d="M29 9H23C22.4477 9 22 9.44772 22 10C22 10.5523 22.4477 11 23 11H29C29.5523 11 30 10.5523 30 10C30 9.44772 29.5523 9 29 9Z" fill="black"/>
 </svg>
diff --git a/src/assets/images/theme/gov/icons-chat-new-group.svg b/src/assets/images/theme/gov/icons-chat-new-group.svg
index 7b439345a..1e983ba34 100644
--- a/src/assets/images/theme/gov/icons-chat-new-group.svg
+++ b/src/assets/images/theme/gov/icons-chat-new-group.svg
@@ -1,7 +1,7 @@
 <svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M17.5 35C27.165 35 35 27.165 35 17.5C35 7.83502 27.165 0 17.5 0C7.83502 0 0 7.83502 0 17.5C0 27.165 7.83502 35 17.5 35Z" fill="#FFB81C"/>
-<path d="M27 7C27 6.44772 26.5523 6 26 6C25.4477 6 25 6.44772 25 7V13C25 13.5523 25.4477 14 26 14C26.5523 14 27 13.5523 27 13V7Z" fill="white"/>
-<path d="M29 9H23C22.4477 9 22 9.44772 22 10C22 10.5523 22.4477 11 23 11H29C29.5523 11 30 10.5523 30 10C30 9.44772 29.5523 9 29 9Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5 12C15.104 12 13.16 13.943 13.16 16.34V16.423C13.16 17.79 13.793 19.009 14.782 19.805C11.984 20.903 10 23.649 10 26.863C10 31.046 25 31.046 25 26.863C25 23.649 23.016 20.903 20.217 19.803C21.207 19.009 21.839 17.79 21.839 16.423V16.339C21.84 13.943 19.896 12 17.5 12Z" stroke="white" stroke-width="2" stroke-linejoin="round"/>
-<path d="M7.406 24C5.527 23.514 4.182 22.658 4.182 21.432C4.182 18.386 6.452 15.884 9.1 14.768M15.182 8.983C14.427 7.792 13.087 7 11.56 7C9.202 7 7.291 8.886 7.291 11.213V11.294C7.291 12.64 7.931 13.839 8.927 14.61L15.182 8.983Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M27 7C27 6.44772 26.5523 6 26 6C25.4477 6 25 6.44772 25 7V13C25 13.5523 25.4477 14 26 14C26.5523 14 27 13.5523 27 13V7Z" fill="black"/>
+<path d="M29 9H23C22.4477 9 22 9.44772 22 10C22 10.5523 22.4477 11 23 11H29C29.5523 11 30 10.5523 30 10C30 9.44772 29.5523 9 29 9Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5 12C15.104 12 13.16 13.943 13.16 16.34V16.423C13.16 17.79 13.793 19.009 14.782 19.805C11.984 20.903 10 23.649 10 26.863C10 31.046 25 31.046 25 26.863C25 23.649 23.016 20.903 20.217 19.803C21.207 19.009 21.839 17.79 21.839 16.423V16.339C21.84 13.943 19.896 12 17.5 12Z" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M7.406 24C5.527 23.514 4.182 22.658 4.182 21.432C4.182 18.386 6.452 15.884 9.1 14.768M15.182 8.983C14.427 7.792 13.087 7 11.56 7C9.202 7 7.291 8.886 7.291 11.213V11.294C7.291 12.64 7.931 13.839 8.927 14.61L15.182 8.983Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/theme/gov/icons-chat-record-audio.svg b/src/assets/images/theme/gov/icons-chat-record-audio1.svg
similarity index 87%
rename from src/assets/images/theme/gov/icons-chat-record-audio.svg
rename to src/assets/images/theme/gov/icons-chat-record-audio1.svg
index 48eb285e7..5c13ef594 100644
--- a/src/assets/images/theme/gov/icons-chat-record-audio.svg
+++ b/src/assets/images/theme/gov/icons-chat-record-audio1.svg
@@ -1,4 +1,6 @@
-<svg width="45" height="45" viewBox="0 0 45 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="45" height="45" viewBox="0 0 45 45" fill="black" xmlns="http://www.w3.org/2000/svg">
 <path d="M22.5 45C34.9264 45 45 34.9264 45 22.5C45 10.0736 34.9264 0 22.5 0C10.0736 0 0 10.0736 0 22.5C0 34.9264 10.0736 45 22.5 45Z" fill="#FFB81C"/>
-<path d="M22.25 26.5C24.7358 26.5 26.75 24.4858 26.75 22V14.5C26.75 12.0142 24.7358 10 22.25 10C19.7642 10 17.75 12.0142 17.75 14.5V22C17.75 24.4844 19.7234 26.5 22.25 26.5ZM29.375 19C28.7516 19 28.25 19.5016 28.25 20.0828V22C28.25 25.4373 25.3452 28.2063 21.8609 27.9859C18.7634 27.7905 16.25 24.8645 16.25 21.7609V20.0828C16.25 19.5016 15.7461 19 15.125 19C14.5039 19 14 19.5016 14 20.0828V21.5898C14 25.7927 16.9986 29.5398 21.125 30.107V31.75H19.25C18.3973 31.75 17.7106 32.4616 17.7519 33.3236C17.7702 33.7094 18.1156 34 18.5 34H26C26.3854 34 26.7298 33.7086 26.7481 33.3236C26.7875 32.4625 26.1031 31.75 25.25 31.75H23.375V30.167C27.3922 29.6172 30.5 26.1672 30.5 22V20.0828C30.5 19.5016 29.9984 19 29.375 19Z" fill="white"/>
+<path d="M22.25 26.5C24.7358 26.5 26.75 24.4858 26.75 22V14.5C26.75 12.0142 24.7358 10 22.25 10C19.7642 10 17.75 12.0142 17.75 14.5V22C17.75 24.4844 19.7234 26.5 22.25 26.5ZM29.375 19C28.7516 19 28.25 19.5016 28.25 20.0828V22C28.25 25.4373 25.3452 28.2063 21.8609 27.9859C18.7634 27.7905 16.25 24.8645 16.25 21.7609V20.0828C16.25 19.5016 15.7461 19 15.125 19C14.5039 19 14 19.5016 14 20.0828V21.5898C14 25.7927 16.9986 29.5398 21.125 30.107V31.75H19.25C18.3973 31.75 17.7106 32.4616 17.7519 33.3236C17.7702 33.7094 18.1156 34 18.5 34H26C26.3854 34 26.7298 33.7086 26.7481 33.3236C26.7875 32.4625 26.1031 31.75 25.25 31.75H23.375V30.167C27.3922 29.6172 30.5 26.1672 30.5 22V20.0828C30.5 19.5016 29.9984 19 29.375 19Z" fill="black"/>
 </svg>
+
+
diff --git a/src/assets/images/theme/gov/icons-chat-send.svg b/src/assets/images/theme/gov/icons-chat-send.svg
index ab4457c38..341923384 100644
--- a/src/assets/images/theme/gov/icons-chat-send.svg
+++ b/src/assets/images/theme/gov/icons-chat-send.svg
@@ -1,7 +1,7 @@
 <svg width="45" height="45" viewBox="0 0 45 45" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9 9H23V10H9V9Z" fill="white"/>
-<path d="M14 12C15.1046 12 16 11.1046 16 10C16 8.89543 15.1046 8 14 8C12.8954 8 12 8.89543 12 10C12 11.1046 12.8954 12 14 12Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 9H23V10H9V9Z" fill="black"/>
+<path d="M14 12C15.1046 12 16 11.1046 16 10C16 8.89543 15.1046 8 14 8C12.8954 8 12 8.89543 12 10C12 11.1046 12.8954 12 14 12Z" fill="black"/>
 <path d="M22.5 45C34.9264 45 45 34.9264 45 22.5C45 10.0736 34.9264 0 22.5 0C10.0736 0 0 10.0736 0 22.5C0 34.9264 10.0736 45 22.5 45Z" fill="#FFB81C"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34 22L12 30L16 22L12 14L34 22Z" stroke="white" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16 21H33V23H16V21Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34 22L12 30L16 22L12 14L34 22Z" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 21H33V23H16V21Z" fill="black"/>
 </svg>
diff --git a/src/assets/images/theme/gov/icons-collaps-down.svg b/src/assets/images/theme/gov/icons-collaps-down.svg
index e2930614e..2f63a7b0d 100644
--- a/src/assets/images/theme/gov/icons-collaps-down.svg
+++ b/src/assets/images/theme/gov/icons-collaps-down.svg
@@ -1,3 +1,4 @@
-<svg width="498" height="498" viewBox="0 0 498 498" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M496.998 248.106C497.492 385.105 386.893 496.504 249.894 496.998C112.895 497.492 1.49549 386.893 1.00156 249.894C0.507627 112.895 111.107 1.49558 248.106 1.00165C385.105 0.507719 496.504 111.107 496.998 248.106ZM266.41 362.838L401.421 226.85C410.787 217.416 410.732 202.217 401.299 192.951L384.238 176.012C374.804 166.646 359.604 166.701 350.338 176.134L249.105 278.1L147.139 176.867C137.705 167.501 122.505 167.556 113.239 176.989L96.3008 194.05C86.9348 203.484 86.9896 218.684 96.4231 227.95L232.411 362.961C241.845 372.327 257.044 372.272 266.41 362.838Z" fill="#FFB81C"/>
+<svg width="496" height="496" viewBox="0 0 496 496" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="81" y="103" width="334" height="291" fill="black"/>
+<path d="M495.998 247.106C496.492 384.105 385.893 495.504 248.894 495.998C111.895 496.492 0.495578 385.893 0.00164799 248.894C-0.492285 111.895 110.107 0.495578 247.106 0.00164798C384.105 -0.492283 495.504 110.107 495.998 247.106ZM265.41 361.838L400.421 225.85C409.787 216.416 409.732 201.217 400.299 191.951L383.238 175.012C373.804 165.646 358.604 165.701 349.338 175.134L248.105 277.1L146.139 175.867C136.705 166.501 121.505 166.556 112.239 175.989L95.3009 193.05C85.9349 202.484 85.9897 217.684 95.4232 226.95L231.411 361.961C240.845 371.327 256.044 371.272 265.41 361.838Z" fill="#FFB81C"/>
 </svg>
diff --git a/src/assets/images/theme/gov/icons-collaps-up.svg b/src/assets/images/theme/gov/icons-collaps-up.svg
index f7678ebca..e971dff07 100644
--- a/src/assets/images/theme/gov/icons-collaps-up.svg
+++ b/src/assets/images/theme/gov/icons-collaps-up.svg
@@ -1,3 +1,11 @@
 <svg width="496" height="496" viewBox="0 0 496 496" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 248C0 111 111 0 248 0C385 0 496 111 496 248C496 385 385 496 248 496C111 496 0 385 0 248ZM231 134.1L95.5 269.6C86.1 279 86.1 294.2 95.5 303.5L112.5 320.5C121.9 329.9 137.1 329.9 146.4 320.5L248 218.9L349.6 320.5C359 329.9 374.2 329.9 383.5 320.5L400.5 303.5C409.9 294.1 409.9 278.9 400.5 269.6L265 134.1C255.6 124.7 240.4 124.7 231 134.1Z" fill="#FFB81C"/>
+<g clip-path="url(#clip0_924_16)">
+<rect x="83" y="102" width="332" height="284" fill="black"/>
+<path d="M9.15527e-05 248C9.15527e-05 111 111 0 248 0C385 0 496 111 496 248C496 385 385 496 248 496C111 496 9.15527e-05 385 9.15527e-05 248ZM231 134.1L95.5001 269.6C86.1001 279 86.1001 294.2 95.5001 303.5L112.5 320.5C121.9 329.9 137.1 329.9 146.4 320.5L248 218.9L349.6 320.5C359 329.9 374.2 329.9 383.5 320.5L400.5 303.5C409.9 294.1 409.9 278.9 400.5 269.6L265 134.1C255.6 124.7 240.4 124.7 231 134.1Z" fill="#FFB81C"/>
+</g>
+<defs>
+<clipPath id="clip0_924_16">
+<rect width="496" height="496" fill="white"/>
+</clipPath>
+</defs>
 </svg>
diff --git a/src/assets/images/theme/gov/icons-edit.svg b/src/assets/images/theme/gov/icons-edit.svg
index e71901278..be875b108 100644
--- a/src/assets/images/theme/gov/icons-edit.svg
+++ b/src/assets/images/theme/gov/icons-edit.svg
@@ -1,8 +1,8 @@
 <svg width="45" height="45" viewBox="0 0 45 45" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9 9H23.143V10.286H9V9Z" fill="white"/>
-<path d="M13.5 11.572C14.5654 11.572 15.429 10.7083 15.429 9.64299C15.429 8.57763 14.5654 7.71399 13.5 7.71399C12.4346 7.71399 11.571 8.57763 11.571 9.64299C11.571 10.7083 12.4346 11.572 13.5 11.572Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 9H23.143V10.286H9V9Z" fill="black"/>
+<path d="M13.5 11.572C14.5654 11.572 15.429 10.7083 15.429 9.64299C15.429 8.57763 14.5654 7.71399 13.5 7.71399C12.4346 7.71399 11.571 8.57763 11.571 9.64299C11.571 10.7083 12.4346 11.572 13.5 11.572Z" fill="black"/>
 <path d="M22.5 45C34.9264 45 45 34.9264 45 22.5C45 10.0736 34.9264 0 22.5 0C10.0736 0 0 10.0736 0 22.5C0 34.9264 10.0736 45 22.5 45Z" fill="#FFB81C"/>
-<path d="M12.572 34.714H32.429C32.9813 34.714 33.429 35.1617 33.429 35.714V36.285C33.429 36.8373 32.9813 37.285 32.429 37.285H12.572C12.0197 37.285 11.572 36.8373 11.572 36.285V35.714C11.572 35.1617 12.0197 34.714 12.572 34.714Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.6657 13.2079L15.83 15.4224C15.352 15.6984 15.188 16.3104 15.464 16.7885L15.7495 17.283C16.026 17.7619 16.6375 17.925 17.1155 17.649L20.9512 15.4345C21.4292 15.1585 21.5937 14.5474 21.3172 14.0685L21.0317 13.574C20.7557 13.0959 20.1437 12.9319 19.6657 13.2079Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15.579 8.714L14.589 9.286C13.633 9.838 13.305 11.061 13.857 12.018L24.107 29.771L27.941 31.269L28.561 27.199L18.311 9.446C17.759 8.49 16.536 8.162 15.579 8.714V8.714Z" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path d="M12.572 34.714H32.429C32.9813 34.714 33.429 35.1617 33.429 35.714V36.285C33.429 36.8373 32.9813 37.285 32.429 37.285H12.572C12.0197 37.285 11.572 36.8373 11.572 36.285V35.714C11.572 35.1617 12.0197 34.714 12.572 34.714Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.6657 13.2079L15.83 15.4224C15.352 15.6984 15.188 16.3104 15.464 16.7885L15.7495 17.283C16.026 17.7619 16.6375 17.925 17.1155 17.649L20.9512 15.4345C21.4292 15.1585 21.5937 14.5474 21.3172 14.0685L21.0317 13.574C20.7557 13.0959 20.1437 12.9319 19.6657 13.2079Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.579 8.714L14.589 9.286C13.633 9.838 13.305 11.061 13.857 12.018L24.107 29.771L27.941 31.269L28.561 27.199L18.311 9.446C17.759 8.49 16.536 8.162 15.579 8.714V8.714Z" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/theme/gov/icons-received-event.svg b/src/assets/images/theme/gov/icons-received-event.svg
index 3912abc68..e5eb14e83 100644
--- a/src/assets/images/theme/gov/icons-received-event.svg
+++ b/src/assets/images/theme/gov/icons-received-event.svg
@@ -1,10 +1,10 @@
 <svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 7H18V8H7V7Z" fill="white"/>
-<path d="M10.5 9C11.3284 9 12 8.32843 12 7.5C12 6.67157 11.3284 6 10.5 6C9.67157 6 9 6.67157 9 7.5C9 8.32843 9.67157 9 10.5 9Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 7H18V8H7V7Z" fill="black"/>
+<path d="M10.5 9C11.3284 9 12 8.32843 12 7.5C12 6.67157 11.3284 6 10.5 6C9.67157 6 9 6.67157 9 7.5C9 8.32843 9.67157 9 10.5 9Z" fill="black"/>
 <path d="M17.5 35C27.165 35 35 27.165 35 17.5C35 7.83502 27.165 0 17.5 0C7.83502 0 0 7.83502 0 17.5C0 27.165 7.83502 35 17.5 35Z" fill="#FFB81C"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 16L17.5 20L27 16V27H8V16Z" stroke="white" stroke-width="2" stroke-linejoin="round"/>
-<path d="M10.5 17V7H24.5V17" stroke="white" stroke-width="2" stroke-linejoin="round"/>
-<path d="M8 16L10.5 13.5" stroke="white" stroke-width="2"/>
-<path d="M27 16L24.5 13.5" stroke="white" stroke-width="2"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5 15.25L15.443 16.332L15.836 14.041L14.171 12.418L16.471 12.084L17.5 10L18.529 12.084L20.829 12.418L19.164 14.041L19.557 16.332L17.5 15.25Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 16L17.5 20L27 16V27H8V16Z" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M10.5 17V7H24.5V17" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M8 16L10.5 13.5" stroke="black" stroke-width="2"/>
+<path d="M27 16L24.5 13.5" stroke="black" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5 15.25L15.443 16.332L15.836 14.041L14.171 12.418L16.471 12.084L17.5 10L18.529 12.084L20.829 12.418L19.164 14.041L19.557 16.332L17.5 15.25Z" fill="black"/>
 </svg>
diff --git a/src/assets/images/theme/gov/icons-search-close.svg b/src/assets/images/theme/gov/icons-search-close.svg
index 97dcbe0c6..5eadffda3 100644
--- a/src/assets/images/theme/gov/icons-search-close.svg
+++ b/src/assets/images/theme/gov/icons-search-close.svg
@@ -1,7 +1,7 @@
 <svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5 5H12.778V6H5V5Z" fill="white"/>
-<path d="M7.77799 6.66701C8.39158 6.66701 8.88899 6.1696 8.88899 5.55601C8.88899 4.94242 8.39158 4.44501 7.77799 4.44501C7.1644 4.44501 6.66699 4.94242 6.66699 5.55601C6.66699 6.1696 7.1644 6.66701 7.77799 6.66701Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 5H12.778V6H5V5Z" fill="black"/>
+<path d="M7.77799 6.66701C8.39158 6.66701 8.88899 6.1696 8.88899 5.55601C8.88899 4.94242 8.39158 4.44501 7.77799 4.44501C7.1644 4.44501 6.66699 4.94242 6.66699 5.55601C6.66699 6.1696 7.1644 6.66701 7.77799 6.66701Z" fill="black"/>
 <path d="M12.5 25C19.4036 25 25 19.4036 25 12.5C25 5.59644 19.4036 0 12.5 0C5.59644 0 0 5.59644 0 12.5C0 19.4036 5.59644 25 12.5 25Z" fill="#FFB81C"/>
-<path d="M8.26038 7.98245L17.2951 17.0172" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M17.2958 7.98245L8.26107 17.0172" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.26038 7.98245L17.2951 17.0172" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.2958 7.98245L8.26107 17.0172" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/theme/gov/icons-search.svg b/src/assets/images/theme/gov/icons-search.svg
index 6a62127b8..11da39760 100644
--- a/src/assets/images/theme/gov/icons-search.svg
+++ b/src/assets/images/theme/gov/icons-search.svg
@@ -1,7 +1,7 @@
 <svg width="45" height="45" viewBox="0 0 45 45" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9 9H23V10H9V9Z" fill="white"/>
-<path d="M14 12C15.1046 12 16 11.1046 16 10C16 8.89543 15.1046 8 14 8C12.8954 8 12 8.89543 12 10C12 11.1046 12.8954 12 14 12Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 9H23V10H9V9Z" fill="black"/>
+<path d="M14 12C15.1046 12 16 11.1046 16 10C16 8.89543 15.1046 8 14 8C12.8954 8 12 8.89543 12 10C12 11.1046 12.8954 12 14 12Z" fill="black"/>
 <path d="M22.5 45C34.9264 45 45 34.9264 45 22.5C45 10.0736 34.9264 0 22.5 0C10.0736 0 0 10.0736 0 22.5C0 34.9264 10.0736 45 22.5 45Z" fill="#FFB81C"/>
-<path d="M21.857 28.571C25.565 28.571 28.571 25.565 28.571 21.857C28.571 18.149 25.565 15.143 21.857 15.143C18.149 15.143 15.143 18.149 15.143 21.857C15.143 25.565 18.149 28.571 21.857 28.571Z" stroke="white" stroke-width="2"/>
-<path d="M27 27L31.5 31.5" stroke="white" stroke-width="2" stroke-linecap="round"/>
+<path d="M21.857 28.571C25.565 28.571 28.571 25.565 28.571 21.857C28.571 18.149 25.565 15.143 21.857 15.143C18.149 15.143 15.143 18.149 15.143 21.857C15.143 25.565 18.149 28.571 21.857 28.571Z" stroke="black" stroke-width="2"/>
+<path d="M27 27L31.5 31.5" stroke="black" stroke-width="2" stroke-linecap="round"/>
 </svg>
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 50e56fda6..455ff071a 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -115,6 +115,9 @@ $app-theme: mat-light-theme(
   --ion-color-light-tint: #f5f6f9;
 
   --ion-color-expediente: #dae3f3;
+
+  
+  --ion-color-primary-contrast: black;
 }
 
 // dark-mode
@@ -1089,4 +1092,5 @@ body {
 
 .chat-aside {
   top: -31px;
-}
\ No newline at end of file
+}
+
diff --git a/version/git-version.ts b/version/git-version.ts
index 2bbfe1157..923cc57e1 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "1b9f5a25c",
-  "SHA": "1b9f5a25cb0229cdb51b82ee43aa9d5cbff75bb7",
+  "shortSHA": "7ee834558",
+  "SHA": "7ee834558ce74ba7341b794ce916853ce0ffdd39",
   "branch": "developer-prod",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Wed Aug 30 14:18:05 2023 +0100'",
-  "lastCommitMessage": "agenda drop down calendar",
-  "lastCommitNumber": "5237",
+  "lastCommitTime": "'Wed Aug 30 14:39:27 2023 +0100'",
+  "lastCommitMessage": "improve action on mobile",
+  "lastCommitNumber": "5238",
   "change": "",
-  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/publications/edit-action/edit-action.page.html\n\tmodified:   src/app/pages/publications/edit-action/edit-action.page.ts",
+  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/publications/publications.page.html\n\tmodified:   src/app/shared/agenda/view-event/view-event.page.scss\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified:   src/assets/icon/theme/gov/icons-chat-record-audio.svg\n\tmodified:   src/assets/icon/theme/gov/icons-chat-send.svg\n\tmodified:   src/assets/icon/theme/gov/icons-most-searched-words-open.svg\n\tdeleted:    src/assets/images/icons-menu.svg\n\tdeleted:    src/assets/images/icons-nav-agenda-active.svg\n\tdeleted:    src/assets/images/icons-profile-calendar-md.svg\n\tmodified:   src/assets/images/icons-received-event.svg\n\tmodified:   src/assets/images/theme/gov/advance-search-show-modal.svg\n\tnew file:   src/assets/images/theme/gov/icon-reload.svg\n\tmodified:   src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg\n\tmodified:   src/assets/images/theme/gov/icons-attach-doc.svg\n\tmodified:   src/assets/images/theme/gov/icons-chat-new-conversation.svg\n\tmodified:   src/assets/images/theme/gov/icons-chat-new-group.svg\n\trenamed:    src/assets/images/theme/gov/icons-chat-record-audio.svg -> src/assets/images/theme/gov/icons-chat-record-audio1.svg\n\tmodified:   src/assets/images/theme/gov/icons-chat-send.svg\n\tmodified:   src/assets/images/theme/gov/icons-collaps-down.svg\n\tmodified:   src/assets/images/theme/gov/icons-collaps-up.svg\n\tmodified:   src/assets/images/theme/gov/icons-edit.svg\n\tmodified:   src/assets/images/theme/gov/icons-received-event.svg\n\tmodified:   src/assets/images/theme/gov/icons-search-close.svg\n\tmodified:   src/assets/images/theme/gov/icons-search.svg\n\tmodified:   src/theme/variables.scss",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 64e463ab6f5bb8852b42054e895dbdc45dff457e Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 30 Aug 2023 17:53:02 +0100
Subject: [PATCH 6/6] icons changes

---
 src/app/services/task.service.ts                    |  2 +-
 src/app/shared/agenda/event-list/event-list.page.ts |  7 ++++++-
 .../events-to-approve/events-to-approve.page.html   |  5 ++++-
 .../events-to-approve/events-to-approve.page.scss   | 12 ++++++++++++
 .../events-to-approve/events-to-approve.page.ts     | 13 ++++++++-----
 version/git-version.ts                              | 12 ++++++------
 workspace.code-workspace                            |  3 ---
 7 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts
index d6ef06ae1..068542df7 100644
--- a/src/app/services/task.service.ts
+++ b/src/app/services/task.service.ts
@@ -318,7 +318,7 @@ export class TaskService {
         for(let calendar of this.eventService.calendarNamesAry) {
           if(calendar == 'Meu calendario') {
             // color
-            let genericEvents = await this.processesbackend.GetTasksList('Agendar Evento', false).toPromise();
+            let genericEvents = await this.processesbackend.eventsToApprove(SessionStore.user.UserId, false).toPromise();
             let eventsList
             try {
               eventsList = genericEvents
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts
index 0514803d9..345422ef7 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -106,7 +106,12 @@ export class EventListPage implements OnInit {
 
     if(this.segment == 'Meu calendario') {
       // color
-      this.color = 'mdgpr'
+
+      if(SessionStore.user.Profile == 'PR') {
+        this.color = 'pr'
+      } else {
+        this.color = 'mdgpr'
+      }
 
       let genericEvents = await this.processes.eventsToApprove(SessionStore.user.UserId,'mobile agenda').toPromise()
       try {
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
index da030c116..6eaa521f1 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
@@ -106,7 +106,7 @@
           >
             <div class="expediente" *ngIf="TaskService.filter(event, filterName)">
               <!-- (click)="openApproveModal(event)" -->
-              <div class="event-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100 d-flex">
+              <div class="event-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100 d-flex flex-wrap">
                 <div class="approve-event-time">
                   <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
                   <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
@@ -120,6 +120,9 @@
                   <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(event.deadline)">Para hoje</span>
                   <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(event.taskReceiveDate)">Nova</span>
                 </div>
+                <div *ngIf="event.activityInstanceName" class="width-100 ml-40">
+                  <div class="label-event-type font-13-rem"> {{ event.activityInstanceName }} </div>
+                </div>
               </div>
             </div>
           </div>
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
index abc4123d5..303219235 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
@@ -258,3 +258,15 @@
     width: 20px;
   }
 }
+
+
+
+
+.label-event-type {
+  padding: 1px 7px;
+  display: inline-block;
+  background: #ffb703;
+  border-radius: 17px;
+  color: black;
+  font-size: rem(13);
+}
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index 596d312d2..2609fa03d 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -176,14 +176,17 @@ export class EventsToApprovePage implements OnInit {
     this.showLoader = true;
     const segment = this.segment
 
-    if(SessionStore.user.Profile == 'PR') {
-      return false
-    }
-    
+
 
     if(this.segment == 'Meu calendario') {
       // color
-      this.color = 'mdgpr'
+
+      if(SessionStore.user.Profile == 'PR') {
+        this.color = 'pr'
+      } else {
+        this.color = 'mdgpr'
+      }
+      
 
       let genericEvents = await this.processes.eventsToApprove(SessionStore.user.UserId,'mobile agenda').toPromise()
       try {
diff --git a/version/git-version.ts b/version/git-version.ts
index c5640fa1f..914a2c4f7 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "0379b722c",
-  "SHA": "0379b722cf410a9a53b892b968d6ef44a0dafedf",
+  "shortSHA": "f472d5ac0",
+  "SHA": "f472d5ac0b3819bb8239a0b3512a53eff32df19b",
   "branch": "developer-prod",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Wed Aug 30 17:11:31 2023 +0100'",
-  "lastCommitMessage": "change icons",
-  "lastCommitNumber": "5239",
+  "lastCommitTime": "'Wed Aug 30 17:14:59 2023 +0100'",
+  "lastCommitMessage": "merge",
+  "lastCommitNumber": "5244",
   "change": "",
-  "changeStatus": "On branch developer-prod\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/modals/create-process/create-process.page.html\n\tmodified:   src/app/modals/delegar/delegar.page.html\n\tmodified:   src/app/modals/document-detail/document-detail.page.html\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified:   src/app/modals/forward/forward.page.html\n\tmodified:   src/app/modals/profile/edit-profile/edit-profile.page.ts\n\tmodified:   src/app/modals/profile/profile.page.ts\n\tmodified:   src/app/modals/view-event/view-event.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.html\n\tmodified:   src/app/pages/agenda/view-event/view-event.page.html\n\tmodified:   src/app/pages/chat/messages/messages.page.ts\n\tmodified:   src/app/pages/events/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/events/event-detail-modal/event-detail-modal.page.html\n\tmodified:   src/app/pages/events/event-detail/event-detail.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified:   src/app/services/events/edit-event/edit-event.page.html\n\tmodified:   src/app/services/events/event-detail-modal/event-detail-modal.page.html\n\tmodified:   src/app/services/events/event-detail/event-detail.page.html\n\tmodified:   src/app/services/notifications.service.ts\n\tmodified:   src/app/services/processes.service.ts\n\tmodified:   src/app/services/task.service.ts\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.html\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html\n\tmodified:   src/app/shared/agenda/view-event/view-event.page.html\n\tmodified:   src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified:   src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified:   src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.html\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified:   src/app/shared/header/header.page.ts",
+  "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",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file
diff --git a/workspace.code-workspace b/workspace.code-workspace
index 65a75eafa..07d71037b 100644
--- a/workspace.code-workspace
+++ b/workspace.code-workspace
@@ -2,9 +2,6 @@
     "folders": [
 		{
 			"path": "."
-		},
-		{
-			"path": "../srccccccccccccc/src"
 		}
 	],
     "settings": {