diff --git a/src/app/pages/events/attachments/attachments.page.ts b/src/app/pages/events/attachments/attachments.page.ts
index 6e1974cdf..733310fa2 100644
--- a/src/app/pages/events/attachments/attachments.page.ts
+++ b/src/app/pages/events/attachments/attachments.page.ts
@@ -37,7 +37,7 @@ export class AttachmentsPage implements OnInit {
async viewDocument(documenturl:string)
{
- const url: string = documenturl.replace("webTRIX.Viewer","webTRIX.Viewer/branch1");
+ const url: string = documenturl.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
const browser = this.iab.create(url,"_blank");
browser.show();
}
diff --git a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal-routing.module.ts b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal-routing.module.ts
deleted file mode 100644
index a109fe905..000000000
--- a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { ExpedienteModalPage } from './expediente-modal.page';
-
-const routes: Routes = [
- {
- path: '',
- component: ExpedienteModalPage
- }
-];
-
-@NgModule({
- imports: [RouterModule.forChild(routes)],
- exports: [RouterModule],
-})
-export class ExpedienteModalPageRoutingModule {}
diff --git a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.module.ts b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.module.ts
deleted file mode 100644
index 281bb0bbf..000000000
--- a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.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 { ExpedienteModalPageRoutingModule } from './expediente-modal-routing.module';
-
-import { ExpedienteModalPage } from './expediente-modal.page';
-
-@NgModule({
- imports: [
- CommonModule,
- FormsModule,
- IonicModule,
- ExpedienteModalPageRoutingModule
- ],
- declarations: [ExpedienteModalPage]
-})
-export class ExpedienteModalPageModule {}
diff --git a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.html b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.html
deleted file mode 100644
index 1db40d94c..000000000
--- a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.html
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
- Novo Processo
-
-
-
-
-
-
- Assunto
-
-
-
- Remetentes
-
-
-
-
-
-
-
- Data
-
-
-
-
-
- Anexos
-
-
-
-
- Lei do orçamento geral do Estado
-
-
-
-
-
-
-
-
-
- Cancelar
-
-
-
- {{ viewTitle }}
-
-
- Guardar
-
-
-
-
-
diff --git a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.scss b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.spec.ts b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.spec.ts
deleted file mode 100644
index 399b84a95..000000000
--- a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { IonicModule } from '@ionic/angular';
-
-import { ExpedienteModalPage } from './expediente-modal.page';
-
-describe('ExpedienteModalPage', () => {
- let component: ExpedienteModalPage;
- let fixture: ComponentFixture;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [ ExpedienteModalPage ],
- imports: [IonicModule.forRoot()]
- }).compileComponents();
-
- fixture = TestBed.createComponent(ExpedienteModalPage);
- component = fixture.componentInstance;
- fixture.detectChanges();
- }));
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.ts b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.ts
deleted file mode 100644
index b97866bc3..000000000
--- a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ModalController } from '@ionic/angular';
-import { LoadingService } from 'src/app/services/loading.service';
-
-@Component({
- selector: 'app-expediente-modal',
- templateUrl: './expediente-modal.page.html',
- styleUrls: ['./expediente-modal.page.scss'],
-})
-export class ExpedienteModalPage implements OnInit {
-
- viewTitle: string;
-
- expediente = {
- title: '',
- desc: '',
- };
-
- modalReady = false;
-
- constructor(private modalCtrl: ModalController, private loadingService: LoadingService) { }
-
- ngOnInit() {
- this.loading();
- }
-
- ngAfterViewInit(): void {
- setTimeout(()=>{
- this.modalReady = true;
- }, 0);
- }
-
- save(){
- this.modalCtrl.dismiss({event: this.expediente})
- }
-
- onViewTitleChanged(title){
- this.viewTitle = title;
- }
-
- onTimeSelected(ev){
-
- }
-
- close(){
- this.modalCtrl.dismiss();
- }
- loading(){
- this.loadingService.simpleLoading("A carregar...");
- }
-}
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 8313f2758..fe107dd68 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
@@ -47,7 +47,7 @@ export class ExpedienteDetailPage implements OnInit {
viewDocument()
{
- const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer/branch1");
+ 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/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 4e8e8e922..e56518733 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -1,7 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { ModalController } from '@ionic/angular';
-import { ExpedienteModalPage } from '../expediente-modal/expediente-modal.page';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -23,9 +22,8 @@ export class ExpedientePage implements OnInit {
taskslist:DailyWorkTask[];
constructor(
- private router: Router,private modalCtrl: ModalController,
- private processes:ProcessesService,
- private loadingService:LoadingService) { }
+ private modalCtrl: ModalController,
+ private processes:ProcessesService) { }
ngOnInit() {
//Inicializar segment
@@ -33,18 +31,6 @@ export class ExpedientePage implements OnInit {
this.LoadList();
}
- async openExpedienteModal(){
- const modal = await this.modalCtrl.create({
- component: ExpedienteModalPage,
- cssClass: 'expediente-modal',
- backdropDismiss: false
- });
-
- await modal.present();
-
- modal.onDidDismiss();
- }
-
LoadList()
{
this.processes.GetTasksList("Expediente", false).subscribe(result => {
diff --git a/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts b/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts
index 03f601326..3e3287a2e 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts
@@ -11,10 +11,6 @@ const routes: Routes = [
{
path: 'expediente',
loadChildren: () => import('./expediente/expediente.module').then( m => m.ExpedientePageModule)
- },
- {
- path: 'expediente-modal',
- loadChildren: () => import('../../pages/gabinete-digital/expediente-modal/expediente-modal.module').then( m => m.ExpedienteModalPageModule)
}
];