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

@@ -22,7 +22,7 @@
 
       <!-- Add scrolls -->
       <div class="d-flex flex-column height-100 overflow-y-auto">
-        
+
         <div class="container-div width-100">
           <div class="ion-item-class-2">
             <div class="ion-icon-class">
@@ -44,18 +44,18 @@
             </div>
           </div>
         </div> -->
-        
+
         <div class="container-div width-100">
           <div class="ion-item-class-2 width-100">
             <div class="ion-icon-class">
               <ion-icon class="icon-time" slot="start" name="time-outline"></ion-icon>
             </div>
             <div class="ion-input-class" [class.input-error]="Form?.get('Priority')?.invalid  && validateFrom ">
-              <ion-select 
+              <ion-select
-                placeholder="Prazo*" 
+                placeholder="Prazo*"
-                [(ngModel)]="postData.Priority" 
+                [(ngModel)]="postData.Priority"
-                interface="action-sheet" 
+                interface="action-sheet"
-                Cancel-text="Cancelar" 
+                Cancel-text="Cancelar"
                 required
                 class="d-block d-md-none"
                 >
@@ -95,18 +95,18 @@
               <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
             </div>
             <div class="ion-input-class" [class.input-error]="Form?.get('selectedTypes')?.invalid  && validateFrom ">
-              <!-- <ion-item 
+              <!-- <ion-item
                 class="ion-no-border ion-no-padding ion-no-margin d-block d-md-none">
                 <ion-select
                 [(ngModel)]="selectedTypes"
-                (ngModelChange)="onSelectedTypesChanged($event)" 
+                (ngModelChange)="onSelectedTypesChanged($event)"
                 multiple="true" interface="alert" Cancel-text="Cancelar" required>
                   <ion-select-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</ion-select-option>
                 </ion-select>
               </ion-item> -->
               <mat-form-field
                 floatLabel="never"
-                appearance="fill" 
+                appearance="fill"
                 class="width-100 d-block"
                 appearance="none">
                 <mat-select [(ngModel)]="selectedTypes" multiple placeholder="Selecione o tipo de evento*">
@@ -127,7 +127,7 @@
             </div>
           </div>
         </div>
-  
+
         <div class="container-div" >
           <div class="ion-item-class-2">
             <div class="ion-icon-class">
@@ -148,7 +148,7 @@
             </div>
           </div>
         </div>
-  
+
         <div class="container-div">
           <div class="ion-item-class-2">
             <div class="ion-icon-class">
@@ -169,7 +169,7 @@
             </div>
           </div>
         </div>
-  
+
         <div class="ion-item-container-no-border" (click)="getDoc()">
           <ion-label class="d-flex align-center">
             <div class="attach-icon d-flex align-center">
@@ -177,35 +177,33 @@
             </div>
             <div class="attach-document pl-10">
               <ion-label>Anexar Documentos</ion-label>
-            </div> 
+            </div>
           </ion-label>
         </div>
-  
+
-        <div class="list "  *ngFor="let document of documents; let i = index" > 
+        <div class="list "  *ngFor="let document of documents; let i = index" >
           <ion-list>
             <ion-item>
             <ion-label>
-              <p class="d-flex ion-justify-content-between"> 
+              <p class="d-flex ion-justify-content-between">
-                <span class="attach-title-item">{{document.Assunto}}</span> 
+                <span class="attach-title-item">{{document.Assunto}}</span>
-                <span class="app-name">{{document.appName}}</span> 
+                <span class="app-name">{{document.appName}}</span>
                 <span class="close-button text-black" (click)="removeAttachment(i)" >
                   <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                 </span>
-              </p> 
+              </p>
               <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
             </ion-label>
           </ion-item>
           </ion-list>
         </div>
-
       </div>
-      
     </div>
-    
+
     <div *ngIf="postData" class="aside-right flex-column height-100">
-      <app-empty-container 
+      <app-empty-container
-          [texto]="emptyTextDescription" 
+          [texto]="emptyTextDescription"
-          *ngIf="!showAttendees" 
+          *ngIf="!showAttendees"
           class="d-flex height-100 flex-column">
       </app-empty-container>
       <app-attendee-modal
@@ -230,4 +228,4 @@
     <button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
     <button class="btn-ok" shape="round" (click)="saveTask()">Gravar</button>
   </div>
-</ion-footer>
+</ion-footer>

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.close();
-        this.goBack();
       }
     });
   }

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

@@ -24,12 +24,12 @@
           </button>
         </div>
     </div>
-  
+
   <div class="width-100" *ngIf="taskslist">
-    
+
     <ion-list>
-      <div 
+      <div
-          class="expediente cursor-pointer"  
+          class="expediente cursor-pointer"
           *ngFor = "let task of taskslist"
           (click)="goToExpediente(task.SerialNumber)"
           >
@@ -54,7 +54,7 @@
     </ion-list>
   </div>
   <div *ngIf="skeletonLoader">
-  
+
     <ion-list>
       <ion-item>
         <ion-thumbnail slot="end">

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']);
   }