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

src/app/pages/agenda/agenda.page.ts

@@ -161,6 +161,7 @@ export class AgendaPage implements OnInit {
       this.showLoader = false;
       this.showTimelineFilterState = false;
       this.showTimeline = false;
+      this.mobileComponent.showEventList = true;
 
   }
 

src/app/pages/events/events.page.html

@@ -90,13 +90,9 @@
             <ion-icon class="icon" slot="end" src="assets/images/icons-correspondencias.svg"></ion-icon>
             <div class="text">Correspondência por ler</div>
           </div>
-          <ion-icon 
+          <button class="btn-no-color" (click)="viewExpedientListPage()">
-          class="icon-next" 
+            <ion-icon class="icon-next" slot="end" src="assets/images/icons-arrow-circle-arrow-right.svg"></ion-icon>
-          slot="end" 
+          </button>
-          src="assets/images/icons-arrow-circle-arrow-right.svg"
-          (click)="viewExpedientListPage()"
-          ></ion-icon>
-          
         </div>
         <div class="content">
           <ion-list>

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

@@ -14,7 +14,9 @@
       <div class="aside-wrapper d-flex flex-column pt-25 justify-center width-md-40 ">
         <div class="title-container">
           <span class="text-center mt-0 aside-title px-20">Gabinete Digital</span>
-          <ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
+          <button class="btn-no-color" (click)="doRefresh($event)">
+            <ion-icon class="title-icon" name="reload-circle"></ion-icon>
+          </button>
         </div>
         
         <div class="aside overflow-y-auto d-flex d-md-block  flex-wrap justify-center width-100 px-20">

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

@@ -13,11 +13,15 @@ ion-content{
   }
   .title-container{
     margin-bottom: 15px;
+    .btn-no-color{
+      display: flex;
+      float: right;
+    }
     .title-icon{
       float: right;
       margin-right: 20px;
       font-size: 30px;
-      color: #0782c9;
+      color: #42b9fe;
     }
   }
 

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

@@ -33,8 +33,8 @@ export class GabineteDigitalPage implements OnInit {
     showExpediente : false
   }
   showEventsToApprove = false;
-  showEmptyContainer = true;
+  showEmptyContainer = false;
-  showExpedients = false;
+  showExpedients = true;
   showExpedientDetail = false;
   emptyTextDescription = 'Sem opção selecionada';
 
@@ -58,23 +58,13 @@ export class GabineteDigitalPage implements OnInit {
 
       this.adjastModalHeight();
 
-      /* this.activatedRoute.queryParams.subscribe(params => {
+      this.activatedRoute.queryParams.subscribe(params => {
         if(params["show"]){
           this.openExpedientListPage();
         }
-        else if(params["events-to-approve"]){
+        else if(params["events"]){
           this.openEventsToApprovePage("MDGPR");
         }
-      }); */
-
-      this.activatedRoute.paramMap.subscribe(paramMap =>{
-        if (paramMap.has("show")){
-          this.openExpedientListPage();
-        }
-        else if(paramMap.has("events")){
-          this.openEventsToApprovePage("MDGPR");
-          this.LoadCounts();
-        }
       });
       
     }
@@ -161,7 +151,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
 
   doRefresh(event) {
     this.closeAllDesktopComponents();
-    this.showEmptyContainer = true;
+    this.showExpedients = true;
     this.LoadCounts();
 
     setTimeout(() => {