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 cdff33d52..d179a1ce3 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,6 +1,6 @@
- Solicitar Parecer
+ {{modalTitle[taskType]}}
@@ -39,14 +39,17 @@
@@ -56,8 +59,18 @@
-
@@ -65,7 +78,7 @@
- Anexar Documentos
+ Anexar Documentos
@@ -77,7 +90,7 @@
Cancelar
- Guardar
+ Gravar
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 60d5da146..f9998b438 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
@@ -49,7 +49,25 @@ ion-select{
float: left;
}
.ion-input-class-no-height{
- border: 1px solid red;
+ border: 1px solid #ebebeb;
+ border-radius: 5px;
+ overflow: auto;
+}
+.list-people{
+ width: 256px;
+ float: left;
+
+}
+.add-people{
+ width: 45px;
+ float: right;
+ overflow: auto;
+ font-size: 25px;
+ padding: 10px;
+}
+.attach-document{
+ font-size: 15px;
+ color: #0d89d1;
}
.container-footer{
margin:0 auto;
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 34d4e3572..f7a95d00c 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,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
-import { ModalController } from '@ionic/angular';
+import { ModalController, NavParams } from '@ionic/angular';
@Component({
selector: 'app-expedient-task-modal',
@@ -9,10 +9,21 @@ import { ModalController } from '@ionic/angular';
})
export class ExpedientTaskModalPage implements OnInit {
- constructor(private modalController: ModalController,
- private router:Router,) { }
+ modalTitle: string[] = [
+ 'Efectuar Despacho',
+ 'Solicitar Parecer',
+ 'Solicitar Deferimento'
+ ];
+ taskType:number;
+
+ constructor(
+ private modalController: ModalController,
+ private router:Router,
+ private navParams: NavParams,
+ ) { }
ngOnInit() {
+ this.taskType = this.navParams.get('taskType');
}
close(){
@@ -25,5 +36,9 @@ export class ExpedientTaskModalPage implements OnInit {
saveTask(){
}
+ clicked(){
+ console.log('clicked');
+
+ }
}
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 fa24a5df7..f94c1f5d7 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,15 +20,15 @@
-
+
Efectuar Despacho
-
+
Pedido de Parecer
-
+
Pedido de Deferimento
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 534807a4d..d1a6b2db6 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
@@ -92,11 +92,11 @@ export class ExpedienteDetailPage implements OnInit {
dispatchExpedient(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
- async openExpedientActionsModal(eventSerialNumber){
+ async openExpedientActionsModal(taskType:any){
const modal = await this.modalController.create({
component: ExpedientTaskModalPage,
componentProps:{
- serialNumber: eventSerialNumber,
+ taskType: taskType,
},
cssClass: 'expedient-task-modal',
backdropDismiss: false
diff --git a/src/assets/images/icons-arrow-forward.svg b/src/assets/images/icons-arrow-forward.svg
new file mode 100644
index 000000000..d9efb2130
--- /dev/null
+++ b/src/assets/images/icons-arrow-forward.svg
@@ -0,0 +1,11 @@
+