From 07823d856af095f3a83b6692df2bcc35c5c0a05d Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 30 Sep 2021 13:31:17 +0100 Subject: [PATCH 1/2] Fix --- .../document-viewer/document-viewer.page.ts | 2 +- .../expediente-detail.page.ts | 25 ++++++++++++++++--- .../publication-detail.page.ts | 2 +- src/assets/www/pdfjs/build/pdf.js | 6 ++++- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/app/modals/document-viewer/document-viewer.page.ts b/src/app/modals/document-viewer/document-viewer.page.ts index 101a06365..c03b9b3f3 100644 --- a/src/app/modals/document-viewer/document-viewer.page.ts +++ b/src/app/modals/document-viewer/document-viewer.page.ts @@ -193,7 +193,7 @@ export class DocumentViewerPage implements OnInit { pdfDoc.getPage(1).then(function(page) { // you can now use *page* here - alert('first page') + // alert('first page') }); // Initial/first page rendering diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 488cc9a8d..2763e609e 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -3,7 +3,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { Event } from '../../../../models/event.model'; import { ModalController, PopoverController } from '@ionic/angular'; import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page'; @@ -22,6 +22,7 @@ import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe'; import { ExpedienteService } from 'src/app/Rules/expediente.service'; import { expedienteTask } from 'src/app/models/dailyworktask.model'; import { TaskService } from 'src/app/Rules/task.service'; +import { DocumentViewerPage } from 'src/app/modals/document-viewer/document-viewer.page'; @Component({ selector: 'app-expediente-detail', @@ -301,11 +302,29 @@ export class ExpedienteDetailPage implements OnInit { } - viewDocument(DocId:string) { + async viewDocument(DocId:string) { - this.expedienteService.viewDocument({ApplicationId:'361', DocId}) + const modal = await this.modalController.create({ + component: DocumentViewerPage, + cssClass: 'modal-desktop modal', + componentProps: { + DocId: DocId + } + }); + await modal.present(); + modal.onDidDismiss().then( async (res)=> { + }); + + + + } + // viewDocument(DocId:string) { + + // this.expedienteService.viewDocument({ApplicationId:'361', DocId}) + // } + getAttachments(serialNumber) { console.log(serialNumber); diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts index 02485a606..e4d305800 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts @@ -101,7 +101,7 @@ export class PublicationDetailPage implements OnInit { } - async deletePost(){ + async deletePost() { const loader = this.toastService.loading() diff --git a/src/assets/www/pdfjs/build/pdf.js b/src/assets/www/pdfjs/build/pdf.js index 0dfefedbd..0281ecd4a 100644 --- a/src/assets/www/pdfjs/build/pdf.js +++ b/src/assets/www/pdfjs/build/pdf.js @@ -9928,6 +9928,8 @@ function getDocument(src) { source = src; } + console.log('source================================================', source) + var params = Object.create(null); var rangeTransport = null, worker = null; @@ -10000,7 +10002,9 @@ function getDocument(src) { } (0, _util.setVerbosityLevel)(params.verbosity); - + + console.log('params=======================', params) + if (!worker) { var workerParams = { verbosity: params.verbosity, From 8b2bfd9fccbb37a406b4528741cb1e30e1561d91 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 30 Sep 2021 15:42:51 +0100 Subject: [PATCH 2/2] add autorization --- src/app/services/notifications.service.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index 54bd07f16..073fb8c28 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -15,6 +15,7 @@ import { Optional } from '@angular/core'; import { JsonStore } from './jsonStore.service'; import { synchro } from './socket/synchro.service'; import { v4 as uuidv4 } from 'uuid' +import { SessionStore } from '../store/session.service'; @Injectable({ providedIn: 'root' }) @@ -110,7 +111,7 @@ export class NotificationsService { console.log('STORAGE TOKEN', value) this.storageService.get(AuthConnstants.USER).then(res => { console.log('USERID', res); - const headers = { 'Authorization': 'Basic cGF1bG8ucGludG9AZ2FiaW5ldGVkaWdpdGFsLmxvY2FsOnRhYnRlc3RlQDAwNg==' }; + const headers = { 'Authorization': SessionStore.user.BasicAuthKey }; const body = { UserId: res.UserId, TokenId: successResponse.deviceId,