Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

src/app/pages/agenda/agenda.page.ts

@@ -170,7 +170,7 @@ export class AgendaPage implements OnInit {
     if(this.loggeduser.Profile == 'MDGPR') {
       this.mobileComponent.showEventList = true;
     }
-
+  
   }
 
   ngOnInit() {

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts

@@ -5,6 +5,8 @@ import { Event } from 'src/app/models/event.model';
 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 { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
+import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
 import { EmendMessageModalPage } from '../emend-message-modal/emend-message-modal.page';
 import { EventActionsPopoverPage } from '../event-actions-popover/event-actions-popover.page';
 
@@ -69,29 +71,51 @@ export class ApproveEventModalPage implements OnInit {
       
     })
   }
-  approveTask(serialNumber:string){
+  async approveTask(serialNumber:string){
     let body = { 
       "serialNumber": serialNumber, 
       "action": "Aprovar" 
     }
-    this.processes.PostTaskAction(body);
-    this.router.navigate(['/home/gabinete-digital/event-list']);
-    this.modalController.dismiss(null);
+
+    try {
+      await this.processes.PostTaskAction(body);
+      this.router.navigate(['/home/gabinete-digital/event-list']);
+      this.modalController.dismiss(null);
+      this.successMessage()
+    } catch (error) {
+      this.badRequest()
+    }
+
   }
 
-  emendTask(serialNumber:string){
-    this.menu.close();
-    this.openEmendMessageModal(serialNumber);
-    this.modalController.dismiss(null);
+  async emendTask(serialNumber:string){
+
+    try {
+      await this.openEmendMessageModal(serialNumber);
+      this.modalController.dismiss(null);
+      this.menu.close();
+    } catch (error) {
+
+    }
+
+
   }
 
-  rejectTask(serialNumber:string){
+  async rejectTask(serialNumber:string){
   
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
-    this.processes.PostTaskAction(body);
-    this.router.navigate(['/home/gabinete-digital/event-list']);
-    this.modalController.dismiss(null);
+
+    try {
+      await this.processes.PostTaskAction(body);
+      this.router.navigate(['/home/gabinete-digital/event-list']);
+      this.modalController.dismiss(null);
+      this.successMessage()
+    } catch (error) {
+      this.badRequest()
+    }
+   
   }
+
   getAttachments(){
     this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{
       this.loadedAttachments = res;
@@ -108,36 +132,72 @@ export class ApproveEventModalPage implements OnInit {
     });
     return await popover.present();
   }
+
   openMenu() {
     this.menu.open();
- }
- async openEmendMessageModal(serialNumber:string) {
-  const modal = await this.modalController.create({
-    component: EmendMessageModalPage,
-    componentProps:{
-      
-    },
-    cssClass: 'emend-message-modal',
-    backdropDismiss: false
-  });
+  }
 
-  await modal.present();
+  async openEmendMessageModal(serialNumber:string) {
+    const modal = await this.modalController.create({
+      component: EmendMessageModalPage,
+      componentProps:{
+        
+      },
+      cssClass: 'emend-message-modal',
+      backdropDismiss: false
+    });
 
-  modal.onDidDismiss().then(res => {
-    if(res.data !== ''){
-      let body = { "serialNumber": serialNumber, 
-       "action": "Emendar",
-       "dataFields": {
-       "ReviewerUseComment": res.data,
-       }
+    await modal.present();
+
+    modal.onDidDismiss().then(res => {
+      if(res.data !== ''){
+        let body = { "serialNumber": serialNumber, 
+        "action": "Emendar",
+        "dataFields": {
+        "ReviewerUseComment": res.data,
+        }
+        }
+      this.processes.PostTaskAction(body);
+      this.router.navigate(['/home/gabinete-digital/event-list']);
       }
-    this.processes.PostTaskAction(body);
-    this.router.navigate(['/home/gabinete-digital/event-list']);
-    }
-    else{
-      //this.alertService.presentAlert('Operação cancelada!');
-    }
-  });
-}
-  
+      else{
+        //this.alertService.presentAlert('Operação cancelada!');
+      }
+    });
+  }
+    
+
+  async successMessage(message?: string) {
+    
+    const modal = await this.modalController.create({
+      component: SuccessMessageComponent,
+       componentProps: {
+        message: message || 'Processo efetuado' ,
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+    
+  }
+
+  async badRequest() {
+    const modal = await this.modalController.create({
+      component: BadRequestComponent,
+      componentProps: {
+        message: 'hello',
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },1000)
+  }
 }

src/app/pages/agenda/edit-event/edit-event.page.ts

@@ -6,6 +6,8 @@ import { EventPerson } from 'src/app/models/eventperson.model';
 import { AlertService } from 'src/app/services/alert.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
+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 { Event } from '../../../models/event.model';
 import { AttendeesPage } from '../../events/attendees/attendees.page';
 import { SearchPage } from '../../search/search.page';
@@ -101,16 +103,27 @@ export class EditEventPage implements OnInit {
 
     this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc)
 
-    this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
-      /* const alert = await this.alertController.create({
-        cssClass: 'my-custom-class',
-        header: 'Evento actualizado',
-        buttons: ['OK']
+    try{
+      this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
+        /* const alert = await this.alertController.create({
+          cssClass: 'my-custom-class',
+          header: 'Evento actualizado',
+          buttons: ['OK']
+        });
+        await alert.present(); */
+
+        this.successMessage()
+      }, error => {
+        this.badRequest()
       });
-      await alert.present(); */
-    });
-    this.isEventEdited = true;
-    this.modalController.dismiss(this.isEventEdited);
+
+      this.isEventEdited = true;
+      this.modalController.dismiss(this.isEventEdited);
+
+    } catch (error) {
+      this.badRequest()
+    }
+
   }
 
   async openAttendees() {
@@ -220,4 +233,38 @@ export class EditEventPage implements OnInit {
     });
   }
 
