-
-
- 
+
+
+
+
+ 
+ 
+
+
+
+
+
+
+
+
+ Presidente da República
+ +GABINETE DIGITAL
+
+
+
Presidente da República
+ +GABINETE DIGITAL
+
diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.scss b/src/app/modals/profile/edit-profile/edit-profile.page.scss
index 79df9b441..35049c06c 100644
--- a/src/app/modals/profile/edit-profile/edit-profile.page.scss
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.scss
@@ -10,18 +10,68 @@
.div-logo{
background: transparent;
- width: calc(100% - 40px) !important;
+ width: em(140px);
justify-content: center;
display: flex;
+ color: black;
+ overflow: auto;
float: left;
- .logo{
- width: 140px;
- .img{
+ .logo-icon{
+ width: 25.33%;
+ overflow: auto;
+
+ img{
width: 100%;
margin: 0px auto;
}
}
+
+ .logo-description{
+ width: 74.67%;
+ margin: 0 auto;
+ overflow: auto;
+ font-size: 8.5px;
+ font-family: Bahnschrift;
+
+ .logo-description-content{
+ width: 100%;
+
+ .logo-description-text{
+ font-weight: 700;
+ text-align: center;
+ width: 100%;
+ margin: 0 !important;
+ padding: 0 !important;
+ }
+
+ .add-line{
+ width: 100%;
+ border-bottom: 1px solid #000;
+ margin-bottom: 2.5px !important;
+ padding: 0 !important;
+ }
+
+ .add-line-white{
+ width: 100%;
+ border-bottom: 1px solid #fff;
+ margin-bottom: 2.5px !important;
+ padding: 0 !important;
+ }
+ }
+ .color-white{
+ color: #fff !important;
+ }
+
+ .add-botton-border{
+ border-bottom: 1px solid #000;
+ }
+
+ .add-botton-border-white{
+ border-bottom: 1px solid #fff;
+ }
+
+ }
}
}
.btn-close{
diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html
index 01b6bdc77..0b4d029e5 100644
--- a/src/app/modals/profile/profile.page.html
+++ b/src/app/modals/profile/profile.page.html
@@ -1,8 +1,24 @@
-
@@ -120,8 +122,7 @@
-
-
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 2bd1434e5..699ed9fa2 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -75,10 +75,12 @@
-->
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Presidente da República
+ +GABINETE DIGITAL
+
+
+
Presidente da República
+ +GABINETE DIGITAL
+
@@ -13,7 +29,7 @@
-
+
-
+
{{loggeduser.RoleDescription}}
@@ -37,7 +53,7 @@
diff --git a/src/app/modals/profile/profile.page.scss b/src/app/modals/profile/profile.page.scss
index 5d3981b20..fad53463a 100644
--- a/src/app/modals/profile/profile.page.scss
+++ b/src/app/modals/profile/profile.page.scss
@@ -4,20 +4,70 @@
padding: 20px 20px;
border: 0 !important;
- .div-logo {
+ .div-logo{
background: transparent;
- width: calc(100% - 40px) !important;
+ width: em(140px);
justify-content: center;
display: flex;
+ color: black;
+ overflow: auto;
float: left;
- .logo {
- width: 140px;
- .img {
+ .logo-icon{
+ width: 25.33%;
+ overflow: auto;
+
+ img{
width: 100%;
margin: 0px auto;
}
}
+
+ .logo-description{
+ width: 74.67%;
+ margin: 0 auto;
+ overflow: auto;
+ font-size: 8.5px;
+ font-family: Bahnschrift;
+
+ .logo-description-content{
+ width: 100%;
+
+ .logo-description-text{
+ font-weight: 700;
+ text-align: center;
+ width: 100%;
+ margin: 0 !important;
+ padding: 0 !important;
+ }
+
+ .add-line{
+ width: 100%;
+ border-bottom: 1px solid #000;
+ margin-bottom: 2.5px !important;
+ padding: 0 !important;
+ }
+
+ .add-line-white{
+ width: 100%;
+ border-bottom: 1px solid #fff;
+ margin-bottom: 2.5px !important;
+ padding: 0 !important;
+ }
+ }
+ .color-white{
+ color: #fff !important;
+ }
+
+ .add-botton-border{
+ border-bottom: 1px solid #000;
+ }
+
+ .add-botton-border-white{
+ border-bottom: 1px solid #fff;
+ }
+
+ }
}
}
.btn-close {
diff --git a/src/app/modals/view-media/view-media.module.ts b/src/app/modals/view-media/view-media.module.ts
index 772ba6e59..eb52e9daf 100644
--- a/src/app/modals/view-media/view-media.module.ts
+++ b/src/app/modals/view-media/view-media.module.ts
@@ -8,7 +8,6 @@ import { ViewMediaPageRoutingModule } from './view-media-routing.module';
import { ViewMediaPage } from './view-media.page';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { PdfViewerModule } from 'ng2-pdf-viewer';
@NgModule({
imports: [
@@ -17,7 +16,6 @@ import { PdfViewerModule } from 'ng2-pdf-viewer';
IonicModule,
FontAwesomeModule,
ViewMediaPageRoutingModule,
- PdfViewerModule
],
declarations: [ViewMediaPage]
})
diff --git a/src/app/modals/view-media/view-media.page.html b/src/app/modals/view-media/view-media.page.html
index 3334943bd..b4367aac4 100644
--- a/src/app/modals/view-media/view-media.page.html
+++ b/src/app/modals/view-media/view-media.page.html
@@ -24,13 +24,11 @@
-
+
-
+
-
+
-
-
-
+
{{group.name.split('-').join(' ')}}
@@ -132,11 +133,12 @@
{{group.userThatIsTyping}} está escrever ...
-
-
-
+
diff --git a/src/app/pages/chat/group-messages/group-messages.module.ts b/src/app/pages/chat/group-messages/group-messages.module.ts
index f6047147e..910c7e4e4 100644
--- a/src/app/pages/chat/group-messages/group-messages.module.ts
+++ b/src/app/pages/chat/group-messages/group-messages.module.ts
@@ -16,6 +16,7 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { ImageCropperModule } from 'ngx-image-cropper';
import { AngularCropperjsModule } from 'angular-cropperjs';
import { LettersAvatarModule } from "ngx-letters-avatar";
+import { PipesModule } from 'src/app/pipes/pipes.module';
@NgModule({
imports: [
@@ -26,7 +27,8 @@ import { LettersAvatarModule } from "ngx-letters-avatar";
GroupMessagesPageRoutingModule,
ChatPopoverPageModule,
BtnModalDismissPageModule,
- LettersAvatarModule
+ LettersAvatarModule,
+ PipesModule,
/* ImageCropperModule,
AngularCropperjsModule */
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 9bbe22d91..4a1a20dec 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -106,7 +106,7 @@
-
+
-
-
+
@@ -190,32 +193,47 @@
+
+
+
+ {{durationDisplay}}
+
+
+
-
+
-
-
-
-
- {{storedFileNames}}
-
-
- {{storedFileNames}}
-
-
-
-
+
-
+
+
@@ -173,43 +176,41 @@
fontFamily="Roboto">
está a escrever ...
+
+
+
+ {{durationDisplay}}
+
+
-
-
-
-
-
-
-
diff --git a/src/app/shared/chat/group-messages/group-messages.module.ts b/src/app/shared/chat/group-messages/group-messages.module.ts
index 2865c3427..bdbe70cc8 100644
--- a/src/app/shared/chat/group-messages/group-messages.module.ts
+++ b/src/app/shared/chat/group-messages/group-messages.module.ts
@@ -11,10 +11,10 @@ import { SharedModule } from 'src/app/shared/shared.module';
import { ChatPopoverPageModule } from '../../popover/chat-popover/chat-popover.module';
import { NewEventPageModule } from '../../agenda/new-event/new-event.module';
-import { PdfViewerModule } from 'ng2-pdf-viewer';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import {MatMenuModule} from '@angular/material/menu';
import { LettersAvatarModule } from "ngx-letters-avatar";
+import { PipesModule } from 'src/app/pipes/pipes.module';
@NgModule({
imports: [
@@ -22,11 +22,11 @@ import { LettersAvatarModule } from "ngx-letters-avatar";
FormsModule,
IonicModule,
FontAwesomeModule,
- PdfViewerModule,
ChatPopoverPageModule,
GroupMessagesPageRoutingModule,
MatMenuModule,
- LettersAvatarModule
+ LettersAvatarModule,
+ PipesModule,
//
],
exports: [GroupMessagesPage],
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 3550c16ad..4760a3eaa 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -72,6 +72,7 @@
+ {{msg.u.name}}
{{msg.duration}}
-
+
-
-
+
@@ -205,22 +209,23 @@
+
+
+
+
+
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 905a5cb1d..9742565e9 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.scss
+++ b/src/app/shared/chat/group-messages/group-messages.page.scss
@@ -80,6 +80,10 @@
}
}
}
+ .btn-delete-recording{
+ margin-left: 20px !important;
+ }
+
ion-content{
.welcome-text{
/* width: 322px; */
@@ -288,4 +292,4 @@
.typing ngx-letters-avatar {
padding-right: 5px;
-}
\ No newline at end of file
+}
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 e16cb668f..245533836 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -33,6 +33,9 @@ import { element } from 'protractor';
import { FileType } from 'src/app/models/fileType';
import { ToastService } from 'src/app/services/toast.service';
import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
+import { VoiceRecorder, VoiceRecorderPlugin, RecordingData, GenericResponse, CurrentRecordingStatus } from 'capacitor-voice-recorder';
+import { Filesystem, Directory, Encoding } from '@capacitor/filesystem';
+import { DomSanitizer } from '@angular/platform-browser';
/*
import * as pdfjsLib from 'pdfjs-dist';
@@ -85,7 +88,16 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
pdfurl = "http://www.africau.edu/images/default/sample.pdf";
downloadFile: any;
- showAvatar = false
+ showAvatar = false;
+
+ recording = false;
+ allowTyping = true;
+ storedFileNames = [];
+ lastAudioRecorded = '';
+ audioRecorded:any = "";
+ audioDownloaded:any = "";
+ durationDisplay = '';
+ duration = 0;
constructor(
public wsChatMethodsService: WsChatMethodsService,
@@ -108,6 +120,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
private CameraService: CameraService,
private toastService: ToastService,
+ private sanitiser: DomSanitizer,
) {
console.log('OnCONSTRUCTOR');
@@ -134,6 +147,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
this.showAvatar = true
}, 50)
+ this.deleteRecording();
+
}
ngOnInit() {
@@ -146,6 +161,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
}, 1000);
this.getChatMembers();
//this.getMessageDB();
+ VoiceRecorder.requestAudioRecordingPermission();
+ this.deleteRecording();
+ this.loadFiles();
}
@@ -229,12 +247,100 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
this.currentPosition = scroll;
}
+ calculateDuration() {
+ if (!this.recording) {
+ this.duration = 0;
+ this.durationDisplay = '';
+ return;
+ }
+ this.duration += 1;
+ const minutes = Math.floor(this.duration / 60);
+ const seconds = (this.duration % 60).toString().padStart(2, '0');
+ this.durationDisplay = `${minutes}:${seconds}`;
+
+ setTimeout(() => {
+ this.calculateDuration();
+ }, 1000)
+ }
+
+ async getFile(fileName?:any){
+ const audioFile = await Filesystem.readFile({
+ path: fileName,
+ directory: Directory.Data
+ })
+ const base64sound = audioFile.data;
+ const base64Response = await fetch(`data:audio/ogg;base64,${base64sound}`);
+ this.audioRecorded = base64Response.url;
+ }
+
+ async loadFiles() {
+
+ this.storage.get('fileName').then((fileName) => {
+ this.lastAudioRecorded = fileName;
+ })
+
+ this.storage.get('recordData').then((recordData) => {
+ console.log(recordData);
+ if(recordData.value.recordDataBase64.includes('data:audio')){
+ this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData.value.recordDataBase64);
+ }
+ else{
+ this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`);
+ }
+ });
+ }
+
+ startRecording() {
+ console.log('Recording');
+
+ if (this.recording) {
+ return;
+ }
+ this.recording = true;
+ VoiceRecorder.startRecording();
+ this.calculateDuration();
+ }
+
+ stopRecording() {
+ this.deleteRecording();
+ this.allowTyping = false;
+ console.log('Stop');
+ if (!this.recording) {
+ return;
+ }
+ this.recording = false;
+ VoiceRecorder.stopRecording().then(async (result: RecordingData) => {
+ console.log(result);
+ this.recording = false;
+ if (result.value && result.value.recordDataBase64) {
+ const recordData = result.value.recordDataBase64;
+ //console.log(recordData);
+ const fileName = new Date().getTime() + ".mp3";
+ //Save file
+ this.storage.set('fileName',fileName);
+ this.storage.set('recordData',result).then(() => {
+ console.log('Audio recorded saved');
+ })
+ }
+ })
+ setTimeout(async () => {
+ this.loadFiles();
+ }, 1000);
+ }
+
+ async deleteRecording(){
+ this.storage.remove('fileName');
+ this.storage.remove('recordData');
+
+ this.allowTyping = true;
+ this.lastAudioRecorded = '';
+ this.loadFiles();
+ }
+
ngOnDestroy() {
window.removeEventListener('scroll', this.scrollChangeCallback, true);
}
-
-
async getChatMembers() {
//return await this.chatService.getMembers(roomId).toPromise();
this.chatService.getAllUsers().subscribe(res => {
@@ -311,6 +417,43 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
this.wsChatMethodsService.getGroupRoom(this.roomId).send({})
}
+ async sendAudio(fileName) {
+
+ const roomId = this.roomId
+ this.storage.get('recordData').then((recordData) => {
+ console.log(recordData);
+ if(recordData.value.recordDataBase64.includes('data:audio')){
+ this.audioRecorded = recordData.value.recordDataBase64;
+ }
+ else{
+ this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`;
+ }
+ });
+
+ //Converting base64 to blob
+ const base64Response = await fetch(this.audioRecorded);
+ const blob = await base64Response.blob();
+
+ const formData = new FormData();
+ formData.append("blobFile", blob);
+
+ this.wsChatMethodsService.getGroupRoom(roomId).send({
+ file: {
+ "type": "application/audio",
+ /* "guid": '', */
+ },
+ attachments: [{
+ "title": fileName ,
+ "title_link": this.audioRecorded,
+ "title_link_download": true,
+ "type": "file"
+ }],
+ temporaryData: formData
+ })
+ this.deleteRecording();
+
+ }
+
deleteMessage(msgId: string) {
const room = this.wsChatMethodsService.getGroupRoom(this.roomId)
this.alertService.confirmDeleteMessage(msgId, room);
@@ -842,10 +985,10 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
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') {
-
+
this.downloadFile = event.body;
}
-
+
msg.attachments[0] = {
image_url: this.downloadFile,
name: msg.attachments[0].name,
diff --git a/src/app/shared/chat/messages/messages.module.ts b/src/app/shared/chat/messages/messages.module.ts
index aec854bf1..574c55e8a 100644
--- a/src/app/shared/chat/messages/messages.module.ts
+++ b/src/app/shared/chat/messages/messages.module.ts
@@ -12,7 +12,7 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { MatButtonModule } from '@angular/material/button';
import {MatMenuModule} from '@angular/material/menu';
import { LettersAvatarModule } from "ngx-letters-avatar";
-import { PdfViewerModule } from 'ng2-pdf-viewer';
+import { PipesModule } from 'src/app/pipes/pipes.module';
@NgModule({
imports: [
@@ -24,7 +24,7 @@ import { PdfViewerModule } from 'ng2-pdf-viewer';
MatButtonModule,
MatMenuModule,
LettersAvatarModule,
- PdfViewerModule
+ PipesModule,
],
exports: [MessagesPage],
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index e5fba0df8..6abb082f5 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -89,7 +89,7 @@
-->
+ {{durationDisplay}}
+
+
-
-
+
@@ -242,24 +247,34 @@
+
-
+
+
-
-
+
-
-
+
-
\ No newline at end of file
+
diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss
index 3112f005a..f594b8b3f 100644
--- a/src/app/shared/chat/messages/messages.page.scss
+++ b/src/app/shared/chat/messages/messages.page.scss
@@ -328,4 +328,4 @@ display: block;
.typing ngx-letters-avatar {
padding-right: 5px;
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index c52649b9b..9a45aa8fb 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -19,7 +19,6 @@ import { ThemeService } from 'src/app/services/theme.service'
import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
import { SqliteService } from 'src/app/services/sqlite.service';
import { StorageService } from 'src/app/services/storage.service';
-import { Directory, Filesystem } from '@capacitor/filesystem';
import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
import { Storage } from '@ionic/storage';
import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service'
@@ -34,6 +33,9 @@ import { ProcessesService } from 'src/app/services/processes.service';
import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service';
import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
import { DocumentViewer, DocumentViewerOptions } from '@ionic-native/document-viewer';
+import { VoiceRecorder, VoiceRecorderPlugin, RecordingData, GenericResponse, CurrentRecordingStatus } from 'capacitor-voice-recorder';
+import { Filesystem, Directory, Encoding } from '@capacitor/filesystem';
+import { DomSanitizer } from '@angular/platform-browser';
const IMAGE_DIR = 'stored-images';
@Component({
@@ -78,7 +80,16 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
downloadFile: any;
massages: MessageService[] = []
- showAvatar = true
+ showAvatar = true;
+
+ recording = false;
+ allowTyping = true;
+ storedFileNames = [];
+ lastAudioRecorded = '';
+ audioRecorded:any = "";
+ audioDownloaded:any = "";
+ durationDisplay = '';
+ duration = 0;
constructor(
public popoverController: PopoverController,
@@ -107,6 +118,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
private CameraService: CameraService,
private processesService: ProcessesService,
private fileToBase64Service: FileToBase64Service,
+ private sanitiser: DomSanitizer,
) {
this.loggedUser = authService.ValidatedUserChat['data'];
@@ -130,13 +142,17 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.showAvatar = true
}, 150)
+ this.deleteRecording()
+
}
ngOnInit() {
this.scrollToBottom();
this.getChatMembers();
-
+ VoiceRecorder.requestAudioRecordingPermission();
+ this.deleteRecording();
+ this.loadFiles();
}
@@ -209,6 +225,96 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.currentPosition = scroll;
}
+ calculateDuration() {
+ if (!this.recording) {
+ this.duration = 0;
+ this.durationDisplay = '';
+ return;
+ }
+ this.duration += 1;
+ const minutes = Math.floor(this.duration / 60);
+ const seconds = (this.duration % 60).toString().padStart(2, '0');
+ this.durationDisplay = `${minutes}:${seconds}`;
+
+ setTimeout(() => {
+ this.calculateDuration();
+ }, 1000)
+ }
+
+ async getFile(fileName?:any){
+ const audioFile = await Filesystem.readFile({
+ path: fileName,
+ directory: Directory.Data
+ })
+ const base64sound = audioFile.data;
+ const base64Response = await fetch(`data:audio/ogg;base64,${base64sound}`);
+ this.audioRecorded = base64Response.url;
+ }
+
+ async loadFiles() {
+
+ this.storage.get('fileName').then((fileName) => {
+ this.lastAudioRecorded = fileName;
+ })
+
+ this.storage.get('recordData').then((recordData) => {
+ console.log(recordData);
+ if(recordData.value.recordDataBase64.includes('data:audio')){
+ this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData.value.recordDataBase64);
+ }
+ else{
+ this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`);
+ }
+ });
+ }
+
+ startRecording() {
+ console.log('Recording');
+
+ if (this.recording) {
+ return;
+ }
+ this.recording = true;
+ VoiceRecorder.startRecording();
+ this.calculateDuration();
+ }
+
+ stopRecording() {
+ this.deleteRecording();
+ this.allowTyping = false;
+ console.log('Stop');
+ if (!this.recording) {
+ return;
+ }
+ this.recording = false;
+ VoiceRecorder.stopRecording().then(async (result: RecordingData) => {
+ console.log(result);
+ this.recording = false;
+ if (result.value && result.value.recordDataBase64) {
+ const recordData = result.value.recordDataBase64;
+ //console.log(recordData);
+ const fileName = new Date().getTime() + ".mp3";
+ //Save file
+ this.storage.set('fileName',fileName);
+ this.storage.set('recordData',result).then(() => {
+ console.log('Audio recorded saved');
+ })
+ }
+ })
+ setTimeout(async () => {
+ this.loadFiles();
+ }, 1000);
+ }
+
+ async deleteRecording(){
+ this.storage.remove('fileName');
+ this.storage.remove('recordData');
+
+ this.allowTyping = true;
+ this.lastAudioRecorded = '';
+ this.loadFiles();
+ }
+
ngOnDestroy() {
this.checktimeOut = false;
window.removeEventListener('scroll', this.scrollChangeCallback, true);
@@ -250,6 +356,47 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.wsChatMethodsService.getDmRoom(this.roomId).send({})
}
+ async sendAudio(fileName) {
+
+ const roomId = this.roomId
+ let audioFile;
+ this.storage.get('recordData').then((recordData) => {
+ console.log(recordData);
+ audioFile = recordData;
+ if(recordData.value.recordDataBase64.includes('data:audio')){
+ this.audioRecorded = recordData.value.recordDataBase64;
+ }
+ else{
+ this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`;
+ }
+ });
+
+ //Converting base64 to blob
+ const base64Response = await fetch(this.audioRecorded);
+ const blob = await base64Response.blob();
+
+ const formData = new FormData();
+ formData.append("blobFile", blob);
+
+ this.wsChatMethodsService.getDmRoom(roomId).send({
+ file: {
+ "type": "application/audio",
+ /* "guid": '', */
+ "msDuration":audioFile.value.msDuration,
+ "mimeType":audioFile.value.mimeType,
+ },
+ attachments: [{
+ "title": fileName ,
+ "title_link": this.audioRecorded,
+ "title_link_download": true,
+ "type": "audio"
+ }],
+ temporaryData: formData
+ })
+ this.deleteRecording();
+
+ }
+
deleteMessage(msgId: string) {
const room = this.wsChatMethodsService.getDmRoom(this.roomId)
this.alertService.confirmDeleteMessage(msgId, room);
@@ -749,7 +896,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
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') {
-
+
this.downloadFile = event.body;
}
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index 19811a85f..bab69b979 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -22,13 +22,20 @@
+
+
+
-
+
-
+
+
Presidente da República
GABINETE DIGITAL
+
+
+ Presidente da República
+ +GABINETE DIGITAL
+
diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss
index 29f30ee38..3265696a1 100644
--- a/src/app/shared/header/header.page.scss
+++ b/src/app/shared/header/header.page.scss
@@ -49,12 +49,26 @@
margin-bottom: 2.5px !important;
padding: 0 !important;
}
+
+ .add-line-white{
+ width: 100%;
+ border-bottom: 1px solid #fff;
+ margin-bottom: 2.5px !important;
+ padding: 0 !important;
+ }
+ }
+ .color-white{
+ color: #fff !important;
}
.add-botton-border{
border-bottom: 1px solid #000;
}
+ .add-botton-border-white{
+ border-bottom: 1px solid #fff;
+ }
+
}
}
diff --git a/src/assets/audio/Audiorecord.mp3 b/src/assets/audio/Audiorecord.mp3
new file mode 100644
index 000000000..7f06c568b
Binary files /dev/null and b/src/assets/audio/Audiorecord.mp3 differ
diff --git a/src/assets/icon/theme/default/icons-chat-record-audio.svg b/src/assets/icon/theme/default/icons-chat-record-audio.svg
new file mode 100644
index 000000000..867be5447
--- /dev/null
+++ b/src/assets/icon/theme/default/icons-chat-record-audio.svg
@@ -0,0 +1,8 @@
+
diff --git a/src/assets/icon/theme/gov/icons-chat-mic-white.svg b/src/assets/icon/theme/gov/icons-chat-mic-white.svg
new file mode 100644
index 000000000..20365f766
--- /dev/null
+++ b/src/assets/icon/theme/gov/icons-chat-mic-white.svg
@@ -0,0 +1,7 @@
+
diff --git a/src/assets/icon/theme/gov/icons-chat-record-audio.svg b/src/assets/icon/theme/gov/icons-chat-record-audio.svg
new file mode 100644
index 000000000..6e90079a1
--- /dev/null
+++ b/src/assets/icon/theme/gov/icons-chat-record-audio.svg
@@ -0,0 +1,8 @@
+
diff --git a/src/assets/images/logo-no-bg.png b/src/assets/images/logo-no-bg.png
index 1074db181..a9c353e2b 100644
Binary files a/src/assets/images/logo-no-bg.png and b/src/assets/images/logo-no-bg.png differ
diff --git a/src/assets/images/theme/gov/icons-chat-record-audio.svg b/src/assets/images/theme/gov/icons-chat-record-audio.svg
new file mode 100644
index 000000000..48eb285e7
--- /dev/null
+++ b/src/assets/images/theme/gov/icons-chat-record-audio.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index d333a7fd8..6bf93dabc 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -5,7 +5,7 @@
export const environment = {
production: false,
apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
- // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
+ //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
//apiChatUrl: 'https://www.tabularium.pt/api/v1/',
diff --git a/src/global.scss b/src/global.scss
index 585fca574..4e6f94865 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -1138,6 +1138,7 @@ ngx-mat-datetime-content{
.messages{
.messages-list-item-wrapper{
.message-item{
+ overflow: auto;
.message-item-options{
.message-options-icon{
display: none;
@@ -1146,6 +1147,11 @@ ngx-mat-datetime-content{
position: absolute !important;
}
}
+ .audio-contentainer{
+ width: 200px !important;
+ display: flex;
+ overflow: auto !important;
+ }
.title{
//border: 1px solid blue;
@@ -1183,15 +1189,20 @@ ngx-mat-datetime-content{
//font-weight: 400;
}
+.add-attachment-bg-color{
+ background-color: #42b9fe13;
+}
+
.message-attachments{
border-radius: 5px;
- background-color: #42b9fe13;
- padding: 1px;
+ //background-color: #42b9fe13;
.file{
width: 100%;
align-items: center;
overflow: auto;
color: #000;
+ //border: 1px solid blue;
+ padding: 1px;
ion-thumbnail{
--size: 20px;
@@ -1199,7 +1210,7 @@ ngx-mat-datetime-content{
.file-details{
max-width: 100%;
padding-left: 5px;
-
+ padding: 1px;
/* .file-title{
padding-left: 5px;
} */
@@ -1238,6 +1249,13 @@ ngx-mat-datetime-content{
.powerpoint-icon{
color: #d24726;
}
+.icon-size-45{
+ font-size: 45px !important;
+}
+.icon-size-27{
+ font-size: 27px !important;
+ color: #797979;
+}
.menu-icon{
color: #42b9fe;
padding: 0 5px 0 5px;
diff --git a/src/plugin/player.js b/src/plugin/player.js
new file mode 100644
index 000000000..642dc5645
--- /dev/null
+++ b/src/plugin/player.js
@@ -0,0 +1,19 @@
+{
+ class AudioPlayer extends HTMLElement{
+ constructor(){
+ super()
+
+ this.attachShadow({ mode: 'open' });
+ this.render();
+ }
+
+ render(){
+ this.shadowRoot.innerHTML = `
+
+ `;
+ }
+
+
+ }
+ customElements.define('audio-player', AudioPlayer)
+}