diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html index a1095d704..74fc9bf48 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -62,17 +62,9 @@ PIN - - - - diff --git a/src/app/models/imageTypes.ts b/src/app/models/imageTypes.ts new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index efccca931..35ae9787e 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -65,7 +65,7 @@
{{showDateDuration(dm._updatedAt)}}
-
+
{{dm.lastMessage.msg}} @@ -98,7 +98,7 @@
{{showDateDuration(group._updatedAt)}}
-
+
{{group.lastMessage.u.name}}: {{group.lastMessage.msg}}
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index c3496e88e..991abb5a2 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -382,6 +382,7 @@ hideRefreshButton(){ async getDirectMessages(event?){ this.chatService.getAllDirectMessages().subscribe(async (res:any)=>{ + console.log(res.ims); if(res != 200){ //console.log(res.ims); diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index 6d649403c..13523de85 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -40,11 +40,11 @@ - +
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 8a623855f..db6c33508 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -41,11 +41,11 @@ - +
{{msg.msg}}
-
+
image
-
+
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 15f53070d..072fb8230 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -4,11 +4,14 @@ import { GestureController, Gesture, ModalController, NavParams, PopoverControll import { map } from 'rxjs/operators'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; import { EventPerson } from 'src/app/models/eventperson.model'; +import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage'; +import { SearchDocumentDetails, SearchFolderDetails } from 'src/app/models/search-document'; import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page'; import { AlertService } from 'src/app/services/alert.service'; import { AuthService } from 'src/app/services/auth.service'; import { ChatService } from 'src/app/services/chat.service'; import { FileService } from 'src/app/services/functions/file.service'; +import { ProcessesService } from 'src/app/services/processes.service'; import { synchro } from 'src/app/services/socket/synchro.service'; import { ToastService } from 'src/app/services/toast.service'; import { NewEventPage } from 'src/app/shared/agenda/new-event/new-event.page'; @@ -55,6 +58,10 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { showMessageOptions = false; selectedMsgId:string; + dicIndex = 0; + task: ExpedientTaskModalPageNavParamsTask; + LoadedDocument:any = null; + constructor( public popoverController: PopoverController, private modalController: ModalController, @@ -67,6 +74,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { private activatedRoute: ActivatedRoute, private fileService: FileService, private gestureController: GestureController, + private processes: ProcessesService, ) { /* this.activatedRoute.paramMap.subscribe(params => { if(params["params"].SerialNumber) { @@ -111,19 +119,19 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { this.scrollChangeCallback = () => this.onContentScrolled(event); window.addEventListener('scroll', this.scrollChangeCallback, true); - const gesture = this.gestureController.create({ - el: this.rectangle.nativeElement, - gestureName:'long-press', - onStart: () => { alert('OP') }, - /* onMove () => { - console.log('Move'); - }, */ - onEnd: () => { - console.log('ENNNNNDS'); - }, - }) + // const gesture = this.gestureController.create({ + // el: this.rectangle.nativeElement, + // gestureName:'long-press', + // onStart: () => { alert('OP') }, + // /* onMove () => { + // console.log('Move'); + // }, */ + // onEnd: () => { + // console.log('ENNNNNDS'); + // }, + // }) - gesture.enable(); + // gesture.enable(); } handlePress(id?:string){ @@ -275,6 +283,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { } viewDocument(file:any){ + console.log(file); + if(file.type == "file"){ let fullUrl = "https://www.tabularium.pt" + file.title_link; this.fileService.viewDocumentByUrl(fullUrl); @@ -285,17 +295,80 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { } } + docIndex(index: number){ + this.dicIndex = index + } + async openViewDocumentModal(file:any){ - const modal = await this.modalController.create({ - component: ViewDocumentPage, - componentProps: { - file: file, - }, - cssClass: 'modal modal-desktop', - backdropDismiss: false + console.log(file); + const docId = file.DocId; + const applicationId: any = file.ApplicationId; + + this.processes.GetDocumentDetails(docId, applicationId).subscribe( async(res)=> { + + this.LoadedDocument = res; + this.LoadedDocument.Subject = this.LoadedDocument.Assunto + + let thedate = new Date(this.LoadedDocument.DateDispatch || this.LoadedDocument.DocDate); + //this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]); + + let task: ExpedientTaskModalPageNavParamsTask + let document: SearchDocumentDetails = this.LoadedDocument + let folder: SearchFolderDetails = this.LoadedDocument + + if(this.LoadedDocument.ApplicationID == 361 || this.LoadedDocument.ApplicationId == 361) { + task = { + serialNumber: folder.DispatchNumber, + taskStartDate: folder.DateDispatch, + isEvent: true, + workflowInstanceDataFields: { + FolderID: folder['FolderId'] || folder['FolderID'] || folder.folderId, + Subject: folder.Assunto, + SourceSecFsID: folder.ApplicationID || folder['ApplicationId'], + SourceType: 'FOLDER', + SourceID: folder.folderId, + DispatchNumber: folder.DispatchNumber + }, + } + } + else if (document.ApplicationID == 8 || document.ApplicationId == 8) + { + task = { + serialNumber: document.DocId, + taskStartDate: document.DocDate, + isEvent: true, + workflowInstanceDataFields: { + FolderID: null, + Subject: document.Assunto, + DispatchNumber: null, + SourceSecFsID: document.ApplicationID || document.ApplicationId, + SourceType: 'DOC', + SourceID: document.DocId, + } + } + } else { + console.log('unexpected ApplicationID') + } + + + const modal = await this.modalController.create({ + component: ViewDocumentPage, + componentProps: { + trustedUrl: '', + file: { + title: task.workflowInstanceDataFields.Subject, + url: '', + title_link: '', + }, + Document: this.LoadedDocument, + applicationId: document.ApplicationID || document.ApplicationId, + docId: document.ApplicationID || document.ApplicationId, + folderId: folder['FolderId'] || folder['FolderID'] || folder.folderId + }, + cssClass: 'modal modal-desktop' + }); + await modal.present(); }); - await modal.present(); - modal.onDidDismiss(); } getChatMembers() { @@ -401,6 +474,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { } async openChatOptions(ev?: any) { + const roomId = this.roomId console.log(this.members); const popover = await this.popoverController.create({ @@ -421,11 +495,11 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { this.bookMeeting(); } else if(res['data'] == 'take-picture'){ - this.fileService.addCameraPictureToChat(this.roomId); + this.fileService.addCameraPictureToChat(roomId); //this.loadPicture(); } else if(res['data'] == 'add-picture'){ - this.fileService.addPictureToChat(this.roomId); + this.fileService.addPictureToChatMobile(roomId); //this.loadPicture(); } else if(res['data'] == 'add-document'){ diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html index 9f63cff4d..30ca368f1 100644 --- a/src/app/pages/events/attendees/attendees.page.html +++ b/src/app/pages/events/attendees/attendees.page.html @@ -74,13 +74,11 @@ diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html index 92787fa63..780781089 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -26,13 +26,13 @@ refreshingText="A actualizar..."> - +
@@ -63,17 +63,17 @@
- +
-
Lista vazia
-
+
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html index c993e3825..4e016a8a6 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html @@ -59,7 +59,7 @@
Documentos Anexados
- { // if not mobile remove all component @@ -143,7 +143,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { // this.eventoaprovacaostore.resetmd([]) // this.eventoaprovacaostore.resetpr([]) - + } ngDoCheck(): void { @@ -183,6 +183,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { callback: ()=> { this.checkRoutes(); this.LoadCounts(); + this.loadAllProcesses(); } }) } @@ -303,12 +304,12 @@ export class GabineteDigitalPage implements OnInit, DoCheck { goToProcess(serialNumber:string, workflowName:string, activityName:string){ if(workflowName == 'Despacho') { - if(activityName == 'Tarefa de Despacho'){ + if(activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho'){ this.router.navigate(['/home/gabinete-digital/despachos',serialNumber,'gabinete-digital']); } } else if(workflowName == 'Despacho do Presidente da República') { - if(activityName == 'Tarefa de Despacho'){ + if(activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho'){ this.router.navigate(['/home/gabinete-digital/despachos-pr',serialNumber,'gabinete-digital']); } else if(activityName == 'Revisar Diploma' || activityName == 'Assinar Diploma'){ @@ -565,6 +566,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { break; } */ this.LoadCounts(); + this.loadAllProcesses(); //this.refreshExpedientes(); if(event){ diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index 7c2b6ac00..29943d512 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -13,7 +13,7 @@
- + Parecer @@ -27,7 +27,7 @@
- + { // // you can use this method to get file and perform respective operations // let files = Array.from(input.files); // console.log(files); // }; + input.click(); return input - + + } getFirstFile(input: HTMLInputElement) { diff --git a/src/app/services/functions/file.service.ts b/src/app/services/functions/file.service.ts index 95f02e6b5..4dbdcd120 100644 --- a/src/app/services/functions/file.service.ts +++ b/src/app/services/functions/file.service.ts @@ -86,38 +86,114 @@ export class FileService { } addCameraPictureToChat(roomId){ - let data = this.takePicture(); - if(data.name != null){ + + const options: CameraOptions = { + quality: 50, + destinationType: this.camera.DestinationType.DATA_URL, + encodingType: this.camera.EncodingType.JPEG, + mediaType: this.camera.MediaType.PICTURE, + targetWidth: 720, + targetHeight: 720, + } + + this.camera.getPicture(options).then((imageData) => { + this.capturedImage = 'data:image/png;base64,'+imageData; + this.capturedImageTitle = new Date().getTime() + '.jpeg'; + let body = { "message": { "rid": roomId, "msg": "", "attachments": [{ - "title": data.name, + "title": this.capturedImageTitle, "title_link_download": false, - "image_url": data.image, + "image_url": this.capturedImage, }] } } + const loader = this.toastService.loading(); this.chatService.sendMessage(body).subscribe(res=> { console.log(res); + loader.remove(); },(error) => { - + loader.remove(); + this.toastService.badRequest("Não foi possível adicionar a fotografia!"); }); - } - else{ + + }, (err) => { this.toastService.badRequest("Não foi possível adicionar a fotografia!"); - } + }); + } - addPictureToChat(roomId:string) { + addPictureToChatMobile(roomId) { + alert('Here') + + const options: CameraOptions = { + quality: 90, + sourceType: this.camera.PictureSourceType.PHOTOLIBRARY, + destinationType: this.camera.DestinationType.DATA_URL, + encodingType: this.camera.EncodingType.JPEG, + mediaType: this.camera.MediaType.PICTURE, + targetWidth: 720, + targetHeight: 720, + correctOrientation: true + } + + this.camera.getPicture(options).then((imageData) => { + let base64Image = 'data:image/jpeg;base64,' + imageData; + this.capturedImage = imageData; + this.capturedImageTitle = new Date().getTime() + '.jpeg'; + + //const loader = this.toastService.loading(); + + let body = { + "message": + { + "rid": roomId, + "msg": "", + "attachments": [{ + //"title": this.capturedImageTitle , + //"text": "description", + "title_link_download": false, + "image_url": this.capturedImage, + }] + } + } + + console.log(this.capturedImage) + + this.chatService.sendMessage(body).subscribe(res=> { + //loader.remove(); + //console.log(res); + },(error) => { + //loader.remove(); + }); + + + }, (err) => { + //console.log(err); + }); + + } + + addPictureToChat(roomId) { + const input = this.fileLoaderService.createInput({ accept: ['image/apng', 'image/jpeg', 'image/png'] }) + + setInterval(()=>{ + console.log(input.value) + }, 550) + + input.onchange = async () => { + alert('Onchange AQUI') + const file = this.fileLoaderService.getFirstFile(input) console.log(file); @@ -141,6 +217,8 @@ export class FileService { } } + console.log(this.capturedImage) + this.chatService.sendMessage(body).subscribe(res=> { loader.remove(); //console.log(res); @@ -189,6 +267,8 @@ export class FileService { modal.onDidDismiss().then(async res=>{ const data = res.data; + alert('HERE') + if(data.selected){ const loader = this.toastService.loading(); @@ -197,6 +277,10 @@ export class FileService { console.log(res.data.selected.Id); console.log(res.data.selected.ApplicationType); + console.log('AQUIIIII'); + + alert('HERE 2') + let url = await this.processesService.GetDocumentUrl(res.data.selected.Id, res.data.selected.ApplicationType).toPromise(); let url_no_options: string = url.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); console.log(url_no_options); @@ -218,7 +302,9 @@ export class FileService { }], "file":{ "name": res.data.selected.Assunto, - "type": "application/webtrix" + "type": "application/webtrix", + "ApplicationId": res.data.selected.ApplicationType, + "DocId": res.data.selected.Id, } } } diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index 051d6a75d..5afddf0db 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -138,9 +138,6 @@ - - - @@ -150,6 +147,9 @@ + + +
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index a26012f2e..c582ee122 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -111,9 +111,6 @@ - - - @@ -123,6 +120,9 @@ + + + diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index dddeaea49..3b20a5099 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -380,10 +380,12 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy takePicture(){ - this.fileService.addCameraPictureToChat(this.roomId); + const roomId = this.roomId + this.fileService.addCameraPictureToChat(roomId); } addImage(){ - this.fileService.addPictureToChat(this.roomId); + const roomId = this.roomId + this.fileService.addPictureToChat(roomId); } addFile(){ this.fileService.addDocumentToChat(this.roomId); diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html index 239ba5a31..d259c2355 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.html +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html @@ -75,13 +75,11 @@ diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html index 9a1c3a09a..5226c4525 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html @@ -6,9 +6,9 @@
- - - + + +
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts index 7aea36628..27df26c1e 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts @@ -54,6 +54,15 @@ export class ChatOptionsPopoverPage implements OnInit { } } + addFile(){ + if( window.innerWidth < 701){ + this.popoverController.dismiss('add-document'); + } + else{ + this.modalController.dismiss('add-document'); + } + } + anexarFoto(){ if( window.innerWidth < 701){ this.popoverController.dismiss('add-picture');