PR
MDGPR
-
Agenda do {{calendars.Fullname}}
+
Agenda do {{calendars.Fullname}}
+
-
\ No newline at end of file
+
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index e243c7405..0f25ba173 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -32,6 +32,10 @@ import { SessionStore } from 'src/app/store/session.service';
import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
import { RouteService } from 'src/app/services/route.service';
+import { FileValidatorService } from "src/app/services/file/file-validator.service"
+import { sanitize } from "sanitize-filename-ts";
+
+
@Component({
selector: 'app-group-messages',
templateUrl: './group-messages.page.html',
@@ -104,6 +108,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
private file: File,
private fileOpener: FileOpener,
public RouteService: RouteService,
+ private FileValidatorService: FileValidatorService
) {
this.ChatSystemService.getUser()
@@ -507,7 +512,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
"mimeType": audioFile.value.mimeType,
},
attachments: [{
- "title": fileName,
+ "title": sanitize(fileName),
"title_link_download": true,
"type": "audio"
}],
@@ -828,37 +833,45 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
const file: any = await this.fileService.getFileFromDevice(types);
+ const fileName = file.name
- if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") {
+ const validation = this.FileValidatorService.fileNameValidation(fileName)
- const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch((error) => {
- console.error(error);
- })));
- const blob = this.fileService.base64toBlob(encodedData, file.type)
+ if(validation.isOk) {
- const formData = new FormData();
- formData.append('blobFile', blob);
+ 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) => {
+ console.error(error);
+ })));
+ const blob = this.fileService.base64toBlob(encodedData, file.type)
+
+ const formData = new FormData();
+ formData.append('blobFile', blob);
- this.ChatSystemService.getGroupRoom(roomId).send({
- file: {
- "type": file.type,
- "guid": '',
- },
- attachments: [{
- "title": file.name,
- "name": file.name,
- // "text": "description",
- "title_link_download": false,
- }],
- temporaryData: formData,
- attachmentsModelData: {
- fileBase64: encodedData
- }
- });
+ this.ChatSystemService.getGroupRoom(roomId).send({
+ file: {
+ "type": file.type,
+ "guid": '',
+ },
+ attachments: [{
+ "title": sanitize(fileName),
+ "name": sanitize(fileName),
+ // "text": "description",
+ "title_link_download": false,
+ }],
+ temporaryData: formData,
+ attachmentsModelData: {
+ fileBase64: encodedData
+ }
+ });
+ } else {
+
+ }
} else {
-
+ this.toastService._badRequest("Ficheiro inválido")
}
}
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 2d5982a83..5e82e5eb5 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -23,7 +23,7 @@
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 3a42df267..65744ee81 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -33,6 +33,10 @@ import { Filesystem, Directory } from '@capacitor/filesystem';
import { NewEventPage } from '../../agenda/new-event/new-event.page';
import { NotificationsService } from 'src/app/services/notifications.service';
import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-connector.service'
+import { FileValidatorService } from "src/app/services/file/file-validator.service"
+import { sanitize } from "sanitize-filename-ts";
+
+
const IMAGE_DIR = 'stored-images';
@@ -117,6 +121,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
private fileOpener: FileOpener,
private router: Router,
public RochetChatConnectorService: RochetChatConnectorService,
+ private FileValidatorService: FileValidatorService
) {
try {
@@ -413,12 +418,13 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`;
}
-
-
//Converting base64 to blob
const encodedData = btoa(this.audioRecorded);
const blob = this.fileService.base64toBlob(encodedData, recordData.value.mimeType)
+
+ const validation = await this.FileValidatorService.validateAudioFromBlob(blob)
+
const formData = new FormData();
formData.append("blobFile", blob);
@@ -429,7 +435,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
"mimeType": audioFile.value.mimeType,
},
attachments: [{
- "title": fileName,
+ "title": sanitize(fileName),
"title_link_download": true,
"type": "audio"
}],
@@ -759,7 +765,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
async addFileToChatMobile(types: typeof FileType[]) {
- console.log('add image from gallery')
const roomId = this.roomId
const file = await Camera.getPhoto({
@@ -852,43 +857,41 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
formData.append('blobFile', blob);
console.log('add file', fileBase64) */
+ const fileName = file.name
+ const validation = this.FileValidatorService.fileNameValidation(fileName)
- if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") {
- console.log('TYPE', file.type)
+ if(validation.isOk) {
- const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch((error) => {
- console.error(error);
- })));
- console.log(encodedData)
- const blob = this.fileService.base64toBlob(encodedData, file.type)
- console.log('BLOB BLOB', blob)
-
- const formData = new FormData();
- formData.append('blobFile', blob);
- /* console.log('add file', fileBase64) */
-
- this.ChatSystemService.getDmRoom(roomId).send({
- file: {
- "type": file.type,
- "guid": '',
- },
- attachments: [{
- "title": file.name,
- "name": file.name,
- // "text": "description",
- "title_link_download": false,
- }],
- temporaryData: formData,
- attachmentsModelData: {
- fileBase64: encodedData,
- }
- });
- } else {
- console.log('file not supported')
- }
+ const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch((error) => {
+ console.error(error);
+ })));
+ console.log(encodedData)
+ const blob = this.fileService.base64toBlob(encodedData, file.type)
+ const formData = new FormData();
+ formData.append('blobFile', blob);
+ /* console.log('add file', fileBase64) */
+ this.ChatSystemService.getDmRoom(roomId).send({
+ file: {
+ "type": file.type,
+ "guid": '',
+ },
+ attachments: [{
+ "title": sanitize(fileName),
+ "name": sanitize(fileName),
+ // "text": "description",
+ "title_link_download": false,
+ }],
+ temporaryData: formData,
+ attachmentsModelData: {
+ fileBase64: encodedData,
+ }
+ });
+ } else {
+ this.toastService._badRequest("Ficheiro inválido")
+ }
}
diff --git a/src/app/pages/events/attendees/attendees.page.ts b/src/app/pages/events/attendees/attendees.page.ts
index 28cb7e94e..5f6245388 100644
--- a/src/app/pages/events/attendees/attendees.page.ts
+++ b/src/app/pages/events/attendees/attendees.page.ts
@@ -21,27 +21,27 @@ export class AttendeesPageModal implements OnInit {
eventPersons: EventPerson[];
adding: "intervenient" | "CC";
currentPath = window.location.pathname;
-
+
taskParticipants:EventPerson[] = [];
taskParticipantsCc:EventPerson[] = [];
loggeduser: LoginUserRespose;
@Input() loggedAttendSon: boolean;
taskType: any;
-
+
constructor(
- private modalCtrl: ModalController,
+ private modalCtrl: ModalController,
private contactsService: ContactsService,
private navParams: NavParams,
private modalController: ModalController,
public ThemeService: ThemeService,
private router: Router,) {
-
+
this.adding = this.navParams.get('adding');
this.taskParticipants = this.navParams.get('taskParticipants');
this.taskParticipantsCc = this.navParams.get('taskParticipantsCc');
this.taskType = this.navParams.get('taskType');
-
+
this.loggeduser = SessionStore.user;
}
@@ -49,7 +49,7 @@ export class AttendeesPageModal implements OnInit {
ngOnInit() {
console.log('Pesquisa de contactos current path1',this.router.url)
this.fetchContacts("");
-
+
if(this.taskParticipants == null || this.taskParticipants == undefined){
this.taskParticipants = [];
}
@@ -57,9 +57,9 @@ export class AttendeesPageModal implements OnInit {
if(this.taskParticipantsCc == null || this.taskParticipantsCc == undefined){
this.taskParticipantsCc = [];
}
-
+
}
-
+
ngOnChanges(event) {}
save(){
@@ -81,16 +81,16 @@ export class AttendeesPageModal implements OnInit {
filterSearchList(itm: EventPerson): boolean {
const result = this.taskParticipants.concat( this.taskParticipantsCc).find((contact, index)=>{
-
+
if(contact.Name.toLocaleLowerCase() == itm.Name.toLocaleLowerCase() && contact.EmailAddress.toLocaleLowerCase() == itm.EmailAddress.toLocaleLowerCase()){
index = index;
return contact;
}
})
-
+
return undefined == result;
-
+
}
remove(itm: EventPerson) {
@@ -103,7 +103,7 @@ export class AttendeesPageModal implements OnInit {
return contact;
}
return false;
-
+
});
} else if (this.adding == "CC") {
@@ -114,7 +114,7 @@ export class AttendeesPageModal implements OnInit {
return contact;
}
return false;
-
+
});
}
@@ -124,7 +124,7 @@ export class AttendeesPageModal implements OnInit {
if(this.adding == "intervenient"){
itm.IsRequired = true;
this.taskParticipants.push(itm);
-
+
} else if (this.adding == "CC") {
itm.IsRequired = false;
this.taskParticipantsCc.push(itm);
@@ -142,7 +142,7 @@ export class AttendeesPageModal implements OnInit {
const index: number = result.findIndex((cont) => {
return cont.EmailAddress.toLocaleLowerCase() == attendee.EmailAddress.toLocaleLowerCase()
});
-
+
result.splice(index, 1);
});
@@ -153,16 +153,16 @@ export class AttendeesPageModal implements OnInit {
this.showLoader = false;
} else {
this.contacts = result;
- console.log('Attendes Email',this.loggeduser.Email)
+ // console.log('Attendes Email',this.loggeduser.Email)
let filterLoggedUserEmail = this.contacts.filter(item => item.EmailAddress.toLocaleLowerCase() != this.loggeduser.Email.toLocaleLowerCase())
if(this.taskType == 0 || this.taskType == 1){
filterLoggedUserEmail = this.contacts.filter(item => item.IsPR == false)
}
- console.log('Attendes Email', filterLoggedUserEmail)
+ // console.log('Attendes Email', filterLoggedUserEmail)
let filterEmptyEmail = filterLoggedUserEmail.filter(item => item.EmailAddress.toLocaleLowerCase() != "")
-
+
this.contacts = filterEmptyEmail;
- console.log('Attendes Email', this.contacts)
+ //console.log('Attendes Email', this.contacts)
this.showLoader = false;
}
@@ -183,4 +183,4 @@ export class AttendeesPageModal implements OnInit {
}).reverse()
}
-}
\ No newline at end of file
+}
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss
index debecae07..0181bab5d 100644
--- a/src/app/pages/events/events.page.scss
+++ b/src/app/pages/events/events.page.scss
@@ -311,7 +311,8 @@ label {
.time {
font-family: Roboto;
text-align: center;
- color: var(--header-tab-text-white);
+ /* color: var(--header-tab-text-white); */
+ color: black;
line-height: unset;
margin-top: 10px;
width: 100%;
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
index 1bc6b9bed..05c9b559f 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
@@ -12,7 +12,7 @@
{{ task.Folio}}
- 
+ src='assets/images/secretaria_geral.png'> -->