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

Merge branch 'developer-prod' of bitbucket.org:equilibriumito/gabinete-digital-fo into chat/labels3

Browse Source
This commit is contained in:
Peter Maquiran
2023-09-12 21:16:42 +01:00
parent 81e711e28c 474e791c71
commit 86915ee911
43 changed files with 1383 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/chat/edit-group/edit-group.page.ts
+1 -2
View File
@@ -174,9 +174,8 @@ export class EditGroupPage implements OnInit {
{
name: 'minutes',
prefix: 'Minutos',
selectedIndex: 3,
selectedIndex: 0,
options: [
{ text: '0', value: 0 },
{ text: '5', value: 5 },
{ text: '10', value: 10 },
{ text: '15', value: 15 },
src/app/shared/chat/group-messages/group-messages.page.html
+2 -2
View File
@@ -275,9 +275,9 @@
<!-- <ion-fab-button *ngIf="p.userPermission([p.permissionList.Agenda.access])" title="Nova Reunião" (click)="bookMeeting()" color="light">
<ion-icon name="calendar"></ion-icon>
</ion-fab-button> -->
<!-- <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
<ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
<ion-icon name="document"></ion-icon>
</ion-fab-button> -->
</ion-fab-button>
<ion-fab-button title="Anexar Fotografia" (click)="addImage()" color="light">
<ion-icon name="image"></ion-icon>
</ion-fab-button>
src/app/shared/chat/group-messages/group-messages.page.ts
+18 -5
View File
@@ -907,13 +907,26 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch ((error) => {
console.error(error);
})));
const blob = this.fileService.base64toBlob(encodedData, file.type)
let blob;
let formData
let fileBase64
if (this.platform.is("tablet")) {
const fileBase64 = await this._getBase64(file)
blob = this.fileService.base64toBlob(encodedData, file.type)
console.log('BLOB BLOB', blob)
const formData = new FormData();
formData.append('blobFile', blob);
formData = new FormData();
formData.append('blobFile', blob);
/* console.log('add file', fileBase64) */
} else {
blob = this.fileService.base64toBlob(encodedData, file.type)
fileBase64 = await this._getBase64(file)
formData = new FormData();
formData.append('blobFile', blob);
}
this.ChatSystemService.getGroupRoom(roomId).send({
file: {
src/app/shared/chat/messages/messages.page.html
+3 -3
View File
@@ -40,7 +40,7 @@
<div class="messages-list-item-wrapper container-width-100"
*ngFor="let msg of ChatSystemService.getDmRoom(roomId).messages; index as i; let last = last" >
<div class='message-item incoming-{{msg.u.username!=sessionStore.user.UserName}} max-width-45' *ngIf="msg.msg !=''" [class.dateLabel]="msg.dateLabel">
<div [class.dateLabel]="msg.dateLabel" class='message-item incoming-{{msg.u.username!=sessionStore.user.UserName}} max-width-45' *ngIf="msg.msg !=''" >
<div class="message-item-options d-flex justify-content-end" *ngIf="!msg.dateLabel">
<fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer">
</fa-icon>
@@ -253,9 +253,9 @@
<!-- <ion-fab-button *ngIf="p.userPermission([p.permissionList.Agenda.access])" title="Nova Reunião" (click)="bookMeeting()" color="light">
<ion-icon name="calendar"></ion-icon>
</ion-fab-button> -->
<!-- <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
<ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
<ion-icon name="document"></ion-icon>
</ion-fab-button> -->
</ion-fab-button>
<ion-fab-button title="Anexar Fotografia" (click)="addImage()" color="light">
<ion-icon name="image"></ion-icon>
</ion-fab-button>
src/app/shared/chat/messages/messages.page.scss
+8 -15
View File
@@ -1,4 +1,4 @@
@import '~src/function.scss';
@import "~src/function.scss";
.header-toolbar {
--background: transparent;
@@ -29,7 +29,6 @@
margin: 2px 0 0 5px;
display: flex;
align-items: center;
}
.right {
@@ -45,13 +44,11 @@
width: 95%;
overflow: auto;
.header-bottom-icon {
width: rem(30);
font-size: rem(25);
float: left;
padding: 2px;
}
.header-bottom-contacts {
@@ -164,7 +161,6 @@ ion-content {
overflow: auto;
}
.incoming-true,
.incoming-false {
padding: 15px 20px;
@@ -267,7 +263,6 @@ ion-footer {
align-self: center;
}
}
}
.text-color-blue {
@@ -357,7 +352,6 @@ ion-footer {
align-items: center;
}
.typing ngx-letters-avatar {
padding-right: 5px;
}
@@ -390,24 +384,23 @@ ion-footer {
right: 50%;
}
.try {
color: red;
background: #f3414159;
padding: 6px;
border-radius: 10px;
cursor: pointer;
background: #f3414159;
padding: 6px;
border-radius: 10px;
cursor: pointer;
}
.red-top {
border-top: 1px solid red !important;
}
.red {
color: red !important;
color: red !important;
}
.lido, .enviado {
.lido,
.enviado {
font-size: rem(11);
}
src/app/shared/chat/messages/messages.page.ts
+58 -35
View File
@@ -100,6 +100,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
roomName: any;
isAdmin = false;
roomCountDownDate: string;
constructor(
public popoverController: PopoverController,
@@ -137,6 +138,9 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.showAvatar = false
setTimeout(() => {
this.scrollToBottomClicked()
this.showAvatar = true
@@ -144,13 +148,12 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.deleteRecording()
// this.ChatSystemService.getDmRoom(this.roomId).deleteAll()
}
async ChatMessageDebuggingPage() {
const modal = await this.modalController.create({
component: ChatMessageDebuggingPage,
cssClass: 'model profile-modal search-submodal',
@@ -183,6 +186,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.deleteRecording();
this.loadFiles();
}
@@ -612,25 +616,25 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
// convert base64 to raw binary data held in a string
// doesn't handle URLEncoded DataURIs - see SO answer #6850276 for code that does this
var byteString = atob(dataURI.split(',')[1]);
// separate out the mime component
var mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0]
// write the bytes of the string to an ArrayBuffer
var ab = new ArrayBuffer(byteString.length);
// create a view into the buffer
var ia = new Uint8Array(ab);
// set the bytes of the buffer to the correct values
for (var i = 0; i < byteString.length; i++) {
ia[i] = byteString.charCodeAt(i);
ia[i] = byteString.charCodeAt(i);
}
// write the ArrayBuffer to a blob, and you're done
var blob = new Blob([ab], {type: mimeString});
var blob = new Blob([ab], { type: mimeString });
return blob;
}
async takePictureMobile() {
@@ -645,7 +649,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
source: CameraSource.Camera
});
var base64 = 'data:image/jpeg;base64,' + file.base64String
var base64 = 'data:image/jpeg;base64,' + file.base64String
const compressedImage = await this.compressImageBase64(
base64,
800, // maxWidth
@@ -785,7 +789,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
//const imageData = await this.fileToBase64Service.convert(file)
//
var base64 = 'data:image/jpeg;base64,' + file.base64String
var base64 = 'data:image/jpeg;base64,' + file.base64String
const compressedImage = await this.compressImageBase64(
base64,
800, // maxWidth
@@ -795,7 +799,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
console.log('Selected: ', picture)
base64 = picture
});
const response = await fetch(base64);
const blob = await response.blob();
@@ -827,23 +831,42 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
async addFileToChat(types: typeof FileType[]) {
const roomId = this.roomId
const file: any = await this.fileService.getFileFromDevice(types);
console.log(file.type)
if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") {
const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch ((error) => {
const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch((error) => {
console.error(error);
})));
const blob = this.fileService.base64toBlob(encodedData, file.type)
const fileBase64 = await this._getBase64(file)
let blob;
let formData
let fileBase64
if (this.platform.is("tablet")) {
blob = this.fileService.base64toBlob(encodedData, file.type)
console.log('BLOB BLOB', blob)
formData = new FormData();
formData.append('blobFile', blob);
/* console.log('add file', fileBase64) */
} else {
blob = this.fileService.base64toBlob(encodedData, file.type)
fileBase64 = await this._getBase64(file)
formData = new FormData();
formData.append('blobFile', blob);
}
const formData = new FormData();
formData.append('blobFile', blob);
this.ChatSystemService.getDmRoom(roomId).send({
@@ -872,7 +895,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
}
_getBase64(file) {
return new Promise((resolve, reject)=>{
return new Promise((resolve, reject) => {
var reader = new FileReader();
reader.readAsDataURL(file);
reader.onload = function () {
@@ -882,7 +905,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
console.log('Error: ', error);
};
})
}
}
getFileReader(): FileReader {
const fileReader = new FileReader();
const zoneOriginalInstance = (fileReader as any)["__zone_symbol__originalInstance"];
@@ -991,7 +1014,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
});
await modal.present();
}
@@ -1094,7 +1117,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.downloadFileMsg(msg)
} else {
var str = msg.attachments[0].image_url
str = str.substring(1, ((str.length) - 1));
@@ -1176,14 +1199,14 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
if (this.room.name) {
try {
this.roomName = this.room.name.split('-').join(' ');
} catch(error) {
} catch (error) {
this.roomName = this.room.name;
}
}
}
if(SessionStore.user.ChatData.data.userId == this.room.u._id){
}
if (SessionStore.user.ChatData.data.userId == this.room.u._id) {
this.isAdmin = true
} else {
this.isAdmin = false
@@ -1199,32 +1222,32 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
return new Promise((resolve, reject) => {
const image = new (window as any).Image();
image.src = base64String;
image.onload = async () => {
const canvas = document.createElement('canvas');
let newWidth = image.width;
let newHeight = image.height;
if (newWidth > maxWidth) {
newHeight *= maxWidth / newWidth;
newWidth = maxWidth;
}
if (newHeight > maxHeight) {
newWidth *= maxHeight / newHeight;
newHeight = maxHeight;
}
canvas.width = newWidth;
canvas.height = newHeight;
const context = canvas.getContext('2d');
context?.drawImage(image, 0, 0, newWidth, newHeight);
const compressedBase64 = canvas.toDataURL('image/jpeg', quality);
resolve(compressedBase64);
};
image.onerror = (error) => {
reject(error);
};
src/app/shared/chat/new-group/new-group.page.ts
+1 -2
View File
@@ -335,9 +335,8 @@ export class NewGroupPage implements OnInit{
{
name: 'minutes',
prefix: 'Minutos',
selectedIndex: 3,
selectedIndex: 0,
options: [
{ text: '0', value: 0 },
{ text: '5', value: 5 },
{ text: '10', value: 10 },
{ text: '15', value: 15 },