diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts index e7da18647..dd3968b89 100644 --- a/src/app/modals/view-document/view-document.page.ts +++ b/src/app/modals/view-document/view-document.page.ts @@ -45,7 +45,8 @@ export class ViewDocumentPage implements OnInit { ngOnInit() { this.processes.GetViewer(this.docId, this.applicationId).subscribe(res=> { - const link: string = res; + console.log(res) + const link: string = res.replace('//pdfjs/web/', '/pdfjs/web/') this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(link); }, ()=>{ this.close(); diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index b06bcb2c8..515a2864f 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -636,7 +636,7 @@ export class SearchPage implements OnInit { } } - clearInputRemetente(){ + clearInputRemetente() { this.searchSender = ""; } @@ -758,9 +758,11 @@ export class SearchPage implements OnInit { } else if(this.type == "AccoesPresidenciais & ArquivoDespachoElect") { - if(ApplicationType == '8' || ApplicationType == '361') { - + // 361 + if(ApplicationType == '8') { this.viewDocumentDetail(Id, ApplicationType); + } else if (ApplicationType == '361') { + this.viewDocumentModal(searchDocument) } } } @@ -805,4 +807,44 @@ export class SearchPage implements OnInit { } + + async viewDocumentModal(LoadedDocument) { + + console.log(LoadedDocument) + const selectedDoc = LoadedDocument + + let task = { + serialNumber: '', + taskStartDate: '', + isEvent: true, + workflowInstanceDataFields: { + FolderID: '', + Subject: LoadedDocument.SourceName || LoadedDocument.Assunto, + SourceSecFsID: LoadedDocument.ApplicationId || LoadedDocument.ApplicationType, + SourceType: 'DOC', + SourceID: LoadedDocument.Id || LoadedDocument.Id, + DispatchNumber: '' + } + } + + const modal = await this.modalController.create({ + component: ViewDocumentPage, + componentProps: { + trustedUrl: '', + file: { + title: task.workflowInstanceDataFields.Subject, + url: '', + title_link: '', + }, + Document: LoadedDocument, + applicationId: task.workflowInstanceDataFields.SourceSecFsID, + docId: task.workflowInstanceDataFields.SourceID , + folderId: '', + task: task + }, + cssClass: 'modal modal-desktop' + }); + await modal.present(); + } + } diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index c098c7df7..7f6b01435 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -441,9 +441,15 @@ export class EventsService { for (let calendar of this.loggeduser.OwnerCalendars) { if (calendar.CalendarName == 'Oficial') { prO = await this.getAllMdOficialEvents(startdate, enddate).toPromise(); + if(!Array.isArray(prO)) { + prO = [] + } } if(calendar.CalendarName == 'Pessoal') { prP = await this.getAllMdPessoalEvents(startdate, enddate).toPromise(); + if(!Array.isArray(prP)) { + prP = [] + } } } @@ -462,10 +468,16 @@ export class EventsService { if(this.hasOwnOficial) { ownO = await this.getAllOwnOficialEvents(startdate, enddate).toPromise(); + if(!Array.isArray(ownO)) { + ownO = [] + } } if(this.hasOwnPessoal) { ownP = await this.getAllOwnPessoalEvents(startdate, enddate).toPromise(); + if(!Array.isArray(ownP)) { + ownP = [] + } } const resFinal = ownO.concat(ownP); 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 1cdfb3481..004a4d1ea 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -134,7 +134,7 @@ export class NewActionPage implements OnInit { this.getActions.emit() } catch (error) { this.toastService._badRequest('Não foi possivel criar a acção presidencial') - } finally { + } finally { loader.remove() } diff --git a/version/git-version.ts b/version/git-version.ts index 062d7099b..f43500f0a 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "252157df1", - "SHA": "252157df19a1afcedf7ed740291a1a63d1098dad", + "shortSHA": "85eafdea1", + "SHA": "85eafdea13c8cdf0e437d351fd0abf5ba7801952", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Jan 17 15:53:17 2023 +0100'", - "lastCommitMessage": "improve agenda", - "lastCommitNumber": "4644", - "change": "diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html\nindex 38d2679d0..f6323e183 100644\n--- a/src/app/pages/agenda/new-event/new-event.page.html\n+++ b/src/app/pages/agenda/new-event/new-event.page.html\n@@ -30,7 +30,7 @@\n \n \n
Agenda de {{calendars}}
\n-
Agenda de {{loggeduser.FullName}}
\n+
Agenda de {{loggeduser.FullName}}
\n \n
\n \ndiff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts\nindex a1bf277c6..5eaaa4bbc 100644\n--- a/src/app/pages/agenda/new-event/new-event.page.ts\n+++ b/src/app/pages/agenda/new-event/new-event.page.ts\n@@ -103,15 +103,6 @@ export class NewEventPage implements OnInit {\n this.selectedDate = this.navParams.get('eventSelectedDate');\n this.taskParticipants = this.navParams.get('attendees');\n \n-\n- if(!this.CalendarName) {\n- if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n- this.CalendarName = 'Meu calendario';\n- } else if(this.eventService.calendarNamesAry.length == 1 ) {\n- this.CalendarName = this.eventService.calendarNamesAry[0]\n- }\n- }\n-\n }\n \n ngOnInit() {\n@@ -119,6 +110,13 @@ export class NewEventPage implements OnInit {\n this.CalendarName = this.loggeduser.Profile;\n this.selectedRecurringType = \"-1\";\n \n+ if(!this.CalendarName) {\n+ if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n+ this.CalendarName = 'Meu calendario';\n+ } else {\n+ this.CalendarName = this.eventService.calendarNamesAry[0]\n+ }\n+ }\n \n \n this.getRecurrenceTypes();\ndiff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html\nindex 34b8207b2..0be3e0bc3 100644\n--- a/src/app/shared/agenda/new-event/new-event.page.html\n+++ b/src/app/shared/agenda/new-event/new-event.page.html\n@@ -41,7 +41,7 @@\n \n \n
Agenda de {{calendars}}
\n-
Agenda de {{loggeduser.FullName}}
\n+
Agenda de {{loggeduser.FullName}}
\n
\n \n \ndiff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts\nindex 5b5a67ed9..fbc5844a7 100644\n--- a/src/app/shared/agenda/new-event/new-event.page.ts\n+++ b/src/app/shared/agenda/new-event/new-event.page.ts\n@@ -140,7 +140,7 @@ export class NewEventPage implements OnInit {\n if(!this.CalendarName) {\n if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n this.CalendarName = 'Meu calendario';\n- } else if(this.eventService.calendarNamesAry.length == 1 ) {\n+ } else {\n this.CalendarName = this.eventService.calendarNamesAry[0]\n }\n }", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts", + "lastCommitTime": "'Tue Jan 17 16:11:56 2023 +0100'", + "lastCommitMessage": "fix gabinete", + "lastCommitNumber": "4645", + "change": "", + "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/pages/search/search.page.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/shared/publication/new-action/new-action.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file