diff --git a/package-lock.json b/package-lock.json index 0356fc6d8..327dd8601 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21752,6 +21752,15 @@ "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" }, + "ng2-pdf-viewer": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/ng2-pdf-viewer/-/ng2-pdf-viewer-7.0.1.tgz", + "integrity": "sha512-kjjsvHd5t1Ff7ydb3Far3d6cSyw/XJH5KXgcp/0bFzSFBAV2c5aOghxoY/yQVjgG+R6F16nVUh2UrZdngLXLSg==", + "requires": { + "pdfjs-dist": "~2.7.570", + "tslib": "^2.0.0" + } + }, "ngx-socket-io": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/ngx-socket-io/-/ngx-socket-io-3.2.0.tgz", @@ -22617,6 +22626,11 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" }, + "pdfjs-dist": { + "version": "2.7.570", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.7.570.tgz", + "integrity": "sha512-/ZkA1FwkEOyDaq11JhMLazdwQAA0F9uwrP7h/1L9Akt9KWh1G5/tkzS+bPuUELq2s2GDFnaT+kooN/aSjT7DXQ==" + }, "pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", diff --git a/package.json b/package.json index 8e99fe4b8..d4d5367b1 100644 --- a/package.json +++ b/package.json @@ -93,6 +93,7 @@ "jetifier": "^1.6.6", "lite-server": "^2.6.1", "moment": "^2.29.1", + "ng2-pdf-viewer": "^7.0.1", "ngx-socket-io": "^3.2.0", "puppeteer": "^10.1.0", "rxjs": "~6.6.3", diff --git a/src/app/OtherService/document-counter.service.ts b/src/app/OtherService/document-counter.service.ts index 93a91d208..bf9f37521 100644 --- a/src/app/OtherService/document-counter.service.ts +++ b/src/app/OtherService/document-counter.service.ts @@ -26,14 +26,14 @@ export class DocumentCounterService { // falta a contagem dos deplomas get mdTotalDocument(): number { - return this.despachoStore.count + this.expedienteGbStore.count + this.pedidosStore.countdeferimento - + this.pedidosStore.countparecer + this.expedientePrStore.count + this.despachoPrStore.count + this.pendentesStore.count + return this.despachoStore.count + /** this.expedientePrStore.count + */ this.pedidosStore.countdeferimento + + this.pedidosStore.countparecer + this.expedienteGbStore.count + this.despachoPrStore.count + this.pendentesStore.count + this.eventoAprovacaoStore.count + this.deplomasStore.diplomasListCount + this.deplomasStore.countDiplomasAssinadoListCount + this.deplomasStore.deplomasReviewCount } get prTotalDocument(): number { - return this.despachoStore.count + this.expedienteGbStore.count + this.pedidosStore.countdeferimento - + this.pedidosStore.countparecer + this.expedientePrStore.count + this.despachoPrStore.count + this.pendentesStore.count + return this.despachoStore.count + /** this.expedientePrStore.count + */ this.pedidosStore.countdeferimento + + this.pedidosStore.countparecer + this.expedienteGbStore.count + this.despachoPrStore.count + this.pendentesStore.count + this.eventoAprovacaoStore.count + this.deplomasStore.diplomasListCount + this.deplomasStore.countDiplomasAssinadoListCount + this.deplomasStore.deplomasReviewCount } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c8f7c50b9..ea7ce1aef 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -54,6 +54,9 @@ import { far } from '@fortawesome/free-regular-svg-icons' import { fab } from '@fortawesome/free-brands-svg-icons' import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; +import { PdfViewerModule } from 'ng2-pdf-viewer'; + + @NgModule({ declarations: [AppComponent], entryComponents: [], @@ -84,6 +87,8 @@ import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; MatSelectModule, MatDialogModule, + // + PdfViewerModule ], providers: [ { provide: MAT_DATE_LOCALE, useValue: 'pt' }, diff --git a/src/app/pages/events/events.module.ts b/src/app/pages/events/events.module.ts index df42957a9..dbac51237 100644 --- a/src/app/pages/events/events.module.ts +++ b/src/app/pages/events/events.module.ts @@ -11,6 +11,7 @@ import { EventsPage } from './events.page'; import { HeaderNoSearchPageModule } from 'src/app/shared/headers/header-no-search/header-no-search.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { PdfViewerModule } from 'ng2-pdf-viewer'; @NgModule({ imports: [ @@ -19,6 +20,8 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; IonicModule, EventsPageRoutingModule, HeaderPageModule, + // + PdfViewerModule ], declarations: [EventsPage], schemas: [CUSTOM_ELEMENTS_SCHEMA] diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 7e067c269..f600014db 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -112,4 +112,11 @@ + + + + diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 8bca24ba2..da6483b96 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -69,7 +69,8 @@ export class EventsPage implements OnInit { loggeduser: User; existingScreenOrientation: string; - + pdfSrc = "https://vadimdez.github.io/ng2-pdf-viewer/assets/pdf-test.pdf"; + constructor( private eventService: EventsService, private router: Router, diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 0f3d1709e..a68f3bbb2 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -120,7 +120,7 @@

Expediente Presidente

Expediente

-

{{expedienteprstore.count}} Documentos

+

not {{expedienteprstore.count}} Documentos

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index c971df302..1c5977f2c 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -95,7 +95,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { despachoStore = DespachoStore; eventoaprovacaostore = EventoAprovacaoStore; pedidosstore = PedidosStore; - expedienteprstore = ExpedienteprStore; + // expedienteprstore = ExpedienteprStore; despachoprstore = DespachosprStore; totalDocumentStore = TotalDocumentStore deplomasStore = DeplomasStore @@ -459,11 +459,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.expedientegbstore.count = this.count_exp_dailywork; this.expedientegbstore.reset(expedientes) - let expedientes_pr = await this.processesbackend.GetTasksList("Expediente", false).toPromise(); - expedientes_pr = expedientes_pr.filter(data => data.workflowInstanceDataFields.Status == "Active") - this.count_exp_pr = Object.keys(expedientes_pr).length; - this.expedienteprstore.count = this.count_exp_pr; - this.expedienteprstore.reset(expedientes_pr) let despachos = await this.processesbackend.GetTasksList("Despacho", false).toPromise(); despachos = despachos.filter(data => data.workflowInstanceDataFields.Status == "Active")