diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index bd019d5ad..a409d91e3 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -235,6 +235,10 @@ export class AgendaPage implements OnInit { this.tigerUpdate() + window['reloadCalendar'] = () => { + this.reloadCalendar() + } + } diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index a6a5f8e58..517b498b9 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -353,6 +353,10 @@ export class EditEventPage implements OnInit { if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') { this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { + if(window['reloadCalendar']) { + window['reloadCalendar']() + } + if(this.initCalendarName != this.postEvent.CalendarName) { let body = { @@ -375,6 +379,10 @@ export class EditEventPage implements OnInit { } else { this.eventsService.editEvent(this.postEvent, 2, 3, this.postEvent.CalendarId).subscribe(async () => { + if(window['reloadCalendar']) { + window['reloadCalendar']() + } + if(this.initCalendarName != this.postEvent.CalendarName) { let body = { diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts index 5636f9a4f..90eab93a4 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts @@ -147,18 +147,37 @@ export class GroupContactsPage implements OnInit { this.modalController.dismiss(); } - onChange(event){ + onChange(event) { this.textSearch = event.detail.value; - this.users = this.contacts.filter( e => e.name.toLowerCase().includes(this.textSearch.toLowerCase())).sort((a,b) => { - if(a.name < b.name){ + const users = this.contacts.filter( e => e.name.toLowerCase().includes(this.textSearch.toLowerCase())).sort((a,b) => { + if(a.name < b.name) { return -1; } - if(a.name > b.name){ + if(a.name > b.name) { return 1; } return 0; }); + + const selectedUsers = this.users.filter( e => e?.isChecked == true) + + users.forEach( (user, index) => { + if(user[index]) { + console.log({user, index}) + const isCheck = selectedUsers.find( e => e._id == user._id)?.isChecked + if(isCheck) { + user[index].isChecked = isCheck + } + + // if(user[index].isChecked) { + // console.log('user[index].isChecked', user[index].isChecked) + // } + } + + }) + + this.users = users } diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index 4c245deb2..8376f7878 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -99,10 +99,7 @@ - - diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts index 77e4c4d77..7dd8027bb 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts @@ -235,20 +235,39 @@ export class GroupContactsPage implements OnInit { } } - onChange(event){ + onChange(event) { this.textSearch = event.detail.value; - this.users = this.contacts.filter( e => e.name.toLowerCase().includes(this.textSearch.toLowerCase())).sort((a,b) => { - if(a.name < b.name){ + const users: any[] = this.contacts.filter( e => e.name.toLowerCase().includes(this.textSearch.toLowerCase())).sort((a,b) => { + if(a.name < b.name) { return -1; } - if(a.name > b.name){ + if(a.name > b.name) { return 1; } return 0; }); - + const selectedUsers = this.users.filter( e => e?.isChecked == true) + + users.forEach( (user, index) => { + if(user[index]) { + console.log({user, index}) + const isCheck = selectedUsers.find( e => e._id == user._id)?.isChecked + if(isCheck) { + user[index].isChecked = isCheck + } + + // if(user[index].isChecked) { + // console.log('user[index].isChecked', user[index].isChecked) + // } + } + + }) + + this.users = users + + // console.log('this.users', this.users) } clicked(){ diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html index c0eac9b78..e3981897d 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.html +++ b/src/app/shared/publication/new-publication/new-publication.page.html @@ -107,7 +107,7 @@ diff --git a/src/global.scss b/src/global.scss index cf0d964c4..58ec95c9c 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1143,14 +1143,6 @@ background: rgb(92, 92, 92); } } -ngx-mat-datetime-content{ - .actions { - .mat-button-disabled { - background-color: #ff5a5a59 !important; - } - } - -} // angular material inputs @@ -1491,7 +1483,6 @@ ngx-mat-datetime-content .actions { } } - ngx-mat-datetime-content .ngx-mat-timepicker { z-index: 111; } @@ -1499,10 +1490,20 @@ ngx-mat-datetime-content .ngx-mat-timepicker { display: none !important; } - ngx-mat-datetime-content .mat-input-element { padding: 0px !important; } + +ngx-mat-datetime-content{ + .actions { + .mat-button-disabled { + background-color: #ff5a5a59 !important; + } + } + +} + + pre { font-family: 'Roboto' !important; font-size: rem(16) !important; diff --git a/version/git-version.ts b/version/git-version.ts index f0dc8c63b..ac6604b5e 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "4f4381a6d", - "SHA": "4f4381a6d7f9fb23cc31a0a57d4d1bcce86bb204", + "shortSHA": "30aba9b18", + "SHA": "30aba9b182c15ea7321fc807156acacacc2d383e", "branch": "developer", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Aug 14 21:43:52 2023 +0100'", - "lastCommitMessage": "fix errors", - "lastCommitNumber": "5157", + "lastCommitTime": "'Tue Aug 15 10:15:08 2023 +0100'", + "lastCommitMessage": "improve", + "lastCommitNumber": "5158", "change": "", - "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.scss\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/global.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file