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

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

@@ -382,19 +382,17 @@ export class ExpedienteDetailPage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss().then( async(res)=>{
+      alert('AQUI')
       let body = res['data'];
       if(res['data']) {
-
-        //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()
+          this.goBack();
+        } catch (error) {
+          this.toastService.badRequest('Processo não descartado')
+        } finally {
+          loader.remove()
         }
       }
       else{

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

@@ -149,6 +149,7 @@ ion-segment-button{
       border-radius: 15px;
       box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
       background: white;
+      border: 1px solid white;
       float: left;
     }
     .exp-card-long{
@@ -161,7 +162,7 @@ ion-segment-button{
       margin: 7px 20px;
       border-radius: 15px;
       padding: 7px;
-      border: blue !important;
+      border:1px solid white;
 
       .center-div{
         width: fit-content;
@@ -559,6 +560,7 @@ ion-list{
 .active {
   color: white !important;
   fill: white !important;
+  border: 1px solid #42b9fe !important;
   background: #42b9fe !important;
   box-sizing: border-box;