diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 6a5f4e8fe..c76596c9a 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -130,7 +130,8 @@ @@ -161,7 +162,7 @@ diff --git a/src/app/pages/chat/new-group/new-group.page.ts b/src/app/pages/chat/new-group/new-group.page.ts index e49406f48..85ba38051 100644 --- a/src/app/pages/chat/new-group/new-group.page.ts +++ b/src/app/pages/chat/new-group/new-group.page.ts @@ -3,11 +3,9 @@ import { ModalController, NavParams, PickerController, PopoverController } from import { GroupDurationPage } from 'src/app/shared/popover/group-duration/group-duration.page'; import { GroupContactsPage } from '../group-messages/group-contacts/group-contacts.page'; import { ThemeService } from 'src/app/services/theme.service'; -import { ChatService } from 'src/app/services/chat.service'; -import { ProcessesService } from 'src/app/services/processes.service'; import { ChatSystemService } from 'src/app/services/chat/chat-system.service'; -import { AuthService } from 'src/app/services/auth.service'; import { SessionStore } from 'src/app/store/session.service'; +import { ToastService } from 'src/app/services/toast.service'; @Component({ selector: 'app-new-group', @@ -32,6 +30,7 @@ export class NewGroupPage implements OnInit { private navParams: NavParams, public ThemeService: ThemeService, public ChatSystemService: ChatSystemService, + private toastService: ToastService, ) { this.loggedUserChat = SessionStore.user.ChatData['data']; this.isGroupCreated = false; @@ -88,6 +87,82 @@ export class NewGroupPage implements OnInit { this.ChatSystemService.subscribeToRoomUpdate(res.result.rid, res.result); }, 10) + + + if(res?.result?.rid) { + + this.ChatSystemService.getAllRooms(() => { + if(!this.ChatSystemService.getGroupRoom(res.result.rid)) { + this.createGroupWithAttachmentsCath(res) + } else { + setTimeout(()=> { + + this.createGroupWithAttachments(res) + + }, 500) + } + }, res.result.rid); + + + + } else { + + this.toastService._badRequest('Existe um grupo com este nome!'); + + } + + } + + + createGroupWithAttachmentsCath(res: any) { + if(!this.ChatSystemService.getGroupRoom(res.result.rid)) { + setTimeout(()=>{ + this.createGroupWithAttachmentsCath(res) + }, 1500) + } else { + this.createGroupWithAttachments(res) + } + } + + createGroupWithAttachments(res: any) { + this.ChatSystemService.getGroupRoom(res.result.rid).hasLoadHistory = true; + + if(this.documents) { + this.documents.forEach(element => { + this.ChatSystemService.getGroupRoom(res.result.rid).send({ + file: { + "name": element.Assunto, + "type": "application/webtrix", + "ApplicationId": element.ApplicationId, + "DocId": element.DocId, + "Assunto": element.Assunto, + }, + temporaryData: { + data: { + selected: { + Id: element.DocId, + ApplicationType: element.ApplicationId + } + } + }, + attachments: [{ + "title": element.Assunto, + "description": element.Assunto, + "title_link_download": true, + "type": "webtrix", + "text": element.Assunto, + "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png", + }], + }) + }); + } + + + this.ChatSystemService.getAllRooms(); + + setTimeout(() => { + this.groupName = "" + }, 150); } async addContacts(room) { diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 060758143..57c7da224 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -21,6 +21,7 @@ import { SessionStore } from 'src/app/store/session.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { environment } from 'src/environments/environment'; import { TaskService } from 'src/app/services/task.service'; +import { DataService } from 'src/app/services/data.service'; @Component({ selector: 'app-opts-expediente', @@ -54,7 +55,8 @@ export class OptsExpedientePage implements OnInit { private expedienteService: ExpedienteService, public ThemeService: ThemeService, private httpErrorHanlde: HttpErrorHandle, - public TaskService: TaskService + public TaskService: TaskService, + private dataService: DataService, ) { } @@ -65,6 +67,11 @@ export class OptsExpedientePage implements OnInit { async openNewGroupPage() { + this.dataService.set("newGroup", true); + this.dataService.set("task", this.task); + this.dataService.set("newGroupName", this.task.Folio); + this.dataService.set("documents", this.fulltask.Documents); + this.dataService.set("link", window.location.pathname); const modal = await this.modalController.create({ component: NewGroupPage, diff --git a/version/git-version.ts b/version/git-version.ts index 4e67919a0..c8a3ddef8 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "fdce8db60", - "SHA": "fdce8db602a0eb8141d95d38600bc5afd23aeb2a", + "shortSHA": "a89b2739c", + "SHA": "a89b2739c8d9b5d320e107b1366017c8e01607f3", "branch": "developer-prod", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sun Aug 20 22:00:23 2023 +0100'", - "lastCommitMessage": "update create event from document", - "lastCommitNumber": "5175", + "lastCommitTime": "'Mon Aug 21 11:42:34 2023 +0100'", + "lastCommitMessage": "update fix", + "lastCommitNumber": "5176", "change": "", - "changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/chat/new-group/new-group.page.ts\n\tmodified: src/global.scss", + "changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/chat/new-group/new-group.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file