confit

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts

@@ -1,12 +1,13 @@
 import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { Event } from 'src/app/models/event.model';
-import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/emend-message-modal.page';
-import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
 import { AlertService } from 'src/app/services/alert.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { ProcessesService } from 'src/app/services/processes.service';
+import { EmendMessageModalPage } from '../../../agenda/emend-message-modal/emend-message-modal.page';
+import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/event-actions-popover.page';
+
 
 @Component({
   selector: 'app-approve-event-modal',
@@ -15,36 +16,45 @@ import { ProcessesService } from 'src/app/services/processes.service';
 })
 export class ApproveEventModalPage implements OnInit {
   event: Event;
-  loadedEvent:any;
-  loadedAttachments:any;
-  serialNumber:string;
-  customDate:any;
-  today:any;
-  
+  loadedEvent: any;
+  loadedAttachments: any;
+  serialNumber: string;
+  customDate: any;
+  today: any;
+
   months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
   days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
 
-  
+
   constructor(
-    private router:Router,
+    private router: Router,
     private modalController: ModalController,
     private navParams: NavParams,
-    private processes:ProcessesService,
+    private processes: ProcessesService,
     private attachmentsService: AttachmentsService,
     private popoverController: PopoverController,
     private menu: MenuController,
     private alertService: AlertService,
-    )
-    {
-      this.serialNumber = this.navParams.get('serialNumber');
-     }
+    private activatedRoute: ActivatedRoute,
+  ) {
+    this.activatedRoute.paramMap.subscribe(paramMap =>
+      {
+        if (!paramMap.has("serialNumber")){
+          return;
+        }
+        else{
+          this.serialNumber = paramMap.get('serialNumber'); 
+        }
+      });
+  }
 
   ngOnInit() {
     this.getTask();
     this.getAttachments();
   }
 
