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 438e00020..81bf54351 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';
import { SqliteService } from 'src/app/services/sqlite.service';
import { Platform } from '@ionic/angular';
@@ -355,11 +356,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/app/services/notifications.service.ts b/src/app/services/notifications.service.ts
index 44d7c344d..957510944 100644
--- a/src/app/services/notifications.service.ts
+++ b/src/app/services/notifications.service.ts
@@ -16,6 +16,8 @@ import { JsonStore } from './jsonStore.service';
import { synchro } from './socket/synchro.service';
import { v4 as uuidv4 } from 'uuid';
import { EventTrigger } from '../services/eventTrigger.service';
+import { SessionStore } from '../store/session.service';
+
@Injectable({
providedIn: 'root'
})
@@ -112,7 +114,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,
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,
diff --git a/src/index.html b/src/index.html
index d33d13727..b0a3d5496 100644
--- a/src/index.html
+++ b/src/index.html
@@ -14,6 +14,7 @@
+