Fixe merge

src/app/modals/add-note/add-note.page.ts

@@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core';
 import { ModalController } from '@ionic/angular';
 import { SearchDocument } from 'src/app/models/search-document';
 import { SearchPage } from 'src/app/pages/search/search.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-add-note',
@@ -32,7 +34,8 @@ export class AddNotePage implements OnInit {
     this.modalController.dismiss(body);
   }
 
-  async getDoc(){
+  async getDoc() {
+
     const modal = await this.modalController.create({
       component: SearchPage,
       cssClass: 'modal-width-100-width-background modal',
@@ -49,12 +52,46 @@ export class AddNotePage implements OnInit {
           this.documents.push(data.selected);
         }
     });
+
   }
 
   removeAttachment(index: number){
 
     this.documents = this.documents.filter( (e, i) =>  index != i);
+  }
+
+  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/modals/create-process/create-process.page.ts

@@ -16,6 +16,8 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
 import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 import { SearchDocument } from 'src/app/models/search-document';
 import { SearchPage } from 'src/app/pages/search/search.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-create-process',
@@ -130,7 +132,7 @@ export class CreateProcessPage implements OnInit {
     this.modalController.dismiss(null);
     
   }
-  saveTask(){
+  async saveTask(){
 
     if(this.postData.Priority=='99999861'){
       this.dispatchFolder.DeadlineType = 'Normal';
@@ -174,7 +176,14 @@ export class CreateProcessPage implements OnInit {
             DispatchFolder: this.dispatchFolder,
           }
           console.log('this.postData', this.postData, this.taskType);
-          this.processes.postDespatcho(this.postData);
+
+          try {
+            //await this.processes.postDespatcho(this.postData).toPromise()
+            this.successMessage()
+          } catch (error) {
+            this.badRequest()
+          }
+          
           break;
         case '1':
           this.postData = {
@@ -186,7 +195,15 @@ export class CreateProcessPage implements OnInit {
             DispatchFolder: this.dispatchFolder,
           }
           console.log(this.postData);
-          this.processes.postParecer(this.postData);
+          await this.processes.postParecer(this.postData).toPromise()
+
+          try {
+            await this.processes.postParecer(this.postData).toPromise()
+            this.successMessage()
+          } catch (error) {
+            this.badRequest()
+          }
+
           break;
         case '2':
           this.postData = {
@@ -198,7 +215,14 @@ export class CreateProcessPage implements OnInit {
             DispatchFolder: this.dispatchFolder,
           }
           console.log(this.postData);
-          this.processes.postDeferimento(this.postData);
+        
+          try {
+            await this.processes.postDeferimento(this.postData).toPromise()
+            this.successMessage()
+          } catch (error) {
+            this.badRequest()
+          }
+
           break;
       }
       this.executado();
@@ -233,7 +257,6 @@ export class CreateProcessPage implements OnInit {
   async addParticipants() {
     /* console.log('HERES'); */
     
-
     this.adding = "intervenient";
     this.contacts =  this.taskParticipants;
 
@@ -412,4 +435,39 @@ export class CreateProcessPage 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/modals/dar-parecer/dar-parecer.page.ts

@@ -34,7 +34,8 @@ export class DarParecerPage implements OnInit {
     this.modalController.dismiss();
   }
   
-  save(){
+  save() {
+    
     const DocumentToSave = this.documents.map((e) => {
       return {
         ApplicationId: e.ApplicationType,
@@ -43,11 +44,10 @@ export class DarParecerPage implements OnInit {
     });
 
     let docs = {
-      ProcessInstanceID: this.instanceId,
+      ProcessInstanceID: "",
       Attachments: DocumentToSave,
     }
 
-
     let body = { 
       "serialNumber": this.serialNumber, 
       "action": "Registar",

src/app/modals/delegar/delegar.page.ts

@@ -11,6 +11,8 @@ import { AddParticipantsModalPage } from 'src/app/pages/gabinete-digital/expedie
 import { AddParticipantsCcModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { AlertService } from 'src/app/services/alert.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';
 
 @Component({
   selector: 'app-delegar',
@@ -93,6 +95,10 @@ export class DelegarPage implements OnInit {
       console.log(body);
       this.processes.DelegateTask(body).subscribe(res=>{
         console.log(res); 
+        this.successMessage('Processo delegado')
+      },
+      (error)=>{
+        this.badRequest()
       });
       this.close();
     }
@@ -164,4 +170,42 @@ export class DelegarPage implements OnInit {
     this.taskParticipants = taskParticipants;
   }
 
+
+
+  
+
+  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/agenda/approve-event-modal/approve-event-modal.page.ts

@@ -167,12 +167,12 @@ export class ApproveEventModalPage implements OnInit {
   }
     
 
-  async successMessage() {
+  async successMessage(message?: string) {
     
     const modal = await this.modalController.create({
       component: SuccessMessageComponent,
-      componentProps: {
+       componentProps: {
-        message: 'hello',
+        message: message || 'Processo efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -181,7 +181,7 @@ export class ApproveEventModalPage implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    },1000)
+    },3000)
     
   }
 

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

@@ -233,12 +233,12 @@ export class EditEventPage implements OnInit {
     });
   }
 
-  async successMessage() {
+  async successMessage(message?: string) {
     
     const modal = await this.modalController.create({
       component: SuccessMessageComponent,
        componentProps: {
-        message: 'Processo realizado com sucesso',
+        message: message || 'Processo efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });

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

@@ -168,12 +168,12 @@ export class NewEventPage implements OnInit {
   }
 
 
-  async successMessage() {
+  async successMessage(message?: string) {
     
     const modal = await this.modalController.create({
       component: SuccessMessageComponent,
        componentProps: {
-        message: 'Processo realizado com sucesso',
+        message: message || 'Processo efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });

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

@@ -258,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);
         }
       }
     });
@@ -395,12 +410,12 @@ export class DespachoPrPage implements OnInit {
     return await popover.present();
   }
     
-  async successMessage() {
+  async successMessage(message?: string) {
     
     const modal = await this.modalController.create({
       component: SuccessMessageComponent,
        componentProps: {
-        message: 'hello',
+        message: message || 'Processo efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -409,7 +424,7 @@ export class DespachoPrPage implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    },1000)
+    },3000)
     
   }
 

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

@@ -263,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);
         }
       }
     });
@@ -401,12 +415,12 @@ export class DespachoPage implements OnInit {
   }
   
 
-  async successMessage() {
+  async successMessage(message?: string) {
     
     const modal = await this.modalController.create({
       component: SuccessMessageComponent,
        componentProps: {
-        message: 'hello',
+        message: message || 'Processo efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -415,7 +429,7 @@ export class DespachoPage implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    },1000)
+    },3000)
     
   }
 

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

@@ -150,51 +150,51 @@ export class DespachosPage implements OnInit {
     });
   }
 
- // old
+  // old
- async openExpedientActionsModal(taskAction: any, task: any) {
+  async openExpedientActionsModal(taskAction: any, task: any) {
-   //this.modalController.dismiss();
+    //this.modalController.dismiss();
-   let classs;
+    let classs;
-   if( window.innerWidth <= 800){
+    if( window.innerWidth <= 800){
-     classs = 'modal modal-desktop'
+      classs = 'modal modal-desktop'
-   } else  {
+    } else  {
-     classs = 'modal modal-desktop showAsideOptions'
+      classs = 'modal modal-desktop showAsideOptions'
-   }
+    }
 
-   const doc = this.loadedAttachments[ this.dicIndex];
+    const doc = this.loadedAttachments[ this.dicIndex];
 
-   task = {
+    task = {
-    serialNumber: doc.SourceId,
+      serialNumber: doc.SourceId,
-    taskStartDate: doc.CreateDate,
+      taskStartDate: doc.CreateDate,
-    isEvent: true,
+      isEvent: true,
-    workflowInstanceDataFields: {
+      workflowInstanceDataFields: {
-      FsId: doc.ApplicationId, 
+        FsId: doc.ApplicationId, 
-      FolderID: null,
+        FolderID: null,
-      DocId: doc.SourceId, 
+        DocId: doc.SourceId, 
-      Subject: doc.SourceName
+        Subject: doc.SourceName
-    },
+      },
-   }
+    }
 
-   const modal = await this.modalController.create({
+    const modal = await this.modalController.create({
-     component: ExpedientTaskModalPage,
+      component: ExpedientTaskModalPage,
-     componentProps: {
+      componentProps: {
-       taskAction: taskAction,
+        taskAction: taskAction,
-       task: task,
+        task: task,
-       profile: this.profile,
+        profile: this.profile,
-     },
+      },
-     cssClass: classs,
+      cssClass: classs,
-   });
+    });
-   await modal.present();
+    await modal.present();
-   modal.onDidDismiss().then(res=>{
+    modal.onDidDismiss().then(res=>{
-     console.log(res['data']);
+      console.log(res['data']);
-     if(res['data']=='openDiscart'){
+      if(res['data']=='openDiscart'){
-       console.log('open discart');
+        console.log('open discart');
         
-       // this.distartExpedientModal();
+        // this.distartExpedientModal();
 
-     }
+      }
 
-   });
+    });
- }
+  }
 
  async openBookMeetingModal(task: any) {
 

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

@@ -194,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();
         }
       }
@@ -229,12 +244,12 @@ export class DiplomaPage implements OnInit {
     this.modalController.dismiss();
   }
 
-  async successMessage() {
+  async successMessage(message?: string) {
     
     const modal = await this.modalController.create({
       component: SuccessMessageComponent,
        componentProps: {
-        message: 'hello',
+        message: message || 'Processo efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -243,7 +258,7 @@ export class DiplomaPage implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    }, 3000)
+    },3000)
     
   }
 

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

@@ -206,12 +206,12 @@ export class ApproveEventModalPage implements OnInit {
 
   } 
 
-  async successMessage() {
+  async successMessage(message?: string) {
     
     const modal = await this.modalController.create({
       component: SuccessMessageComponent,
        componentProps: {
-        message: 'hello',
+        message: message || 'Processo efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -220,7 +220,7 @@ export class ApproveEventModalPage implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    },1000)
+    },3000)
     
   }
 

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

@@ -87,7 +87,7 @@ export class BookMeetingModalPage implements OnInit {
   cancelTask(){
     this.modalController.dismiss(null);
   }
-  saveTask(){
+  async saveTask(){
 
     // issue12323423
     let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
@@ -120,9 +120,9 @@ export class BookMeetingModalPage implements OnInit {
     if(this.task.FsId == '8') {
 
       try {
-        this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId);
+        await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise()
         this.distartExpedientModal();
-        this.successMessage()
+        this.successMessage('Reunião criada')
       } catch (error) {
         this.badRequest()
       }
@@ -131,8 +131,8 @@ export class BookMeetingModalPage implements OnInit {
     }
     else if(this.task.FsId == '361') {
       try {
-        this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId);
+        await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise()
-        this.successMessage()
+        this.successMessage('Reunião criada')
         this.close();
       } catch (error) {
         this.badRequest()
@@ -282,12 +282,12 @@ export class BookMeetingModalPage implements OnInit {
 
 
 
-  async successMessage() {
+  async successMessage(message?: string) {
     
     const modal = await this.modalController.create({
       component: SuccessMessageComponent,
        componentProps: {
-        message: 'hello',
+        message: message || 'Processo efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -296,15 +296,15 @@ export class BookMeetingModalPage implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    },1000)
+    },3000)
     
   }
 
-  async badRequest() {
+  async badRequest(message?: string) {
     const modal = await this.modalController.create({
       component: BadRequestComponent,
        componentProps: {
-        message: 'hello',
+        message: message || 'Processo não efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -313,7 +313,8 @@ export class BookMeetingModalPage implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    },1000)
+    },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.postData);
-          console.log('this.taskResult', this.taskResult);
+      
+          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,8 +267,16 @@ 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);
           
@@ -263,10 +291,10 @@ export class ExpedientTaskModalPage implements OnInit {
           this.modalController.dismiss(action_deferimento);
           break;
       }
-  }
+    }
-  else {
+    else {
-    this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");
+      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

@@ -53,7 +53,7 @@ export class GabineteDigitalPage implements OnInit {
 
   showEventsToApprove = false;
   showEmptyContainer = false;
-  showExpedients = true;
+  showExpedients = false;
   showPedidos = false;
   showDespachos = false;
   showDespachosPr = false;

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

@@ -369,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'){
+        if(actionName == 'Solicitar Reapreciação') {
-          this.repreciar(res.data.note,res.data.documents);
+
+          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/services/events.service.ts

@@ -203,9 +203,7 @@ export class EventsService {
       headers: this.headers,
       params: params 
     };
-    return this.http.post<any>(`${geturl}`, body, options).toPromise().then(res =>{
+    return this.http.post<any>(`${geturl}`, body, options)
-      console.log(res);
-    });
   }
   createTaskEvent(folderId:any, body:any, sharedagenda:string, serialNumber:any, applicationID:any){
     const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente')+'/dispatch';
@@ -219,9 +217,7 @@ export class EventsService {
       headers: this.headers,
       params: params 
     };
-    return this.http.post<any>(`${geturl}`, body, options).toPromise().then(res =>{
+    return this.http.post<any>(`${geturl}`, body, options)
-      console.log(res);
-    });
   }
 
   postEventToApproveEdit(body: EventToApproveEdit) {

src/app/services/processes.service.ts

@@ -180,7 +180,7 @@ export class ProcessesService {
     let options = { 
       headers: this.headers,
     };
-    return this.http.post<any>(`${geturl}`, body, options).toPromise();
+    return this.http.post<any>(`${geturl}`, body, options)
   }
 
   postParecer(body:any){
@@ -188,7 +188,7 @@ export class ProcessesService {
     let options = { 
       headers: this.headers,
     };
-    return this.http.post<any>(`${geturl}`, body, options).toPromise();
+    return this.http.post<any>(`${geturl}`, body, options)
   }
 
   postDeferimento(body:any){
@@ -196,7 +196,7 @@ export class ProcessesService {
     let options = { 
       headers: this.headers,
     };
-    return this.http.post<any>(`${geturl}`, body, options).toPromise();
+    return this.http.post<any>(`${geturl}`, body, options)
   }
 
 

src/app/shared/agenda/approve-event/approve-event.component.ts

@@ -225,12 +225,12 @@ export class ApproveEventComponent implements OnInit {
   } 
 
 
-  async successMessage() {
+  async successMessage(message?: string) {
     
     const modal = await this.modalController.create({
       component: SuccessMessageComponent,
        componentProps: {
-        message: 'hello',
+        message: message || 'Processo efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -239,7 +239,7 @@ export class ApproveEventComponent implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    },1000)
+    },3000)
     
   }
 

src/app/shared/agenda/new-event/new-event.component.ts

@@ -311,12 +311,12 @@ export class NewEventPage implements OnInit {
     window['temp.path:/home/agenda/new-event.component.ts'] = {}
   }
 
-  async successMessage() {
+  async successMessage(message?: string) {
     
     const modal = await this.modalController.create({
       component: SuccessMessageComponent,
        componentProps: {
-        message: 'Processo realizado com sucesso',
+        message: message || 'Processo efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });

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

@@ -406,12 +406,12 @@ export class EditEventToApproveComponent implements OnInit {
     });
   }
 
-  async successMessage() {
+  async successMessage(message?: string) {
     
     const modal = await this.modalController.create({
       component: SuccessMessageComponent,
        componentProps: {
-        message: 'hello',
+        message: message || 'Processo efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -420,7 +420,7 @@ export class EditEventToApproveComponent implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    },1000)
+    },3000)
     
   }