From b17b9e06f70fa57ee0a930d2aca46fcf89652efe Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 27 May 2021 13:20:37 +0100 Subject: [PATCH] Improve task options --- src/app/app-routing.module.ts | 59 ++++++++++--------- src/app/home/home-routing.module.ts | 6 +- src/app/modals/delegar/delegar.page.ts | 4 -- .../diplomas-assinar.page.scss | 1 - .../expediente-detail.page.ts | 2 +- .../expediente-pr/expediente-pr.page.ts | 5 +- .../pedidos/pedido/pedido.page.html | 2 +- .../pedidos/pedido/pedido.page.ts | 34 ++++++++--- .../gabinete-digital/pedidos/pedidos.page.ts | 16 ++--- .../edit-event.page.html | 4 +- .../gabinete-digital/pedidos/pedidos.page.ts | 4 +- 11 files changed, 81 insertions(+), 56 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index a09c32cdb..faf9dee0e 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,17 +1,18 @@ -import { NgModule } from '@angular/core'; -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; -import { ChatPage } from './pages/chat/chat.page'; -import { MessagesPage } from './pages/chat/messages/messages.page'; - -const routes: Routes = [ - { - path: '', - loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) - }, - { - path: '', - loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) - }, { +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; +import { ChatPage } from './pages/chat/chat.page'; +import { MessagesPage } from './pages/chat/messages/messages.page'; + +const routes: Routes = [ + { + path: '', + loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) + }, + { + path: '', + loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) + }, + { path: 'empty-chat', loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) }, @@ -91,17 +92,21 @@ const routes: Routes = [ path: 'diplomas-assinar', loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) }, + { + path: 'opts-expediente-pr', + loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) + }, - /* { - path: 'chat', - component: ChatPage - } */ - -]; -@NgModule({ - imports: [ - RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) - ], - exports: [RouterModule] -}) -export class AppRoutingModule {} + /* { + path: 'chat', + component: ChatPage + } */ + +]; +@NgModule({ + imports: [ + RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) + ], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 2bc75c478..5c636ea0e 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -120,7 +120,7 @@ const routes: Routes = [ { path:'expediente-task-modal', loadChildren: ()=> import('../pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module').then(m => m.ExpedientTaskModalPageModule), - } + }, ] }, { @@ -186,6 +186,10 @@ const routes: Routes = [ path:'new-publication', loadChildren: ()=> import('../shared/publication/new-publication/new-publication.module').then(m => m.NewPublicationPageModule) }, + { + path: 'request-options', + loadChildren: () => import('../shared/popover/request-options/request-options.module').then( m => m.RequestOptionsPageModule) + }, ] }, { diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index 5ea186381..dba6a266a 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -170,10 +170,6 @@ export class DelegarPage implements OnInit { this.taskParticipants = taskParticipants; } - - - - async successMessage(message?: string) { const modal = await this.modalController.create({ diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss index 91ab91de5..db8b8f501 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss @@ -18,7 +18,6 @@ padding-top: 0px !important; } - .title{ font-family: Roboto; font-size: 25px; 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 aa46a1180..4f8154666 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 @@ -49,7 +49,7 @@ export class ExpedienteDetailPage implements OnInit { private alertService: AlertService, public popoverController: PopoverController, private activatedRoute: ActivatedRoute, - ) { + ) { this.activatedRoute.queryParams.subscribe(params => { if(params["serialNumber"]) { this.serialnumber = params["serialNumber"]; diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index 6ff4f0db8..4e1353f72 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -7,7 +7,7 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { formatDate } from '@angular/common'; import { Event } from '../../../../models/event.model'; -import { MenuController, ModalController, PopoverController } from '@ionic/angular'; +import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { momentG } from 'src/plugin/momentG' @@ -20,6 +20,7 @@ import { AuthService } from 'src/app/services/auth.service'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; +import { OptsExpedientePrPage } from 'src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page'; @Component({ selector: 'app-expediente-pr', @@ -394,7 +395,7 @@ export class ExpedientePrPage implements OnInit { async openOptions(taskAction: any) { const popover = await this.popoverController.create({ - component: OptsExpedientePage, + component: OptsExpedientePrPage, cssClass: 'exp-options', componentProps: { task: this.task, diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index 2785461d9..a05a733aa 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -15,7 +15,7 @@ {{ task.Folio}}
-
+
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 2ed3e3ef2..0174f22b9 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -7,7 +7,7 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { formatDate } from '@angular/common'; import { Event } from '../../../../models/event.model'; -import { MenuController, ModalController } from '@ionic/angular'; +import { MenuController, ModalController, PopoverController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { momentG } from 'src/plugin/momentG' @@ -18,6 +18,8 @@ import { CreateProcessPage } from 'src/app/modals/create-process/create-process. import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; +import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; +import { RequestOptionsPage } from 'src/app/shared/popover/request-options/request-options.page'; @Component({ selector: 'app-pedido', @@ -47,13 +49,14 @@ export class PedidoPage implements OnInit { private menu: MenuController, private router: Router, private modalController: ModalController, - private alertService: AlertService) { + private alertService: AlertService, + public popoverController: PopoverController) { this.activatedRoute.queryParams.subscribe(params => { - if(params["serialNumber"]) { - this.serialnumber = params["serialNumber"]; - // console.log(params["serialNumber"]); - } - }); + if(params["serialNumber"]) { + this.serialnumber = params["serialNumber"]; + // console.log(params["serialNumber"]); + } + }); } ngOnInit() { @@ -157,6 +160,23 @@ export class PedidoPage implements OnInit { this.modalController.dismiss(); } + + async openOptions(taskAction?: any) { + const popover = await this.popoverController.create({ + component: RequestOptionsPage, + cssClass: 'exp-options', + componentProps: { + task: this.task, + fulltask: this.fulltask, + taskAction:taskAction, + showEnviarPendentes: false + }, + translucent: true + }); + return await popover.present(); + } + + repreciar(note:string, documents:any) { let body = { "serialNumber": this.serialnumber, diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index 578f8656d..1a8bd8937 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -91,16 +91,16 @@ export class PedidosPage implements OnInit { this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras); } - notImplemented(){ + notImplemented(){ this.alertService.presentAlert('Funcionalidade em desenvolvimento'); - } + } openExpedientDetailPage(data){ console.log(data); this.openExpedientDetail.emit(data); } - LoadList(){ + LoadList(){ if(this.segment == 'parecer'){ this.taskType = "Pedido de Parecer"; this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => { @@ -159,11 +159,11 @@ export class PedidosPage implements OnInit { console.log(this.taskType); } - doRefresh() { - this.LoadList(); - setTimeout(() => { - }, 2000); - } + doRefresh() { + this.LoadList(); + setTimeout(() => { + }, 2000); + } async viewPedidoDetail(serialNumber:any) { console.log(this.profile); diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index 5d8fec26d..ff85d3890 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -24,7 +24,7 @@
- +
@@ -80,7 +80,7 @@