+  async successMessage(message?: string) {
+    
+    const modal = await this.modalController.create({
+      component: SuccessMessageComponent,
+       componentProps: {
+        message: message || 'Processo efetuado' ,
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+    
+  }
+
+  async badRequest() {
+    const modal = await this.modalController.create({
+      component: BadRequestComponent,
+       componentProps: {
+        message: 'Processo não realizado com sucesso',
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+  }
+
 }

src/app/pages/agenda/new-event/new-event.page.ts

@@ -6,6 +6,8 @@ import { EventPerson } from 'src/app/models/eventperson.model';
 import { SearchDocument } from 'src/app/models/search-document';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
+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 { Event } from '../../../models/event.model';
 import { AttendeesPage } from '../../events/attendees/attendees.page';
 import { SearchPage } from '../../search/search.page';
@@ -50,7 +52,7 @@ export class NewEventPage implements OnInit {
 
   ngOnInit() {
 
-/*     console.log(this.profile); */
+    /* console.log(this.profile); */
   
     let selectedStartdDate = this.selectedDate;
     let selectedEndDate = new Date(this.selectedDate);
@@ -112,6 +114,7 @@ export class NewEventPage implements OnInit {
   close(){
     this.modalController.dismiss();
   }
+  
   async save() {
   /*     console.log(this.postEvent);
     console.log(this.profile); */
@@ -121,37 +124,83 @@ export class NewEventPage implements OnInit {
     }
     
    let eventId: string;
-    
-    if(this.profile=='mdgpr'){
-      eventId = await this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).toPromise();
-    }
-    else if(this.profile=='pr'){
-      eventId = await this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).toPromise();
+  
+    try {
+
+      if(this.profile=='mdgpr') {
+        eventId = await this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).toPromise();
+      }
+      else if(this.profile=='pr'){
+        eventId = await this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).toPromise();
+      }
+
+      const DocumentToSave: EventAttachment[] = this.documents.map((e) => {
+        return {
+          SourceTitle: e.Assunto,
+          ParentId: eventId,
+          Source: '1',
+          SourceId: e.Id,
+          ApplicationId: e.ApplicationType.toString(),
+          Id: '',
+          Link: '',
+          SerialNumber: ''
+        };
+      });
+
+      await  DocumentToSave.forEach( async (attachments, i) => {
+        try {
+          await this.attachmentsService.setEventAttachmentById(attachments).toPromise();
+        } catch(error) {
+          alert('document error')
+        }
+        
+      });
+
+      
+      this.successMessage()
+      this.modalController.dismiss(this.postEvent);
+
+      
+    } catch (error) {
+      this.badRequest()
     }
 
-    const DocumentToSave: EventAttachment[] = this.documents.map((e) => {
-      return {
-        SourceTitle: e.Assunto,
-        ParentId: eventId,
-        Source: '1',
-        SourceId: e.Id,
-        ApplicationId: e.ApplicationType.toString(),
-        Id: '',
-        Link: '',
-        SerialNumber: ''
-      };
-    });
-
-
-    await  DocumentToSave.forEach( async (attachments, i) => {
-      this.attachmentsService.setEventAttachmentById(attachments).toPromise();
-    });
-
-
-    this.modalController.dismiss(this.postEvent);
   }
 
 
+  async successMessage(message?: string) {
+    
+    const modal = await this.modalController.create({
+      component: SuccessMessageComponent,
+       componentProps: {
+        message: message || 'Processo efetuado' ,
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+    
+  }
+
+  async badRequest() {
+    const modal = await this.modalController.create({
+      component: BadRequestComponent,
+       componentProps: {
+        message: 'Processo não realizado com sucesso',
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+  }
 
   async openAttendees() {
     
@@ -202,7 +251,6 @@ export class NewEventPage implements OnInit {
   }
 
 
-
   async getDoc(){
     const modal = await this.modalController.create({
       component: SearchPage,
@@ -227,6 +275,4 @@ export class NewEventPage implements OnInit {
     this.documents = this.documents.filter( (e, i) =>  index != i);
 
   }
-
-  
 }

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts

@@ -18,6 +18,8 @@ import { CreateProcessPage } from 'src/app/modals/create-process/create-process.
 import { DelegarPage } from 'src/app/modals/delegar/delegar.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 { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
+import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
 
 @Component({
   selector: 'app-despacho-pr',
@@ -81,7 +83,7 @@ export class DespachoPrPage implements OnInit {
   goBack(){
     let navigationExtras: NavigationExtras = {
       queryParams: {
-          "despachospr": true,
+        "despachospr": true,
       }
     };
     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
@@ -167,7 +169,8 @@ export class DespachoPrPage implements OnInit {
     this.menu.open();
     this.modalController.dismiss();
   }
-  executado(note:string, documents:any){
+
+  async executado(note:string, documents:any){
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Conhecimento",
@@ -177,10 +180,17 @@ export class DespachoPrPage implements OnInit {
       },
       "AttachmentList" :documents,
     }
-    this.processes.CompleteTask(body);
-    this.close();
+
+    try {
+      await this.processes.CompleteTask(body);
+      this.close();
+      this.successMessage()
+    } catch(error) {
+      this.badRequest()
+    }
   }
-  arquivar(note:string, documents:any){
+
+  async arquivar(note:string, documents:any){
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Arquivo",
@@ -190,10 +200,17 @@ export class DespachoPrPage implements OnInit {
       },
       "AttachmentList" :documents,
     }
-    this.processes.CompleteTask(body);
-    this.close();
+    try {
+      await this.processes.CompleteTask(body);
+      this.successMessage()
+      this.close();
+    } catch (error) {
+      this.badRequest()
+    }
+
   }
-  generateDiploma(note:string, documents:any){
+
+  async generateDiploma(note:string, documents:any){
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Reencaminhar",
@@ -203,8 +220,15 @@ export class DespachoPrPage implements OnInit {
       },
       "AttachmentList" :documents,
     }
-    this.processes.CompleteTask(body);
-    this.close();
+
+    try {
+      await this.processes.CompleteTask(body);
+      this.successMessage()
+      this.close();
+    } catch (error) {
+      this.badRequest()
+    }
+
   }
 
   sendExpedienteToPending(){
@@ -234,14 +258,29 @@ export class DespachoPrPage implements OnInit {
     modal.onDidDismiss().then(res => {
       console.log(res);
       if(res.data){
+
+
+        
+        const DocumentToSave = res.data.documents.map((e) => {
+          return {
+            ApplicationId: e.ApplicationType,
+            SourceId: e.Id,
+          }
+        });
+    
+        let docs = {
+          ProcessInstanceID: "",
+          Attachments: DocumentToSave,
+        }
+
         if(actionName == 'Executado'){
-          this.executado(res.data.note,res.data.documents);
+          this.executado(res.data.note, docs);
         }
         else if(actionName == 'Arquivar'){
-          this.arquivar(res.data.note,res.data.documents);
+          this.arquivar(res.data.note, docs);
         }
         else if(actionName == 'Gerar Diploma'){
-          this.generateDiploma(res.data.note,res.data.documents);
+          this.generateDiploma(res.data.note, docs);
         }
       }
     });
@@ -370,5 +409,38 @@ export class DespachoPrPage implements OnInit {
     });
     return await popover.present();
   }
-  
+    
+  async successMessage(message?: string) {
+    
+    const modal = await this.modalController.create({
+      component: SuccessMessageComponent,
+       componentProps: {
+        message: message || 'Processo efetuado' ,
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+    
+  }
+
+  async badRequest() {
+    const modal = await this.modalController.create({
+      component: BadRequestComponent,
+       componentProps: {
+        message: 'hello',
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },1000)
+  }
 }

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts

@@ -18,6 +18,8 @@ import { CreateProcessPage } from 'src/app/modals/create-process/create-process.
 import { DelegarPage } from 'src/app/modals/delegar/delegar.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 { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
+import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
 
 @Component({
   selector: 'app-despacho',
@@ -82,7 +84,7 @@ export class DespachoPage implements OnInit {
   goBack(){
     let navigationExtras: NavigationExtras = {
       queryParams: {
-          "despachos": true,
+        "despachos": true,
       }
     };
     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
@@ -168,7 +170,8 @@ export class DespachoPage implements OnInit {
     this.menu.open();
     this.modalController.dismiss();
   }
-  executado(note:string, documents:any){
+
+  async executado(note:string, documents:any){
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Conhecimento",
@@ -178,10 +181,17 @@ export class DespachoPage implements OnInit {
       },
       "AttachmentList" :documents,
     }
-    this.processes.CompleteTask(body);
-    this.close();
+
+    try {
+      await this.processes.CompleteTask(body);
+      this.close();
+      this.successMessage()
+    } catch(error) {
+      this.badRequest()
+    }
   }
-  arquivar(note:string, documents:any){
+
+  async arquivar(note:string, documents:any){
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Arquivo",
@@ -191,10 +201,17 @@ export class DespachoPage implements OnInit {
       },
       "AttachmentList" :documents,
     }
-    this.processes.CompleteTask(body);
-    this.close();
+    try {
+      await this.processes.CompleteTask(body);
+      this.successMessage()
+      this.close();
+    } catch (error) {
+      this.badRequest()
+    }
+
   }
-  reexecute(note:string, documents:any){
+
+  async reexecute(note:string, documents:any){
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Reencaminhar",
@@ -204,14 +221,25 @@ export class DespachoPage implements OnInit {
       },
       "AttachmentList" :documents,
     }
-    this.processes.CompleteTask(body);
-    this.close();
+
+    try {
+      await this.processes.CompleteTask(body);
+      this.close();
+      this.successMessage()
+    } catch (error) {
+      this.badRequest()
+    }
+
   }
 
   sendExpedienteToPending(){
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
       console.log(res);
       this.close();
+      this.successMessage()
+    },
+    error => {
+      this.badRequest()
     });
   }
 
@@ -235,14 +263,28 @@ export class DespachoPage implements OnInit {
     modal.onDidDismiss().then(res => {
       console.log(res);
       if(res.data){
+
+        const DocumentToSave = res.data.documents.map((e) => {
+          return {
+            ApplicationId: e.ApplicationType,
+            SourceId: e.Id,
+          }
+        });
+    
+        let docs = {
+          ProcessInstanceID: "",
+          Attachments: DocumentToSave,
+        }
+
         if(actionName == 'Executado'){
-          this.executado(res.data.note,res.data.documents);
+
+          this.executado(res.data.note, docs);
         }
         else if(actionName == 'Arquivar'){
-          this.arquivar(res.data.note,res.data.documents);
+          this.arquivar(res.data.note, docs);
         }
         else if(actionName == 'Reexecução'){
-          this.reexecute(res.data.note,res.data.documents);
+          this.reexecute(res.data.note, docs);
         }
       }
     });
@@ -372,4 +414,38 @@ export class DespachoPage implements OnInit {
     return await popover.present();
   }
   
+
+  async successMessage(message?: string) {
+    
+    const modal = await this.modalController.create({
+      component: SuccessMessageComponent,
+       componentProps: {
+        message: message || 'Processo efetuado' ,
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+    
+  }
+
+  async badRequest() {
+    const modal = await this.modalController.create({
+      component: BadRequestComponent,
+       componentProps: {
+        message: 'hello',
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },1000)
+  }
 }

src/app/pages/gabinete-digital/despachos/despachos.page.ts

@@ -20,179 +20,181 @@ import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/
   templateUrl: './despachos.page.html',
   styleUrls: ['./despachos.page.scss'],
 })
+
 export class DespachosPage implements OnInit {
-//profile:string;
+  //profile:string;
 
-@ViewChild(CalendarComponent) myCal: CalendarComponent;
+  @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
-taskslist:DailyWorkTask[];
-despachoList:any[] = [];
-deferimentoList:DailyWorkTask[] = [];
+  taskslist:DailyWorkTask[];
+  despachoList:any[] = [];
+  deferimentoList:DailyWorkTask[] = [];
 
-taskList:tasksList[] = [];
+  taskList:tasksList[] = [];
 
-taskType: string;
-serialNumber:string;
-totalDocs:any;
+  taskType: string;
+  serialNumber:string;
+  totalDocs:any;
 
-@Input() profile:string;
-segment:string;
-@Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
+  @Input() profile:string;
+  segment:string;
+  @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
 
-loadedAttachments:any;
-dicIndex = 0;
-inicial = false
+  loadedAttachments:any;
+  dicIndex = 0;
+  inicial = false
 
-constructor (
-  private processes:ProcessesService,
-  private modalController: ModalController,
-  private alertService: AlertService,
-  private authService: AuthService,
-  ) { 
-    this.profile = 'mdgpr';
+  constructor (
+    private processes:ProcessesService,
+    private modalController: ModalController,
+    private alertService: AlertService,
+    private authService: AuthService,
+    ) { 
+      this.profile = 'mdgpr';
+      // alert('nice!')
+    }
+
+  ngOnInit() {
+    //Inicializar segment
+    this.segment = "despachos";
+    this.LoadList();
+    this.authService.userData$.subscribe((res:any)=>{
+    console.log(res); 
+    });
+  }
+  segmentChanged(ev: any) {
+    this.LoadList();
   }
 
-ngOnInit() {
-  //Inicializar segment
-  this.segment = "despachos";
-  this.LoadList();
-  this.authService.userData$.subscribe((res:any)=>{
-   console.log(res); 
- });
-}
-segmentChanged(ev: any) {
-  this.LoadList();
-}
+  notImplemented(){
+    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+  }
 
-notImplemented(){
-  this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-}
+  openExpedientDetailPage(data){
+    console.log(data);
+    this.openExpedientDetail.emit(data);
+  }
 
-openExpedientDetailPage(data){
-  console.log(data);
-  this.openExpedientDetail.emit(data);
-}
+  async LoadList() {
 
- async LoadList(){
+    let result = await this.processes.GetTasksList("Despacho", false).toPromise();
+    //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
+    this.despachoList = new Array();
+    
+    console.log(result);
 
-   
-  let result = await this.processes.GetTasksList("Despacho", false).toPromise();
-  //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
-  
-  console.log(result);
+    await result.forEach( (element, index) => {
+      
+      let task = {
+        "SerialNumber": element.serialNumber,
+        "Folio": element.workflowInstanceDataFields.Subject,
+        "Senders": element.workflowInstanceDataFields.Sender,
+        "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": element.workflowInstanceDataFields.Remetente,
+        "DocumentsQty": '',
+        "DocId": element.workflowInstanceDataFields.DocId,
+        "WorkflowName": element.workflowDisplayName,
+        "FolderID": element.workflowInstanceDataFields.FolderID,
+        "activityInstanceName": element.activityInstanceName,
+      }
+        
+      this.despachoList.push(task)
+      
+    });
 
-  await result.forEach( (element, index) => {
-     
-     let task = {
-       "SerialNumber": element.serialNumber,
-       "Folio": element.workflowInstanceDataFields.Subject,
-       "Senders": element.workflowInstanceDataFields.Sender,
-       "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-       "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-       "Remetente": element.workflowInstanceDataFields.Remetente,
-       "DocumentsQty": '',
-       "DocId": element.workflowInstanceDataFields.DocId,
-       "WorkflowName": element.workflowDisplayName,
-       "FolderID": element.workflowInstanceDataFields.FolderID,
-       "activityInstanceName": element.activityInstanceName,
-     }
-     
-     this.despachoList.push(task)
-     
-   });
+    this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
 
-   this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
+    this.despachoList.forEach( (element, index) => {
+      // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
+      let FolderID = element['FolderID'];
 
-   this.despachoList.forEach( (element, index) => {
-     // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
-     let FolderID = element['FolderID'];
+      this.processes.GetDocumentDetails(FolderID, '361').subscribe(res=>{
+        element.DocumentsQty = res.DocumentsTotal
+      })
 
-     this.processes.GetDocumentDetails(FolderID, '361').subscribe(res=>{
-       element.DocumentsQty = res.DocumentsTotal
-     })
+    });
 
-   });
+  }
 
- }
+  sortArrayISODate(myArray: any){
+    return myArray.sort(function(a, b) {
+      return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
+    });
+  }
 
- sortArrayISODate(myArray: any){
-   return myArray.sort(function(a, b) {
-     return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
-   });
- }
-
-doRefresh(event) {
-  this.LoadList();
-
-  setTimeout(() => {
-    event.target.complete();
-  }, 2000);
-}
-
-async viewExpedientDetail(serialNumber:any) {
-  console.log(this.profile);
-
-  const modal = await this.modalController.create({
-    component: DespachoPage,
-    componentProps:{
-      enterAnimation: "",
-      serialNumber: serialNumber,
-      profile: this.profile,
-    },
-    cssClass: 'modal modal-desktop',
-  });
-  await modal.present();
-  modal.onDidDismiss().then((res)=>{
-    console.log('refresh list');
+  doRefresh(event) {
     this.LoadList();
-  });
-}
 
- // old
- async openExpedientActionsModal(taskAction: any, task: any) {
-   //this.modalController.dismiss();
-   let classs;
-   if( window.innerWidth <= 800){
-     classs = 'modal modal-desktop'
-   } else  {
-     classs = 'modal modal-desktop showAsideOptions'
-   }
+    setTimeout(() => {
+      event.target.complete();
+    }, 2000);
+  }
 
-   const doc = this.loadedAttachments[ this.dicIndex];
+  async viewExpedientDetail(serialNumber:any) {
+    console.log(this.profile);
 
-   task = {
-    serialNumber: doc.SourceId,
-    taskStartDate: doc.CreateDate,
-    isEvent: true,
-    workflowInstanceDataFields: {
-      FsId: doc.ApplicationId, 
-      FolderID: null,
-      DocId: doc.SourceId, 
-      Subject: doc.SourceName
-    },
-   }
+    const modal = await this.modalController.create({
+      component: DespachoPage,
+      componentProps:{
+        enterAnimation: "",
+        serialNumber: serialNumber,
+        profile: this.profile,
+      },
+      cssClass: 'modal modal-desktop',
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res)=>{
+      console.log('refresh list');
+      this.LoadList();
+    });
+  }
 
-   const modal = await this.modalController.create({
-     component: ExpedientTaskModalPage,
-     componentProps: {
-       taskAction: taskAction,
-       task: task,
-       profile: this.profile,
-     },
-     cssClass: classs,
-   });
-   await modal.present();
-   modal.onDidDismiss().then(res=>{
-     console.log(res['data']);
-     if(res['data']=='openDiscart'){
-       console.log('open discart');
-       
-       // this.distartExpedientModal();
+  // old
+  async openExpedientActionsModal(taskAction: any, task: any) {
+    //this.modalController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
 
-     }
+    const doc = this.loadedAttachments[ this.dicIndex];
 
-   });
- }
+    task = {
+      serialNumber: doc.SourceId,
+      taskStartDate: doc.CreateDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.ApplicationId, 
+        FolderID: null,
+        DocId: doc.SourceId, 
+        Subject: doc.SourceName
+      },
+    }
+
+    const modal = await this.modalController.create({
+      component: ExpedientTaskModalPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        profile: this.profile,
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      console.log(res['data']);
+      if(res['data']=='openDiscart'){
+        console.log('open discart');
+        
+        // this.distartExpedientModal();
+
+      }
+
+    });
+  }
 
  async openBookMeetingModal(task: any) {
 

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts

@@ -8,6 +8,8 @@ import { momentG }  from 'src/plugin/momentG';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.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';
 
 @Component({
   selector: 'app-diploma',
@@ -53,7 +55,7 @@ export class DiplomaPage implements OnInit {
   goBack(){
     let navigationExtras: NavigationExtras = {
       queryParams: {
-          "diplomas": true,
+        "diplomas": true,
       }
     };
     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
@@ -134,7 +136,7 @@ export class DiplomaPage implements OnInit {
     })
   }
 
-  askSignature(note:string, documents:any){
+  async askSignature(note:string, documents:any){
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Aprovar",
@@ -144,11 +146,16 @@ export class DiplomaPage implements OnInit {
       },
       "AttachmentList" :documents,
     }
-    this.processes.CompleteTask(body);
-    this.close();
+    try {
+      await this.processes.CompleteTask(body);
+      this.close();
+      this.successMessage()
+    } catch (error) {
+      this.badRequest()
+    }
   }
 
-  askToChange(note:string, documents:any){
+  async askToChange(note:string, documents:any){
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Retificar",
@@ -158,8 +165,14 @@ export class DiplomaPage implements OnInit {
       },
       "AttachmentList" :documents,
     }
-    this.processes.CompleteTask(body);
-    this.close();
+
+    try {
+      await this.processes.CompleteTask(body);
+      this.close();
+      this.successMessage()
+    } catch (error) {
+      this.badRequest()
+    }
   }
 
   async openAddNoteModal(actionName:string) {
@@ -181,12 +194,27 @@ export class DiplomaPage implements OnInit {
   
     modal.onDidDismiss().then(res => {
       if(res.data){
+
+                
+        const DocumentToSave = res.data.documents.map((e) => {
+          return {
+            ApplicationId: e.ApplicationType,
+            SourceId: e.Id,
+          }
+        });
+    
+        let docs = {
+          ProcessInstanceID: "",
+          Attachments: DocumentToSave,
+        }
+
+
         if(actionName == 'Solicitar assinatura'){
-          this.askSignature(res.data.note,res.data.documents);
+          this.askSignature(res.data.note, docs);
           this.goBack();
         }
         else if(actionName == 'Solicitar alteração'){
-          this.askToChange(res.data.note,res.data.documents);
+          this.askToChange(res.data.note, docs);
           this.goBack();
         }
       }
@@ -216,4 +244,38 @@ export class DiplomaPage implements OnInit {
     this.modalController.dismiss();
   }
 
+  async successMessage(message?: string) {
+    
+    const modal = await this.modalController.create({
+      component: SuccessMessageComponent,
+       componentProps: {
+        message: message || 'Processo efetuado' ,
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+    
+  }
+
+  async badRequest() {
+    const modal = await this.modalController.create({
+      component: BadRequestComponent,
+       componentProps: {
+        message: 'hello',
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    }, 3000)
+  }
+
 }

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

@@ -6,6 +6,8 @@ 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 { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.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 { EmendMessageModalPage } from '../../../agenda/emend-message-modal/emend-message-modal.page';
 import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/event-actions-popover.page';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
@@ -56,7 +58,6 @@ export class ApproveEventModalPage implements OnInit {
     this.getTask();
     this.getAttachments();
 
-    
   }
 
 
@@ -109,20 +110,27 @@ export class ApproveEventModalPage implements OnInit {
     this.modalController.dismiss(null);
   }
 
-  rejectTask(serialNumber:string){
-    console.log('rejectTask: ',serialNumber)
+  async rejectTask(serialNumber:string) {
+    // console.log('rejectTask: ',serialNumber)
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
-    console.log(body);
-    this.processes.PostTaskAction(body);
-    this.router.navigate(['/home/gabinete-digital/event-list']);
+    // console.log(body);
+    
+    try { 
+      await  this.processes.PostTaskAction(body);
+      this.router.navigate(['/home/gabinete-digital/event-list']);
+
+      this.successMessage()
+    } catch (error) {
+      this.badRequest()
+    }
+
     this.modalController.dismiss(null);
   }
-  async getAttachments(){
 
+  async getAttachments() {
     this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise();
-    console.log(this.loadedAttachments);
-    
 
+    console.log(this.loadedAttachments);
   }
 
   async openOptions(ev:any) {
@@ -134,40 +142,49 @@ export class ApproveEventModalPage implements OnInit {
     });
     return await popover.present();
   }
+
   openMenu() {
     this.menu.open();
- }
- async openEmendMessageModal(serialNumber:string) {
-  const modal = await this.modalController.create({
-    component: EmendMessageModalPage,
-    componentProps:{
-      
-    },
-    cssClass: 'emend-message-modal',
-    backdropDismiss: false
-  });
+  }
 
-  await modal.present();
+  async openEmendMessageModal(serialNumber:string) {
+    const modal = await this.modalController.create({
+      component: EmendMessageModalPage,
+      componentProps:{
+      },
+      cssClass: 'emend-message-modal',
+      backdropDismiss: false
+    });
+
+    await modal.present();
+
+    modal.onDidDismiss().then( async (res) => {
+      if(res.data !== '') {
+        let body = { 
+          "serialNumber": serialNumber, 
+          "action": "Emendar",
+          "dataFields": {
+            "ReviewerUseComment": res.data,
+          }
+        }
+
+        //console.log(body);
+
+        try {
+          await this.processes.PostTaskAction(body);
+          this.router.navigate(['/home/gabinete-digital/event-list']);
+          this.successMessage()
+        } catch (error) {
+          this.badRequest()
+          this.router.navigate(['/home/gabinete-digital/event-list']);
+        }
 
-  modal.onDidDismiss().then(res => {
-    if(res.data !== ''){
-      let body = { "serialNumber": serialNumber, 
-       "action": "Emendar",
-       "dataFields": {
-       "ReviewerUseComment": res.data,
-       }
       }
-    console.log(body);
-    this.processes.PostTaskAction(body);
-    this.router.navigate(['/home/gabinete-digital/event-list']);
-    }
-    else{
-      //this.alertService.presentAlert('Operação cancelada!');
-    }
-  });
-}
-
-
+      else {
+        //this.alertService.presentAlert('Operação cancelada!');
+      }
+    });
+  }
 
   async editar(serialNumber: string) {
 
@@ -188,5 +205,39 @@ export class ApproveEventModalPage implements OnInit {
     });
 
   } 
+
+  async successMessage(message?: string) {
+    
+    const modal = await this.modalController.create({
+      component: SuccessMessageComponent,
+       componentProps: {
+        message: message || 'Processo efetuado' ,
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+    
+  }
+
+  async badRequest() {
+    const modal = await this.modalController.create({
+      component: BadRequestComponent,
+       componentProps: {
+        message: 'hello',
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },1000)
+  }
   
 }

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

@@ -188,7 +188,7 @@ export class ApproveEventPage implements OnInit {
   goToEventsToApprove(){
     let navigationExtras: NavigationExtras = {
       queryParams: {
-          "events": true,
+        "events": true,
       }
     };
     this.router.navigate(['/home/gabinete-digital'], navigationExtras);

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts

@@ -12,6 +12,8 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { SearchPage } from 'src/app/pages/search/search.page';
 import { SearchDocument } from 'src/app/models/search-document';
+import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
+import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
 
 @Component({
   selector: 'app-book-meeting-modal',
@@ -85,7 +87,7 @@ export class BookMeetingModalPage implements OnInit {
   cancelTask(){
     this.modalController.dismiss(null);
   }
-  saveTask(){
+  async saveTask(){
 
     // issue12323423
     let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
@@ -115,15 +117,30 @@ export class BookMeetingModalPage implements OnInit {
     }
     console.log(this.postData);
 
-    if(this.task.FsId == '8'){
-      this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId);
-      this.distartExpedientModal();
+    if(this.task.FsId == '8') {
+
+      try {
+        await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise()
+        this.distartExpedientModal();
+        this.successMessage('Reunião criada')
+      } catch (error) {
+        this.badRequest()
+      }
+
+
     }
-    else if(this.task.FsId == '361'){
-      this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId);
+    else if(this.task.FsId == '361') {
+      try {
+        await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise()
+        this.successMessage('Reunião criada')
+        this.close();
+      } catch (error) {
+        this.badRequest()
+      }
+     
     }
 
-    this.close();
+   
   }
 
   async addParticipants(){
@@ -263,4 +280,41 @@ export class BookMeetingModalPage implements OnInit {
     this.taskParticipantsCc = taskParticipantsCc;
   }
 
+
+
+  async successMessage(message?: string) {
+    
+    const modal = await this.modalController.create({
+      component: SuccessMessageComponent,
+       componentProps: {
+        message: message || 'Processo efetuado' ,
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+    
+  }
+
+  async badRequest(message?: string) {
+    const modal = await this.modalController.create({
+      component: BadRequestComponent,
+       componentProps: {
+        message: message || 'Processo não efetuado' ,
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+  }
+
+
 }

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

@@ -18,6 +18,8 @@ import { SearchPage } from 'src/app/pages/search/search.page';
 import { SearchDocument } from 'src/app/models/search-document';
 import { EventAttachment } from 'src/app/models/attachment.model';
 import { User } from 'src/app/models/user.model';
+import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
+import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
 
 @Component({
   selector: 'app-expedient-task-modal',
@@ -184,6 +186,7 @@ export class ExpedientTaskModalPage implements OnInit {
 
     this.dispatchFolder.SubjectTypes = this.selectedTypes;
 
+
     if(this.taskParticipants.length > 0) {
       switch (this.taskType) {
         case '0':
@@ -198,8 +201,16 @@ export class ExpedientTaskModalPage implements OnInit {
             //SubjectTypes: [],
 
           }
-          console.log('this.postData', this.postData, this.taskType);
-          this.taskResult = await this.processes.postDespatcho(this.postData);
+
+          // console.log('this.postData', this.postData, this.taskType);
+          
+          try {
+            this.taskResult = await this.processes.postDespatcho(this.postData).toPromise()
+            await this.successMessage('Processo efetuado')
+          } catch (error) {
+            await this.badRequest('Processo não efetuado')
+          }
+         
           console.log('this.taskResult', this.taskResult);
 
           let action_despacho = {
@@ -210,6 +221,7 @@ export class ExpedientTaskModalPage implements OnInit {
               "Note": "",
             }
           }
+
           this.modalController.dismiss(action_despacho);
           break;
 
@@ -223,9 +235,17 @@ export class ExpedientTaskModalPage implements OnInit {
             DispatchFolder: this.dispatchFolder,
             AttachmentList: docs
           }
-          console.log(this.postData);
-          this.taskResult = await this.processes.postParecer(this.postData);
-          console.log('this.taskResult', this.taskResult);
+
+          //console.log(this.postData);
+      
+          try {
+            this.taskResult = await this.processes.postParecer(this.postData).toPromise()
+            await this.successMessage('Processo efetuado')
+          } catch (error) {
+            await this.badRequest('Processo não efetuado')
+          }
+          
+          // console.log('this.taskResult', this.taskResult);
 
           let action_parecer = {
             "serialNumber": this.task.serialNumber,
@@ -247,9 +267,17 @@ export class ExpedientTaskModalPage implements OnInit {
             DispatchFolder: this.dispatchFolder,
             AttachmentList: docs
           }
-          console.log(this.postData);
-          this.taskResult = await this.processes.postDeferimento(this.postData);
+
+          //console.log(this.postData);
+         
+          try {
+            this.taskResult = await this.processes.postDeferimento(this.postData).toPromise()
+            await this.successMessage('Processo efetuado')
+          } catch (error) {
+            await this.badRequest('Processo não efetuado')
+          }
           
+
           console.log('this.taskResult', this.taskResult);
           
           let action_deferimento = {
@@ -263,10 +291,10 @@ export class ExpedientTaskModalPage implements OnInit {
           this.modalController.dismiss(action_deferimento);
           break;
       }
-  }
-  else {
-    this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");
-  }
+    }
+    else {
+      this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");
+    }
     
   }
 
@@ -457,4 +485,39 @@ export class ExpedientTaskModalPage implements OnInit {
 
   }
 
+
+  async successMessage(message?: string) {
+    
+    const modal = await this.modalController.create({
+      component: SuccessMessageComponent,
+       componentProps: {
+        message: message || 'Processo efetuado' ,
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+    
+  }
+
+  async badRequest(message?: string) {
+    const modal = await this.modalController.create({
+      component: BadRequestComponent,
+       componentProps: {
+        message: message || 'Processo não efetuado' ,
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+  }
+
 }

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

@@ -15,6 +15,8 @@ import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
 import { momentG }  from 'src/plugin/momentG'
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
 import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
+import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
+import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
 
 @Component({
   selector: 'app-expediente-detail',
@@ -88,7 +90,12 @@ export class ExpedienteDetailPage implements OnInit {
   sendExpedienteToPending(){
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
       console.log(res);
+      this.successMessage('Processo enviado para pendentes')
+
       this.close();
+    },
+    (error)=>{
+      this.badRequest()
     });
   }
 
@@ -305,4 +312,41 @@ export class ExpedienteDetailPage implements OnInit {
     });
     return await popover.present();
   }
+
+
+
+  async successMessage(message?: string) {
+    
+    const modal = await this.modalController.create({
+      component: SuccessMessageComponent,
+       componentProps: {
+        message: message || 'Processo efetuado' ,
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+    
+  }
+
+  async badRequest(message?: string) {
+    const modal = await this.modalController.create({
+      component: BadRequestComponent,
+       componentProps: {
+        message: message || 'Processo não efetuado' ,
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+  }
+
 }

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

@@ -54,7 +54,10 @@ export class GabineteDigitalPage implements OnInit {
   showEventsToApprove = false;
   showEmptyContainer = false;
   showExpedients = false;
+<<<<<<< HEAD
   showExpedientesPr = false;
+=======
+>>>>>>> f7eaca61e7eb3f287c9ce200e1f3654d3ac0ebff
   showPedidos = false;
   showDespachos = false;
   showDespachosPr = false;

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

@@ -51,14 +51,14 @@ export class PedidoPage implements OnInit {
      this.activatedRoute.queryParams.subscribe(params => {
       if(params["serialNumber"]) {
         this.serialnumber = params["serialNumber"];
-        console.log(params["serialNumber"]);
+        // console.log(params["serialNumber"]);
       }
     });
     }
 
   ngOnInit() {
     this.profile = "mdgpr";
-    console.log(this.serialnumber);
+    // console.log(this.serialnumber);
     
     this.LoadTaskDetail(this.serialnumber);
   }
@@ -66,7 +66,7 @@ export class PedidoPage implements OnInit {
   goBack(){
     let navigationExtras: NavigationExtras = {
       queryParams: {
-          "pedidos": true,
+        "pedidos": true,
       }
     };
     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
@@ -147,7 +147,7 @@ export class PedidoPage implements OnInit {
   getDocumentDetails(forlderId:string, applicationId:string){
     this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
       this.attachments = res.Documents;
-      console.log(res['Documents']);
+      // console.log(res['Documents']);
       console.log(this.attachments);
     })
   }
@@ -165,7 +165,8 @@ export class PedidoPage implements OnInit {
     this.menu.open();
     this.modalController.dismiss();
   }
-  repreciar(note:string, documents:any){
+
+  repreciar(note:string, documents:any) {
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Reapreciação",
@@ -179,7 +180,7 @@ export class PedidoPage implements OnInit {
     this.close();
   }
   
-  arquivar(note:string, documents:any){
+  arquivar(note:string, documents:any) {
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Arquivo",
@@ -368,13 +369,28 @@ export class PedidoPage implements OnInit {
     await modal.present();
   
     modal.onDidDismiss().then(res => {
-      console.log(res);
+
+
+      const DocumentToSave = res.data.documents.map((e) => {
+        return {
+          ApplicationId: e.ApplicationType,
+          SourceId: e.Id,
+        }
+      });
+  
+      let docs = {
+        ProcessInstanceID: "",
+        Attachments: DocumentToSave,
+      }
+
+
       if(res.data){
-        if(actionName == 'Solicitar Reapreciação'){
-          this.repreciar(res.data.note,res.data.documents);
+        if(actionName == 'Solicitar Reapreciação') {
+
+          this.repreciar(res.data.note, docs);
         }
         else if(actionName == 'Arquivar'){
-          this.arquivar(res.data.note,res.data.documents);
+          this.arquivar(res.data.note, docs);
         }
       }
     });

src/app/pages/gabinete-digital/pendentes/pendentes.page.ts

@@ -46,6 +46,7 @@ export class PendentesPage implements OnInit {
      console.log(res); 
    });
   }
+  
   segmentChanged(ev: any) {
     this.LoadList();
   }