diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 508ad8347..f4287e966 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -27,7 +27,7 @@ - Ações + Acções diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index ab295c1d4..90fda08ac 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -117,6 +117,24 @@ export class DocumentSetUpMeetingPage implements OnInit { this.postData.CalendarName = "Oficial"; this.postData.Category = 'Reunião' + + if(!this.CalendarName) { + if(this._eventService.calendarNamesAry.includes('Meu calendario')) { + this.CalendarName = 'Meu calendario'; + console.log(this._eventService.calendarNamesAry) + } else { + this.CalendarName = this._eventService.calendarNamesAry[0] + } + } + + if(this.taskParticipants.length == 0) { + this.taskParticipants = [{ + EmailAddress: SessionStore.user.Email, + IsRequired: true, + Name: SessionStore.user.UserName + }] + } + } ngOnInit() { diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 08641b7e7..174cfcd3e 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -130,6 +130,8 @@ export class BookMeetingModalPage implements OnInit { authService: AuthService, private toastService: ToastService, public ThemeService: ThemeService, + public eventService: EventsService, + ) { this.taskParticipants = []; @@ -148,6 +150,23 @@ export class BookMeetingModalPage implements OnInit { this.postData.Category = 'Reunião' + if(!this.CalendarName) { + if(this.eventService.calendarNamesAry.includes('Meu calendario')) { + this.CalendarName = 'Meu calendario'; + console.log(this.eventService.calendarNamesAry) + } else { + this.CalendarName = this.eventService.calendarNamesAry[0] + } + } + + if(this.taskParticipants.length == 0) { + this.taskParticipants = [{ + EmailAddress: SessionStore.user.Email, + IsRequired: true, + Name: SessionStore.user.UserName + }] + } + } ngOnInit() { diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index b901bac6f..a8ffc6082 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -260,8 +260,9 @@ export class PublicationsPage implements OnInit { } finally { loader.remove() + this.refreshing() } - this.refreshing() + } async AddPublicationFolder(item?: any) { diff --git a/version/git-version.ts b/version/git-version.ts index ce748ec79..9b9af958e 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "658720f47", - "SHA": "658720f47ff463fe7e6ff672a2f562d74662480c", + "shortSHA": "378ea8fe5", + "SHA": "378ea8fe5b32dc1a9b68a71b98b32ed1e2e7a5a0", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sun Jan 22 15:27:01 2023 +0100'", - "lastCommitMessage": "save", - "lastCommitNumber": "4677", + "lastCommitTime": "'Sun Jan 22 18:48:45 2023 +0100'", + "lastCommitMessage": "improve", + "lastCommitNumber": "4678", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/home/home.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/publications/publications.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file