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 @@