mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer
This commit is contained in:
@@ -193,7 +193,7 @@ export class DocumentViewerPage implements OnInit {
|
|||||||
|
|
||||||
pdfDoc.getPage(1).then(function(page) {
|
pdfDoc.getPage(1).then(function(page) {
|
||||||
// you can now use *page* here
|
// you can now use *page* here
|
||||||
alert('first page')
|
// alert('first page')
|
||||||
});
|
});
|
||||||
|
|
||||||
// Initial/first page rendering
|
// Initial/first page rendering
|
||||||
|
|||||||
+22
-3
@@ -3,7 +3,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
|
|||||||
import { AttachmentsService } from 'src/app/services/attachments.service';
|
import { AttachmentsService } from 'src/app/services/attachments.service';
|
||||||
import { EventsService } from 'src/app/services/events.service';
|
import { EventsService } from 'src/app/services/events.service';
|
||||||
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
|
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 { Event } from '../../../../models/event.model';
|
||||||
import { ModalController, PopoverController } from '@ionic/angular';
|
import { ModalController, PopoverController } from '@ionic/angular';
|
||||||
import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page';
|
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 { ExpedienteService } from 'src/app/Rules/expediente.service';
|
||||||
import { expedienteTask } from 'src/app/models/dailyworktask.model';
|
import { expedienteTask } from 'src/app/models/dailyworktask.model';
|
||||||
import { TaskService } from 'src/app/Rules/task.service';
|
import { TaskService } from 'src/app/Rules/task.service';
|
||||||
|
import { DocumentViewerPage } from 'src/app/modals/document-viewer/document-viewer.page';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-expediente-detail',
|
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) {
|
getAttachments(serialNumber) {
|
||||||
console.log(serialNumber);
|
console.log(serialNumber);
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -101,7 +101,7 @@ export class PublicationDetailPage implements OnInit {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async deletePost(){
|
async deletePost() {
|
||||||
|
|
||||||
const loader = this.toastService.loading()
|
const loader = this.toastService.loading()
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import { Optional } from '@angular/core';
|
|||||||
import { JsonStore } from './jsonStore.service';
|
import { JsonStore } from './jsonStore.service';
|
||||||
import { synchro } from './socket/synchro.service';
|
import { synchro } from './socket/synchro.service';
|
||||||
import { v4 as uuidv4 } from 'uuid'
|
import { v4 as uuidv4 } from 'uuid'
|
||||||
|
import { SessionStore } from '../store/session.service';
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
@@ -110,7 +111,7 @@ export class NotificationsService {
|
|||||||
console.log('STORAGE TOKEN', value)
|
console.log('STORAGE TOKEN', value)
|
||||||
this.storageService.get(AuthConnstants.USER).then(res => {
|
this.storageService.get(AuthConnstants.USER).then(res => {
|
||||||
console.log('USERID', res);
|
console.log('USERID', res);
|
||||||
const headers = { 'Authorization': 'Basic cGF1bG8ucGludG9AZ2FiaW5ldGVkaWdpdGFsLmxvY2FsOnRhYnRlc3RlQDAwNg==' };
|
const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
|
||||||
const body = {
|
const body = {
|
||||||
UserId: res.UserId,
|
UserId: res.UserId,
|
||||||
TokenId: successResponse.deviceId,
|
TokenId: successResponse.deviceId,
|
||||||
|
|||||||
@@ -9928,6 +9928,8 @@ function getDocument(src) {
|
|||||||
source = src;
|
source = src;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log('source================================================', source)
|
||||||
|
|
||||||
var params = Object.create(null);
|
var params = Object.create(null);
|
||||||
var rangeTransport = null,
|
var rangeTransport = null,
|
||||||
worker = null;
|
worker = null;
|
||||||
@@ -10000,7 +10002,9 @@ function getDocument(src) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
(0, _util.setVerbosityLevel)(params.verbosity);
|
(0, _util.setVerbosityLevel)(params.verbosity);
|
||||||
|
|
||||||
|
console.log('params=======================', params)
|
||||||
|
|
||||||
if (!worker) {
|
if (!worker) {
|
||||||
var workerParams = {
|
var workerParams = {
|
||||||
verbosity: params.verbosity,
|
verbosity: params.verbosity,
|
||||||
|
|||||||
Reference in New Issue
Block a user