mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 12:37:53 +00:00
Peter Maquiran
12 lines
19 KiB
TypeScript
12 lines
19 KiB
TypeScript
export let versionData = {
|
|
"shortSHA": "119f4df39",
|
|
"SHA": "119f4df39d56f36d4b81373849b0de65514f2649",
|
|
"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, </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"
|
|
} |