New changes added + AddEvent method partially done

This commit is contained in:
Tiago Kayaya
2020-08-20 14:28:50 +01:00
parent ffa9ecd1fe
commit 65c4cabcbf
24 changed files with 418 additions and 170 deletions
@@ -0,0 +1,17 @@
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 {}
@@ -0,0 +1,20 @@
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 {}
@@ -0,0 +1,60 @@
<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>
@@ -0,0 +1,24 @@
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();
});
});
@@ -0,0 +1,46 @@
import { Component, OnInit } from '@angular/core';
import { ModalController } from '@ionic/angular';
@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) { }
ngOnInit() {
}
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();
}
}
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { ExpedienteDetailPage } from './expediente-detail.page';
const routes: Routes = [
{
path: '',
component: ExpedienteDetailPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class ExpedienteDetailPageRoutingModule {}
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { ExpedienteDetailPageRoutingModule } from './expediente-detail-routing.module';
import { ExpedienteDetailPage } from './expediente-detail.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
ExpedienteDetailPageRoutingModule
],
declarations: [ExpedienteDetailPage]
})
export class ExpedienteDetailPageModule {}
@@ -0,0 +1,40 @@
<ion-header>
<ion-toolbar>
<ion-buttons slot="start">
<ion-back-button defaultHref="/expediente"></ion-back-button>
</ion-buttons>
<ion-title>Detalhes do Processo</ion-title>
</ion-toolbar>
</ion-header>
<ion-content padding>
<ion-item-group>
<ion-item>
<ion-label position="stacked">Assunto</ion-label>
<ion-input value='Reunião de Conselho de Ministros'></ion-input>
</ion-item>
<ion-item>
<ion-label position="stacked">Remetentes</ion-label>
<ion-list>
<ion-item>
<ion-input value='MINEC'></ion-input>
</ion-item>
</ion-list>
</ion-item>
<ion-item>
<ion-label position="stacked">Data</ion-label>
<ion-input value=''></ion-input>
</ion-item>
<ion-list>
<ion-list-header>Documentos a Anexar</ion-list-header>
<ion-item>
<ion-icon name="attach" slot="start"></ion-icon>
<ion-label>Lei do orçamento geral do Estado</ion-label>
</ion-item>
</ion-list>
</ion-item-group>
<div class="event-detail-buttons">
<ion-button class="ion-button-right">Guardar</ion-button>
</div>
</ion-content>
@@ -0,0 +1,14 @@
.event-detail-buttons{
width: 80%;
margin: 10px auto;
}
.event-detail-buttons ion-button{
width: 40%;
}
.ion-button-left{
float: left;
background: none;
}
.ion-button-right{
float: right;
}
@@ -0,0 +1,24 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { ExpedienteDetailPage } from './expediente-detail.page';
describe('ExpedienteDetailPage', () => {
let component: ExpedienteDetailPage;
let fixture: ComponentFixture<ExpedienteDetailPage>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ExpedienteDetailPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(ExpedienteDetailPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-expediente-detail',
templateUrl: './expediente-detail.page.html',
styleUrls: ['./expediente-detail.page.scss'],
})
export class ExpedienteDetailPage implements OnInit {
constructor() { }
ngOnInit() {
}
}
@@ -7,6 +7,10 @@ const routes: Routes = [
{
path: '',
component: ExpedientePage
},
{
path: 'expediente-detail',
loadChildren: () => import('./expediente-detail/expediente-detail.module').then( m => m.ExpedienteDetailPageModule)
}
];
@@ -24,7 +24,7 @@
<ion-item-sliding>
<ion-item lines="none">
<div class="div-content-expediente">
<ion-item lines="none">
<ion-item lines="none" [routerLink]="['/home/gabinete-digital/1/1']">
<ion-icon slot="end" name="document-outline"></ion-icon>
<h3>Reunião de Conselho de Ministros</h3>
</ion-item>
@@ -50,19 +50,9 @@
</ion-item-group>
</ion-list>
</div>
<!-- <p>Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
</p> -->
<ion-fab vertical="bottom" horizontal="end" slot="fixed">
<ion-fab-button>
<ion-icon name="create"></ion-icon>
<ion-icon name="create" (click)="openExpedienteModal()"></ion-icon>
</ion-fab-button>
</ion-fab>
</ion-content>
@@ -1,4 +1,8 @@
import { Component, OnInit } from '@angular/core';
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';
@Component({
selector: 'app-expediente',
@@ -9,11 +13,50 @@ export class ExpedientePage implements OnInit {
segment:string;
constructor() { }
@ViewChild(CalendarComponent) myCal: CalendarComponent;
constructor(private router: Router,private modalCtrl: ModalController ) { }
ngOnInit() {
//Inicializar segment
this.segment = "expediente";
}
async openExpedienteModal(){
const modal = await this.modalCtrl.create({
component: ExpedienteModalPage,
cssClass: 'expediente-modal',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then((result) => {
if (result.data && result.data.event) {
let event = result.data.event;
if (event.allDay) {
let start = event.startTime;
event.startTime = new Date(
Date.UTC(
start.getUTCFullYear(),
start.getUTCMonth(),
start.getUTCDate()
)
);
event.endTime = new Date(
Date.UTC(
start.getUTCFullYear(),
start.getUTCMonth(),
start.getUTCDate() + 1
)
);
}
/* Here you save the data entered */
/* this.eventSource.push(result.data.event); */
/* Here you load the data saved */
/* this.myCal.loadEvents(); */
}
});
}
}
@@ -10,6 +10,10 @@ 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)
}