peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

lasta chnages

Browse Source
This commit is contained in:
Eudes Inácio
2022-03-03 08:21:22 +01:00
parent 99275b891b
commit 5c210928c0
15 changed files with 527 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/src/main/assets/capacitor.config.json
+1 -1
View File
@@ -18,6 +18,6 @@
} }
}, },
"server": { "server": {
"url": "http://192.168.0.92:8100" "url": "http://192.168.1.5:8100"
} }
} }
package-lock.json
Generated
+83 -14
View File
@@ -4999,6 +4999,11 @@
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
"dev": true "dev": true
}, },
"@types/pdfjs-dist": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/@types/pdfjs-dist/-/pdfjs-dist-0.1.2.tgz",
"integrity": "sha512-BvRLWz6RCI8FMKbgfdTCadVwimUv8920gLsnBEAkECjtqIy95jtt+G1ebNQE2b8PTnLjJICPpmBOGhgkSsiPKA=="
},
"@types/prettier": { "@types/prettier": {
"version": "2.4.1", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.1.tgz", "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.1.tgz",
@@ -6159,8 +6164,7 @@
"big.js": { "big.js": {
"version": "5.2.2", "version": "5.2.2",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
"dev": true
}, },
"binary-extensions": { "binary-extensions": {
"version": "2.2.0", "version": "2.2.0",
@@ -7181,8 +7185,7 @@
"co": { "co": {
"version": "4.6.0", "version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
"dev": true
}, },
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
@@ -9453,8 +9456,7 @@
"emojis-list": { "emojis-list": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
"dev": true
}, },
"enabled": { "enabled": {
"version": "2.0.0", "version": "2.0.0",
@@ -16465,18 +16467,22 @@
} }
}, },
"ng2-pdf-viewer": { "ng2-pdf-viewer": {
"version": "7.0.1", "version": "3.0.8",
"resolved": "https://registry.npmjs.org/ng2-pdf-viewer/-/ng2-pdf-viewer-7.0.1.tgz", "resolved": "https://registry.npmjs.org/ng2-pdf-viewer/-/ng2-pdf-viewer-3.0.8.tgz",
"integrity": "sha512-kjjsvHd5t1Ff7ydb3Far3d6cSyw/XJH5KXgcp/0bFzSFBAV2c5aOghxoY/yQVjgG+R6F16nVUh2UrZdngLXLSg==", "integrity": "sha512-p2qndFu1wQW4y+xXXw7yk1BhpRo5PGHKWD3PTc7pUULujx9d2vT26lhXR3p9WHitySadGqdCQpkA7W3v1dBlSg==",
"requires": { "requires": {
"pdfjs-dist": "~2.7.570", "@types/pdfjs-dist": "^0.1.1",
"tslib": "^2.0.0" "pdfjs-dist": "1.9.489"
}, },
"dependencies": { "dependencies": {
"pdfjs-dist": { "pdfjs-dist": {
"version": "2.7.570", "version": "1.9.489",
"resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.7.570.tgz", "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-1.9.489.tgz",
"integrity": "sha512-/ZkA1FwkEOyDaq11JhMLazdwQAA0F9uwrP7h/1L9Akt9KWh1G5/tkzS+bPuUELq2s2GDFnaT+kooN/aSjT7DXQ==" "integrity": "sha1-yuWf7d0WouXRlappUnlVz+QALB0=",
"requires": {
"node-ensure": "^0.0.0",
"worker-loader": "^0.8.0"
}
} }
} }
}, },
@@ -16565,6 +16571,11 @@
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
"integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
}, },
"node-ensure": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/node-ensure/-/node-ensure-0.0.0.tgz",
"integrity": "sha1-7K52QVDemYYexcgQ/V0Jaxg5Mqc="
},
"node-fetch": { "node-fetch": {
"version": "2.6.1", "version": "2.6.1",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
@@ -24774,6 +24785,64 @@
"resolved": "https://registry.npmjs.org/wordcloud/-/wordcloud-1.2.2.tgz", "resolved": "https://registry.npmjs.org/wordcloud/-/wordcloud-1.2.2.tgz",
"integrity": "sha512-fUnDsGrHXou+49j1OeKaC7nOeZPx+sWjIet0L/j6eAcm0nXy+a+AuUs/iDAX4PLBg1Zc6wgXWXhoXdQsXRWAEw==" "integrity": "sha512-fUnDsGrHXou+49j1OeKaC7nOeZPx+sWjIet0L/j6eAcm0nXy+a+AuUs/iDAX4PLBg1Zc6wgXWXhoXdQsXRWAEw=="
}, },
"worker-loader": {
"version": "0.8.1",
"resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-0.8.1.tgz",
"integrity": "sha1-6OmVMx6jTfW/aCloJL+38K1XjUM=",
"requires": {
"loader-utils": "^1.0.2",
"schema-utils": "^0.3.0"
},
"dependencies": {
"ajv": {
"version": "5.5.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
"requires": {
"co": "^4.6.0",
"fast-deep-equal": "^1.0.0",
"fast-json-stable-stringify": "^2.0.0",
"json-schema-traverse": "^0.3.0"
}
},
"fast-deep-equal": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
},
"json-schema-traverse": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
},
"json5": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
"requires": {
"minimist": "^1.2.0"
}
},
"loader-utils": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^1.0.1"
}
},
"schema-utils": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
"integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
"requires": {
"ajv": "^5.0.0"
}
}
}
},
"wrap-ansi": { "wrap-ansi": {
"version": "7.0.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
package.json
+2 -1
View File
@@ -97,6 +97,7 @@
"angular-cropperjs": "^0.1.5", "angular-cropperjs": "^0.1.5",
"angular-svg-icon": "^12.0.0", "angular-svg-icon": "^12.0.0",
"angular-tag-cloud-module": "^5.2.2", "angular-tag-cloud-module": "^5.2.2",
"base64-js": "^1.5.1",
"bootstrap": "^4.5.0", "bootstrap": "^4.5.0",
"build": "0.1.4", "build": "0.1.4",
"capacitor-voice-recorder": "^2.0.0", "capacitor-voice-recorder": "^2.0.0",
@@ -133,7 +134,7 @@
"lite-server": "^2.6.1", "lite-server": "^2.6.1",
"moment": "^2.29.1", "moment": "^2.29.1",
"ng-lazyload-image": "^9.1.2", "ng-lazyload-image": "^9.1.2",
"ng2-pdf-viewer": "^7.0.1", "ng2-pdf-viewer": "^3.0.8",
"ngx-cookie-service": "^12.0.3", "ngx-cookie-service": "^12.0.3",
"ngx-image-compress": "^11.0.3", "ngx-image-compress": "^11.0.3",
"ngx-image-cropper": "^5.0.1", "ngx-image-cropper": "^5.0.1",
src/app/modals/view-media/view-media.module.ts
+3 -1
View File
@@ -8,6 +8,7 @@ import { ViewMediaPageRoutingModule } from './view-media-routing.module';
import { ViewMediaPage } from './view-media.page'; import { ViewMediaPage } from './view-media.page';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { PdfViewerModule } from 'ng2-pdf-viewer';
@NgModule({ @NgModule({
imports: [ imports: [
@@ -15,7 +16,8 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
FormsModule, FormsModule,
IonicModule, IonicModule,
FontAwesomeModule, FontAwesomeModule,
ViewMediaPageRoutingModule ViewMediaPageRoutingModule,
PdfViewerModule
], ],
declarations: [ViewMediaPage] declarations: [ViewMediaPage]
}) })
src/app/modals/view-media/view-media.page.html
+7 -1
View File
@@ -20,7 +20,13 @@
<ion-slides style="width: 100%; height: 100%;" [options]="sliderOpts"> <ion-slides style="width: 100%; height: 100%;" [options]="sliderOpts">
<ion-slide> <ion-slide>
<div class="swiper-zoom-container"> <div class="swiper-zoom-container">
<img src="{{image}}"> <div *ngIf="type == 'application/img'">
<img src="{{image}}">
</div>
<div *ngIf="type == 'application/pdf'">
<pdf-viewer [src]="image" [render-text]="true" [original-size]="false" [zoom]="0.5" style="display: block;">
</pdf-viewer>
</div>
</div> </div>
</ion-slide> </ion-slide>
</ion-slides> </ion-slides>
src/app/modals/view-media/view-media.page.ts
+2
View File
@@ -9,6 +9,7 @@ import { ModalController, NavParams } from '@ionic/angular';
export class ViewMediaPage implements OnInit { export class ViewMediaPage implements OnInit {
image: any; image: any;
type: any;
name: string name: string
_updatedAt: string _updatedAt: string
@@ -22,6 +23,7 @@ export class ViewMediaPage implements OnInit {
private navParams:NavParams, private navParams:NavParams,
) { ) {
this.image = this.navParams.get('image') this.image = this.navParams.get('image')
this.type = this.navParams.get('type')
this.name = this.navParams.get('username') this.name = this.navParams.get('username')
this._updatedAt = this.navParams.get('_updatedAt') this._updatedAt = this.navParams.get('_updatedAt')
} }
src/app/pages/chat/group-messages/group-messages.page.html
+1 -1
View File
@@ -107,7 +107,7 @@
</div> </div>
<div *ngIf="msg.file.type != 'application/img'"> <div *ngIf="msg.file.type != 'application/img'">
<div class="file"> <div class="file">
<div (click)="viewDocument(msg.file, file.title_link)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file"> <div (click)="openPreview(msg)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
<span *ngIf="msg.file.type"> <span *ngIf="msg.file.type">
<fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
<fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
src/app/pages/chat/group-messages/group-messages.page.ts
+204 -186
View File
@@ -1,5 +1,5 @@
import { Component, ElementRef, OnInit, ViewChild, AfterViewChecked, AfterViewInit, OnDestroy, ChangeDetectorRef, } from '@angular/core'; import { Component, ElementRef, OnInit, ViewChild, AfterViewChecked, AfterViewInit, OnDestroy, ChangeDetectorRef, } from '@angular/core';
import { ActionSheetController, IonSlides, MenuController, ModalController, NavParams, PopoverController,Platform } from '@ionic/angular'; import { ActionSheetController, IonSlides, MenuController, ModalController, NavParams, PopoverController, Platform } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { AuthService } from 'src/app/services/auth.service'; import { AuthService } from 'src/app/services/auth.service';
import { ChatService } from 'src/app/services/chat.service'; import { ChatService } from 'src/app/services/chat.service';
@@ -8,7 +8,7 @@ import { ChatPopoverPage } from 'src/app/shared/popover/chat-popover/chat-popove
import { ContactsPage } from '../new-group/contacts/contacts.page'; import { ContactsPage } from '../new-group/contacts/contacts.page';
import { NewGroupPage } from '../new-group/new-group.page'; import { NewGroupPage } from '../new-group/new-group.page';
import { GroupContactsPage } from './group-contacts/group-contacts.page'; import { GroupContactsPage } from './group-contacts/group-contacts.page';
import {Router} from '@angular/router' import { Router } from '@angular/router'
import { EditGroupPage } from '../edit-group/edit-group.page'; import { EditGroupPage } from '../edit-group/edit-group.page';
import { TimeService } from 'src/app/services/functions/time.service'; import { TimeService } from 'src/app/services/functions/time.service';
import { FileLoaderService } from 'src/app/services/file/file-loader.service'; import { FileLoaderService } from 'src/app/services/file/file-loader.service';
@@ -43,33 +43,33 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
showLoader: boolean; showLoader: boolean;
isGroupCreated:boolean; isGroupCreated: boolean;
loggedUser: any; loggedUser: any;
room:any; room: any;
roomName:any; roomName: any;
members:any; members: any;
contacts: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"]; contacts: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
allUsers:any[] = []; allUsers: any[] = [];
roomId: string; roomId: string;
loggedUserChat:any; loggedUserChat: any;
eventSelectedDate: Date = new Date(); eventSelectedDate: Date = new Date();
scrollingOnce:boolean = true; scrollingOnce: boolean = true;
private scrollChangeCallback: () => void; private scrollChangeCallback: () => void;
currentPosition: any; currentPosition: any;
startPosition: number; startPosition: number;
capturedImage:any; capturedImage: any;
capturedImageTitle:any; capturedImageTitle: any;
attendees: EventPerson[] = []; attendees: EventPerson[] = [];
scrollToBottomBtn = false; scrollToBottomBtn = false;
longPressActive = false; longPressActive = false;
showMessageOptions = false; showMessageOptions = false;
selectedMsgId:string; selectedMsgId: string;
roomCountDownDate:any; roomCountDownDate: any;
downloadFile: any; downloadFile: any;
@ViewChild('scrollMe') private myScrollContainer: ElementRef; @ViewChild('scrollMe') private myScrollContainer: ElementRef;
@@ -104,7 +104,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.isGroupCreated = true; this.isGroupCreated = true;
this.roomId = this.navParams.get('roomId'); this.roomId = this.navParams.get('roomId');
window.onresize = (event) => { window.onresize = (event) => {
if( window.innerWidth > 701){ if (window.innerWidth > 701) {
this.modalController.dismiss(); this.modalController.dismiss();
} }
}; };
@@ -113,7 +113,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked; this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked;
this.wsChatMethodsService.openRoom(this.roomId) this.wsChatMethodsService.openRoom(this.roomId)
setTimeout(()=>{ setTimeout(() => {
this.scrollToBottomClicked() this.scrollToBottomClicked()
}, 50) }, 50)
@@ -121,7 +121,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
ngOnInit() { ngOnInit() {
console.log(this.roomId); console.log(this.roomId);
this.loggedUser=this.loggedUserChat; this.loggedUser = this.loggedUserChat;
this.getRoomInfo(); this.getRoomInfo();
this.scrollToBottom(); this.scrollToBottom();
this.serverLongPull(); this.serverLongPull();
@@ -134,7 +134,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}) })
} }
setStatus(status:string){ setStatus(status: string) {
let body = { let body = {
message: '', message: '',
status: status, status: status,
@@ -144,16 +144,16 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}) })
} }
deleteMessage(msgId:string){ deleteMessage(msgId: string) {
let body = { let body = {
"roomId": this.roomId, "roomId": this.roomId,
"msgId": msgId, "msgId": msgId,
"asUser": false, "asUser": false,
} }
if(msgId){ if (msgId) {
//this.alertService.confirmDeleteMessage(body); //this.alertService.confirmDeleteMessage(body);
} }
else{ else {
this.toastService.badRequest('Não foi possível apagar'); this.toastService.badRequest('Não foi possível apagar');
} }
this.showMessageOptions = false; this.showMessageOptions = false;
@@ -166,12 +166,12 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.roomCountDownDate = this.timeService.countDownDate(this.room.customFields.countDownDate, this.room._id); this.roomCountDownDate = this.timeService.countDownDate(this.room.customFields.countDownDate, this.room._id);
} }
handlePress(id?:string){ handlePress(id?: string) {
this.selectedMsgId = id; this.selectedMsgId = id;
this.showMessageOptions = true; this.showMessageOptions = true;
} }
handleClick(){ handleClick() {
this.showMessageOptions = false; this.showMessageOptions = false;
this.selectedMsgId = ""; this.selectedMsgId = "";
} }
@@ -188,10 +188,10 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
//alert('UP'); //alert('UP');
this.scrollingOnce = false; this.scrollingOnce = false;
} }
if((containerHeight - 100) > scroll){ if ((containerHeight - 100) > scroll) {
this.scrollToBottomBtn = true; this.scrollToBottomBtn = true;
} }
else{ else {
this.scrollToBottomBtn = false; this.scrollToBottomBtn = false;
} }
this.currentPosition = scroll; this.currentPosition = scroll;
@@ -225,25 +225,25 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
scrollToBottom(): void { scrollToBottom(): void {
try { try {
if(this.scrollingOnce){ if (this.scrollingOnce) {
this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight; this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
//this.scrollingOnce = false; //this.scrollingOnce = false;
} }
} catch(err) { } } catch (err) { }
} }
scrollToBottomClicked = () => { scrollToBottomClicked = () => {
try { try {
this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight; this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
} catch(err) { } } catch (err) { }
} }
getRoomInfo(){ getRoomInfo() {
this.showLoader = true; this.showLoader = true;
this.chatService.getRoomInfo(this.roomId).subscribe(room=>{ this.chatService.getRoomInfo(this.roomId).subscribe(room => {
this.room = room['room']; this.room = room['room'];
this.roomName = this.room.name.split('-').join(' '); this.roomName = this.room.name.split('-').join(' ');
if(this.room.customFields.countDownDate){ if (this.room.customFields.countDownDate) {
this.roomCountDownDate = this.timeService.countDownDateTimer(this.room.customFields.countDownDate, this.room._id); this.roomCountDownDate = this.timeService.countDownDateTimer(this.room.customFields.countDownDate, this.room._id);
} }
this.getGroupContacts(this.room); this.getGroupContacts(this.room);
@@ -251,9 +251,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}); });
} }
async getChatMembers(){ async getChatMembers() {
//return await this.chatService.getMembers(roomId).toPromise(); //return await this.chatService.getMembers(roomId).toPromise();
this.chatService.getAllUsers().subscribe(res=> { this.chatService.getAllUsers().subscribe(res => {
console.log(res); console.log(res);
this.allUsers = res['users'].filter(data => data.username != this.loggedUserChat.me.username); this.allUsers = res['users'].filter(data => data.username != this.loggedUserChat.me.username);
@@ -266,28 +266,28 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.loadGroupMessages(); this.loadGroupMessages();
} */ } */
close(){ close() {
this.modalController.dismiss(); this.modalController.dismiss();
} }
doRefresh(ev:any){ doRefresh(ev: any) {
this.getRoomInfo(); this.getRoomInfo();
ev.target.complete(); ev.target.complete();
} }
getGroupContacts(room:any){ getGroupContacts(room: any) {
this.showLoader = true; this.showLoader = true;
//If group is private call getGroupMembers //If group is private call getGroupMembers
if(this.room.t === 'p'){ if (this.room.t === 'p') {
this.chatService.getGroupMembers(this.roomId).subscribe(res=>{ this.chatService.getGroupMembers(this.roomId).subscribe(res => {
console.log(res); console.log(res);
this.members = res['members']; this.members = res['members'];
this.showLoader = false; this.showLoader = false;
}); });
} }
//Otherwise call getChannelMembers for públic groups //Otherwise call getChannelMembers for públic groups
else{ else {
this.chatService.getChannelMembers(this.roomId).subscribe(res=>{ this.chatService.getChannelMembers(this.roomId).subscribe(res => {
console.log(res); console.log(res);
this.members = res['members']; this.members = res['members'];
this.showLoader = false; this.showLoader = false;
@@ -296,10 +296,10 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
} }
showDateDuration(start:any){ showDateDuration(start: any) {
return this.timeService.showDateDuration(start); return this.timeService.showDateDuration(start);
} }
countDownDate(date:any, roomId:string){ countDownDate(date: any, roomId: string) {
this.roomCountDownDate = this.timeService.countDownDate(date, roomId); this.roomCountDownDate = this.timeService.countDownDate(date, roomId);
return this.timeService.countDownDateTimer(date, roomId); return this.timeService.countDownDateTimer(date, roomId);
} }
@@ -328,33 +328,33 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}, },
}); });
await modal.present(); await modal.present();
modal.onDidDismiss().then(res=>{ modal.onDidDismiss().then(res => {
if(res.data == 'leave'){ if (res.data == 'leave') {
console.log('saiu do grupo'); console.log('saiu do grupo');
//this.wsChatMethodsService.subscribeToRoomUpdate(this.roomId, this.room); //this.wsChatMethodsService.subscribeToRoomUpdate(this.roomId, this.room);
} }
else if(res.data == 'cancel'){ else if (res.data == 'cancel') {
console.log('cancel'); console.log('cancel');
} }
else if(res.data == 'edit'){ else if (res.data == 'edit') {
this.editGroup(this.roomId); this.editGroup(this.roomId);
} }
}); });
} }
viewDocument(file:any, url?:string){ viewDocument(file: any, url?: string) {
if(file.type == "application/webtrix") { if (file.type == "application/webtrix") {
this.openViewDocumentModal(file); this.openViewDocumentModal(file);
} }
else{ else {
let fullUrl = "https://www.tabularium.pt" + url; let fullUrl = "https://www.tabularium.pt" + url;
this.fileService.viewDocumentByUrl(fullUrl); this.fileService.viewDocumentByUrl(fullUrl);
} }
} }
async openViewDocumentModal(file:any){ async openViewDocumentModal(file: any) {
let task = { let task = {
serialNumber: '', serialNumber: '',
@@ -371,17 +371,17 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
} }
let doc = { let doc = {
"Id": "", "Id": "",
"ParentId": "", "ParentId": "",
"Source": 1, "Source": 1,
"ApplicationId": file.ApplicationId, "ApplicationId": file.ApplicationId,
"CreateDate": "", "CreateDate": "",
"Data": null, "Data": null,
"Description":"", "Description": "",
"Link": null, "Link": null,
"SourceId": file.DocId, "SourceId": file.DocId,
"SourceName": file.Assunto, "SourceName": file.Assunto,
"Stakeholders": "", "Stakeholders": "",
} }
const modal = await this.modalController.create({ const modal = await this.modalController.create({
@@ -406,19 +406,19 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
} }
async bookMeeting() { async bookMeeting() {
this.attendees = this.members.map((val)=>{ this.attendees = this.members.map((val) => {
return { return {
Name: val.name, Name: val.name,
EmailAddress: val.username+"@"+environment.domain, EmailAddress: val.username + "@" + environment.domain,
IsRequired: "true", IsRequired: "true",
} }
}); });
console.log(this.attendees); console.log(this.attendees);
this.popoverController.dismiss(); this.popoverController.dismiss();
if( window.innerWidth <= 1024){ if (window.innerWidth <= 1024) {
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: NewEventPage, component: NewEventPage,
componentProps:{ componentProps: {
attendees: this.attendees, attendees: this.attendees,
}, },
cssClass: 'modal modal-desktop', cssClass: 'modal modal-desktop',
@@ -426,7 +426,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}); });
await modal.present(); await modal.present();
modal.onDidDismiss().then((data) => { modal.onDidDismiss().then((data) => {
if(data){ if (data) {
} }
}); });
@@ -441,7 +441,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
const image = await this.CameraService.takePicture(); const image = await this.CameraService.takePicture();
await this.fileService.saveImage(image) await this.fileService.saveImage(image)
const lastphoto: any = await this.fileService.loadFiles(); const lastphoto: any = await this.fileService.loadFiles();
const { capturedImage, capturedImageTitle} = await this.fileService.loadFileData(lastphoto); const { capturedImage, capturedImageTitle } = await this.fileService.loadFileData(lastphoto);
const base64 = await fetch(capturedImage); const base64 = await fetch(capturedImage);
const blob = await base64.blob(); const blob = await base64.blob();
const formData = new FormData(); const formData = new FormData();
@@ -454,8 +454,8 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}, },
temporaryData: formData, temporaryData: formData,
attachments: [{ attachments: [{
"title": capturedImageTitle , "title": capturedImageTitle,
"image_url": capturedImage, // rocketchat //"image_url": capturedImage, // rocketchat
"text": "description", "text": "description",
"title_link_download": false, "title_link_download": false,
}] }]
@@ -482,13 +482,13 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
} }
}); });
await modal.present(); await modal.present();
modal.onDidDismiss().then(async res=>{ modal.onDidDismiss().then(async res => {
const data = res.data; const data = res.data;
if(data.selected) { if (data.selected) {
this.wsChatMethodsService.getGroupRoom(this.roomId).send({ this.wsChatMethodsService.getGroupRoom(this.roomId).send({
file:{ file: {
"name": res.data.selected.Assunto, "name": res.data.selected.Assunto,
"type": "application/webtrix", "type": "application/webtrix",
"ApplicationId": res.data.selected.ApplicationType, "ApplicationId": res.data.selected.ApplicationType,
@@ -515,26 +515,37 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
async addFileToChat(types: typeof FileType[] ) { async addFileToChat(types: typeof FileType[] ) {
const roomId = this.roomId
const file: any = await this.fileService.getFileFromDevice(types); const file: any = await this.fileService.getFileFromDevice(types);
const imageData = await this.fileToBase64Service.convert(file) console.log('Add file', file)
/* const imageData = await this.fileToBase64Service.convert(file).then((filee) => {
console.log('Add file', filee)
}) */
const response = await fetch(file);
const blob = await response.blob();
console.log('Add file', blob)
const formData = new FormData(); const formData = new FormData();
formData.append("blobFile", file); formData.append("blobFile", blob);
this.wsChatMethodsService.getGroupRoom(this.roomId).send({ this.wsChatMethodsService.getGroupRoom(roomId).send({
file: { file: {
"type": "application/img", "type": file.type,
"guid": '' "guid": '',
}, },
temporaryData: formData,
attachments: [{ attachments: [{
"title": file.name , "title": file.name ,
"text": "description", "name": file.name ,
"image_url": imageData, // "text": "description",
//"image_url": file.base64String, // rocketchat
"title_link_download": false, "title_link_download": false,
}] }],
temporaryData: formData
}) })
} }
async openChatOptions(ev?: any) { async openChatOptions(ev?: any) {
@@ -553,7 +564,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
translucent: true translucent: true
}); });
await popover.present(); await popover.present();
await popover.onDidDismiss().then( async(res)=>{ await popover.onDidDismiss().then(async (res) => {
console.log(res['data']); console.log(res['data']);
if (res['data'] == 'meeting') { if (res['data'] == 'meeting') {
this.bookMeeting(); this.bookMeeting();
@@ -575,7 +586,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}); });
} }
async addContacts(){ async addContacts() {
console.log(this.members); console.log(this.members);
const modal = await this.modalController.create({ const modal = await this.modalController.create({
@@ -592,12 +603,12 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
await modal.present(); await modal.present();
modal.onDidDismiss().then(()=>{ modal.onDidDismiss().then(() => {
this.getRoomInfo(); this.getRoomInfo();
}); });
} }
async editGroup(roomId){ async editGroup(roomId) {
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: EditGroupPage, component: EditGroupPage,
cssClass: 'modal modal-desktop', cssClass: 'modal modal-desktop',
@@ -606,7 +617,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}, },
}); });
await modal.present(); await modal.present();
modal.onDidDismiss().then((res)=>{ modal.onDidDismiss().then((res) => {
console.log(res.data); console.log(res.data);
this.getRoomInfo(); this.getRoomInfo();
//this.modalController.dismiss(res.data); //this.modalController.dismiss(res.data);
@@ -711,42 +722,42 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
} }
async serverLongPull(){ async serverLongPull() {
this.chatService.getPrivateGroupMessages(this.roomId).subscribe(async res => { this.chatService.getPrivateGroupMessages(this.roomId).subscribe(async res => {
if (res == 502) { if (res == 502) {
// Connection timeout // Connection timeout
// happens when the connection was pending for too long // happens when the connection was pending for too long
// let's reconnect // let's reconnect
await this.serverLongPull(); await this.serverLongPull();
} else if (res != 200) { } else if (res != 200) {
// Show Error // Show Error
//showMessage(response.statusText); //showMessage(response.statusText);
//this.loadMessages() //this.loadMessages()
let msgOnly = res['messages'].filter(data => data.t != 'au'); let msgOnly = res['messages'].filter(data => data.t != 'au');
//this.messages = msgOnly.reverse(); //this.messages = msgOnly.reverse();
// console.log('MOBILE MSG ROCKET',this.messages); // console.log('MOBILE MSG ROCKET',this.messages);
this.transformDataMSG(msgOnly.reverse()); this.transformDataMSG(msgOnly.reverse());
this.getRoomMessageDB(this.roomId); this.getRoomMessageDB(this.roomId);
// Reconnect in one second // Reconnect in one second
if(this.route.url != "/home/chat"){ if (this.route.url != "/home/chat") {
console.log("Timer message stop") console.log("Timer message stop")
} else { } else {
//Check if modal is opened //Check if modal is opened
if(document.querySelector('.isGroupChatOpened')){ if (document.querySelector('.isGroupChatOpened')) {
await new Promise(resolve => setTimeout(resolve, 5000)); await new Promise(resolve => setTimeout(resolve, 5000));
await this.serverLongPull(); await this.serverLongPull();
console.log('Timer message running') console.log('Timer message running')
}
} }
}
} else { } else {
// Got message // Got message
//let message = await response.text(); //let message = await response.text();
//this.loadMessages() //this.loadMessages()
await this.serverLongPull(); await this.serverLongPull();
} }
}); });
} }
sliderOpts = { sliderOpts = {
@@ -756,86 +767,93 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
centeredSlides: true centeredSlides: true
}; };
zoomActive = false; zoomActive = false;
zoomScale = 1; zoomScale = 1;
sliderZoomOpts = { sliderZoomOpts = {
allowSlidePrev: false, allowSlidePrev: false,
allowSlideNext: false, allowSlideNext: false,
zoom: { zoom: {
maxRatio: 5 maxRatio: 5
}, },
on: { on: {
zoomChange: (scale, imageEl, slideEl) => { zoomChange: (scale, imageEl, slideEl) => {
this.zoomActive = true; this.zoomActive = true;
this.zoomScale = scale/5; this.zoomScale = scale / 5;
this.changeDetectorRef.detectChanges(); this.changeDetectorRef.detectChanges();
}
} }
} }
}
async touchEnd(zoomslides: IonSlides, card) { async touchEnd(zoomslides: IonSlides, card) {
// Zoom back to normal // Zoom back to normal
const slider = await zoomslides.getSwiper(); const slider = await zoomslides.getSwiper();
const zoom = slider.zoom; const zoom = slider.zoom;
zoom.out(); zoom.out();
// Card back to normal // Card back to normal
card.el.style['z-index'] = 9; card.el.style['z-index'] = 9;
this.zoomActive = false; this.zoomActive = false;
this.changeDetectorRef.detectChanges(); this.changeDetectorRef.detectChanges();
} }
touchStart(card) { touchStart(card) {
// Make card appear above backdrop // Make card appear above backdrop
card.el.style['z-index'] = 11; card.el.style['z-index'] = 11;
} }
downloadFileMsg(msg) { downloadFileMsg(msg) {
console.log('FILE TYPE', msg.file.type) console.log('FILE TYPE', msg.file.type)
this.downloadFile = ""; this.downloadFile = "";
if (msg.file.type == "application/img") { // if (msg.file.type == "application/img") {
this.AttachmentsService.downloadFile(msg.file.guid).subscribe(async (event) => { this.AttachmentsService.downloadFile(msg.file.guid).subscribe(async (event) => {
console.log('FILE TYPE 22', msg.file.guid) console.log('FILE TYPE 22', msg.file.guid)
var name = msg.file.guid; var name = msg.file.guid;
if (event.type === HttpEventType.DownloadProgress) { if (event.type === HttpEventType.DownloadProgress) {
//this.downloadProgess = Math.round((100 * event.loaded) / event.total); //this.downloadProgess = Math.round((100 * event.loaded) / event.total);
console.log('FILE TYPE 33', msg.file.type) console.log('FILE TYPE 33', msg.file.type)
} else if (event.type === HttpEventType.Response) { } else if (event.type === HttpEventType.Response) {
this.downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), '')); if (msg.file.type == "application/img") {
console.log('FILE TYPE 44', this.downloadFile) this.downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''));
} else {
msg.file = { this.downloadFile = event.body;
guid: msg.file.guid,
image_url: this.downloadFile,
type: msg.file.type
} }
this.sqlservice.updateChatMsg(msg._id, this.downloadFile);
} msg.attachments[0] = {
}); image_url: this.downloadFile,
console.log('FILE TYPE 44', this.downloadFile) name: msg.attachments[0].name,
title: msg.attachments[0].title,
title_link_download: msg.attachments[0].title_link_download,
ts: msg.attachments[0].ts
}
this.sqlservice.updateChatMsg(msg._id, this.downloadFile);
}
});
console.log('FILE TYPE 44', this.downloadFile)
//}
}
async openPreview(msg) {
if (!msg.attachments[0].image_url ||msg.attachments[0].image_url === null || msg.attachments[0].image_url === '') {
this.downloadFileMsg(msg)
} else {
const modal = await this.modalController.create({
component: ViewMediaPage,
cssClass: 'modal modal-desktop',
componentProps: {
image: msg.attachments[0].image_url,
type: msg.file.type,
username: msg.u.name,
_updatedAt: msg._updatedAt
}
});
modal.present();
}
} }
} }
async openPreview(msg) {
if (msg.attachments[0].image_url === null || msg.attachments[0].image_url === '' ) {
this.downloadFileMsg(msg)
} else {
const modal = await this.modalController.create({
component: ViewMediaPage,
cssClass: 'modal modal-desktop',
componentProps: {
image: msg.attachments[0].image_url,
username: msg.u.name,
_updatedAt: msg._updatedAt
}
});
modal.present();
}
}
}
src/app/pages/chat/messages/messages.page.html
+1 -1
View File
@@ -88,7 +88,7 @@
</div> </div>
<div *ngIf="msg.file.type != 'application/img'"> <div *ngIf="msg.file.type != 'application/img'">
<div class="file"> <div class="file">
<div (click)="docIndex(i); viewDocument(msg, file.title_link)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file"> <div (click)="docIndex(i); openPreview(msg)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
<span *ngIf="msg.file.type"> <span *ngIf="msg.file.type">
<fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
<fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
src/app/pages/chat/messages/messages.page.ts
+51 -41
View File
@@ -40,9 +40,10 @@ import { SearchPage } from 'src/app/pages/search/search.page';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service'; import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service';
import { Camera, CameraResultType, CameraSource } from '@capacitor/camera'; import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
import {Plugins} from '@capacitor/core'; import { Plugins } from '@capacitor/core';
import { fromByteArray } from 'base64-js';
const { Filesystem } = Plugins; const { Filesystem } = Plugins;
const IMAGE_DIR = 'stored-images'; const IMAGE_DIR = 'stored-images';
@@ -133,7 +134,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.wsChatMethodsService.getDmRoom(this.roomId).scrollDown = this.scrollToBottomClicked this.wsChatMethodsService.getDmRoom(this.roomId).scrollDown = this.scrollToBottomClicked
this.wsChatMethodsService.openRoom(this.roomId) this.wsChatMethodsService.openRoom(this.roomId)
setTimeout(()=>{ setTimeout(() => {
this.scrollToBottomClicked() this.scrollToBottomClicked()
}, 150) }, 150)
@@ -375,7 +376,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
}); });
}; };
console.log('WRITE',writeSecretFile); console.log('WRITE', writeSecretFile);
const readSecretFile = async () => { const readSecretFile = async () => {
const contents = await Filesystem.readFile({ const contents = await Filesystem.readFile({
@@ -387,7 +388,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
console.log('secrets:', contents); console.log('secrets:', contents);
}; };
console.log('READ',readSecretFile); console.log('READ', readSecretFile);
} catch (e) { } catch (e) {
console.error("Unable to write file", e); console.error("Unable to write file", e);
@@ -558,7 +559,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
const image = await this.CameraService.takePicture(); const image = await this.CameraService.takePicture();
await this.fileService.saveImage(image) await this.fileService.saveImage(image)
const lastphoto: any = await this.fileService.loadFiles(); const lastphoto: any = await this.fileService.loadFiles();
const { capturedImage, capturedImageTitle} = await this.fileService.loadFileData(lastphoto); const { capturedImage, capturedImageTitle } = await this.fileService.loadFileData(lastphoto);
const base64 = await fetch(capturedImage); const base64 = await fetch(capturedImage);
@@ -573,8 +574,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
"guid": '' "guid": ''
}, },
attachments: [{ attachments: [{
"image_url": capturedImage, "title": capturedImageTitle,
"title": capturedImageTitle ,
"text": "description", "text": "description",
"title_link_download": false, "title_link_download": false,
}], }],
@@ -606,14 +606,14 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
} }
}); });
await modal.present(); await modal.present();
modal.onDidDismiss().then(async res=>{ modal.onDidDismiss().then(async res => {
const data = res.data; const data = res.data;
const roomId = this.roomId const roomId = this.roomId
if(data.selected) { if (data.selected) {
this.wsChatMethodsService.getDmRoom(roomId).send({ this.wsChatMethodsService.getDmRoom(roomId).send({
file:{ file: {
"name": res.data.selected.Assunto, "name": res.data.selected.Assunto,
"type": "application/webtrix", "type": "application/webtrix",
"ApplicationId": res.data.selected.ApplicationType, "ApplicationId": res.data.selected.ApplicationType,
@@ -636,7 +636,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
}); });
} }
async addFileToChatMobile(types: typeof FileType[] ) { async addFileToChatMobile(types: typeof FileType[]) {
const roomId = this.roomId const roomId = this.roomId
const file = await Camera.getPhoto({ const file = await Camera.getPhoto({
@@ -649,7 +649,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
//const imageData = await this.fileToBase64Service.convert(file) //const imageData = await this.fileToBase64Service.convert(file)
//console.log('ADDFILECHAT', imageData) //console.log('ADDFILECHAT', imageData)
const response = await fetch('data:image/jpeg;base64,'+ file.base64String!); const response = await fetch('data:image/jpeg;base64,' + file.base64String!);
const blob = await response.blob(); const blob = await response.blob();
const formData = new FormData(); const formData = new FormData();
@@ -662,8 +662,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
}, },
temporaryData: formData, temporaryData: formData,
attachments: [{ attachments: [{
"title": file.path , "title": file.path,
"image_url": 'data:image/jpeg;base64,' +file.base64String,
"text": "description", "text": "description",
"title_link_download": false, "title_link_download": false,
}] }]
@@ -673,7 +672,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
async addFileToChat(types: typeof FileType[] ) { async addFileToChat(types: typeof FileType[]) {
const roomId = this.roomId const roomId = this.roomId
@@ -682,8 +681,11 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
/* const imageData = await this.fileToBase64Service.convert(file).then((filee) => { /* const imageData = await this.fileToBase64Service.convert(file).then((filee) => {
console.log('Add file', filee) console.log('Add file', filee)
}) */ }) */
const blob = new Blob([file],{type: file.type}) const response = await fetch(file);
console.log('Add file', blob) const blob = await response.blob();
const blob2 = new Blob([blob])
console.log('Add file base64', file)
console.log('Add file blob', blob)
const formData = new FormData(); const formData = new FormData();
formData.append("blobFile", blob); formData.append("blobFile", blob);
@@ -694,10 +696,9 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
"guid": '', "guid": '',
}, },
attachments: [{ attachments: [{
"title": file.name , "title": file.name,
"name": file.name , "name": file.name,
// "text": "description", // "text": "description",
"image_url": file, // rocketchat
"title_link_download": false, "title_link_download": false,
}], }],
temporaryData: formData temporaryData: formData
@@ -708,7 +709,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
async openChatOptions(ev?: any) { async openChatOptions(ev?: any) {
const roomId = this.roomId const roomId = this.roomId
console.log('MOBILE CHAT OPTION',this.members); console.log('MOBILE CHAT OPTION', this.members);
const popover = await this.popoverController.create({ const popover = await this.popoverController.create({
component: ChatOptionsPopoverPage, component: ChatOptionsPopoverPage,
@@ -722,7 +723,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
translucent: true translucent: true
}); });
await popover.present(); await popover.present();
popover.onDidDismiss().then( async (res) => { popover.onDidDismiss().then(async (res) => {
console.log(res['data']); console.log(res['data']);
if (res['data'] == 'meeting') { if (res['data'] == 'meeting') {
this.bookMeeting(); this.bookMeeting();
@@ -824,34 +825,42 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
downloadFileMsg(msg: MessageService) { downloadFileMsg(msg: MessageService) {
console.log('FILE TYPE', msg.file.type) console.log('FILE TYPE', msg.file.type)
this.downloadFile = ""; this.downloadFile = "";
if (msg.file.type == "application/img") { //if (msg.file.type == "application/img") {
this.AttachmentsService.downloadFile(msg.file.guid).subscribe(async (event) => { this.AttachmentsService.downloadFile(msg.file.guid).subscribe(async (event) => {
console.log('FILE TYPE 22', msg.file.guid) console.log('FILE TYPE 22', msg.file.guid)
var name = msg.file.guid; var name = msg.file.guid;
if (event.type === HttpEventType.DownloadProgress) { if (event.type === HttpEventType.DownloadProgress) {
//this.downloadProgess = Math.round((100 * event.loaded) / event.total); //this.downloadProgess = Math.round((100 * event.loaded) / event.total);
console.log('FILE TYPE 33', msg.file.type) console.log('FILE TYPE 33', msg.file.type)
} else if (event.type === HttpEventType.Response) { } else if (event.type === HttpEventType.Response) {
if (msg.file.type == "application/img") {
this.downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), '')); this.downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''));
} else {
msg.file = { //console.log('TRY THIS LIBRARY ',fromByteArray(event.body));
guid: msg.file.guid, this.downloadFile = event.body;
image_url: this.downloadFile,
type: msg.file.type
}
this.sqlservice.updateChatMsg(msg._id, this.downloadFile);
} }
}); msg.attachments[0] = {
image_url: this.downloadFile,
name: msg.attachments[0].name,
title: msg.attachments[0].title,
title_link_download: msg.attachments[0].title_link_download,
ts: msg.attachments[0].ts
}
this.sqlservice.updateChatMsg(msg._id, this.downloadFile);
}
} });
//}
} }
async openPreview(msg) { async openPreview(msg) {
console.log(msg);
if (msg.attachments[0].image_url === null || msg.attachments[0].image_url === '' ) { if (!msg.attachments[0].image_url || msg.attachments[0].image_url === null || msg.attachments[0].image_url === '') {
this.downloadFileMsg(msg) this.downloadFileMsg(msg)
} else { } else {
@@ -860,6 +869,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
cssClass: 'modal modal-desktop', cssClass: 'modal modal-desktop',
componentProps: { componentProps: {
image: msg.attachments[0].image_url, image: msg.attachments[0].image_url,
type: msg.file.type,
username: msg.u.name, username: msg.u.name,
_updatedAt: msg._updatedAt _updatedAt: msg._updatedAt
} }
src/app/shared/chat/group-messages/group-messages.page.html
+1 -1
View File
@@ -83,7 +83,7 @@
</div> </div>
<div *ngIf="msg.file.type != 'application/img'"> <div *ngIf="msg.file.type != 'application/img'">
<div class="file"> <div class="file">
<div (click)="viewDocument(msg.file, file.title_link)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file"> <div (click)="openPreview(msg)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
<span *ngIf="msg.file.type"> <span *ngIf="msg.file.type">
<fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
<fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
src/app/shared/chat/group-messages/group-messages.page.ts
+51 -20
View File
@@ -695,29 +695,52 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
async addFileToChat(types: typeof FileType[] ) { async addFileToChat(types: typeof FileType[] ) {
const roomId = this.roomId const roomId = this.roomId
const file: any = await this.fileService.getFileFromDevice(types); const file: any = await this.fileService.getFileFromDevice(types);
const imageData = await this.fileToBase64Service.convert(file) console.log('Add file', file)
/* const imageData = await this.fileToBase64Service.convert(file).then((filee) => {
console.log('Add file', filee)
}) */
const blob = new Blob([file],{type: file.type})
console.log('Add file', blob)
const formData = new FormData(); const formData = new FormData();
formData.append("blobFile", file); formData.append("blobFile", blob);
let pdfBase64;
this.blobToBase64(blob).then(res => {
console.log('Base64 pdf', res);
this.wsChatMethodsService.getGroupRoom(roomId).send({
file: {
"type": file.type,
"guid": '',
},
attachments: [{
"title": file.name ,
"name": file.name ,
"image_url": res,
// "text": "description",
"title_link_download": false,
}],
temporaryData: formData
})
});
this.wsChatMethodsService.getGroupRoom(roomId).send({
file: {
"type": "application/img",
"guid": ''
},
temporaryData: formData,
attachments: [{
"title": file.name ,
"image_url": imageData,
"text": "description",
"title_link_download": false,
}]
})
} }
blobToBase64 = blob => {
const reader = new FileReader();
reader.readAsDataURL(blob);
return new Promise(resolve => {
reader.onloadend = () => {
resolve(reader.result);
};
});
};
bookMeeting() { bookMeeting() {
let data = { let data = {
roomId: this.roomId, roomId: this.roomId,
@@ -812,12 +835,19 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
//this.downloadProgess = Math.round((100 * event.loaded) / event.total); //this.downloadProgess = Math.round((100 * event.loaded) / event.total);
console.log('FILE TYPE 33', msg.file.type) console.log('FILE TYPE 33', msg.file.type)
} else if (event.type === HttpEventType.Response) { } else if (event.type === HttpEventType.Response) {
this.downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), '')); if (msg.file.type == "application/img") {
this.downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''));
} else if (msg.file.type === 'application/pdf') {
msg.file = { this.downloadFile = event.body;
guid: msg.file.guid, }
msg.attachments[0] = {
image_url: this.downloadFile, image_url: this.downloadFile,
type: msg.file.type name: msg.attachments[0].name,
title: msg.attachments[0].title,
title_link_download: msg.attachments[0].title_link_download,
ts: msg.attachments[0].ts
} }
await this.storage.set(msg.file.guid, this.downloadFile).then(() => { await this.storage.set(msg.file.guid, this.downloadFile).then(() => {
@@ -833,7 +863,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
async openPreview(msg) { async openPreview(msg) {
if (msg.attachments[0].image_url === null || msg.attachments[0].image_url === '' ) { if (!msg.attachments[0].image_url || msg.attachments[0].image_url === null || msg.attachments[0].image_url === '' ) {
this.downloadFileMsg(msg) this.downloadFileMsg(msg)
} else { } else {
@@ -842,6 +872,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
cssClass: 'modal modal-desktop', cssClass: 'modal modal-desktop',
componentProps: { componentProps: {
image: msg.attachments[0].image_url, image: msg.attachments[0].image_url,
type: msg.file.type,
username: msg.u.name, username: msg.u.name,
_updatedAt: msg._updatedAt _updatedAt: msg._updatedAt
} }
src/app/shared/chat/messages/messages.module.ts
+3 -1
View File
@@ -12,6 +12,7 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { MatButtonModule } from '@angular/material/button'; import { MatButtonModule } from '@angular/material/button';
import {MatMenuModule} from '@angular/material/menu'; import {MatMenuModule} from '@angular/material/menu';
import { LettersAvatarModule } from "ngx-letters-avatar"; import { LettersAvatarModule } from "ngx-letters-avatar";
import { PdfViewerModule } from 'ng2-pdf-viewer';
@NgModule({ @NgModule({
imports: [ imports: [
@@ -22,7 +23,8 @@ import { LettersAvatarModule } from "ngx-letters-avatar";
MessagesPageRoutingModule, MessagesPageRoutingModule,
MatButtonModule, MatButtonModule,
MatMenuModule, MatMenuModule,
LettersAvatarModule LettersAvatarModule,
PdfViewerModule
], ],
exports: [MessagesPage], exports: [MessagesPage],
src/app/shared/chat/messages/messages.page.html
+34 -26
View File
@@ -38,7 +38,8 @@
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="messages" #scrollMe> <div class="messages" #scrollMe>
<div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getDmRoom(roomId).messages; let last = last"> <div class="messages-list-item-wrapper container-width-100"
*ngFor="let msg of wsChatMethodsService.getDmRoom(roomId).messages; let last = last">
<div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.msg !=''"> <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.msg !=''">
<div class="message-item-options d-flex justify-content-end"> <div class="message-item-options d-flex justify-content-end">
<fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"> <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer">
@@ -53,8 +54,9 @@
</div> </div>
<div class="d-flex justify-space-between"> <div class="d-flex justify-space-between">
<ion-label class="flex-0">{{msg.msg}}</ion-label> <ion-label class="flex-0">{{msg.msg}}</ion-label>
<ion-label class="float-status-all float-status" > <ion-label class="float-status-all float-status">
<ion-icon *ngIf="!msg.offline && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> <ion-icon *ngIf="!msg.offline && msg.viewed.length == 0" src="assets/images/check-double-solid.svg">
</ion-icon>
<ion-icon *ngIf="msg.offline && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> <ion-icon *ngIf="msg.offline && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon>
<ion-icon *ngIf="msg.viewed.length == 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> <ion-icon *ngIf="msg.viewed.length == 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
</ion-label> </ion-label>
@@ -63,7 +65,8 @@
</div> </div>
<div *ngIf="msg.file"> <div *ngIf="msg.file">
<div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.file.type != 'application/meeting'"> <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45'
*ngIf="msg.file.type != 'application/meeting'">
<div class="message-item-options d-flex justify-content-end"> <div class="message-item-options d-flex justify-content-end">
<fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"> <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer">
</fa-icon> </fa-icon>
@@ -72,7 +75,7 @@
</mat-menu> </mat-menu>
</div> </div>
<div class="title"> <div class="title">
<ion-label>{{msg.u.name}} </ion-label> <ion-label>{{msg.u.name}} </ion-label>
<span class="time">{{msg.duration}}</span> <span class="time">{{msg.duration}}</span>
</div> </div>
<div> <div>
@@ -81,23 +84,28 @@
<div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)" dfsdvsvs> <div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)" dfsdvsvs>
<img src={{msg.attachments[0].image_url}} alt="image"> <img src={{msg.attachments[0].image_url}} alt="image">
<ion-label class="float-status-image float-status-all"> <ion-label class="float-status-image float-status-all">
<ion-icon *ngIf="!msg.offline && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> <ion-icon *ngIf="!msg.offline && msg.viewed.length == 0" src="assets/images/check-double-solid.svg">
<ion-icon *ngIf="msg.offline && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> </ion-icon>
<ion-icon *ngIf="msg.viewed.length == 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> <ion-icon *ngIf="msg.offline && msg.viewed.length == 0" src="assets/images/check-solid.svg">
</ion-icon>
<ion-icon *ngIf="msg.viewed.length == 1" src="assets/images/check-double-solid -viewed.svg">
</ion-icon>
</ion-label> </ion-label>
</div> </div>
<div *ngIf="msg.file.type != 'application/img'"> <div *ngIf="msg.file.type != 'application/img'">
<div class="file"> <div class="file">
<div (click)="viewDocument(msg)" class="file-details add-ellipsis cursor-pointer" <div (click)="openPreview(msg)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
*ngIf="msg.file">
<span *ngIf="msg.file.type"> <span *ngIf="msg.file.type">
<fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
<fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon> <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon">
</fa-icon>
<fa-icon <fa-icon
*ngIf="msg.file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'" *ngIf="msg.file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'"
icon="file-word" class="excel-icon"></fa-icon> icon="file-word" class="excel-icon"></fa-icon>
<ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon> <ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg">
<ion-icon *ngIf="msg.file.type == 'application/meeting'" src="assets/icon/webtrix.svg"></ion-icon> </ion-icon>
<ion-icon *ngIf="msg.file.type == 'application/meeting'" src="assets/icon/webtrix.svg">
</ion-icon>
</span> </span>
<ion-label class="file-title">{{file.title}}</ion-label> <ion-label class="file-title">{{file.title}}</ion-label>
</div> </div>
@@ -106,13 +114,15 @@
<ion-label *ngIf="msg.file"> <ion-label *ngIf="msg.file">
<span *ngIf="file.description">{{file.description}}</span> <span *ngIf="file.description">{{file.description}}</span>
<span *ngIf="file.description && msg.file.type != 'application/webtrix'"> • </span> <span *ngIf="file.description && msg.file.type != 'application/webtrix'"> • </span>
<span <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.displayType}}</span>
*ngIf="msg.file.type != 'application/webtrix'">{{msg.displayType}}</span>
</ion-label> </ion-label>
<ion-label class="float-status-webtrix float-status-all"> <ion-label class="float-status-webtrix float-status-all">
<ion-icon *ngIf="!msg.offline && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> <ion-icon *ngIf="!msg.offline && msg.viewed.length == 0"
<ion-icon *ngIf="msg.offline && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> src="assets/images/check-double-solid.svg"></ion-icon>
<ion-icon *ngIf="msg.viewed.length == 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> <ion-icon *ngIf="msg.offline && msg.viewed.length == 0" src="assets/images/check-solid.svg">
</ion-icon>
<ion-icon *ngIf="msg.viewed.length == 1" src="assets/images/check-double-solid -viewed.svg">
</ion-icon>
</ion-label> </ion-label>
</div> </div>
</div> </div>
@@ -198,12 +208,9 @@
<ion-footer> <ion-footer>
<div class="typing" > <div class="typing">
<ngx-letters-avatar *ngIf="showAvatar" <ngx-letters-avatar *ngIf="showAvatar" [avatarName]="wsChatMethodsService.getDmRoom(roomId).name" [width]="30"
[avatarName]= "wsChatMethodsService.getDmRoom(roomId).name" [circular]="true" fontFamily="Open Sans"></ngx-letters-avatar>
[width]="30"
[circular]="true"
fontFamily="Open Sans"></ngx-letters-avatar>
A escrever... A escrever...
</div> </div>
@@ -240,8 +247,9 @@
<div class="width-100"> <div class="width-100">
<ion-item class="ion-no-padding type-message" lines="none"> <ion-item class="ion-no-padding type-message" lines="none">
<ion-textarea (keyup.enter)="sendMessage()" clearOnEdit="true" placeholder="Escrever uma mensagem" <ion-textarea (keyup.enter)="sendMessage()" clearOnEdit="true" placeholder="Escrever uma mensagem"
class="message-input" rows="1" [(ngModel)]="wsChatMethodsService.getDmRoom(roomId).message" (ionChange)="wsChatMethodsService.getDmRoom(roomId).sendTyping()"></ion-textarea> class="message-input" rows="1" [(ngModel)]="wsChatMethodsService.getDmRoom(roomId).message"
<button hidden class="btn-no-color" > (ionChange)="wsChatMethodsService.getDmRoom(roomId).sendTyping()"></ion-textarea>
<button hidden class="btn-no-color">
<ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon> <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
</button> </button>
</ion-item> </ion-item>
src/app/shared/chat/messages/messages.page.ts
+75 -62
View File
@@ -33,7 +33,7 @@ import { SearchPage } from 'src/app/pages/search/search.page';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service'; import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service';
import { Camera, CameraResultType, CameraSource } from '@capacitor/camera'; import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
import { DocumentViewer, DocumentViewerOptions} from '@ionic-native/document-viewer'; import { DocumentViewer, DocumentViewerOptions } from '@ionic-native/document-viewer';
const IMAGE_DIR = 'stored-images'; const IMAGE_DIR = 'stored-images';
@Component({ @Component({
@@ -274,11 +274,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
//fullUrl = "http://www.africau.edu/images/default/sample.pdf"; //fullUrl = "http://www.africau.edu/images/default/sample.pdf";
this.frameUrl = fullUrl; */ this.frameUrl = fullUrl; */
let file = new Blob([msg.attachments.image_url], {type:'application/pdf'}); let file = new Blob([msg.attachments[0].image_url], { type: 'application/pdf' });
let fileURL = URL.createObjectURL(file) let fileURL = URL.createObjectURL(file)
window.open(fileURL,"_blank"); window.open(fileURL);
// this.chatService.getDocumentDetails(fullUrl); // this.chatService.getDocumentDetails(fullUrl);
} }
} }
@@ -457,7 +457,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
//const imageData = await this.fileToBase64Service.convert(file) //const imageData = await this.fileToBase64Service.convert(file)
//console.log('ADDFILECHAT', imageData) //console.log('ADDFILECHAT', imageData)
const response = await fetch('data:image/jpeg;base64,'+ file.base64String!); const response = await fetch('data:image/jpeg;base64,' + file.base64String!);
const blob = await response.blob(); const blob = await response.blob();
const formData = new FormData(); const formData = new FormData();
@@ -470,8 +470,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
}, },
temporaryData: formData, temporaryData: formData,
attachments: [{ attachments: [{
"title": file.path , "title": file.path,
"image_url": 'data:image/jpeg;base64,' +file.base64String, //"image_url": 'data:image/jpeg;base64,' + file.base64String,
"text": "description", "text": "description",
"title_link_download": false, "title_link_download": false,
}] }]
@@ -485,7 +485,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
const image = await this.CameraService.takePicture(); const image = await this.CameraService.takePicture();
await this.fileService.saveImage(image) await this.fileService.saveImage(image)
const lastphoto: any = await this.fileService.loadFiles(); const lastphoto: any = await this.fileService.loadFiles();
const { capturedImage, capturedImageTitle} = await this.fileService.loadFileData(lastphoto); const { capturedImage, capturedImageTitle } = await this.fileService.loadFileData(lastphoto);
const base64 = await fetch(capturedImage); const base64 = await fetch(capturedImage);
console.log('imsge take picture', image) console.log('imsge take picture', image)
const blob = await base64.blob(); const blob = await base64.blob();
@@ -501,7 +501,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
}, },
temporaryData: formData, temporaryData: formData,
attachments: [{ attachments: [{
"title": capturedImageTitle , "title": capturedImageTitle,
"image_url": capturedImage, "image_url": capturedImage,
"text": "description", "text": "description",
"title_link_download": false, "title_link_download": false,
@@ -529,14 +529,14 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
} }
}); });
await modal.present(); await modal.present();
modal.onDidDismiss().then(async res=>{ modal.onDidDismiss().then(async res => {
const data = res.data; const data = res.data;
const roomId = this.roomId const roomId = this.roomId
if(data.selected) { if (data.selected) {
this.wsChatMethodsService.getDmRoom(roomId).send({ this.wsChatMethodsService.getDmRoom(roomId).send({
file:{ file: {
"name": res.data.selected.Assunto, "name": res.data.selected.Assunto,
"type": "application/webtrix", "type": "application/webtrix",
"ApplicationId": res.data.selected.ApplicationType, "ApplicationId": res.data.selected.ApplicationType,
@@ -558,7 +558,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
}); });
} }
async addFileToChatMobile(types: typeof FileType[] ) { async addFileToChatMobile(types: typeof FileType[]) {
const roomId = this.roomId const roomId = this.roomId
const file = await Camera.getPhoto({ const file = await Camera.getPhoto({
@@ -571,7 +571,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
//const imageData = await this.fileToBase64Service.convert(file) //const imageData = await this.fileToBase64Service.convert(file)
//console.log('ADDFILECHAT', imageData) //console.log('ADDFILECHAT', imageData)
const response = await fetch('data:image/jpeg;base64,'+ file.base64String!); const response = await fetch('data:image/jpeg;base64,' + file.base64String!);
const blob = await response.blob(); const blob = await response.blob();
const formData = new FormData(); const formData = new FormData();
@@ -584,8 +584,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
}, },
temporaryData: formData, temporaryData: formData,
attachments: [{ attachments: [{
"title": file.path , "title": file.path,
"image_url": 'data:image/jpeg;base64,' +file.base64String, //"image_url": 'data:image/jpeg;base64,' + file.base64String,
"text": "description", "text": "description",
"title_link_download": false, "title_link_download": false,
}] }]
@@ -595,7 +595,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
async addFileToChat(types: typeof FileType[] ) { async addFileToChat(types: typeof FileType[]) {
const roomId = this.roomId const roomId = this.roomId
@@ -604,7 +604,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
/* const imageData = await this.fileToBase64Service.convert(file).then((filee) => { /* const imageData = await this.fileToBase64Service.convert(file).then((filee) => {
console.log('Add file', filee) console.log('Add file', filee)
}) */ }) */
const blob = new Blob([file],{type: file.type}) const blob = new Blob([file], { type: file.type })
console.log('Add file', blob) console.log('Add file', blob)
const formData = new FormData(); const formData = new FormData();
@@ -619,11 +619,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
"guid": '', "guid": '',
}, },
attachments: [{ attachments: [{
"title": file.name , "title": file.name,
"name": file.name , "name": file.name,
//"image_url": res,
// "text": "description", // "text": "description",
"title_link_download": false, "title_link_download": false,
"image_url": res,
}], }],
temporaryData: formData temporaryData: formData
}) })
@@ -632,7 +632,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
} }
blobToBase64 = blob => { blobToBase64 = blob => {
const reader = new FileReader(); const reader = new FileReader();
reader.readAsDataURL(blob); reader.readAsDataURL(blob);
return new Promise(resolve => { return new Promise(resolve => {
@@ -694,7 +694,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
} }
}); });
await modal.present(); await modal.present();
modal.onDidDismiss().then( async (res) => { modal.onDidDismiss().then(async (res) => {
console.log(res['data']); console.log(res['data']);
@@ -738,38 +738,50 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
console.log('FILE TYPE', msg.file.type) console.log('FILE TYPE', msg.file.type)
this.downloadFile = ""; this.downloadFile = "";
//if (msg.file.type == "application/img") { //if (msg.file.type == "application/img") {
this.AttachmentsService.downloadFile(msg.file.guid).subscribe(async (event) => { this.AttachmentsService.downloadFile(msg.file.guid).subscribe(async (event) => {
console.log('FILE TYPE 22', msg.file.guid) console.log('FILE TYPE 22', msg.file.guid)
var name = msg.file.guid; var name = msg.file.guid;
if (event.type === HttpEventType.DownloadProgress) { if (event.type === HttpEventType.DownloadProgress) {
//this.downloadProgess = Math.round((100 * event.loaded) / event.total); //this.downloadProgess = Math.round((100 * event.loaded) / event.total);
console.log('FILE TYPE 33', msg.file.type) console.log('FILE TYPE 33', msg.file.type)
} else if (event.type === HttpEventType.Response) { } else if (event.type === HttpEventType.Response) {
if (msg.file.type == "application/img") { if (msg.file.type == "application/img") {
this.downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), '')); this.downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''));
} else { } else if (msg.file.type === 'application/pdf') {
this.downloadFile = btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''));
this.downloadFile = event.body;
} }
msg.attachments[0] = {
msg.file = { image_url: this.downloadFile,
guid: msg.file.guid, name: msg.attachments[0].name,
image_url: this.downloadFile, title: msg.attachments[0].title,
type: msg.file.type title_link_download: msg.attachments[0].title_link_download,
} ts: msg.attachments[0].ts
await this.storage.set(msg.file.guid, this.downloadFile).then(() => {
console.log('IMAGE SAVED')
});
} }
}); await this.storage.set(msg.file.guid, this.downloadFile).then(() => {
console.log('IMAGE SAVED')
});
}
// } });
// }
} }
_arrayBufferToBase64( buffer ) {
var binary = '';
var bytes = new Uint8Array( buffer );
var len = bytes.byteLength;
for (var i = 0; i < len; i++) {
binary += String.fromCharCode( bytes[ i ] );
}
return window.btoa( binary );
}
pdfPreview() { pdfPreview() {
const options: DocumentViewerOptions = { const options: DocumentViewerOptions = {
title: 'My App' title: 'My App'
@@ -778,34 +790,35 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
} }
async openPreview(msg) { async openPreview(msg) {
console.log(msg); console.log(msg);
if (msg.file.image_url === null || msg.file.image_url === '' ) { if (!msg.attachments[0].image_url || msg.attachments[0].image_url === null || msg.attachments[0].image_url === '') {
this.downloadFileMsg(msg) this.downloadFileMsg(msg)
} else { } else {
if(msg.file.type === "application/pdf") { /* if(msg.file.type === "application/pdf") {
this.viewDocument(msg, msg.attachments.image_url) this.viewDocument(msg, msg.attachments.image_url)
} else { } else { */
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: ViewMediaPage, component: ViewMediaPage,
cssClass: 'modal modal-desktop', cssClass: 'modal modal-desktop',
componentProps: { componentProps: {
image: msg.attachments[0].image_url, image: msg.attachments[0].image_url,
username: msg.u.name, type: msg.file.type,
_updatedAt: msg._updatedAt username: msg.u.name,
} _updatedAt: msg._updatedAt
}); }
modal.present(); });
} modal.present();
//}
} }
} }
testEditMessage(msg:MessageService) { testEditMessage(msg: MessageService) {
msg.receptorReceive() msg.receptorReceive()
// alert('cool!') // alert('cool!')
} }