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

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

@@ -197,9 +197,7 @@
           </ion-item>
           </ion-list>
         </div>
-
       </div>
-      
     </div>
 
     <div *ngIf="postData" class="aside-right flex-column height-100">

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

@@ -272,13 +272,22 @@ export class ExpedientTaskModalPage implements OnInit {
                 AttachmentList: docs,
               }
 
+              let action_despacho = {
+                "serialNumber": this.task.serialNumber,
+                "action": "Tratado",
+                "ActionTypeId": 94,
+                "dataFields": {
+                  "Note": "",
+                }
+              }
+
               console.log(this.postData);
 
               try {
 
                 this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
                 await this.toastService.successMessage('Processo efetuado');
-                this.modalController.dismiss();
+                this.modalController.dismiss(action_despacho);
 
               } catch (error) {
                 await this.toastService.badRequest('Processo não efetuado')

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

@@ -192,7 +192,6 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
   async openExpedientActionsModal(taskAction: any, task: any) {
-    //this.modalController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -210,15 +209,12 @@ export class ExpedienteDetailPage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss().then(res=>{
-      console.log(res['data']);
       let body = res['data'];
       if(res['data']){
-        console.log('open discart')
         this.distartExpedientModal(body);
       }
       else{
-        console.log('Not open');
-        this.goBack();
+        this.close();
       }
     });
   }

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

@@ -15,6 +15,7 @@ export class ExpedientePage implements OnInit {
   segment:string;
   skeletonLoader = true
   //profile:string;
+  showLoader:boolean;
 
   taskslist:DailyWorkTask[];
   serialNumber:string;
@@ -84,6 +85,7 @@ export class ExpedientePage implements OnInit {
   }
 
   goToExpediente(serialNumber:any){
+    //console.log('ABRE');
     this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
   }