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

src/app/pages/chat/chat.page.scss

@@ -74,7 +74,7 @@ ion-content{
   width: 100%;
   border-bottom: 1px solid #ebebeb;
   padding: 0px 20px 0 20px !important;
-  overflow: auto;
+  overflow: hidden;
 
   .item-icon{
     width: 40px;
@@ -126,7 +126,7 @@ ion-content{
    color: #fff !important;
    background-color: #42b9fe !important;
 }
-@media only screen and (min-width: 801px) {
+@media only screen and (min-width: 701px) {
   .main-content{
 
 
@@ -148,6 +148,7 @@ ion-content{
     .item{
       .item-icon{
         width: 10%;
+        margin-right: 10px !important;
       }
       .item-content{
         width: 90%;

src/app/pages/chat/chat.page.ts

@@ -181,7 +181,7 @@ hideRefreshButton(){
   }
   openMessagesPage(rid) {
     this.idSelected = rid;
-    if( window.innerWidth < 801){
+    if( window.innerWidth < 701){
       this.openMessagesModal(rid);
       //this.router.navigate(['/home/chat/messages',rid,]);
     }
@@ -196,7 +196,7 @@ hideRefreshButton(){
     console.log('OK');
     this.closeAllDesktopComponents();
 
-    if( window.innerWidth < 801){
+    if( window.innerWidth < 701){
       this.selectContact();
     }
     else{

src/app/pages/chat/messages/messages.page.scss

@@ -14,7 +14,7 @@
         padding: 30px 20px 0px 20px;
         color:#000;
         transform: translate3d(0, 1px, 0);
-        
+
         .header-top{
           margin: 0px auto;
           overflow: auto;
@@ -33,7 +33,7 @@
             margin: 2.5px 0 0 5px;
             display: flex;
             align-items: center;
-            
+
           }
           .right{
             padding: 0!important;
@@ -67,7 +67,7 @@
             margin: 1px;
           }
         }
-    
+
         .title{
           font-size: 25px;
           overflow: auto;
@@ -83,7 +83,7 @@
         .div-icon ion-icon{
           float: right;
           padding-left: 20px;
-        } 
+        }
     }
  }
  ion-content{
@@ -115,7 +115,7 @@
     height: 100%;
     word-wrap: break-word;
     -webkit-overflow-scrolling: touch;
-    
+
 
     .incoming-true, .incoming-false{
       width: 305px;
@@ -154,9 +154,9 @@
  .container{
    justify-content: center;
    justify-content: space-evenly;
-   
+
  }
- 
+
  .chat-icon-options{
    display:block !important;
    font-size: 25px;
@@ -184,7 +184,7 @@
      overflow: auto;
    }
  }
- 
+
 }
 
  .text-color-blue{
@@ -228,4 +228,4 @@ display: block;
   display: block;
  float: left;
  padding-left: 10px;
-}
+}

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

@@ -40,7 +40,7 @@ export class DiplomaAssinarPage implements OnInit {
     private router: Router,
     private animationController: AnimationController,
     private toastService: ToastService
-  ) { 
+  ) {
     this.activatedRoute.queryParams.subscribe(params => {
       if(params["serialNumber"]) {
         this.serialnumber = params["serialNumber"];
@@ -64,7 +64,7 @@ export class DiplomaAssinarPage implements OnInit {
           "diplomasassinar": true,
         }
       }
-      
+
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
     }
   }
@@ -74,9 +74,7 @@ export class DiplomaAssinarPage implements OnInit {
       component: DeplomaOptionsPage,
       cssClass: 'exp-options',
       componentProps: {
-        task: this.task,
-        fulltask: this.fulltask,
-        taskAction:taskAction,
+        serialNumber: this.task.SerialNumber,
         showEnviarPendentes: false
       },
       translucent: true
@@ -105,7 +103,7 @@ export class DiplomaAssinarPage implements OnInit {
 
       this.fulltask = res;
       console.log(this.task);
-      
+
       console.log('GetTask', res);
 
       let thedate = new Date(this.task.CreateDate);
@@ -119,7 +117,7 @@ export class DiplomaAssinarPage implements OnInit {
           return user.Type == 'CC';
         });
         console.log(users);
-        
+
       });
       this.getDocumentDetails(this.task.FolderId, '361');
 
@@ -148,7 +146,7 @@ export class DiplomaAssinarPage implements OnInit {
       browser.show();
     });
   }
-  
+
   getDocumentDetails(forlderId:string, applicationId:string) {
     this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
       this.attachments = res.Documents;
@@ -158,8 +156,8 @@ export class DiplomaAssinarPage implements OnInit {
   }
 
   async Assinar(){
-    let body = { 
-      "serialNumber": this.serialnumber, 
+    let body = {
+      "serialNumber": this.serialnumber,
       "action": "Assinado",
       "ActionTypeId": 99999842,
       "dataFields": {
@@ -172,7 +170,7 @@ export class DiplomaAssinarPage implements OnInit {
 
     try {
       await this.processes.CompleteTask(body).toPromise()
-      
+
       this.toastService.successMessage(false, ()=>{
         this.goBack();
       })
@@ -182,7 +180,7 @@ export class DiplomaAssinarPage implements OnInit {
     finally {
       loader.remove()
     }
-    
+
   }
 
 

src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html

@@ -18,7 +18,7 @@
 <ion-content>
 
   <div class="main-content width-100 overflow-y-auto height-100">
-          
+
     <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
       <ion-refresher-content
         pullingIcon="chevron-down-circle-outline"
@@ -29,14 +29,14 @@
     </ion-refresher>
     <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
 
-    <div class="width-100" *ngIf="diplomasList.length >= 1">.
-      
+    <div class="width-100" *ngIf="diplomasList.length >= 1">
+
       <div *ngIf="diplomasList">
         <ion-list >
           <!-- *ngFor = "let task of parecerList; let i = index"
           (click)="viewExpedientDetail(task.SerialNumber)" -->
           <div
-            class="expediente ion-no-padding ion-no-margin cursor-pointer"  
+            class="expediente ion-no-padding ion-no-margin cursor-pointer"
             *ngFor = "let task of diplomasList"
             (click)="goToDiploma(task.SerialNumber)"
           >
@@ -72,8 +72,8 @@
     </div>
 
     <!-- Empty -->
-    <div 
-      *ngIf="!skeletonLoader && diplomasList.length == 0" 
+    <div
+      *ngIf="!skeletonLoader && diplomasList.length == 0"
       class="empty-list d-flex height-100 align-center justify-content-center"
     >
       <span>Lista vazia</span>

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

@@ -224,7 +224,18 @@ export class ExpedienteDetailPage implements OnInit {
     modal.onDidDismiss().then( async(res)=>{
       let body = res['data'];
       if(res['data']) {
-        await this.distartExpedientModal(body);
+
+        //await this.distartExpedientModal(body);
+        const loader = this.toastService.loading()
+        try {
+          await this.processes.CompleteTask(body).toPromise();
+            this.toastService.successMessage('Processo descartado');
+            this.goBack();
+          } catch (error) {
+            this.toastService.badRequest('Processo não descartado')
+          } finally {
+            loader.remove()
+        }
       }
       else{
         this.close();
@@ -260,7 +271,7 @@ export class ExpedienteDetailPage implements OnInit {
 
           try {
             await this.processes.CompleteTask(otherbody).toPromise()
-            //this.toastService.successMessage('Processo descartado');
+            this.toastService.successMessage('Processo descartado');
             this.goBack();
           } catch (error) {
             this.toastService.badRequest('Processo não descartado')
@@ -275,6 +286,7 @@ export class ExpedienteDetailPage implements OnInit {
       }
       else{
         if(res['data']== 'Yes'){
+
           const loader = this.toastService.loading()
           try {
             await this.processes.CompleteTask(body).toPromise();