From e30e38f253002d20e785b513021aa4d9d91fad3b Mon Sep 17 00:00:00 2001 From: Paulo Pinto Date: Fri, 28 Aug 2020 12:43:19 +0100 Subject: [PATCH] Refinamentos 1 --- src/app/app-routing.module.ts | 4 ---- .../attachments/attachments-routing.module.ts | 4 ---- .../events/attachments/attachments.page.ts | 22 +++-------------- .../viewer/viewer-routing.module.ts | 17 ------------- .../attachments/viewer/viewer.module.ts | 20 ---------------- .../attachments/viewer/viewer.page.html | 22 ----------------- .../attachments/viewer/viewer.page.scss | 0 .../attachments/viewer/viewer.page.spec.ts | 24 ------------------- .../events/attachments/viewer/viewer.page.ts | 21 ---------------- .../events/event-detail/event-detail.page.ts | 3 --- src/app/pages/feed/feed.page.ts | 4 ---- .../expediente-detail.page.ts | 6 ++--- .../gabinete-digital.page.html | 10 ++++---- .../gabinete-digital/gabinete-digital.page.ts | 7 +++--- src/app/services/loading.service.ts | 2 -- src/index.html | 2 +- 16 files changed, 16 insertions(+), 152 deletions(-) delete mode 100644 src/app/pages/events/attachments/viewer/viewer-routing.module.ts delete mode 100644 src/app/pages/events/attachments/viewer/viewer.module.ts delete mode 100644 src/app/pages/events/attachments/viewer/viewer.page.html delete mode 100644 src/app/pages/events/attachments/viewer/viewer.page.scss delete mode 100644 src/app/pages/events/attachments/viewer/viewer.page.spec.ts delete mode 100644 src/app/pages/events/attachments/viewer/viewer.page.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 617c14603..7fa9fe7ad 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -10,10 +10,6 @@ const routes: Routes = [ path: '', loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) }, - { - path: 'viewer', - loadChildren: () => import('./pages/events/attachments/viewer/viewer.module').then( m => m.ViewerPageModule) - }, /* { path: 'cal-modal', loadChildren: () => import('./pages/cal-modal/cal-modal.module').then( m => m.CalModalPageModule) diff --git a/src/app/pages/events/attachments/attachments-routing.module.ts b/src/app/pages/events/attachments/attachments-routing.module.ts index 5c1f17c5a..4ea13a050 100644 --- a/src/app/pages/events/attachments/attachments-routing.module.ts +++ b/src/app/pages/events/attachments/attachments-routing.module.ts @@ -7,10 +7,6 @@ const routes: Routes = [ { path: '', component: AttachmentsPage - }, - { - path: 'viewer', - loadChildren: () => import('./viewer/viewer.module').then( m => m.ViewerPageModule) } ]; diff --git a/src/app/pages/events/attachments/attachments.page.ts b/src/app/pages/events/attachments/attachments.page.ts index 4b3d9aedc..6e1974cdf 100644 --- a/src/app/pages/events/attachments/attachments.page.ts +++ b/src/app/pages/events/attachments/attachments.page.ts @@ -3,8 +3,6 @@ import { AttachmentsService } from 'src/app/services/attachments.service'; import { Attachment } from 'src/app/models/attachment.model'; import { ActivatedRoute, Router } from '@angular/router'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { AlertController, ModalController } from '@ionic/angular'; -import { ViewerPage } from 'src/app/pages/events/attachments/viewer/viewer.page' @Component({ selector: 'app-attachments', @@ -16,7 +14,7 @@ export class AttachmentsPage implements OnInit { loadedEventAttachments: Attachment[]; pageId: string; - constructor(private attachamentsService: AttachmentsService, private activatedRoute: ActivatedRoute, private iab: InAppBrowser, private route: Router, private modalCtrl: ModalController) { } + constructor(private attachamentsService: AttachmentsService, private activatedRoute: ActivatedRoute, private iab: InAppBrowser, private route: Router) { } ngOnInit() { /* Emit new data when something changes */ @@ -39,23 +37,9 @@ export class AttachmentsPage implements OnInit { async viewDocument(documenturl:string) { - //var ref = cordova.InAppBrowser.open(documenturl, '_blank', 'location=yes'); - - const browser = this.iab.create(documenturl, "_self") + const url: string = documenturl.replace("webTRIX.Viewer","webTRIX.Viewer/branch1"); + const browser = this.iab.create(url,"_blank"); browser.show(); - - // const modal = await this.modalCtrl.create({ - // component: ViewerPage, - // componentProps: { - // externalLink: documenturl - // }, - // cssClass: 'viewer', - // backdropDismiss: false - // }); - - // await modal.present(); - - // modal.onDidDismiss(); } navigateBack(){ diff --git a/src/app/pages/events/attachments/viewer/viewer-routing.module.ts b/src/app/pages/events/attachments/viewer/viewer-routing.module.ts deleted file mode 100644 index 53c069780..000000000 --- a/src/app/pages/events/attachments/viewer/viewer-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { ViewerPage } from './viewer.page'; - -const routes: Routes = [ - { - path: '', - component: ViewerPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class ViewerPageRoutingModule {} diff --git a/src/app/pages/events/attachments/viewer/viewer.module.ts b/src/app/pages/events/attachments/viewer/viewer.module.ts deleted file mode 100644 index 7521bc01b..000000000 --- a/src/app/pages/events/attachments/viewer/viewer.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { ViewerPageRoutingModule } from './viewer-routing.module'; - -import { ViewerPage } from './viewer.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - ViewerPageRoutingModule - ], - declarations: [ViewerPage] -}) -export class ViewerPageModule {} diff --git a/src/app/pages/events/attachments/viewer/viewer.page.html b/src/app/pages/events/attachments/viewer/viewer.page.html deleted file mode 100644 index fdeedbb71..000000000 --- a/src/app/pages/events/attachments/viewer/viewer.page.html +++ /dev/null @@ -1,22 +0,0 @@ - - - viewer - - - - - - - diff --git a/src/app/pages/events/attachments/viewer/viewer.page.scss b/src/app/pages/events/attachments/viewer/viewer.page.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/app/pages/events/attachments/viewer/viewer.page.spec.ts b/src/app/pages/events/attachments/viewer/viewer.page.spec.ts deleted file mode 100644 index e52b6f7b6..000000000 --- a/src/app/pages/events/attachments/viewer/viewer.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { ViewerPage } from './viewer.page'; - -describe('ViewerPage', () => { - let component: ViewerPage; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ViewerPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(ViewerPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/events/attachments/viewer/viewer.page.ts b/src/app/pages/events/attachments/viewer/viewer.page.ts deleted file mode 100644 index e899bad11..000000000 --- a/src/app/pages/events/attachments/viewer/viewer.page.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; - -@Component({ - selector: 'app-viewer', - templateUrl: './viewer.page.html', - styleUrls: ['./viewer.page.scss'], -}) -export class ViewerPage implements OnInit { - - externalLink: string; - externalLinkSanitized: SafeResourceUrl; - - constructor(public sanitizer: DomSanitizer) { } - - ngOnInit() { - this.externalLinkSanitized = this.sanitizer.bypassSecurityTrustResourceUrl(this.externalLink); - console.log(this.externalLinkSanitized); - } - -} diff --git a/src/app/pages/events/event-detail/event-detail.page.ts b/src/app/pages/events/event-detail/event-detail.page.ts index 44eada819..6b8deca1b 100644 --- a/src/app/pages/events/event-detail/event-detail.page.ts +++ b/src/app/pages/events/event-detail/event-detail.page.ts @@ -78,9 +78,6 @@ export class EventDetailPage implements OnInit { async deleteConfirm() { - console.log(this.loadedEvent.Attendees); - console.log(this.loadedEvent.CalendarName); - const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Apagar evento!', diff --git a/src/app/pages/feed/feed.page.ts b/src/app/pages/feed/feed.page.ts index 818b140e9..707318b96 100644 --- a/src/app/pages/feed/feed.page.ts +++ b/src/app/pages/feed/feed.page.ts @@ -25,17 +25,13 @@ export class FeedPage implements OnInit { timeDate = this.today.getHours() + ":" + this.today.getMinutes(); showGreeting(){ if(this.today.getHours() >= 6 && this.today.getHours() < 12){ - console.log(this.grettings[0]+this.today.getHours()); this.greetting = this.grettings[0]; } else if(this.today.getHours() >= 12 && this.today.getHours() < 18){ - console.log(this.grettings[1]+this.today.getHours()); this.greetting = this.grettings[1]; } else /* if(this.today.getHours() < 6 && this.today.getHours() >= 18) */{ - console.log(this.grettings[2]+this.today.getHours()); this.greetting = this.grettings[2]; - } } 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 ae8c912e8..8313f2758 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 @@ -16,8 +16,7 @@ export class ExpedienteDetailPage implements OnInit { constructor(private activateRoute: ActivatedRoute, private processes:ProcessesService, - private iab: InAppBrowser, - private loadingService: LoadingService) { } + private iab: InAppBrowser) { } task: DailyWorkTask; @@ -48,7 +47,8 @@ export class ExpedienteDetailPage implements OnInit { viewDocument() { - const browser = this.iab.create(this.task.DocumentURL,"_blank"); + const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer/branch1"); + const browser = this.iab.create(url,"_blank"); browser.show(); } } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index e640caa95..dbbcf6072 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -21,11 +21,11 @@ Correspondência {{ count_exp_dailywork }} - + Pedidos de parecer {{count_exp_pp}} - + Pedidos de deferimento {{count_exp_pd}} @@ -36,11 +36,11 @@ Diplomas - + Assinados pelo PR {{count_dip_apr}} - + Por validar (MDGPR) {{count_dip_pv}} @@ -51,7 +51,7 @@ Despachos Efectuados - + Presidente da República {{count_de_pr}} diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index e627dee0e..db29e2438 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ProcessesService } from 'src/app/services/processes.service'; +import { AlertService } from 'src/app/services/alert.service'; @Component({ selector: 'app-gabinete-digital', @@ -11,7 +12,7 @@ export class GabineteDigitalPage implements OnInit { segment:string; showLoader: boolean; - constructor(private processesbackend:ProcessesService) { } + constructor(private processesbackend:ProcessesService, private alertService: AlertService) { } count_exp_dailywork : number; count_exp_pp : string; @@ -46,9 +47,9 @@ export class GabineteDigitalPage implements OnInit { }, 2000); } - load() + notImplemented() { - + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } } diff --git a/src/app/services/loading.service.ts b/src/app/services/loading.service.ts index 40e600392..6b884d4e6 100644 --- a/src/app/services/loading.service.ts +++ b/src/app/services/loading.service.ts @@ -17,7 +17,6 @@ export class LoadingService { await loading.present(); const { role, data } = await loading.onDidDismiss(); - console.log('Loading dismissed!'); } async customizedLoading() { @@ -32,7 +31,6 @@ export class LoadingService { await loading.present(); const { role, data } = await loading.onDidDismiss(); - console.log('Loading dismissed with role:', role); } } diff --git a/src/index.html b/src/index.html index 00db3737a..67272b208 100644 --- a/src/index.html +++ b/src/index.html @@ -3,7 +3,7 @@ - Ionic App + Gabinete Digital