diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal-routing.module.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal-routing.module.ts new file mode 100644 index 000000000..3fae022d2 --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { BookMeetingModalPage } from './book-meeting-modal.page'; + +const routes: Routes = [ + { + path: '', + component: BookMeetingModalPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class BookMeetingModalPageRoutingModule {} diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts new file mode 100644 index 000000000..e89e2d7be --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts @@ -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 { BookMeetingModalPageRoutingModule } from './book-meeting-modal-routing.module'; + +import { BookMeetingModalPage } from './book-meeting-modal.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + BookMeetingModalPageRoutingModule + ], + declarations: [BookMeetingModalPage] +}) +export class BookMeetingModalPageModule {} diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html new file mode 100644 index 000000000..2c35e2622 --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -0,0 +1,102 @@ + + + Convocar Reunião + +
+ +
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+
+ + Nunca + Sim + +
+
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + + + + +

+ Cancelar +

+

+ Gravar +

+ + + + diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss new file mode 100644 index 000000000..f8ddda4c4 --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss @@ -0,0 +1,69 @@ +.title{ + font-family: Roboto; + font-size: 25px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #000000; + margin: 28px 0 8px 5px; +} +.container-div{ + margin-bottom: 15px; + overflow: auto; +} +.ion-item-container{ + width: 360px; + margin: 15px auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 10px; +} +.ion-item-class-2{ + width: 360px; + margin: 0px auto; +} +.ion-icon-class{ + width: 45px; + height: 45px; + float: left; + padding: 10px; + font-size: 25px; +} +.ion-input-class{ + width: 315px; + height: 45px; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 10px; + float: left; +} +.container-footer{ + margin:0 auto; + overflow: auto; +} +.button-cancel { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #e0e9ee; + --color: #061b52; + margin:10px; + } + .button-save { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #42b9fe; + --color:#ffffff; + margin:10px; + } + +.text-input{ + width: 100%; + border: 1px solid #ebebeb; + margin: 0px 15px 15px 0px; + padding: 0 !important; + border-radius: 5px; +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.spec.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.spec.ts new file mode 100644 index 000000000..6a119ada7 --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { BookMeetingModalPage } from './book-meeting-modal.page'; + +describe('BookMeetingModalPage', () => { + let component: BookMeetingModalPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ BookMeetingModalPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(BookMeetingModalPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts new file mode 100644 index 000000000..66b84c4c8 --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -0,0 +1,29 @@ +import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { ModalController } from '@ionic/angular'; + +@Component({ + selector: 'app-book-meeting-modal', + templateUrl: './book-meeting-modal.page.html', + styleUrls: ['./book-meeting-modal.page.scss'], +}) +export class BookMeetingModalPage implements OnInit { + + constructor(private modalController: ModalController, + private router:Router,) { } + + ngOnInit() { + } + + close(){ + this.router.navigate(['/home/gabinete-digital/expediente']); + this.modalController.dismiss(null); + } + cancelTask(){ + this.modalController.dismiss(null); + } + saveTask(){ + + } + +} diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 3611e0207..cdff33d52 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -1,9 +1,84 @@ - - - expedient-task-modal - - - + + Solicitar Parecer + +
+ +
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+
+ + Normal + Urgente + Muito Urgente + Urgentíssimo + +
+
+
+ +
+
+
+ +
+
+ + + + segpr@exemplo.gov.ao + segpr@exemplo.gov.ao + + + +
+
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+ + + Anexar Documentos + +
+ + + +

+ Cancelar +

+

+ Guardar +

+ + + diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss index e69de29bb..60d5da146 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss @@ -0,0 +1,73 @@ +.title{ + font-family: Roboto; + font-size: 25px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #000000; + margin: 28px 0 8px 8px; +} +.container-div{ + margin-bottom: 15px; + overflow: auto; +} +.ion-item-container{ + width: 360px; + margin: 15px auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 5px; +} +.ion-item-container-no-border{ + width: 360px; + margin: 15px auto; +} +.ion-item-class-2{ + width: 360px; + margin: 0px auto; +} +.ion-icon-class{ + width: 45px; + height: 45px; + float: left; + padding: 10px; + font-size: 25px; +} +ion-select{ + padding-left: 5px; + margin-left: 0; +} +.ion-input-class{ + width: 315px; + height: 45px; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 5px; + padding-right: 10px; + float: left; +} +.ion-input-class-no-height{ + border: 1px solid red; +} +.container-footer{ + margin:0 auto; + overflow: auto; +} +.button-cancel { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #e0e9ee; + --color: #061b52; + margin:10px; + } + .button-save { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #42b9fe; + --color:#ffffff; + margin:10px; + } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 9ced1f721..34d4e3572 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -1,4 +1,6 @@ import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { ModalController } from '@ionic/angular'; @Component({ selector: 'app-expedient-task-modal', @@ -7,9 +9,21 @@ import { Component, OnInit } from '@angular/core'; }) export class ExpedientTaskModalPage implements OnInit { - constructor() { } + constructor(private modalController: ModalController, + private router:Router,) { } ngOnInit() { } + close(){ + this.router.navigate(['/home/gabinete-digital/expediente']); + this.modalController.dismiss(null); + } + cancelTask(){ + this.modalController.dismiss(null); + } + saveTask(){ + + } + } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 1d5568bc4..fa24a5df7 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -20,23 +20,23 @@ - - - Apresentação de OGE 2020 - - + Efectuar Despacho - + Pedido de Parecer - + Pedido de Deferimento - + + + Marcar reunião + + Descartar @@ -44,10 +44,6 @@ Enviar para pendentes - - - Marcar reunião - 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 21ec8ce52..534807a4d 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 @@ -7,8 +7,10 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute } from '@angular/router'; import { formatDate } from '@angular/common'; import { Event } from '../../../../models/event.model'; -import { MenuController } from '@ionic/angular'; +import { MenuController, ModalController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; +import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page'; +import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page'; @Component({ selector: 'app-expediente-detail', @@ -23,6 +25,7 @@ export class ExpedienteDetailPage implements OnInit { private attachments: AttachmentsService, private events: EventsService, private menu: MenuController, + private modalController: ModalController, private alertService: AlertService) { } task: DailyWorkTask; @@ -89,4 +92,35 @@ export class ExpedienteDetailPage implements OnInit { dispatchExpedient(){ this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } + async openExpedientActionsModal(eventSerialNumber){ + const modal = await this.modalController.create({ + component: ExpedientTaskModalPage, + componentProps:{ + serialNumber: eventSerialNumber, + }, + cssClass: 'expedient-task-modal', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss(); + } + discartExpedient(){ + + } + async openBookMeetingModal(eventSerialNumber){ + const modal = await this.modalController.create({ + component: BookMeetingModalPage, + componentProps:{ + serialNumber: eventSerialNumber, + }, + cssClass: 'book-meeting-modal', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss(); + } } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts b/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts index 4964a6725..c8f4d8275 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts @@ -1,26 +1,30 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { ExpedientePage } from './expediente.page'; - -const routes: Routes = [ - { - path: '', - component: ExpedientePage - }, - { - path: 'expediente-detail', - loadChildren: () => import('./expediente-detail/expediente-detail.module').then( m => m.ExpedienteDetailPageModule) - }, - { - path: 'expedient-task-modal', - loadChildren: () => import('./expedient-task-modal/expedient-task-modal.module').then( m => m.ExpedientTaskModalPageModule) +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ExpedientePage } from './expediente.page'; + +const routes: Routes = [ + { + path: '', + component: ExpedientePage + }, + { + path: 'expediente-detail', + loadChildren: () => import('./expediente-detail/expediente-detail.module').then( m => m.ExpedienteDetailPageModule) + }, + { + path: 'expedient-task-modal', + loadChildren: () => import('./expedient-task-modal/expedient-task-modal.module').then( m => m.ExpedientTaskModalPageModule) + }, { + path: 'book-meeting-modal', + loadChildren: () => import('./book-meeting-modal/book-meeting-modal.module').then( m => m.BookMeetingModalPageModule) } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class ExpedientePageRoutingModule {} + +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ExpedientePageRoutingModule {} diff --git a/src/assets/images/icons-attach-doc.svg b/src/assets/images/icons-attach-doc.svg new file mode 100644 index 000000000..721a263ba --- /dev/null +++ b/src/assets/images/icons-attach-doc.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-calendar.svg b/src/assets/images/icons-calendar.svg new file mode 100644 index 000000000..2b60c572e --- /dev/null +++ b/src/assets/images/icons-calendar.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-description.svg b/src/assets/images/icons-description.svg new file mode 100644 index 000000000..47a4092f5 --- /dev/null +++ b/src/assets/images/icons-description.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-location.svg b/src/assets/images/icons-location.svg new file mode 100644 index 000000000..6a29b154b --- /dev/null +++ b/src/assets/images/icons-location.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-people-cc.svg b/src/assets/images/icons-people-cc.svg new file mode 100644 index 000000000..65b81e25d --- /dev/null +++ b/src/assets/images/icons-people-cc.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-person.svg b/src/assets/images/icons-person.svg new file mode 100644 index 000000000..04f2226b4 --- /dev/null +++ b/src/assets/images/icons-person.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-refresh.svg b/src/assets/images/icons-refresh.svg new file mode 100644 index 000000000..c2fcf59d7 --- /dev/null +++ b/src/assets/images/icons-refresh.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + +