several improvements

This commit is contained in:
tiago.kayaya
2021-09-21 14:05:59 +01:00
parent afb7c42e9f
commit 2e209711bb
22 changed files with 603 additions and 74 deletions
@@ -17,7 +17,7 @@
<ion-icon src="assets/icon/icons-user.svg"></ion-icon>
</div>
<div class="header-bottom-contacts">
<ion-label *ngFor="let member of members" >
<ion-label class="contacts-list" *ngFor="let member of members" >
{{member.name}},
</ion-label>
</div>
@@ -46,7 +46,7 @@
}
.header-bottom-contacts{
width: 275px;
width: calc(100% - 40px);
font-size: 15px;
color: #797979;
white-space: nowrap;
@@ -55,6 +55,12 @@
float: left;
padding: 5px;
margin: 1px;
.contacts-list{
white-space: nowrap;
overflow: hidden !important;
text-overflow: ellipsis !important;
}
}
}
@@ -15,6 +15,9 @@ 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';
import { environment } from 'src/environments/environment';
import { NewEventPage } from '../../agenda/new-event/new-event.page';
import { EventPerson } from 'src/app/models/eventperson.model';
@Component({
selector: 'app-group-messages',
@@ -45,6 +48,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
capturedImage:any;
capturedImageTitle:any;
attendees: EventPerson[] = [];
@ViewChild('scrollMe') private myScrollContainer: ElementRef;
@@ -320,6 +324,34 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.fileService.viewDocumentByUrl(url);
}
async bookMeeting() {
this.attendees = this.members.map((val)=>{
return {
Name: val.name,
EmailAddress: val.username+"@"+environment.domain,
IsRequired: "true",
}
});
console.log(this.attendees);
this.popoverController.dismiss();
if( window.innerWidth <= 1024){
const modal = await this.modalController.create({
component: NewEventPage,
componentProps:{
attendees: this.attendees,
},
cssClass: 'modal modal-desktop',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then((data) => {
if(data){
}
});
}
}
async openChatOptions(ev?: any) {
console.log(this.members);
@@ -336,33 +368,26 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
});
await popover.present();
await popover.onDidDismiss().then((res)=>{
if(res['data'] == "loadPicture"){
this.loadPicture();
console.log(res['data']);
if(res['data'] == 'meeting'){
this.bookMeeting();
}
else if(res['data'] == "takePicture"){
let data = this.fileService.takePicture();
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) => {
else if(res['data'] == 'take-picture'){
this.fileService.addCameraPictureToChat(this.roomId);
//this.loadPicture();
}
else if(res['data'] == 'add-picture'){
this.fileService.addPictureToChat(this.roomId);
//this.loadPicture();
}
else if(res['data'] == 'add-document'){
this.fileService.addDocumentToChat(this.roomId);
//this.loadDocument();
}
else if(res['data'] == 'documentoGestaoDocumental'){
});
}
else{
this.toastService.badRequest("Não foi possível adicionar a fotografia!");
}
this.fileService.addDocGestaoDocumentalToChat(this.roomId);
//this.addDocGestaoDocumental();
}
});
}