mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 12:37:53 +00:00
Merge branch 'master' of https://bitbucket.org/equilibriumito/gabinete-digital into master
This commit is contained in:
Tiago Kayaya
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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 {}
|
||||
@@ -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 {}
|
||||
@@ -1,60 +0,0 @@
|
||||
<ion-header>
|
||||
<ion-toolbar>
|
||||
<ion-buttons slot="start">
|
||||
<ion-button (click)="close()">
|
||||
<ion-icon name="chevron-back" slot="start"></ion-icon>
|
||||
</ion-button>
|
||||
</ion-buttons>
|
||||
<ion-title>Novo Processo</ion-title>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
|
||||
<ion-content padding>
|
||||
<ion-item-group>
|
||||
<ion-item>
|
||||
<ion-label position="stacked">Assunto</ion-label>
|
||||
<ion-input></ion-input>
|
||||
</ion-item>
|
||||
<ion-item>
|
||||
<ion-label position="stacked">Remetentes</ion-label>
|
||||
<ion-list>
|
||||
<ion-item>
|
||||
<ion-input></ion-input>
|
||||
</ion-item>
|
||||
</ion-list>
|
||||
</ion-item>
|
||||
<ion-item>
|
||||
<ion-label position="stacked">Data</ion-label>
|
||||
<ion-input></ion-input>
|
||||
</ion-item>
|
||||
<div class="div-attach">
|
||||
<ion-item>
|
||||
<ion-icon name="add" slot="end"></ion-icon>
|
||||
<ion-label class="attach-label">Anexos</ion-label>
|
||||
</ion-item>
|
||||
<div id="AttachFiles"></div>
|
||||
<ion-item lines="none">
|
||||
<ion-icon name="attach"></ion-icon>
|
||||
<ion-label color="secondary">Lei do orçamento geral do Estado</ion-label>
|
||||
<ion-icon name="trash" slot="end"></ion-icon>
|
||||
</ion-item>
|
||||
</div>
|
||||
</ion-item-group>
|
||||
</ion-content>
|
||||
<ion-footer class="ion-no-border">
|
||||
<ion-toolbar color="primary">
|
||||
<ion-buttons slot="start">
|
||||
<ion-button (click)="close()">
|
||||
<ion-label>Cancelar</ion-label>
|
||||
<ion-icon name="close" slot="start"></ion-icon>
|
||||
</ion-button>
|
||||
</ion-buttons>
|
||||
<ion-title>{{ viewTitle }}</ion-title>
|
||||
<ion-buttons slot="end">
|
||||
<ion-button (click)="save()">
|
||||
<ion-label>Guardar</ion-label>
|
||||
<ion-icon name="checkmark" slot="start"></ion-icon>
|
||||
</ion-button>
|
||||
</ion-buttons>
|
||||
</ion-toolbar>
|
||||
</ion-footer>
|
||||
@@ -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<ExpedienteModalPage>;
|
||||
|
||||
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();
|
||||
});
|
||||
});
|
||||
@@ -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...");
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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 => {
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user