From 7e5388e4e1d6c316733b2ab4e8cd69a629c57660 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 14 Dec 2021 14:58:34 +0100 Subject: [PATCH] add message errors in new action. --- .../new-action/new-action.page.ts | 20 ++++++++----- src/app/services/functions/file.service.ts | 7 ++++- .../shared/agenda/new-event/new-event.page.ts | 5 ---- .../group-messages/group-messages.page.html | 4 +-- .../shared/chat/messages/messages.page.html | 4 +-- src/app/shared/chat/messages/messages.page.ts | 1 + .../publication/new-action/new-action.page.ts | 28 +++++++++++-------- 7 files changed, 41 insertions(+), 28 deletions(-) diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts index 196a9ada0..b81efd8d9 100644 --- a/src/app/pages/publications/new-action/new-action.page.ts +++ b/src/app/pages/publications/new-action/new-action.page.ts @@ -66,7 +66,7 @@ export class NewActionPage implements OnInit { private publication: PublicationsService, private toastService: ToastService - ) { + ) { this.folder = new PublicationFolder(); @@ -76,7 +76,7 @@ export class NewActionPage implements OnInit { this.folder.DateBegin = new Date().toISOString() this.folder.DateEnd = (new Date(new Date().getTime() + 15 * 60000)).toISOString() - + } ngOnInit() { @@ -102,7 +102,13 @@ export class NewActionPage implements OnInit { } runValidation() { - this.validateFrom = true + this.validateFrom = true; + if(new Date(this.folder.DateBegin).toISOString() > new Date(this.folder.DateEnd).toISOString()){ + this.toastService.badRequest("A data de início não pode ser superior a data de fim"); + } + else if(this.folder.DateBegin > new Date().toISOString()){ + this.toastService.badRequest("A data de início não pode ser superior a data actual"); + } } injectValidation() { @@ -134,8 +140,8 @@ export class NewActionPage implements OnInit { DateEnd: this.folder.DateEnd, ActionType: this.segment, } - - + + const loader = this.toastService.loading() try { @@ -144,7 +150,7 @@ export class NewActionPage implements OnInit { this.toastService.successMessage("Ação presidencial criado"); this.close(); } catch (error) { - + this.toastService.badRequest("Ação presidencial não criado"); } finally { loader.remove() @@ -156,5 +162,5 @@ export class NewActionPage implements OnInit { close(){ this.modalController.dismiss(); } - + } diff --git a/src/app/services/functions/file.service.ts b/src/app/services/functions/file.service.ts index 087e77394..ee3d2d9de 100644 --- a/src/app/services/functions/file.service.ts +++ b/src/app/services/functions/file.service.ts @@ -51,7 +51,9 @@ export class FileService { private platform: Platform, private loadingCtrl: LoadingController, private http: HttpClient, - ) { } + ) { + this.headers = new HttpHeaders(); + } uploadFile(formData:any){ @@ -71,6 +73,9 @@ export class FileService { params = params.set("path", guid); + this.headers = this.headers.set('responseType', 'blob'); + this.headers = this.headers.set('Content-Type', 'application/octet-stream'); + let options = { headers: this.headers, params: params diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index e615df6a8..dd837f708 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -201,13 +201,11 @@ export class NewEventPage implements OnInit { } }) } - this.taskParticipants = removeDuplicate(this.taskParticipants); this.taskParticipantsCc = removeDuplicate(this.taskParticipantsCc); this.setIntervenient.emit(this.taskParticipants); this.setIntervenientCC.emit(this.taskParticipantsCc); - } @@ -307,7 +305,6 @@ export class NewEventPage implements OnInit { close(){ this.deleteTemporaryData(); - this.cloneAllmobileComponent.emit(); this.clearContact.emit(); this.setIntervenient.emit([]); @@ -425,10 +422,8 @@ export class NewEventPage implements OnInit { (id) => { console.log(id); - const eventId: any = id; - const DocumentToSave: EventAttachment[] = this.documents.map((e) => { return { SourceTitle: e.Assunto, 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 086fa5332..6947bcfa7 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -149,9 +149,9 @@ - + diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index d1afd2f27..4fcb6d4e2 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -123,9 +123,9 @@ - + diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 67fb6bc09..6d8d05816 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -250,6 +250,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy if(msg.file.type == "application/img"){ let response:any = await this.fileService.getFile(msg.file.guid).toPromise(); console.log(response); + alert(response); //this.openPreview(msg); diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts index 733434a1b..9fee8eedf 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -28,27 +28,27 @@ export class NewActionPage implements OnInit { public stepMinute = 5; public stepSecond = 5; public endMinDate = new Date(new Date().getTime() + 15 * 60000); - + Form: FormGroup; validateFrom = false public dateControlStart = new FormControl(moment("DD MM YYYY hh")); public dateControlEnd = new FormControl(moment("DD MM YYYY hh")); - + @Output() closeDesktopComponent= new EventEmitter(); @Output() getActions= new EventEmitter(); constructor( private publication: PublicationsService, private toastService: ToastService - ) { + ) { this.folder = new PublicationFolder(); this.folder = Object.assign(this.folder, { - DateBegin: moment(new Date()), - DateEnd: moment(new Date(new Date().getTime() + 15 * 60000)), + DateBegin: new Date().toISOString(), + DateEnd: (new Date(new Date().getTime() + 15 * 60000)).toISOString(), }) } @@ -76,9 +76,15 @@ export class NewActionPage implements OnInit { return ['ok'] } } - + runValidation() { - this.validateFrom = true + this.validateFrom = true; + if((new Date(this.folder.DateBegin).getTime()) > (new Date(this.folder.DateEnd).getTime())){ + this.toastService._badRequest("A data de início não pode ser superior a data de fim"); + } + else if(new Date(this.folder.DateBegin).getTime() > new Date().getTime()){ + this.toastService._badRequest("A data de início não pode ser superior a data actual"); + } } injectValidation() { @@ -119,21 +125,21 @@ export class NewActionPage implements OnInit { ActionType: this.segment, } console.log(this.folder); - + const loader = this.toastService.loading() try { await this.publication.CreatePublicationFolder(this.folder).toPromise() this.close(); - this.toastService.successMessage('Acção presidencial criada') + this.toastService._successMessage('Acção presidencial criada') this.getActions.emit() } catch (error) { - this.toastService.badRequest('Não foi possivel criar a acção presidencial') + this.toastService._badRequest('Não foi possivel criar a acção presidencial') } finally { loader.remove() } - + } close(){