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 f6522049b..31cebe8b8 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 @@ -113,6 +113,17 @@ export class DocumentSetUpMeetingPage implements OnInit { ) { this.loggeduser = SessionStore.user; this.document = this.navParams.get('document') + + if(Array.isArray(this.document)) { + this.attachments = this.document + } else { + this.attachments = [this.document] + } + + + + this.document = [] + this.subject = this.navParams.get('subject') this.postData = new Event(); diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts index 703d19469..0e66d2ced 100644 --- a/src/app/modals/view-document/view-document.page.ts +++ b/src/app/modals/view-document/view-document.page.ts @@ -7,6 +7,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { EventDetailsDocumentsOptionsPage } from 'src/app/shared/popover/event-details-documents-options/event-details-documents-options.page'; import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-set-up-meeting.page'; import { AlertController, ModalController } from '@ionic/angular'; +import { SearchList } from 'src/app/models/search-document'; @Component({ selector: 'app-view-document', @@ -22,6 +23,7 @@ export class ViewDocumentPage implements OnInit { task: ExpedientTaskModalPageNavParamsTask; Document: any loader = true + attachment: SearchList[] = []; constructor( private modalController: ModalController, @@ -35,6 +37,7 @@ export class ViewDocumentPage implements OnInit { this.docId = this.navParams.get('docId'); this.Document = this.navParams.get('Document') this.task = this.navParams.get('task') + this.attachment = this.navParams.get('attachment') if(!this.file.title) { @@ -92,7 +95,8 @@ export class ViewDocumentPage implements OnInit { componentProps: { fulltask: this.task, task: this.task, - content: "" + content: "", + Document:this.Document } }); await modal.present(); @@ -115,7 +119,7 @@ export class ViewDocumentPage implements OnInit { } async openBookMeetingModal() { - + console.log('this.Document', this.Document) let classs; if( window.innerWidth < 701) { classs = 'book-meeting-modal modal modal-desktop' 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 3aa373434..cc35f393c 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 @@ -60,7 +60,7 @@ export class GroupContactsPage implements OnInit { ngOnInit() { // this.chatService.refreshtoken(); this.loadUsers(); - this.getMembers(); + // this.getMembers(); } @@ -205,8 +205,6 @@ export class GroupContactsPage implements OnInit { }) - this.users = users - diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts index 0e2766c77..c19f5ea02 100644 --- a/src/app/services/chat/chat-system.service.ts +++ b/src/app/services/chat/chat-system.service.ts @@ -66,22 +66,6 @@ export class ChatSystemService { ) { - const user = this.users - - const alfa = {} - - const sortedUserList = user.sort((a, b) => { - if(a.name < b.name) { - return -1; - } - if(a.name > b.name) { - return 1; - } - return 0; - }) - - console.log({sortedUserList}) - this.RochetChatConnectorService.registerCallback({ type: 'reConnect', funx: async () => { diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 7985330b6..5d73fd3c3 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -972,6 +972,13 @@ export class EventsService { const now = new Date(); event.TimeZone = now.toString().match(/([A-Z]+[\+-][0-9]+.*)/)[1]; + event.Organizer = { + "Id": SessionStore.user.UserId, + "EmailAddress": SessionStore.user.Email, + "Name": SessionStore.user.UserName, + "IsRequired": true, + "UserType": "GD" + } params = params.set("CalendarName", calendarName); params = params.set("notifyUsers", true) diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts index 681b0ff0f..da84e3fc6 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.ts +++ b/src/app/shared/chat/messages/contacts/contacts.page.ts @@ -7,6 +7,12 @@ import { ThemeService } from 'src/app/services/theme.service' import { ChatSystemService } from 'src/app/services/chat/chat-system.service' import { SessionStore } from 'src/app/store/session.service'; + + +class UserToSelect { + +} + @Component({ selector: 'app-contacts', templateUrl: './contacts.page.html', @@ -29,9 +35,10 @@ export class ContactsPage implements OnInit { @Output() backToChat:EventEmitter = new EventEmitter(); @Output() closeAllDesktopComponents:EventEmitter = new EventEmitter(); - userList = this.ChatSystemService.users + CoolList = [] + constructor( private modalController: ModalController, private chatService: ChatService, @@ -57,6 +64,21 @@ export class ContactsPage implements OnInit { const username = e.name.toLowerCase() return username.includes(this.textSearch) }) + + + const alfa = {} + + for (let user of this.userList) { + + let firstCharacter = user.name.charAt(0); + + if(!alfa[firstCharacter]) { + alfa[firstCharacter] = [user] + } else { + alfa[firstCharacter].push(user) + } + + } } diff --git a/version/git-version.ts b/version/git-version.ts index 883bf7759..9ce51ca10 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "cb0c4459a", - "SHA": "cb0c4459a704510a0666480af4aaf9841079a29c", + "shortSHA": "2dea55c7f", + "SHA": "2dea55c7f06c955eecee3619da88a66d848a9748", "branch": "developer", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Sun Aug 20 18:09:10 2023 +0100'", - "lastCommitMessage": "update badge das notificações", - "lastCommitNumber": "5178", + "lastCommitTime": "'Sun Aug 20 22:05:46 2023 +0100'", + "lastCommitMessage": "download file chat solved", + "lastCommitNumber": "5179", "change": "", - "changeStatus": "On branch developer\nYour branch and 'origin/developer' have diverged,\nand have 9 and 5 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: android/app/src/main/AndroidManifest.xml\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts", + "changeStatus": "On branch developer\nYour branch and 'origin/developer' have diverged,\nand have 10 and 5 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\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/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file