diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index b5295fc19..ed27104e0 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -110,7 +110,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { this.load(); this.setStatus('online'); - this.loadFiles(); + //this.loadFiles(); VoiceRecorder.requestAudioRecordingPermission(); Filesystem.mkdir({ path: IMAGE_DIR, @@ -562,7 +562,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { let msgChat = { _id: element.Id, - attachments: this.isJson(element.Attachments), + attachments: this.isJson(element.Attachments), channels: this.isJson(element.Channels), file: this.isJson(element.File), mentions: this.isJson(element.Mentions), @@ -613,7 +613,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { this.sqlservice.addChatMSG(chatmsg) }); } - + } async serverLongPull() { @@ -643,8 +643,11 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { // Show Error //showMessage(response.statusText); //this.loadMessages() - //this.messages = res['messages'].reverse(); - //this.chatMessageStore.add(roomId, this.messages) + + if (this.platform.is('desktop') || this.platform.is('mobileweb')) { + this.messages = res['messages'].reverse(); + this.chatMessageStore.add(roomId, this.messages) + } //console.log(this.messages); // Reconnect in one second 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/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 151742973..3ebb7d4de 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -40,7 +40,7 @@
- {{viagem.Detail}}

-
diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss index c98ad9b40..84cd1fecb 100644 --- a/src/app/pages/publications/publications.page.scss +++ b/src/app/pages/publications/publications.page.scss @@ -165,10 +165,13 @@ ion-toolbar{ width: 25px; font-size: 20px; } - .item-content-date-active, .item-content-title-active, .item-content-detail-active, .item-options-active{ + .item-content-date-active, .item-content-title-active, .item-content-detail-active{ color: #fff; } } + .item-options-active{ + display: none !important; + } } .item-active{ @@ -240,5 +243,7 @@ ion-toolbar{ } .item-options{ display: block !important; + padding: 10px; + } } diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 3ceb83fc3..671e6a488 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -70,7 +70,7 @@ export class PublicationsPage implements OnInit { private backgroundservice: BackgroundService, private platform: Platform, public ThemeService: ThemeService, - + ) { this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; this.days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; @@ -187,7 +187,7 @@ export class PublicationsPage implements OnInit { } getFromDB() { - + if (this.platform.is('desktop') || this.platform.is('mobileweb')) { } else { this.sqliteservice.getAllActions().then((actions: any[]) => { @@ -277,13 +277,12 @@ export class PublicationsPage implements OnInit { } goToPublicationsList(folderId: string) { - this.folderId = folderId - this.idSelected = folderId; - if (window.innerWidth <= 800) { this.router.navigate(['/home/publications', folderId]); + this.idSelected = ""; } else { this.closeDesktopComponent(); + this.idSelected = folderId; this.folderId = folderId this.desktopComponent.showViewPublication = true; } @@ -461,5 +460,5 @@ export class PublicationsPage implements OnInit { // newImage => console.log('new image path is: ' + newImage), // error => console.error('Error cropping image', error) // ); - + } 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..a9c145708 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 @@ - + @@ -161,7 +161,8 @@ -
+ +
-
+
-
+ +
-
- + 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(){ diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index 72f6ae99f..e7b3590b6 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -89,12 +89,10 @@ export class ViewPublicationsPage implements OnInit { } getPublicationDetail() { - - setTimeout(() => { - let allActions = this.publicationEventFolderStorage.list.concat(this.publicationTravelFolderService.list) - this.item = allActions.find((e)=> e.ProcessId == this.folderId); - },100); - + this.publications.GetPresidentialAction(this.folderId).subscribe(res=>{ + console.log(res); + this.item = res; + }); } getPublications() {