-  notImplemented(){
+
+  notImplemented() {
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
 
@@ -55,7 +65,7 @@ export class ApproveEventModalPage implements OnInit {
 
   getTask(){
     this.processes.GetTask(this.serialNumber).subscribe(res => {
-      console.log(res);
+      console.log('GET TASK SERIALNUMBER: ', this.serialNumber,'Approve event',res);
       this.loadedEvent = res;
       this.today = new Date(res.workflowInstanceDataFields.StartDate);
       console.log(new Date(this.today));
@@ -64,6 +74,7 @@ export class ApproveEventModalPage implements OnInit {
     })
   }
   approveTask(serialNumber:string){
+    console.log('approveTask SERIALNUMBER: ', serialNumber)
     let body = { "serialNumber": serialNumber, "action": "Aprovar" }
     console.log(body);
     this.processes.PostTaskAction(body);
@@ -73,6 +84,7 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   emendTask(serialNumber:string){
+    console.log('emendTask: ',serialNumber)
     /* console.log('Emendar'); */
     this.menu.close();
     this.openEmendMessageModal(serialNumber);
@@ -80,7 +92,7 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   rejectTask(serialNumber:string){
-  
+    console.log('rejectTask: ',serialNumber)
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
     console.log(body);
     this.processes.PostTaskAction(body);
@@ -90,6 +102,7 @@ export class ApproveEventModalPage implements OnInit {
   }
   getAttachments(){
     this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{
+      console.log('getAttachments: ',this.serialNumber)
       this.loadedAttachments = res;
       console.log(res);
     });

src/app/pages/gabinete-digital/event-list/event-list.page.html

@@ -40,6 +40,7 @@
           <ion-item-sliding>
             <ion-item class="Rectangle" lines="none" 
               *ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber)">
+              
               <div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}}">
                 <div class="approve-event-time">
                   <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -4,7 +4,7 @@ import { EventPerson } from 'src/app/models/eventperson.model';
 import { Event } from 'src/app/models/event.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController, NavParams } from '@ionic/angular';
-import { ApproveEventModalPage } from '../../agenda/approve-event-modal/approve-event-modal.page';
+import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
 import { NavigationEnd, Router } from '@angular/router';
 
 @Component({

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html

@@ -32,6 +32,18 @@
       </div>
     </div>
   </div>
+  <div class="container-div">
+    <div class="ion-item-class-2">
+      <div class="ion-icon-class">
+        <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+      </div>
+      <div class="ion-input-class">
+        <ion-select placeholder="Tipo" [(ngModel)]="postData.SubjectTypeId" interface="action-sheet" Cancel-text="Cancelar" required>
+          <ion-select-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</ion-select-option>
+        </ion-select>
+      </div>
+    </div>
+  </div>
 
   <div class="container-div">
     <div class="ion-item-class-2">

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -34,6 +34,7 @@ export class ExpedientTaskModalPage implements OnInit {
   taskDescription: string;
   user: string;
   loadedAttachments:any;
+  subjectTypes:any;
 
   postData: Despacho;
   dispatchFolder: Folder;
@@ -65,6 +66,8 @@ export class ExpedientTaskModalPage implements OnInit {
       this.postData.UsersSelected = this.participants;
       /* By Default TypeDeadline should be 'Normal' */
       this.postData.Priority = '99999861';
+      /* By Default TypeDeadline should be 'Economia' */
+      this.postData.SubjectTypeId = '99999844';
       /* Initialize 'Subject' with the title of the expedient */
       this.postData.DispatchFolder.Subject = this.task.workflowInstanceFolio;
      }
@@ -79,7 +82,9 @@ export class ExpedientTaskModalPage implements OnInit {
     
     console.log(this.task.serialNumber);
     this.getAttachments();
-    
+
+    console.log(this.getSubjectType());
+  
   }
 
   close(){
@@ -89,6 +94,12 @@ export class ExpedientTaskModalPage implements OnInit {
   cancelTask(){
     this.modalController.dismiss(null);
   }
+  getSubjectType(){
+    this.processes.GetSubjectType().subscribe(res=>{
+      console.log(res);
+      this.subjectTypes = res;
+    });
+  }
   saveTask(){
     console.log(this.taskType);
     
@@ -100,6 +111,7 @@ export class ExpedientTaskModalPage implements OnInit {
           CountryCode: 'AO',
           Priority: this.postData.Priority,
           UserEmail: this.user,
+          SubjectTypeId: this.postData.SubjectTypeId,
           UsersSelected: this.participants,
           DispatchFolder: this.dispatchFolder,
         }
@@ -113,6 +125,7 @@ export class ExpedientTaskModalPage implements OnInit {
           CountryCode: 'AO',
           Priority: this.postData.Priority,
           UserEmail: this.user,
+          SubjectTypeId: this.postData.SubjectTypeId,
           UsersSelected: this.participants,
           DispatchFolder: this.dispatchFolder,
         }
@@ -124,6 +137,7 @@ export class ExpedientTaskModalPage implements OnInit {
           CountryCode: 'AO',
           Priority: this.postData.Priority,
           UserEmail: this.user,
+          SubjectTypeId: this.postData.SubjectTypeId,
           UsersSelected: this.participants,
           DispatchFolder: this.dispatchFolder,
         }
@@ -201,6 +215,7 @@ export class ExpedientTaskModalPage implements OnInit {
   }
 
   async distartExpedientModal(){
+    console.log(this.task.serialNumber);
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
        componentProps: {

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -22,18 +22,18 @@ import { momentG }  from 'src/plugin/momentG'
 export class ExpedienteDetailPage implements OnInit {
 
   task: any;
-  fulltask:any;
-  eventsList: Event[];  
-  serialnumber:string;
+  fulltask: any;
+  eventsList: Event[];
+  serialnumber: string;
   profile: string;
 
   constructor(private activateRoute: ActivatedRoute,
-    private processes:ProcessesService,
+    private processes: ProcessesService,
     private iab: InAppBrowser,
     private attachments: AttachmentsService,
     private events: EventsService,
     private menu: MenuController,
-    private router:Router,
+    private router: Router,
     private modalController: ModalController,
     private navParams: NavParams,
     private alertService: AlertService) { 
@@ -46,7 +46,7 @@ export class ExpedienteDetailPage implements OnInit {
     console.log(this.serialnumber);
     
     this.activateRoute.paramMap.subscribe(paramMap => {
-      if (!paramMap.has('SerialNumber')){
+      if (!paramMap.has('SerialNumber')) {
         return;
       }
       /* this.serialnumber = paramMap.get('SerialNumber'); */
@@ -58,8 +58,7 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
 
-  async LoadTaskDetail(serial:string)
-  {
+  async LoadTaskDetail(serial: string) {
     this.processes.GetTask(serial).subscribe(res => {
       this.task = {
         "SerialNumber": res.serialNumber,
@@ -71,18 +70,16 @@ export class ExpedienteDetailPage implements OnInit {
       }
       this.fulltask = res;
       console.log(res);
-      
+
     });
   }
 
-  async LoadRelatedEvents(serial:string)
-  {
-    if (this.eventsList == null)
-    {
+  async LoadRelatedEvents(serial: string) {
+    if (this.eventsList == null) {
       this.attachments.getAttachmentsBySerial(serial).subscribe(res => {
         console.log(res);
-        res.forEach(att =>{
-          if (this.eventsList == null){
+        res.forEach(att => {
+          if (this.eventsList == null) {
             this.eventsList = new Array();
           }
           this.events.getEvent(att.ParentId).subscribe(event => {
@@ -101,13 +98,13 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
   openMenu() {
-     this.menu.open();
+    this.menu.open();
   }
 
-  async openExpedientActionsModal(taskAction:any, task:any){
+  async openExpedientActionsModal(taskAction: any, task: any) {
     const modal = await this.modalController.create({
       component: ExpedientTaskModalPage,
-      componentProps:{
+      componentProps: {
         taskAction: taskAction,
         task: task,
       },
@@ -118,17 +115,17 @@ export class ExpedienteDetailPage implements OnInit {
     modal.onDidDismiss();
   }
 
-  discartExpedient(){
+  discartExpedient() {
     let body = { "serialNumber": this.serialnumber, "action": "Task Completed" }
     console.log(body);
     this.processes.PostTaskAction(body);
     this.router.navigate(['/home/gabinete-digital/expediente']);
   }
 
-  async openBookMeetingModal(task:any){
+  async openBookMeetingModal(task: any) {
     const modal = await this.modalController.create({
       component: BookMeetingModalPage,
-      componentProps:{
+      componentProps: {
         task: task,
       },
       cssClass: 'book-meeting-modal',
@@ -138,12 +135,12 @@ export class ExpedienteDetailPage implements OnInit {
     modal.onDidDismiss();
   }
 
-  async viewEventDetail(eventId:any) {
+  async viewEventDetail(eventId: any) {
     console.log(this.profile);
-    
+
     const modal = await this.modalController.create({
       component: ViewEventPage,
-      componentProps:{
+      componentProps: {
         eventId: eventId,
         profile: this.profile,
       },
@@ -151,8 +148,8 @@ export class ExpedienteDetailPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      if(res){
+    modal.onDidDismiss().then((res) => {
+      if (res) {
       }
     });
   }