diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts index dd3968b89..1e9910e26 100644 --- a/src/app/modals/view-document/view-document.page.ts +++ b/src/app/modals/view-document/view-document.page.ts @@ -1,13 +1,13 @@ import { Component, OnInit } from '@angular/core'; import { DomSanitizer } from '@angular/platform-browser'; -import { ModalController, NavParams } from '@ionic/angular'; +import { NavParams } from '@ionic/angular'; import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage'; import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; import { ProcessesService } from 'src/app/services/processes.service'; import { EventDetailsDocumentsOptionsPage } from 'src/app/shared/popover/event-details-documents-options/event-details-documents-options.page'; import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-set-up-meeting.page'; - - +import { AlertService } from 'src/app/services/alert.service'; +import { AlertController, ModalController } from '@ionic/angular'; @Component({ selector: 'app-view-document', templateUrl: './view-document.page.html', @@ -27,6 +27,7 @@ export class ViewDocumentPage implements OnInit { private navParams: NavParams, private sanitazer: DomSanitizer, private processes: ProcessesService, + private alertController: AlertController, ) { this.file = this.navParams.get('file'); this.applicationId = this.navParams.get('applicationId'); @@ -44,10 +45,27 @@ export class ViewDocumentPage implements OnInit { ngOnInit() { - this.processes.GetViewer(this.docId, this.applicationId).subscribe(res=> { - console.log(res) + this.processes.GetViewer(this.docId, this.applicationId).subscribe(async(res)=> { + const link: string = res.replace('//pdfjs/web/', '/pdfjs/web/') this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(link); + + if(res == "") { + const alert = await this.alertController.create({ + cssClass: 'my-custom-class', + //header: 'Apagar evento!', + message: 'Sem imagem', + buttons: [ + { + text: 'Sim', + handler: () => { + this.close(); + } + } + ] + }); + } + }, ()=>{ this.close(); }); diff --git a/src/app/modals/view-event/view-event.page.ts b/src/app/modals/view-event/view-event.page.ts index f37748364..aa0103420 100644 --- a/src/app/modals/view-event/view-event.page.ts +++ b/src/app/modals/view-event/view-event.page.ts @@ -153,8 +153,8 @@ export class ViewEventPage implements OnInit { }); } else { - if(this.CalendarId) { + console.log('calendar id') this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => { this.loadedEvent = res; this.addEventToDb(res); @@ -172,6 +172,8 @@ export class ViewEventPage implements OnInit { } loader.remove() }); + } else { + console.log('no calendar id') } } diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index fb0689084..e00f64a40 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -331,6 +331,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { async goToEvent(event: any) { + // console.log(event) + let classs; if (window.innerWidth < 701) { classs = 'modal modal-desktop' diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index b4efdde6e..cb3a456a1 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -259,7 +259,7 @@ -
+
@@ -372,7 +372,6 @@
-
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 1a9cd14d9..abb3cb545 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -106,6 +106,8 @@ export class GabineteDigitalPage implements OnInit { AllProcess = [] + workerList : Worker + @ViewChild(ExpedientsPage) expedientesPage: ExpedientsPage; @ViewChild(PendentesPage) pendentesListPage: PendentesPage; @ViewChild(EventsToApprovePage) eventsToApprove: EventsToApprovePage; @@ -126,6 +128,12 @@ export class GabineteDigitalPage implements OnInit { public NotificationsService: NotificationsService ) { + this.workerList = new Worker(new URL('./list.worker.js', import.meta.url)); + + this.workerList.onmessage = (oEvent) => { + this.AllProcess = oEvent.data + } + window.onresize = (event) => { // if not mobile remove all component if (window.innerWidth < 701) { @@ -571,6 +579,20 @@ export class GabineteDigitalPage implements OnInit { this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento) .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list) .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList) + + // try{ + // this.workerList.postMessage([ + // this.expedientegbstore.list,this.pedidosstore.listparecer,this.pedidosstore.listdeferimento, + // this.despachoprstore.list, this.eventoaprovacaostore.listmd, this.eventoaprovacaostore.listpr, this.despachoStore.list, + // this.deplomasStore.diplomasParaAssinarList, this.deplomasStore.diplomasAssinadoList, this.deplomasStore.DiplomaGerarList + // ]) + // } catch (e) { + // this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento) + // .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list) + // .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList) + // } + + } get getAllProcessCount() { diff --git a/src/app/pages/gabinete-digital/list.worker.js b/src/app/pages/gabinete-digital/list.worker.js new file mode 100644 index 000000000..adcecfb94 --- /dev/null +++ b/src/app/pages/gabinete-digital/list.worker.js @@ -0,0 +1,10 @@ +onmessage = function(oEvent) { + + + const list = Event.data + var a = [] + postMessage( + a.concat.apply([], [list]) + ); + +}; \ No newline at end of file diff --git a/src/app/services/chat/chat-methods.service.ts b/src/app/services/chat/chat-methods.service.ts index 379d048b5..abb25e3a4 100644 --- a/src/app/services/chat/chat-methods.service.ts +++ b/src/app/services/chat/chat-methods.service.ts @@ -25,6 +25,7 @@ export class ChatMethodsService { "end_date": data.end, "venue": data.venue, "id": data.id, + "calendarId": data.calendarId } } } 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 fbc5844a7..706229c88 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -585,7 +585,6 @@ export class NewEventPage implements OnInit { this.postEvent.CalendarName - const CalendarId = this.selectedCalendarId() let loader = this.toastService.loading(); @@ -643,15 +642,18 @@ export class NewEventPage implements OnInit { } selectedCalendarId () { + console.log('1:1',this.eventService.calendarNamesType,'2', this.CalendarName) if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postEvent.CalendarName == 'Oficial') { + console.log('1') return this.eventService.calendarNamesType[this.CalendarName]['OficialId'] } else if (this.eventService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postEvent.CalendarName == 'Pessoal') { - + console.log('2') return this.eventService.calendarNamesType[this.CalendarName]['PessoalId'] } else { + console.log('1:1',this.eventService.calendarNamesType,'2', this.CalendarName) return '11:11' } } diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html index 1bc3ba743..d2dc9f9cc 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html @@ -1,5 +1,5 @@ - +
Todas as tarefas
@@ -119,6 +119,4 @@
- - - + \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index df796b55d..2c2ce13a8 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "b890b58a8", - "SHA": "b890b58a86e4c459836236774015a1bc38ee0b1c", + "shortSHA": "16de34050", + "SHA": "16de340501dfaa35a26f36e5dfcc4424eec7f9f3", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Jan 18 11:59:53 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4652", + "lastCommitTime": "'Wed Jan 18 14:40:12 2023 +0100'", + "lastCommitMessage": "fix chat delete message", + "lastCommitNumber": "4653", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/events.service.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tnew file: src/app/pages/gabinete-digital/list.worker.js\n\tmodified: src/app/services/chat/chat-methods.service.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file