From 26da3a85b74901659261fead0b1041f61988cc02 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 8 Sep 2021 14:36:49 +0100 Subject: [PATCH 01/22] save --- src/app/pages/chat/chat.page.html | 2 +- .../pages/chat/group-messages/group-messages.page.html | 2 +- .../chat/group-messages/group-messages.page.html | 10 +++++++--- .../shared/chat/group-messages/group-messages.page.ts | 5 ++++- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 57c795332..897f6b8df 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -44,7 +44,7 @@
+ [class.item-active]="dm._id == idSelected">
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 3e336a143..742513d3f 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -40,7 +40,7 @@ A conversa original mantêm-se como chat individual
-
+
{{msg.u.name}} {{showDateDuration(msg._updatedAt)}} 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 54d9bbcbf..f39dbe359 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -39,7 +39,7 @@ A conversa original mantêm-se como chat individual
-
+
{{msg.u.name}} {{showDateDuration(msg._updatedAt)}} @@ -53,11 +53,15 @@ Alterou o nome do grupo para "{{msg.msg.split('-').join(' ')}}"
{{last ? scrollToBottom() : ''}}
+
+ O contacto {{msg.msg.split('-').join(' ')}} saiu do grupo
+ {{last ? scrollToBottom() : ''}} +
-
+ diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index a266277f4..c98787c17 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -271,7 +271,10 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe modal.onDidDismiss().then(res=>{ console.log(res); if(res.data == 'leave'){ - this.leaveStatus = this.loggedUser.me.name + ' saiu do grupo'; + //this.leaveStatus = this.loggedUser.me.name + ' saiu do grupo'; + this.getRoomInfo(); + this.closeAllDesktopComponents.emit(); + this.showEmptyContainer.emit(); } else if(res.data == 'delete'){ this.closeAllDesktopComponents.emit(); From 9ff7a588d8850e829ece32fdea1e20bb220e67ae Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 8 Sep 2021 15:02:14 +0100 Subject: [PATCH 02/22] save --- .../chat-popover/chat-popover.page.html | 4 +-- .../popover/chat-popover/chat-popover.page.ts | 28 ++++++++++++++----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index f179b830e..d402757a7 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -1,6 +1,6 @@
-
@@ -8,7 +8,7 @@
- +
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts index 990d70100..2f0417fa6 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { ModalController, NavParams, PopoverController } from '@ionic/angular'; import { ChatService } from 'src/app/services/chat.service'; +import { ToastService } from 'src/app/services/toast.service'; @Component({ selector: 'app-chat-popover', @@ -16,6 +17,7 @@ export class ChatPopoverPage implements OnInit { private modalController: ModalController, private navParams: NavParams, private chatService: ChatService, + private toastService: ToastService, ) { this.roomId = this.navParams.get('roomId'); } @@ -24,14 +26,14 @@ export class ChatPopoverPage implements OnInit { console.log(this.roomId); } - close(){ + close(action:any){ if( window.innerWidth <= 701){ - this.popoverController.dismiss('cancel'); - this.modalController.dismiss('cancel'); + this.popoverController.dismiss(action); + this.modalController.dismiss(action); } else{ - this.popoverController.dismiss('cancel'); - this.modalController.dismiss('cancel'); + this.popoverController.dismiss(action); + this.modalController.dismiss(action); } } @@ -48,16 +50,28 @@ export class ChatPopoverPage implements OnInit { if(this.room.t === 'p'){ this.chatService.leaveGroup(body).subscribe(res=>{ console.log(res); + this.close('leave'); + }, + (error)=>{ + this.toastService.badRequest("Não foi possível sair do grupo") + }, + ()=>{ + //loader.remove() }); } else{ this.chatService.leaveChannel(body).subscribe(res=>{ console.log(res); + this.close('leave'); + }, + (error)=>{ + this.toastService.badRequest("Não foi possível sair do grupo") + }, + ()=>{ + //loader.remove() }); } }); - this.popoverController.dismiss('leave'); - this.modalController.dismiss('leave'); } //Delete From 129a7095704d0430575b8a490bb7992f4a241c3c Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 9 Sep 2021 11:47:49 +0100 Subject: [PATCH 03/22] improvements --- .../group-messages/group-messages.page.html | 21 +++++++++++++++-- .../group-messages/group-messages.page.ts | 12 ++++++++++ .../group-messages/group-messages.page.html | 16 +++++++++++-- .../group-messages/group-messages.page.ts | 23 ++++++++++++++++++- .../popover/chat-popover/chat-popover.page.ts | 23 +++++++++++++++---- 5 files changed, 86 insertions(+), 9 deletions(-) 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 742513d3f..e1569034a 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -40,7 +40,7 @@ A conversa original mantêm-se como chat individual
-
+
{{msg.u.name}} {{showDateDuration(msg._updatedAt)}} @@ -51,7 +51,24 @@
- Alterou o assunto para "{{msg.msg.split('-').join(' ')}}"
+ Alterou o nome do grupo para "{{msg.msg.split('-').join(' ')}}"
+ {{last ? scrollToBottom() : ''}} +
+
+
+
+ {{user.name}} saiu do grupo
+
+
+ {{last ? scrollToBottom() : ''}} +
+
+
+
+ {{user.name}} foi removido do grupo
+
+
+ {{last ? scrollToBottom() : ''}}
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 6ef11c520..83dc2c51e 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -29,6 +29,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { roomName:any; members:any; contacts: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"]; + allUsers:any[] = []; roomId: string; loggedUserChat:any; @@ -70,6 +71,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { this.scrollToBottom(); this.serverLongPull(); this.setStatus('online'); + this.getChatMembers(); } setStatus(status:string){ @@ -125,6 +127,16 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { }); } + async getChatMembers(){ + //return await this.chatService.getMembers(roomId).toPromise(); + this.chatService.getAllUsers().subscribe(res=> { + console.log(res); + + this.allUsers = res['users'].filter(data => data.username != this.loggedUserChat.me.username); + console.log(this.allUsers); + }); + } + /* load(){ this.getGroupContacts(); this.loadGroupMessages(); 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 f39dbe359..c20b18f07 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -39,7 +39,7 @@ A conversa original mantêm-se como chat individual
-
+
{{msg.u.name}} {{showDateDuration(msg._updatedAt)}} @@ -54,7 +54,19 @@ {{last ? scrollToBottom() : ''}}
- O contacto {{msg.msg.split('-').join(' ')}} saiu do grupo
+
+
+ {{user.name}} saiu do grupo
+
+
+ {{last ? scrollToBottom() : ''}} +
+
+
+
+ {{user.name}} foi removido do grupo
+
+
{{last ? scrollToBottom() : ''}}
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index c98787c17..4ef4d1fa5 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -24,6 +24,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe message:any; leaveStatus:any; messages:any; + allUsers:any[] = []; room:any = new Array(); @@ -72,6 +73,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe this.serverLongPull(); console.log(this.roomId); this.setStatus('online'); + this.getChatMembers(); } setStatus(status:string){ @@ -116,6 +118,16 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe window.removeEventListener('scroll', this.scrollChangeCallback, true); } + async getChatMembers(){ + //return await this.chatService.getMembers(roomId).toPromise(); + this.chatService.getAllUsers().subscribe(res=> { + console.log(res); + + this.allUsers = res['users'].filter(data => data.username != this.loggedUserChat.me.username); + console.log(this.allUsers); + }); + } + openGroupContactsPage(){ this.openGroupContacts.emit(this.roomId); } @@ -210,7 +222,16 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe let body = { "message": { - "rid": this.roomId, "msg": this.message + "rid": this.roomId, + "msg": this.message, + "attachments": [{ + "color": "#ff0000", + "text": "Yay for gruggy!", + "title": "Attachment Example", + "title_link": "https://youtube.com", + "title_link_download": false, + "image_url": "http://res.guggy.com/logo_128.png", + }] } } diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts index 2f0417fa6..ca1d0742b 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -52,8 +52,16 @@ export class ChatPopoverPage implements OnInit { console.log(res); this.close('leave'); }, - (error)=>{ - this.toastService.badRequest("Não foi possível sair do grupo") + (e)=>{ + if(e.error.errorType = "error-you-are-last-owner"){ + this.toastService.badRequest("Você é o último administrador do grupo. Por favor, defina o novo administrador antes de sair da grupo."); + this.close('cancel'); + } + else{ + this.toastService.badRequest("Não foi possível sair do grupo"); + this.close('cancel'); + } + }, ()=>{ //loader.remove() @@ -64,8 +72,15 @@ export class ChatPopoverPage implements OnInit { console.log(res); this.close('leave'); }, - (error)=>{ - this.toastService.badRequest("Não foi possível sair do grupo") + (e)=>{ + if(e.error.errorType = "error-you-are-last-owner"){ + this.toastService.badRequest("Você é o último administrador do grupo. Por favor, defina o novo administrador antes de sair da grupo."); + this.close('cancel'); + } + else{ + this.toastService.badRequest("Não foi possível sair do grupo"); + this.close('cancel'); + } }, ()=>{ //loader.remove() From 9994ba1a5df9aaac318aa6a2b375500ad76dd27a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 13 Sep 2021 12:37:58 +0100 Subject: [PATCH 04/22] add image to chat --- .../chat-options-features.page.html | 2 +- .../chat-options-features.page.ts | 76 +++++++++++++++++++ .../group-messages/group-messages.page.html | 8 +- .../group-messages/group-messages.page.ts | 54 ++++++++++++- .../services/functions/file.service.spec.ts | 16 ++++ src/app/services/functions/file.service.ts | 40 ++++++++++ .../group-messages/group-messages.page.html | 8 +- .../group-messages/group-messages.page.ts | 62 +++++++++++++-- .../chat-options-popover.page.html | 2 +- .../chat-options-popover.page.ts | 9 +++ 10 files changed, 259 insertions(+), 18 deletions(-) create mode 100644 src/app/services/functions/file.service.spec.ts create mode 100644 src/app/services/functions/file.service.ts diff --git a/src/app/modals/chat-options-features/chat-options-features.page.html b/src/app/modals/chat-options-features/chat-options-features.page.html index d7c27f6b5..7e630429f 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.html +++ b/src/app/modals/chat-options-features/chat-options-features.page.html @@ -7,7 +7,7 @@
- +
diff --git a/src/app/modals/chat-options-features/chat-options-features.page.ts b/src/app/modals/chat-options-features/chat-options-features.page.ts index 66fbb4545..a1ee2ec47 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.ts +++ b/src/app/modals/chat-options-features/chat-options-features.page.ts @@ -5,6 +5,9 @@ import { SearchList } from 'src/app/models/search-document'; import { NewEventPage } from 'src/app/pages/agenda/new-event/new-event.page'; import { SearchPage } from 'src/app/pages/search/search.page'; import { AlertService } from 'src/app/services/alert.service'; +import { ChatService } from 'src/app/services/chat.service'; +import { FileLoaderService } from 'src/app/services/file/file-loader.service'; +import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service'; import { environment } from 'src/environments/environment'; @Component({ @@ -18,11 +21,17 @@ export class ChatOptionsFeaturesPage implements OnInit { members: any; attendees: EventPerson[] = []; + capturedImage:any; + capturedImageTitle:any; + constructor( private popoverController: PopoverController, private modalController: ModalController, private alertService: AlertService, private navParams: NavParams, + private fileLoaderService: FileLoaderService, + private fileToBase64Service: FileToBase64Service, + private chatService: ChatService, ) { this.members = this.navParams.get('members'); @@ -59,6 +68,73 @@ export class ChatOptionsFeaturesPage implements OnInit { } + anexarFoto(){ + this.modalController.dismiss('picture'); + } + + laodPicture() { + const input = this.fileLoaderService.createInput({ + accept: ['image/apng', 'image/jpeg', 'image/png'] + }) + + input.onchange = async () => { + const file = this.fileLoaderService.getFirstFile(input) + + console.log(file); + + const imageData = await this.fileToBase64Service.convert(file) + this.capturedImage = imageData; + this.capturedImageTitle = file.name; + + let body = { + "message": + { + "rid": "J5WDHyrYWHQrybbno", + "msg": "this.message", + "attachments": [{ + "title": this.capturedImageTitle , + "text": "description", + "title_link_download": false, + "image_url": this.capturedImage, + }] + } + } + + this.chatService.sendMessage(body).subscribe(res=> { + console.log(res); + },(error) => { + + }); + //console.log(this.capturedImage) + }; + } + + sendMessage(){ + let body = { + "message": + { + "rid": "J5WDHyrYWHQrybbno", + "msg": "this.message", + /* "attachments": [{ + "color": "#ff0000", + "text": "Yay for gruggy!", + "title": "Attachment Example", + "title_link": "https://youtube.com", + "title_link_download": false, + "image_url": "https://upload.wikimedia.org/wikipedia/commons/e/ee/Chain_link_icon.png", + }] */ + } + } + + this.chatService.sendMessage(body).subscribe(res=> { + console.log(res); + + + },(error) => { + + }); + } + /* getGroupContacts(room:any){ this.showLoader = true; //If group is private call getGroupMembers 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 e1569034a..da07a0d23 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -47,6 +47,11 @@
{{msg.msg}} +
+
+ image +
+
{{last ? scrollToBottom() : ''}}
@@ -72,9 +77,6 @@
-
- {{leaveStatus}} -
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 4ef4d1fa5..6c7d073fa 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -11,6 +11,8 @@ import { Router } from '@angular/router' import { ChatOptionsPopoverPage } from '../../popover/chat-options-popover/chat-options-popover.page'; import { ChatOptionsFeaturesPage } from 'src/app/modals/chat-options-features/chat-options-features.page'; import { TimeService } from 'src/app/services/functions/time.service'; +import { FileLoaderService } from 'src/app/services/file/file-loader.service'; +import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service'; @Component({ selector: 'app-group-messages', @@ -22,7 +24,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe isGroupCreated:boolean; loggedUser: any; message:any; - leaveStatus:any; messages:any; allUsers:any[] = []; @@ -31,6 +32,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe roomName:any; members:any; + capturedImage:any; + capturedImageTitle:any; + loggedUserChat:any; scrollingOnce:boolean = true; private scrollChangeCallback: () => void; @@ -58,6 +62,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe private alertService: AlertService, private route: Router, private timeService: TimeService, + private fileLoaderService: FileLoaderService, + private fileToBase64Service: FileToBase64Service, ) { this.loggedUserChat = authService.ValidatedUserChat['data']; this.isGroupCreated = true; @@ -218,20 +224,19 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe } sendMessage(){ - let body = { "message": { "rid": this.roomId, "msg": this.message, - "attachments": [{ + /* "attachments": [{ "color": "#ff0000", "text": "Yay for gruggy!", "title": "Attachment Example", "title_link": "https://youtube.com", "title_link_download": false, - "image_url": "http://res.guggy.com/logo_128.png", - }] + "image_url": "https://upload.wikimedia.org/wikipedia/commons/e/ee/Chain_link_icon.png", + }] */ } } @@ -292,7 +297,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe modal.onDidDismiss().then(res=>{ console.log(res); if(res.data == 'leave'){ - //this.leaveStatus = this.loggedUser.me.name + ' saiu do grupo'; this.getRoomInfo(); this.closeAllDesktopComponents.emit(); this.showEmptyContainer.emit(); @@ -355,6 +359,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe }); } async openChatOptions(ev: any) { + alert('THIS'); const popover = await this.popoverController.create({ component: ChatOptionsPopoverPage, cssClass: 'chat-options-popover', @@ -365,7 +370,10 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe }, translucent: true }); - return await popover.present(); + await popover.present(); + await popover.onDidDismiss().then(()=>{ + alert('THIS2'); + }); } async addContacts(){ console.log(this.members); @@ -416,6 +424,43 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe } */ + loadPicture() { + const input = this.fileLoaderService.createInput({ + accept: ['image/apng', 'image/jpeg', 'image/png'] + }) + + input.onchange = async () => { + const file = this.fileLoaderService.getFirstFile(input) + + console.log(file); + + const imageData = await this.fileToBase64Service.convert(file) + this.capturedImage = imageData; + this.capturedImageTitle = file.name; + + let body = { + "message": + { + "rid": this.roomId, + "msg": "", + "attachments": [{ + //"title": this.capturedImageTitle , + //"text": "description", + "title_link_download": false, + "image_url": this.capturedImage, + }] + } + } + + this.chatService.sendMessage(body).subscribe(res=> { + console.log(res); + },(error) => { + + }); + //console.log(this.capturedImage) + }; + } + async _openChatOptions() { const enterAnimation = (baseEl: any) => { @@ -463,6 +508,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe } this.openNewEventPage.emit(data); } + else if(res['data'] == 'picture'){ + this.loadPicture(); + } }); } 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 0525e41fe..09684cf5c 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 @@ -7,7 +7,7 @@
- +
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 bd38ed2c1..dba07a211 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 @@ -45,6 +45,15 @@ export class ChatOptionsPopoverPage implements OnInit { this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } + anexarFoto(){ + if( window.innerWidth < 701){ + this.popoverController.dismiss('picture'); + } + else{ + this.modalController.dismiss('picture'); + } + } + close(){ if( window.innerWidth < 701){ this.popoverController.dismiss(); From 4ad15f822cd9ce855941a3d5f29e82a4bea01f37 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 14 Sep 2021 10:30:13 +0100 Subject: [PATCH 05/22] save --- package.json | 2 +- .../group-messages/group-messages.page.html | 2 +- .../group-messages/group-messages.page.ts | 29 ++++++++++++++++- src/app/services/functions/file.service.ts | 31 +++++++++++++++++++ .../group-messages/group-messages.page.ts | 26 ---------------- .../chat-options-popover.page.html | 2 +- .../chat-options-popover.page.ts | 15 +++++++-- 7 files changed, 74 insertions(+), 33 deletions(-) diff --git a/package.json b/package.json index d4d5367b1..bdbab333f 100644 --- a/package.json +++ b/package.json @@ -192,4 +192,4 @@ "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git" }, "license": "ISC" -} +} \ No newline at end of file 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 da07a0d23..b028d4964 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -40,7 +40,7 @@ A conversa original mantêm-se como chat individual
-
+
{{msg.u.name}} {{showDateDuration(msg._updatedAt)}} diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 10e792fa3..4751ce45a 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -13,6 +13,7 @@ import { EditGroupPage } from '../edit-group/edit-group.page'; import { TimeService } from 'src/app/services/functions/time.service'; import { FileLoaderService } from 'src/app/services/file/file-loader.service'; import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service'; +import { FileService } from 'src/app/services/functions/file.service'; @Component({ selector: 'app-group-messages', @@ -59,6 +60,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { private timeService: TimeService, private fileLoaderService: FileLoaderService, private fileToBase64Service: FileToBase64Service, + private fileService: FileService, ) { this.loggedUserChat = authService.ValidatedUserChat['data']; this.isGroupCreated = true; @@ -328,9 +330,34 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { }); await popover.present(); await popover.onDidDismiss().then((res)=>{ - if(res['data'] == "picture"){ + if(res['data'] == "loadPicture"){ this.loadPicture(); } + else if(res['data'] == "takePicture"){ + let data = this.fileService.takePicture(); + alert(data); + alert(data.name); + + if(data.name != null){ + let body = { + "message": + { + "rid": this.roomId, + "msg": "", + "attachments": [{ + "title": data.name, + "title_link_download": false, + "image_url": data.image, + }] + } + } + this.chatService.sendMessage(body).subscribe(res=> { + console.log(res); + },(error) => { + + }); + } + } }); } diff --git a/src/app/services/functions/file.service.ts b/src/app/services/functions/file.service.ts index d0cd78eb2..e36efb620 100644 --- a/src/app/services/functions/file.service.ts +++ b/src/app/services/functions/file.service.ts @@ -1,6 +1,8 @@ import { Injectable } from '@angular/core'; import { FileLoaderService } from '../file/file-loader.service'; import { FileToBase64Service } from '../file/file-to-base64.service'; +//Cordova +import { Camera, CameraOptions } from '@ionic-native/camera/ngx'; @Injectable({ providedIn: 'root' @@ -11,10 +13,39 @@ export class FileService { capturedImageTitle:any; constructor( + private camera: Camera, private fileLoaderService: FileLoaderService, private fileToBase64Service: FileToBase64Service, ) { } + takePicture() { + 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) => { + // imageData is either a base64 encoded string or a file URI + // If it's base64 (DATA_URL): m + //let base64Image = 'data:image/jpeg;base64,' + imageData; + + this.capturedImage = 'data:image/png;base64,'+imageData; + this.capturedImageTitle = new Date().getTime() + '.jpeg'; + }, (err) => { + /* console.log(err); */ + }); + let data = { + image:this.capturedImage, + name: this.capturedImageTitle + } + + return data; + } + loadPicture() { const input = this.fileLoaderService.createInput({ accept: ['image/apng', 'image/jpeg', 'image/png'] diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 6c7d073fa..a830fe661 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -398,32 +398,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe }); } - /* async actionSheet() { - const actionSheet = await this.actionSheetController.create({ - cssClass: 'my-custom-class', - buttons: [{ - text: 'Sair do grupo', - handler: () => { - console.log('Delete clicked'); - } - }, { - text: 'Alterar nome do grupo1', - handler: () => { - console.log('Alterar nome do grupo'); - this.openChangeGroupName() - } - }, { - text: 'Apagar o grupo', - handler: () => { - console.log('Play clicked'); - } - }, - ] - }); - await actionSheet.present(); - } - */ - loadPicture() { const input = this.fileLoaderService.createInput({ accept: ['image/apng', 'image/jpeg', 'image/png'] 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 09684cf5c..733469865 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 @@ -5,7 +5,7 @@
- + 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 dba07a211..ef47957ae 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 @@ -45,12 +45,21 @@ export class ChatOptionsPopoverPage implements OnInit { this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } - anexarFoto(){ + takePicture(){ if( window.innerWidth < 701){ - this.popoverController.dismiss('picture'); + this.popoverController.dismiss('takePicture'); } else{ - this.modalController.dismiss('picture'); + this.modalController.dismiss('takePicture'); + } + } + + anexarFoto(){ + if( window.innerWidth < 701){ + this.popoverController.dismiss('loadPicture'); + } + else{ + this.modalController.dismiss('loadPicture'); } } From a59a4749ca818a680e585b032ff6c3785afaa742 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 14 Sep 2021 10:48:28 +0100 Subject: [PATCH 06/22] save --- .../group-messages/group-messages.page.scss | 22 +++++++++---------- .../group-messages/group-messages.page.ts | 8 ++++--- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss index 607802d74..d1b057bfc 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.scss +++ b/src/app/pages/chat/group-messages/group-messages.page.scss @@ -93,17 +93,17 @@ border-radius: 8px; } .info-text{ - /* width: 322px; */ - width: em(422px); - background: #fef4c5; - text-align: center; - font-size: 13px; - color: #262420; - padding: 10px; - margin: 10px auto; - line-height: 1.2rem; - /* margin: 15px 0px 15px 0px; */ - border-radius: 8px; + display: flex; + width: fit-content; + height: auto; + background: #fef4c5; + text-align: center; + font-size: 13px; + color: #262420; + padding: 10px; + margin: 10px auto; + line-height: 1.2rem; + border-radius: 8px; } .info-text-leave{ display: flex; diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 4751ce45a..976139e7e 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -14,6 +14,7 @@ import { TimeService } from 'src/app/services/functions/time.service'; import { FileLoaderService } from 'src/app/services/file/file-loader.service'; import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service'; import { FileService } from 'src/app/services/functions/file.service'; +import { ToastService } from 'src/app/services/toast.service'; @Component({ selector: 'app-group-messages', @@ -61,6 +62,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { private fileLoaderService: FileLoaderService, private fileToBase64Service: FileToBase64Service, private fileService: FileService, + private toastService: ToastService, ) { this.loggedUserChat = authService.ValidatedUserChat['data']; this.isGroupCreated = true; @@ -335,9 +337,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { } else if(res['data'] == "takePicture"){ let data = this.fileService.takePicture(); - alert(data); - alert(data.name); - if(data.name != null){ let body = { "message": @@ -357,6 +356,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { }); } + else{ + this.toastService.badRequest("Não foi possível adicionar a fotografia!"); + } } }); } From 427191ec3699188c7e530821b69de1dceee763b7 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 14 Sep 2021 15:57:24 +0100 Subject: [PATCH 07/22] add document from gestao digital --- .../chat-options-features.page.html | 2 +- .../chat-options-features.page.ts | 5 +- .../expediente-detail.page.ts | 1 - src/app/services/functions/file.service.ts | 7 +++ .../group-messages/group-messages.page.html | 17 ++++- .../group-messages/group-messages.page.scss | 34 +++++++--- .../group-messages/group-messages.page.ts | 63 +++++++++++++++++++ 7 files changed, 113 insertions(+), 16 deletions(-) diff --git a/src/app/modals/chat-options-features/chat-options-features.page.html b/src/app/modals/chat-options-features/chat-options-features.page.html index 7e630429f..d21bc3f28 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.html +++ b/src/app/modals/chat-options-features/chat-options-features.page.html @@ -8,7 +8,7 @@ - +
diff --git a/src/app/modals/chat-options-features/chat-options-features.page.ts b/src/app/modals/chat-options-features/chat-options-features.page.ts index a1ee2ec47..3951f5120 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.ts +++ b/src/app/modals/chat-options-features/chat-options-features.page.ts @@ -72,6 +72,10 @@ export class ChatOptionsFeaturesPage implements OnInit { this.modalController.dismiss('picture'); } + addDocGestaoDocumental(){ + this.modalController.dismiss('documentoGestaoDocumental'); + } + laodPicture() { const input = this.fileLoaderService.createInput({ accept: ['image/apng', 'image/jpeg', 'image/png'] @@ -171,7 +175,6 @@ export class ChatOptionsFeaturesPage implements OnInit { const data = res.data; this.documents.push(data.selected); console.log(res.data); - } }); } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 7d7fc1a75..c986603cb 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -382,7 +382,6 @@ export class ExpedienteDetailPage implements OnInit { }); await modal.present(); modal.onDidDismiss().then( async(res)=>{ - alert('AQUI') let body = res['data']; if(res['data']) { const loader = this.toastService.loading() diff --git a/src/app/services/functions/file.service.ts b/src/app/services/functions/file.service.ts index e36efb620..172e87ba4 100644 --- a/src/app/services/functions/file.service.ts +++ b/src/app/services/functions/file.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { FileLoaderService } from '../file/file-loader.service'; import { FileToBase64Service } from '../file/file-to-base64.service'; +import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; //Cordova import { Camera, CameraOptions } from '@ionic-native/camera/ngx'; @@ -16,6 +17,7 @@ export class FileService { private camera: Camera, private fileLoaderService: FileLoaderService, private fileToBase64Service: FileToBase64Service, + private iab: InAppBrowser, ) { } takePicture() { @@ -68,4 +70,9 @@ export class FileService { return data; }; } + + viewDocumentByUrl(url) { + const browser = this.iab.create(url,"_blank"); + browser.show(); + } } 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 5b625597b..8d6fc801b 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -44,11 +44,22 @@ {{msg.u.name}} {{showDateDuration(msg._updatedAt)}}
-
+
{{msg.msg}} -
+
- image + image +
+
+ + image + + +

{{file.title}}

+

{{file.text}}

+ +
+
{{last ? scrollToBottom() : ''}} diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss index ca3555a51..60395f16b 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.scss +++ b/src/app/shared/chat/group-messages/group-messages.page.scss @@ -144,18 +144,32 @@ float: right; } .title{ - display: inline; - color: #0782c9; - font-weight: bold; - margin-bottom: 5px; + display: inline; + color: #0782c9; + font-weight: bold; + margin-bottom: 5px; - .time{ - color: #797979; - text-align: right; - margin-left: 10px; - float: right; + .time{ + color: #797979; + text-align: right; + margin-left: 10px; + float: right; + } + } + .messages{ + .message-attachments{ + .file{ + align-items: center; + .file-title{ + color: #000; + text-decoration: underline; + } + .file-title:hover{ + color: #0782c9; + } + } + } } - } } ion-footer{ diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index a830fe661..dacb387f5 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -13,6 +13,10 @@ import { ChatOptionsFeaturesPage } from 'src/app/modals/chat-options-features/ch import { TimeService } from 'src/app/services/functions/time.service'; import { FileLoaderService } from 'src/app/services/file/file-loader.service'; import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service'; +import { SearchPage } from 'src/app/pages/search/search.page'; +import { SearchList } from 'src/app/models/search-document'; +import { ProcessesService } from 'src/app/services/processes.service'; +import { FileService } from 'src/app/services/functions/file.service'; @Component({ selector: 'app-group-messages', @@ -26,6 +30,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe message:any; messages:any; allUsers:any[] = []; + documents:SearchList[] = []; room:any = new Array(); @@ -64,6 +69,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe private timeService: TimeService, private fileLoaderService: FileLoaderService, private fileToBase64Service: FileToBase64Service, + private processesService: ProcessesService, + private fileService: FileService, ) { this.loggedUserChat = authService.ValidatedUserChat['data']; this.isGroupCreated = true; @@ -435,6 +442,59 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe }; } + async addDocGestaoDocumental(){ + const modal = await this.modalController.create({ + component: SearchPage, + cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop', + componentProps: { + type: 'AccoesPresidenciais & ArquivoDespachoElect', + select: true, + showSearchInput: true, + } + }); + await modal.present(); + modal.onDidDismiss().then(async res=>{ + if(res){ + const data = res.data; + this.documents.push(data.selected); + console.log(res.data.selected); + console.log(res.data.selected.Id); + console.log(res.data.selected.ApplicationType); + + 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); + console.log('Oie'); + + let body = { + "message": + { + "rid": this.roomId, + "msg": "", + "attachments": [{ + "title": res.data.selected.Assunto, + "text": res.data.selected.DocTypeDesc, + "title_link": url_no_options, + "title_link_download": true, + "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png", + "message_link": url_no_options, + }] + } + } + this.chatService.sendMessage(body).subscribe(res=> { + console.log(res); + },(error) => { + + }); + + } + }); + } + + viewDocument(url:string){ + this.fileService.viewDocumentByUrl(url); + } + async _openChatOptions() { const enterAnimation = (baseEl: any) => { @@ -485,6 +545,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe else if(res['data'] == 'picture'){ this.loadPicture(); } + else if(res['data'] == 'documentoGestaoDocumental'){ + this.addDocGestaoDocumental(); + } }); } From 53144eb6c60666934d3dd6d181a368433988b18f Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 14 Sep 2021 16:34:50 +0100 Subject: [PATCH 08/22] save --- .../group-messages/group-messages.page.html | 17 ++++++++++--- .../group-messages/group-messages.page.scss | 22 +++++++++++++++++ .../group-messages/group-messages.page.ts | 4 ++++ .../group-messages/group-messages.page.html | 4 ++-- .../group-messages/group-messages.page.scss | 24 ++++++++++++------- 5 files changed, 58 insertions(+), 13 deletions(-) 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 b028d4964..5e699a578 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -45,11 +45,22 @@ {{msg.u.name}} {{showDateDuration(msg._updatedAt)}}
-
+
{{msg.msg}} -
+
- image + image +
+
+ + image + + +

{{file.title}}

+

{{file.text}}

+ +
+
{{last ? scrollToBottom() : ''}} diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss index d1b057bfc..50f7298d0 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.scss +++ b/src/app/pages/chat/group-messages/group-messages.page.scss @@ -167,6 +167,28 @@ text-align: right; float: right; } + .message{ + .message-attachments{ + .file{ + align-items: center; + + .file-details{ + width: 100%; + + .file-title{ + color: #000; + text-decoration: underline; + white-space: nowrap; + overflow: hidden !important; + text-overflow: ellipsis !important; + } + .file-title:hover{ + color: #0782c9; + } + } + } + } + } } .online{ color:#99e47b !important; diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 976139e7e..98ff6ebe2 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -316,6 +316,10 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { }; } + viewDocument(url:string){ + this.fileService.viewDocumentByUrl(url); + } + async openChatOptions(ev?: any) { console.log(this.members); 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 8d6fc801b..93e2c0972 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -44,7 +44,7 @@ {{msg.u.name}} {{showDateDuration(msg._updatedAt)}}
-
+
{{msg.msg}}
@@ -54,7 +54,7 @@ image - +

{{file.title}}

{{file.text}}

 diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss index 60395f16b..dbc4127ba 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.scss +++ b/src/app/shared/chat/group-messages/group-messages.page.scss @@ -156,21 +156,29 @@ float: right; } } - .messages{ + .message{ .message-attachments{ .file{ align-items: center; - .file-title{ - color: #000; - text-decoration: underline; - } - .file-title:hover{ - color: #0782c9; + + .file-details{ + width: 100%; + + .file-title{ + color: #000; + text-decoration: underline; + white-space: nowrap; + overflow: hidden !important; + text-overflow: ellipsis !important; + } + .file-title:hover{ + color: #0782c9; + } } } } } - } + } ion-footer{ padding-top: 7.5px; From 6c1d9e7251ee363e2a1f350eab1f764c83279655 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 15 Sep 2021 08:42:24 +0100 Subject: [PATCH 09/22] save --- .../group-contacts/group-contacts.page.html | 2 +- .../group-messages/group-messages.page.scss | 36 +++++++++---------- .../publication-detail.page.ts | 2 -- .../group-messages/group-messages.page.ts | 4 --- .../expedients/expedients.page.html | 2 +- 5 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html index e5bebbbc9..263363b7d 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html @@ -37,7 +37,7 @@ - +

{{user.name}}

 diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss index 50f7298d0..d6640a5ee 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.scss +++ b/src/app/pages/chat/group-messages/group-messages.page.scss @@ -167,29 +167,29 @@ text-align: right; float: right; } - .message{ - .message-attachments{ - .file{ - align-items: center; + } + .message{ + .message-attachments{ + .file{ + align-items: center; - .file-details{ - width: 100%; + .file-details{ + width: 100%; - .file-title{ - color: #000; - text-decoration: underline; - white-space: nowrap; - overflow: hidden !important; - text-overflow: ellipsis !important; - } - .file-title:hover{ - color: #0782c9; - } - } + .file-title{ + color: #000; + text-decoration: underline; + white-space: nowrap; + overflow: hidden !important; + text-overflow: ellipsis !important; + } + .file-title:hover{ + color: #0782c9; } } } - } + } + } .online{ color:#99e47b !important; } diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts index a13637b80..4661354f9 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts @@ -26,8 +26,6 @@ export class PublicationDetailPage implements OnInit { private animationController: AnimationController, private toastService: ToastService, private location: Location ) { - - alert('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!') this.publicationId = this.navParams.get('publicationId'); /* this.folderId = this.navParams.get('folderIdId'); */ diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index dacb387f5..c75650f5a 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -117,10 +117,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe let scroll = e.srcElement.scrollTop; if (scroll > this.currentPosition) { //this.showButton = false; - //alert('BOTTOM'); } else { //this.showButton = true; - //alert('UP'); this.scrollingOnce = false; } this.currentPosition = scroll; @@ -366,7 +364,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe }); } async openChatOptions(ev: any) { - alert('THIS'); const popover = await this.popoverController.create({ component: ChatOptionsPopoverPage, cssClass: 'chat-options-popover', @@ -379,7 +376,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe }); await popover.present(); await popover.onDidDismiss().then(()=>{ - alert('THIS2'); }); } async addContacts(){ diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index 1c65289ef..cff3e4143 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -1,6 +1,6 @@
-
Expediente11
+
Expediente
+
- +
{{loadedEvent.Location}} - +
{{loadedEvent.CalendarName}} {{loadedEvent.CalendarName}}
- +
{{loadedEvent.CalendarName}} {{loadedEvent.CalendarName}}
- +
@@ -76,8 +76,8 @@
- -
+ +
Documentos Anexados
@@ -86,20 +86,20 @@ {{attach.SourceName}} {{attach.Stakeholders}}

- +
{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}
- +
- +
- +
@@ -110,6 +110,6 @@
- -
- \ No newline at end of file + +
+ diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index a2e90819c..c7a9a8c28 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -16,7 +16,7 @@
@@ -32,14 +32,14 @@
{{loadedEvent.Location}} - - + +
{{loadedEvent.CalendarName}} {{loadedEvent.CalendarName}}
- +
{{loadedEvent.CalendarName}} {{loadedEvent.CalendarName}} @@ -77,8 +77,8 @@
- -
+ +
Documentos Anexados
  • @@ -101,7 +101,7 @@
    • -
    - - - \ No newline at end of file +
    + + + From fdfdd7999170249222414509ce6e3342ece86f78 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 15 Sep 2021 09:54:11 +0100 Subject: [PATCH 13/22] save --- src/app/shared/agenda/view-event/view-event.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index c7a9a8c28..e34659b09 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -78,7 +78,7 @@
    -
    +
    Documentos Anexados
  • From a7266df853d9ff87fc143065e192fa6875ca96e9 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 15 Sep 2021 10:33:40 +0100 Subject: [PATCH 14/22] save --- .../expediente/expediente.page.html | 10 +++++----- .../expedientes-pr/expedientes-pr.page.html | 18 +++++++++--------- .../gabinete-digital.page.html | 2 +- .../expedientes-pr/expedientes-pr.page.html | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index e76fcb838..ee22b60c9 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -33,7 +33,7 @@
    @@ -64,8 +64,8 @@
    -
    Lista vazia @@ -95,9 +95,9 @@ - +
    • - + diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 7140133fe..8098c5464 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -3,7 +3,7 @@ - +
    @@ -18,25 +18,25 @@
    - + - +
    - {{ task.Folio }} + {{ task.Subject }}
    @@ -61,16 +61,16 @@
    -
    Lista vazia
    - +
    - + diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 210a03648..11bb9a371 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -106,7 +106,7 @@

    {{eventoaprovacaostore.countMd + eventoaprovacaostore.countPr}} Documentos

    -
    +
    diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 4ba4bac60..164aec4fb 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -22,7 +22,7 @@
    - {{ task.Folio }} + {{ task.Subject }}
    From f0e6a8a32dc57abc2581848b4fea1e840512316b Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 15 Sep 2021 10:48:32 +0100 Subject: [PATCH 15/22] save --- src/app/pages/events/events.page.ts | 10 ++++++---- .../expediente-detail/expediente-detail.page.ts | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 0ceb9b85d..273348121 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -64,7 +64,7 @@ export class EventsPage implements OnInit { // shared data toDayEventStorage = ToDayEventStorage expedienteGdStore = ExpedienteGdStore - + expedienteTaskPipe = new ExpedienteTaskPipe() @Output() openExpedientListPage:EventEmitter = new EventEmitter(); @@ -111,7 +111,9 @@ export class EventsPage implements OnInit { this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == '/home/events') { this.RefreshEvents(); - this.LoadList(); + setTimeout(()=>{ + this.LoadList(); + }, 1500) } }); this.hideSearch(); @@ -362,7 +364,7 @@ export class EventsPage implements OnInit { viewExpedientListPage(){ if(this.loggeduser.Profile == 'MDGPR'){ - if( window.innerWidth < 801){ + if( window.innerWidth < 701){ this.router.navigate(['/home/gabinete-digital/expediente']); } else{ @@ -371,7 +373,7 @@ export class EventsPage implements OnInit { } } else if(this.loggeduser.Profile == 'PR'){ - if( window.innerWidth < 801){ + if( window.innerWidth < 701){ this.router.navigate(['/home/gabinete-digital/expedientes-pr']); } else{ diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index c986603cb..c2273f7bc 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -143,7 +143,7 @@ export class ExpedienteDetailPage implements OnInit { async openAddNoteModal(actionName:string) { let classs; - if( window.innerWidth < 801) { + if( window.innerWidth < 701) { classs = 'modal modal-desktop' } else { classs = 'add-note-modal' From db851e95ddf738b0c44e6c2d1d9692b5516868c3 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 15 Sep 2021 13:38:14 +0100 Subject: [PATCH 16/22] save --- .../document-detail/document-detail.page.ts | 47 +++++-- .../document-set-up-meeting.page.ts | 40 ++++-- src/app/models/search-document.ts | 1 + .../expediente-detail.page.ts | 2 +- src/app/pages/search/search.page.ts | 118 +++++++++--------- 5 files changed, 128 insertions(+), 80 deletions(-) diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index 53e6865d2..4348f2ace 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -9,6 +9,8 @@ import { SearchDocumentDetails, SearchFolderDetails } from 'src/app/models/searc import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage'; import { PermissionService } from 'src/app/OtherService/permission.service'; import { SearchedDocumentOptionsPage } from 'src/app/shared/popover/searched-document-options/searched-document-options.page'; +import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; +import { Location } from '@angular/common'; @Component({ selector: 'app-document-detail', @@ -39,7 +41,8 @@ export class DocumentDetailPage implements OnInit { private menu: MenuController, private iab: InAppBrowser, public p: PermissionService, - private popoverController: PopoverController + private popoverController: PopoverController, + private location: Location, ) { this.docId = this.navParams.get('docId'); this.applicationId = this.navParams.get('applicationId'); @@ -51,6 +54,8 @@ export class DocumentDetailPage implements OnInit { async LoadDocumentDetails() { this.processes.GetDocumentDetails(this.docId, this.applicationId).subscribe(res=>{ + console.log(res); + this.LoadedDocument = res; this.LoadedDocument.Subject = this.LoadedDocument.Assunto @@ -63,7 +68,7 @@ export class DocumentDetailPage implements OnInit { 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, @@ -95,7 +100,7 @@ export class DocumentDetailPage implements OnInit { } else { console.log('unexpected ApplicationID') } - + this.task = task console.log('this.task = task', this.task) @@ -120,16 +125,16 @@ export class DocumentDetailPage implements OnInit { close() { this.modalController.dismiss(); } - + notImplemented() { this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } - // efetuar despacho + // efetuar despacho async openExpedientActionsModal( taskAction: any) { let classs; - if( window.innerWidth <= 800) { + if( window.innerWidth < 701) { classs = 'modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' @@ -150,9 +155,10 @@ export class DocumentDetailPage implements OnInit { } async openBookMeetingModal() { + console.log(this.LoadedDocument); let classs; - if( window.innerWidth <= 800) { + if( window.innerWidth < 701) { classs = 'book-meeting-modal modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' @@ -170,6 +176,29 @@ export class DocumentDetailPage implements OnInit { modal.onDidDismiss(); } + /* async openBookMeetingModal() { + //console.log(task); + + let classs; + if( window.innerWidth < 701){ + classs = 'book-meeting-modal modal modal-desktop' + } else { + classs = 'modal modal-desktop showAsideOptions' + } + const modal = await this.modalController.create({ + component: BookMeetingModalPage, + componentProps: { + task: this.task, + }, + cssClass: classs, + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss().then(res=>{ + this.location.back(); + }); + } */ + async openOptions() { const popover = await this.popoverController.create({ component: SearchedDocumentOptionsPage, @@ -193,5 +222,5 @@ export class DocumentDetailPage implements OnInit { } }); } - -} \ No newline at end of file + +} 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 34972d358..ee913ea5f 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 @@ -86,8 +86,9 @@ export class DocumentSetUpMeetingPage implements OnInit { emptyTextDescription = "Sem intervenientes selecionados"; document: SearchFolderDetails | SearchDocumentDetails | any; - subject: string - + subject: string; + docs:any[] = []; + eventPipe = new EventPipe() constructor( @@ -178,8 +179,8 @@ export class DocumentSetUpMeetingPage implements OnInit { var Attachments: addAttachment[] = [] let folder: SearchFolderDetails = this.document let document: SearchDocumentDetails = this.document - - if(folder.Documents) { + + /* if(folder.Documents) { this.document.Documents.forEach( (_folder: SearchFolderDetailsDocuments) => { Attachments.push({ ApplicationId: 361, @@ -204,8 +205,18 @@ export class DocumentSetUpMeetingPage implements OnInit { SourceId: e.Id, SourceTitle: e.Assunto }) + }) */ + + this.document.Documents.forEach((e)=> { + this.docs.push({ + ApplicationId: e.ApplicationId || e.ApplicationType, + Source: 1, + SourceId: e.DocId || e.docID || e.docId, + SourceName: e.Assunto + }) }) + console.log(this.docs); let postEvent = { EventId: '', @@ -229,25 +240,32 @@ export class DocumentSetUpMeetingPage implements OnInit { Type: this.EventRecurrenceType, LastOccurrence: this.Occurrence }, + Attachments: this.docs, /* [ + { + "Source": 1, + "SourceId": 121367, + "SourceName": "sample string 5", + "ApplicationId": 8 + } + ], */ } + console.log(postEvent); + + const laoder = this.toastService.loading() - this.eventService.create({ - body: postEvent, - calendar: this.postData.CalendarName - }).subscribe(async (respose) => { - + this.eventService.create({ body: postEvent, calendar: this.postData.CalendarName }).subscribe(async (respose) => { const res: any = respose; const eventId: string = res - const DocumentToSave = this.attachments.map((e) => { + /* const DocumentToSave = this.attachments.map((e) => { return this.eventPipe.AttactSearchResult(e, eventId, {}) }); await DocumentToSave.forEach(async (attachments, i) => { await this.eventService.addAttachment(attachments).toPromise(); - }); + }); */ laoder.remove() this.modalController.dismiss() diff --git a/src/app/models/search-document.ts b/src/app/models/search-document.ts index c190e4461..970cda23f 100644 --- a/src/app/models/search-document.ts +++ b/src/app/models/search-document.ts @@ -12,6 +12,7 @@ export class SearchList { export class Attachments { Id?: number + ParentId?:any Source: number SourceId: any SourceName: any diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index c2273f7bc..488cc9a8d 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -469,7 +469,7 @@ export class ExpedienteDetailPage implements OnInit { console.log(task); let classs; - if( window.innerWidth <= 800){ + if( window.innerWidth < 701){ classs = 'book-meeting-modal modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index a5d019f31..3dc1930a4 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -68,9 +68,9 @@ export class SearchPage implements OnInit { this.select = this.navParams.get('select'); this.showSearchInput = this.navParams.get('showSearchInput'); - + if(this.type == null || this.type == undefined) { - + if(this.currentPath == '/home/agenda') { this.type = "Agenda" } else if (this.currentPath =='/home/gabinete-digital') { @@ -138,7 +138,7 @@ export class SearchPage implements OnInit { res.forEach(e => { const array: any = Object.values(e); - + array[1] = (((array[1] - lowest) / perPercent) * (maximum - minimumSize)/ 100 ) + minimumSize; list.push(array) }); @@ -152,7 +152,7 @@ export class SearchPage implements OnInit { setTimeout(()=>{ WordCloud( elem, - { + { list: this.list, Family: 'Times, serif', gridSize: 15 @@ -171,7 +171,7 @@ export class SearchPage implements OnInit { WordCloud( elem, - { + { list: this.list, Family: 'Times, serif', gridSize: 15 @@ -188,7 +188,7 @@ export class SearchPage implements OnInit { reorderList(orderBy: string) { - + this.ordinance = orderBy; if(this.ordinance == 'recent'){ @@ -210,18 +210,18 @@ export class SearchPage implements OnInit { basicSearch() { if(this.type == "Agenda" ){ - + this.showLoader = true; this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender ,this.searchOrganicEntiry, this.searchDocTypeId, '0').subscribe(res=>{ console.log(res); - + res.Categories.forEach( e => { e['Active'] = false; }); - + // bind respose this.searchCategories = res.Categories; @@ -231,11 +231,11 @@ export class SearchPage implements OnInit { // hide show document if(this.searchDocuments.length >= 1){ - this.showDocuments = true; + this.showDocuments = true; } else { this.showDocuments = false } - + this.showLoader = false; this.loadWordCloud(); @@ -254,24 +254,24 @@ export class SearchPage implements OnInit { this.search.searchForDoc(this.searchSubject, this.searchDocumentDate, this.searchSender ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{ - + res.Categories.forEach( e => { e['Active'] = false; this.searchCategories.push(e) }); - + // bind respose - + this.sortArrayISODate(res.Documents).forEach(e => { e['appName'] = 'Correspondencia' this.searchDocuments.push(e) }); - + this.reorderList(this.ordinance); - + // hide show document if(this.searchDocuments.length >= 1){ - this.showDocuments = true; + this.showDocuments = true; } else { this.showDocuments = false } @@ -280,33 +280,33 @@ export class SearchPage implements OnInit { if(counter ==2){ this.showLoader = false; } - + this.loadWordCloud(); }); - + this.search.searchForDoc(this.searchSubject, this.searchDocumentDate, this.searchSender ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{ - + res.Categories.forEach( e => { e['Active'] = false; this.searchCategories.push(e) }); - - + + this.sortArrayISODate(res.Documents).forEach(e => { e['appName'] = 'ArquivoDespachoElect' this.searchDocuments.push(e) }); - + this.reorderList(this.ordinance); - + // hide show document if(this.searchDocuments.length >= 1){ - this.showDocuments = true; + this.showDocuments = true; } else { this.showDocuments = false } - + this.loadWordCloud(); counter++; @@ -314,34 +314,34 @@ export class SearchPage implements OnInit { this.showLoader = false; } }); - + } else { let counter = 0; this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{ - + res.Categories.forEach( e => { e['Active'] = false; this.searchCategories.push(e) }); - + // bind respose - + this.sortArrayISODate(res.Documents).forEach(e => { e['appName'] = 'Correspondencia' this.searchDocuments.push(e) }); - + this.reorderList(this.ordinance); - + // hide show document if(this.searchDocuments.length >= 1){ - this.showDocuments = true; + this.showDocuments = true; } else { this.showDocuments = false } - + counter++; if(counter ==2){ @@ -350,31 +350,31 @@ export class SearchPage implements OnInit { this.loadWordCloud(); }); - + this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{ - + res.Categories.forEach( e => { e['Active'] = false; this.searchCategories.push(e) }); - - + + this.sortArrayISODate(res.Documents).forEach(e => { e['appName'] = 'ArquivoDespachoElect' this.searchDocuments.push(e) }); - + this.reorderList(this.ordinance); - + // hide show document if(this.searchDocuments.length >= 1){ - this.showDocuments = true; + this.showDocuments = true; } else { this.showDocuments = false } - - + + counter++; if(counter ==2){ @@ -382,22 +382,22 @@ export class SearchPage implements OnInit { } this.loadWordCloud(); }); - + } } else if (this.type == "AccoesPresidenciais"){ - + this.showLoader = true; this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender ,this.searchOrganicEntiry, this.searchDocTypeId, '386').subscribe(res=>{ console.log(res); - + res.Categories.forEach( e => { e['Active'] = false; }); - + // bind respose this.searchCategories = res.Categories; @@ -407,11 +407,11 @@ export class SearchPage implements OnInit { // hide show document if(this.searchDocuments.length >= 1){ - this.showDocuments = true; + this.showDocuments = true; } else { this.showDocuments = false } - + this.showLoader = false; this.loadWordCloud(); }); @@ -447,7 +447,7 @@ export class SearchPage implements OnInit { this.searchCategories.forEach((e, j) => { if(i != j){ e['Active'] = false; - } + } }) if (this.searchCategories[i]['Active']){ @@ -526,10 +526,10 @@ export class SearchPage implements OnInit { } async filterDocList(categoryName:string){ - + // show all category if(this. showCategory == categoryName ){ - + this.showSearchDocuments = this.searchDocuments; } else { // filter category @@ -569,13 +569,13 @@ export class SearchPage implements OnInit { }); await modal.present(); modal.onDidDismiss().then((res)=>{}); - + } else if(this.type == "AccoesPresidenciais"){ - + this.viewPublicationDetail(Id); } else if(this.type == "AccoesPresidenciais & ArquivoDespachoElect"){ - + if(ApplicationType == '8' || ApplicationType == '361') { this.viewDocumentDetail(Id, ApplicationType); // this.openExpedientActionsModal(searchDocument) @@ -594,7 +594,7 @@ export class SearchPage implements OnInit { cssClass: 'publication-detail modal modal-desktop ', //backdropDismiss: false }); - + await modal.present(); modal.onDidDismiss().then(()=>{}); @@ -603,12 +603,12 @@ export class SearchPage implements OnInit { async viewDocumentDetail(docId:string, applicationId:string) { let classs; - if( window.innerWidth <= 800) { + if( window.innerWidth < 701) { classs = 'modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' } - + const modal = await this.modalController.create({ component: DocumentDetailPage, componentProps:{ @@ -622,5 +622,5 @@ export class SearchPage implements OnInit { } - + } From 0e8cb6258a01235973a569c9235f75af3fd44a24 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 15 Sep 2021 14:19:16 +0100 Subject: [PATCH 17/22] save --- .../modals/document-detail/document-detail.page.ts | 4 +++- .../document-set-up-meeting.page.ts | 11 ++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index 4348f2ace..f5fed8a0c 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -173,7 +173,9 @@ export class DocumentDetailPage implements OnInit { backdropDismiss: false }); await modal.present(); - modal.onDidDismiss(); + modal.onDidDismiss().then(res=>{ + this.location.back(); + }); } /* async openBookMeetingModal() { 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 ee913ea5f..c685cfe74 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 @@ -238,16 +238,9 @@ export class DocumentSetUpMeetingPage implements OnInit { HasAttachments: false, EventRecurrence: { Type: this.EventRecurrenceType, - LastOccurrence: this.Occurrence + LastOccurrence: this.Occurrence, }, - Attachments: this.docs, /* [ - { - "Source": 1, - "SourceId": 121367, - "SourceName": "sample string 5", - "ApplicationId": 8 - } - ], */ + Attachments: this.docs, } console.log(postEvent); From 8f52a10ec966b406c55b3d4faff709567d447b9f Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 15 Sep 2021 15:39:55 +0100 Subject: [PATCH 18/22] save --- src/app/pages/agenda/edit-event/edit-event.page.ts | 11 +++++++---- src/app/services/attachments.service.ts | 2 +- src/app/shared/agenda/edit-event/edit-event.page.ts | 7 ++++++- 3 files changed, 14 insertions(+), 6 deletions(-) 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 b6609a129..4ccd375fe 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -189,7 +189,7 @@ export class EditEventPage implements OnInit { } this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc) - + this.postEvent.EventRecurrence.Type = this.selectedRecurringType; this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { @@ -204,7 +204,7 @@ export class EditEventPage implements OnInit { finally { this.goBack(); } - + } this.toastService.successMessage(); @@ -213,7 +213,7 @@ export class EditEventPage implements OnInit { }); this.isEventEdited = true; - + this.modalController.dismiss(this.isEventEdited); @@ -285,7 +285,7 @@ export class EditEventPage implements OnInit { if(newAttendeesCC) { this.setIntervenientCC(newAttendeesCC); } - + } }); } @@ -335,6 +335,9 @@ export class EditEventPage implements OnInit { this.loadedEventAttachments[index]['remove'] = true } + this.attachmentsService.deleteEventAttachmentById(attachmentID).subscribe(res => { + console.log(res); + }); } diff --git a/src/app/services/attachments.service.ts b/src/app/services/attachments.service.ts index ab80bc293..fa0be2ba1 100644 --- a/src/app/services/attachments.service.ts +++ b/src/app/services/attachments.service.ts @@ -74,7 +74,7 @@ export class AttachmentsService { deleteEventAttachmentById(attachmentId) { - let geturl = environment.apiURL + `Attachments/Delete?attachmentId=${attachmentId}`; + let geturl = environment.apiURL + 'Attachments/Delete'; let params = new HttpParams(); diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 308b74d4b..3474266b9 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -166,7 +166,7 @@ export class EditEventPage implements OnInit { const str: any = this.postEvent.EventRecurrence.Type.toString() this.postEvent.EventRecurrence.Type = str } - + this.Form = new FormGroup({ Subject: new FormControl(this.postEvent.Subject, [ Validators.required, @@ -371,6 +371,7 @@ export class EditEventPage implements OnInit { deleteAttachment(attachmentID: string, index) { + const id: any = this.loadedEventAttachments[index].Id if(id == 'add') { @@ -379,6 +380,10 @@ export class EditEventPage implements OnInit { this.loadedEventAttachments[index]['remove'] = true } + this.attachmentsService.deleteEventAttachmentById(attachmentID).subscribe(res => { + console.log(res); + }); + } async getDoc() { From bc1cf6ef73278103d97fff921e3ea49cd3ea39ff Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 15 Sep 2021 16:20:59 +0100 Subject: [PATCH 19/22] save --- src/app/pages/agenda/edit-event/edit-event.page.ts | 3 --- src/app/pages/agenda/view-event/view-event.page.html | 5 +++++ src/app/pages/agenda/view-event/view-event.page.ts | 5 +++++ src/app/shared/agenda/edit-event/edit-event.page.html | 1 + src/app/shared/agenda/edit-event/edit-event.page.ts | 5 ----- src/app/shared/agenda/view-event/view-event.page.ts | 5 +++++ 6 files changed, 16 insertions(+), 8 deletions(-) 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 4ccd375fe..f395efb24 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -335,9 +335,6 @@ export class EditEventPage implements OnInit { this.loadedEventAttachments[index]['remove'] = true } - this.attachmentsService.deleteEventAttachmentById(attachmentID).subscribe(res => { - console.log(res); - }); } diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index f78c11a62..5ae1ebfb3 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -3,6 +3,11 @@ + + + + +
    diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index ffbbfa668..127bfe520 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -122,6 +122,11 @@ export class ViewEventPage implements OnInit { } + doRefresh(ev){ + this.loadEvent(); + ev.target.complete(); + } + loadEvent() { const loader = this.toastService.loading(); this.eventsService.getEvent(this.eventId).subscribe(res => { diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index ddea0f9c0..0bc43371e 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -14,6 +14,7 @@
    +
    diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 3474266b9..4255a3f65 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -371,7 +371,6 @@ export class EditEventPage implements OnInit { deleteAttachment(attachmentID: string, index) { - const id: any = this.loadedEventAttachments[index].Id if(id == 'add') { @@ -380,10 +379,6 @@ export class EditEventPage implements OnInit { this.loadedEventAttachments[index]['remove'] = true } - this.attachmentsService.deleteEventAttachmentById(attachmentID).subscribe(res => { - console.log(res); - }); - } async getDoc() { diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index 49b16ce2b..da5b7723e 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -63,6 +63,11 @@ export class ViewEventPage implements OnInit { //this.getAttachments(); } + doRefresh(ev){ + this.loadEvent(); + ev.target.complete(); + } + ngOnChanges(changes: any): void { this.loadedAttachments = null; this.loadEvent(); From 42ef6f0dc4cc82ff3b7d6adf1d70f6b2d69d96dd Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 16 Sep 2021 09:35:09 +0100 Subject: [PATCH 20/22] save --- .../document-detail/document-detail.page.ts | 2 +- .../document-set-up-meeting.page.ts | 26 ++++++++++++++----- .../all-processes/all-processes.page.ts | 19 +++++++++++++- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index f5fed8a0c..702fee697 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -174,7 +174,7 @@ export class DocumentDetailPage implements OnInit { }); await modal.present(); modal.onDidDismiss().then(res=>{ - this.location.back(); + //this.location.back(); }); } 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 c685cfe74..1837fb12c 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 @@ -119,6 +119,8 @@ export class DocumentSetUpMeetingPage implements OnInit { this.adding = "intervenient"; this.setDefaultTime() this.getRecurrenceTypes(); + console.log(this.document); + } getRecurrenceTypes() { @@ -207,14 +209,24 @@ export class DocumentSetUpMeetingPage implements OnInit { }) }) */ - this.document.Documents.forEach((e)=> { - this.docs.push({ - ApplicationId: e.ApplicationId || e.ApplicationType, - Source: 1, - SourceId: e.DocId || e.docID || e.docId, - SourceName: e.Assunto + if(this.document.Documents){ + this.document.Documents.forEach((e)=> { + this.docs.push({ + ApplicationId: e.ApplicationId || e.ApplicationType, + Source: 1, + SourceId: e.DocId || e.docID || e.docId, + SourceName: e.Assunto + }) }) - }) + } + else{ + this.docs.push({ + ApplicationId: this.document.ApplicationId || this.document.ApplicationType, + Source: 1, + SourceId: this.document.DocId || this.document.docID || this.document.docId, + SourceName: this.document.Assunto + }) + } console.log(this.docs); diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index cd39b96d8..66532d60c 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; +import { NavigationStart, Router } from '@angular/router'; import { LoginUserRespose } from 'src/app/models/user.model'; import { AuthService } from 'src/app/services/auth.service'; import { ProcessesService } from 'src/app/services/processes.service'; @@ -26,6 +26,16 @@ export class AllProcessesPage implements OnInit { ngOnInit() { this.loadAllProcesses(); + + this.router.events.forEach((event) => { + if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital')) { + if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { + this.refreshing(); + } else { + this.loadAllProcesses(); + } + } + }); } doRefresh() { @@ -35,6 +45,13 @@ export class AllProcessesPage implements OnInit { }, 1000); } + refreshing() { + + setTimeout(() => { + this.loadAllProcesses(); + }, 1000); + } + async loadAllProcesses(){ let allProcessesList = await this.processesService.GetTasksList("", false).toPromise(); console.log(allProcessesList); From bffd38e69827c0293082bbdf9cfbe59c025a9407 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 16 Sep 2021 10:11:29 +0100 Subject: [PATCH 21/22] save --- .../document-set-up-meeting/document-set-up-meeting.page.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 1837fb12c..7f603b7d3 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 @@ -272,10 +272,12 @@ export class DocumentSetUpMeetingPage implements OnInit { await this.eventService.addAttachment(attachments).toPromise(); }); */ + this.toastService.successMessage('A sua reunião foi marcada') laoder.remove() this.modalController.dismiss() - - }) + },(error) => { + this.toastService.badRequest('Não foi possível marcar a reunião'); + }); } From afb7c42e9fc293b2108edc873190f89185c9ab91 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 16 Sep 2021 10:19:27 +0100 Subject: [PATCH 22/22] save --- .../document-set-up-meeting/document-set-up-meeting.page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7f603b7d3..4a0227d18 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 @@ -272,7 +272,7 @@ export class DocumentSetUpMeetingPage implements OnInit { await this.eventService.addAttachment(attachments).toPromise(); }); */ - this.toastService.successMessage('A sua reunião foi marcada') + this.toastService.successMessage('Reunião criada') laoder.remove() this.modalController.dismiss() },(error) => {