Improve task options

src/app/app-routing.module.ts

@@ -1,17 +1,18 @@
-import { NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
-import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
+import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
-import { ChatPage } from './pages/chat/chat.page';
+import { ChatPage } from './pages/chat/chat.page';
-import { MessagesPage } from './pages/chat/messages/messages.page';
+import { MessagesPage } from './pages/chat/messages/messages.page';
-
+
-const routes: Routes = [
+const routes: Routes = [
-  {
+  {
-    path: '',
+    path: '',
-    loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule)
+    loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule)
-  },
+  },
-  {
+  {
-    path: '',
+    path: '',
-    loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
+    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',
-    path: 'chat',
+    component: ChatPage
-    component: ChatPage
+  } */
-  } */
+
-
+];
-];
+@NgModule({
-@NgModule({
+  imports: [
-  imports: [
+    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
-    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
+  ],
-  ],
+  exports: [RouterModule]
-  exports: [RouterModule]
+})
-})
+export class AppRoutingModule {}

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)
+          },
         ]
       },
       {

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({

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;

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"];

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,

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html

@@ -15,7 +15,7 @@
             <ion-label class="title">{{ task.Folio}}</ion-label>
           </div>
           <div class="div-icon">
-            <div autoHide="false" class="d-flex">
+            <div autoHide="false" class="d-flex" (click)="openOptions()">
               <ion-icon class="font-30 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
             </div>
           </div>

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"]) {
+        if(params["serialNumber"]) {
-        this.serialnumber = params["serialNumber"];
+          this.serialnumber = params["serialNumber"];
-        // console.log(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, 

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() {
+  doRefresh() {
-   this.LoadList();
+    this.LoadList();
-   setTimeout(() => {
+    setTimeout(() => {
-   }, 2000);
+    }, 2000);
- }
+  }
 
   async viewPedidoDetail(serialNumber:any) {
     console.log(this.profile);

src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html

@@ -24,7 +24,7 @@
                 <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
               </div>
               <div class="ion-input-class">
-                <ion-input placeholder="Localização" [(ngModel)]="Location"></ion-input>
+                <ion-input placeholder="Localização" [(ngModel)]="eventProcess.workflowInstanceDataFields.Location"></ion-input>
               </div>
             </div>
             <!-- Error messages -->
@@ -80,7 +80,7 @@
               <div class="ion-input-class width-100">
                 <ion-datetime 
                   placeholder="Início"
-                  [(ngModel)]="eventProcess.taskStartDate"
+                  [(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
                   displayFormat="D MMM YYYY H:mm"
                   minuteValues="0,15,30,45"
                   monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"

src/app/shared/gabinete-digital/pedidos/pedidos.page.ts

@@ -134,10 +134,10 @@ export class PedidosPage implements OnInit {
     }, 2000);
   }
 
-  goToPedido(serialNumber:any){
+  goToPedido(serialNumber:any) {
     let navigationExtras: NavigationExtras = {
       queryParams: {
-          "serialNumber": serialNumber,
+        "serialNumber": serialNumber,
       }
     };
     this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);