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

src/app/shared/agenda/event-list/event-list.page.html

@@ -33,7 +33,7 @@
    <!-- </div> -->
      <ion-list class="width-100" *ngSwitchCase="'MDGPR'" >
       <div
-        class="item ion-no-padding width-100 cursor-pointer"
+        class="item item-hover ion-no-padding width-100 cursor-pointer"
         *ngFor="let event of eventsMDGPRList"
         (click)="openApproveModal(event.serialNumber, event)"
       >

src/app/shared/chat/group-messages/group-messages.page.ts

@@ -41,6 +41,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   @Output() openGroupContacts:EventEmitter<any> = new EventEmitter<any>();
   @Output() openEditGroupPage:EventEmitter<any> = new EventEmitter<any>();
   @Output() openNewEventPage:EventEmitter<any> = new EventEmitter<any>();
+  @Output() getGroups:EventEmitter<any> = new EventEmitter<any>();
 
   @ViewChild('scrollMe') private myScrollContainer: ElementRef;
 
@@ -457,8 +458,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
         console.log("Timer message stop")
       } else {
         if(document.querySelector('app-group-messages')){
-          await new Promise(resolve => setTimeout(resolve, 5000));
+          await new Promise(resolve => setTimeout(resolve,3000));
           await this.serverLongPull();
+          this.getGroups.emit();
           console.log('Timer message running')
         }
         else{

src/app/shared/chat/messages/messages.page.ts

@@ -37,6 +37,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   @Input() showMessages:string;
 
   @Output() openNewEventPage:EventEmitter<any> = new EventEmitter<any>();
+  @Output() getDirectMessages:EventEmitter<any> = new EventEmitter<any>();
 
 
   synchro  = synchro;
@@ -371,6 +372,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
           if(document.querySelector('app-messages')){
             await new Promise(resolve => setTimeout(resolve, 5000));
             await this.serverLongPull();
+            this.getDirectMessages.emit();
             console.log('Timer message running')
           }
       }

src/app/shared/gabinete-digital/all-processes/all-processes.page.html

@@ -28,7 +28,7 @@
         <div class="listview">
           <ion-list *ngIf="allProcessesList">
             <div
-              class="item-wrapper ion-no-padding cursor-pointer"
+              class="item-wrapper item-hover ion-no-padding cursor-pointer"
               *ngFor = "let task of allProcessesList"
               (click)="goToProcess(task.SerialNumber, task.WorkflowName, task.activityInstanceName)">
               <div class="item width-100">

src/app/shared/gabinete-digital/all-processes/all-processes.page.scss

@@ -36,12 +36,12 @@ ion-list{
   border-radius: 15px;
   box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
   border:1px solid #e9e9e9 !important;
-  background-color: #fff !important;
+  //background-color: #fff !important;
   margin-bottom: 10px !important;
   padding: 15px;
 
   .item{
-    background-color: var(--white);
+    //background-color: var(--white);
     margin: 0 auto;
     overflow: hidden;
 

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

@@ -18,18 +18,18 @@
         refreshingText="A actualizar...">
       </ion-refresher-content>
   </ion-refresher>
-   
-  
+
+
   <div class="width-100 overflow-y-auto height-100">
     <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
     <div  *ngIf="diplomasList.length >= 1">
-     
-      
+
+
       <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"  
+        <div
+          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
           *ngFor = "let task of diplomasList"
           (click)="goToDiploma(task.SerialNumber)"
         >
@@ -60,19 +60,19 @@
             </div>
           </div>
         </div>
-        
+
       </ion-list>
     </div>
 
-    <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>
     </div>
 
     <div *ngIf="skeletonLoader && diplomasList.length == 0">
-  
+
       <ion-list>
         <ion-item>
           <ion-thumbnail slot="end">

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss

@@ -40,7 +40,7 @@
   }
   .ion-item-class{
     padding: 0;
-  
+
   }
   .label-text{
     width: 100%;
@@ -52,7 +52,7 @@ ion-item{
   --background: none;
 }
 .item {
-    background-color: var(--white);
+    //background-color: var(--white);
     margin: 0 auto;
     overflow: hidden;
   }
@@ -86,7 +86,7 @@ ion-item{
   .div-icon ion-icon{
     display: block;
     margin: 0 auto;
-  
+
   }
   .div-content-expediente p, .div-content-pendentes p{
     font-size: 14pt;
@@ -166,7 +166,7 @@ ion-item{
   .exp-workflow{
     float: left;
     margin: 0 !important;
-  
+
     .label{
       border-radius: 15px;
       background: #ffb703;
@@ -229,4 +229,4 @@ ion-item{
   font-size: 45px;
   float: right;
   margin-right: 10px;
-}
+}

src/app/shared/gabinete-digital/diplomas/diplomas.page.html

@@ -26,7 +26,7 @@
     <div *ngIf="deplomasStore.diplomasList.length >= 1">
       <ion-list *ngSwitchCase="'validar'">
         <div
-          class="expediente ion-no-padding ion-no-margin cursor-pointer"
+          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
           *ngFor = "let task of deplomasStore.diplomasList"
           (click)="goToDiploma(task.SerialNumber)"
         >
@@ -63,7 +63,7 @@
         <div
           class="expediente ion-no-padding ion-no-margin cursor-pointer"
           *ngFor = "let task of deplomasStore.diplomasAssinadoList"
-          
+
           (click)="goToDiploma(task.SerialNumber)"
         >
           <div class="item width-100">
@@ -94,15 +94,15 @@
       </ion-list>
     </div>
 
-    <div 
-      *ngIf="!skeletonLoader && deplomasStore.diplomasList.length == 0 && deplomasStore.diplomasAssinadoList.length == 0" 
+    <div
+      *ngIf="!skeletonLoader && deplomasStore.diplomasList.length == 0 && deplomasStore.diplomasAssinadoList.length == 0"
       class="empty-list d-flex height-100 align-center justify-content-center"
     >
       <span>Lista vazia</span>
     </div>
 
     <div *ngIf="skeletonLoader && deplomasStore.diplomasAssinadoList.length == 0 && skeletonLoader && deplomasStore.diplomasList.length == 0">
-    
+
       <ion-list>
         <ion-item>
           <ion-thumbnail slot="end">

src/app/shared/gabinete-digital/diplomas/diplomas.page.scss

@@ -25,7 +25,7 @@
   }
   .ion-item-class{
     padding: 0;
-  
+
   }
   .label-text{
     width: 100%;
@@ -40,7 +40,7 @@ ion-item{
     //border-radius: 15px;
     //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
     //Sborder: solid 1px #e9e9e9;
-    background-color: var(--white);
+    //background-color: var(--white);
     margin: 0 auto;
     //padding: 10px;
     overflow: hidden;
@@ -75,7 +75,7 @@ ion-item{
   .div-icon ion-icon{
     display: block;
     margin: 0 auto;
-  
+
   }
   .div-content-expediente p, .div-content-pendentes p{
     font-size: 14pt;
@@ -157,7 +157,7 @@ ion-item{
   .exp-workflow{
     float: left;
     margin: 0 !important;
-  
+
     .label{
       border-radius: 15px;
       background: #ffb703;
@@ -220,4 +220,4 @@ ion-item{
   font-size: 45px;
   float: right;
   margin-right: 10px;
-}
+}

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html

@@ -32,7 +32,7 @@
 
         <ion-list class="width-100"  >
           <div
-            class="expediente ion-no-padding ion-no-margin cursor-pointer"
+            class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
             *ngFor="let event of eventaprovacaostore.listmd"
             (click)="goToEventDetail(event)"
           >
@@ -66,7 +66,7 @@
       <ion-list class="width-100" *ngSwitchCase="'PR'">
         <div class="width-100" *ngIf="eventaprovacaostore.listpr">
           <div
-            class="expediente ion-no-padding ion-no-margin cursor-pointer"
+            class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
             *ngFor="let event of eventaprovacaostore.listpr"
             (click)="goToEventDetail(event)"
           >

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html

@@ -9,13 +9,13 @@
   </div>
 </ion-header>
 <ion-content>
-  
+
   <div class="width-100 overflow-y-auto height-100" >
 
     <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
     <ion-list *ngIf="expedienteGdStore.list.length >= 1">
       <div
-        class="expediente ion-no-padding ion-no-margin cursor-pointer"
+        class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
         *ngFor = "let task of expedienteGdStore.list"
         (click)="goToExpediente(task.SerialNumber)"
       >
@@ -47,15 +47,15 @@
     </ion-list>
 
 
-    <div 
-      *ngIf="!skeletonLoader && expedienteGdStore.list.length == 0 && expedienteGdStore.list.length == 0" 
+    <div
+      *ngIf="!skeletonLoader && expedienteGdStore.list.length == 0 && expedienteGdStore.list.length == 0"
       class="empty-list d-flex height-100 align-center justify-content-center"
     >
       <span>Lista vazia</span>
     </div>
 
     <div *ngIf="skeletonLoader && expedienteGdStore.list.length == 0">
-  
+
       <ion-list>
         <ion-item>
           <ion-thumbnail slot="end">

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss

@@ -25,7 +25,7 @@
   }
   .ion-item-class{
     padding: 0;
-  
+
   }
   .label-text{
     width: 100%;
@@ -75,7 +75,7 @@ ion-item{
   .div-icon ion-icon{
     display: block;
     margin: 0 auto;
-  
+
   }
   .div-content-expediente p, .div-content-pendentes p{
     font-size: 14pt;
@@ -102,7 +102,7 @@ ion-item{
   border-radius: 15px;
   box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
   border:1px solid #e9e9e9 !important;
-  background-color: var(--white);
+  //background-color: var(--white);
   margin-bottom: 10px !important;
   padding: 15px;
 }
@@ -156,7 +156,7 @@ ion-item{
   .exp-workflow{
     float: left;
     margin: 0 !important;
-  
+
     .label{
       border-radius: 15px;
       background: #ffb703;
@@ -219,4 +219,4 @@ ion-item{
   font-size: 45px;
   float: right;
   margin-right: 10px;
-}
+}

src/app/shared/gabinete-digital/expedients/expedients.page.html

@@ -17,13 +17,13 @@
         refreshingText="A actualizar...">
       </ion-refresher-content>
   </ion-refresher>
-  
+
   <div class="width-100 overflow-y-auto height-100" >
     <div >
       <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
       <ion-list *ngIf="expedientegbstore.list.length >=0">
-        <div 
-          class="expediente ion-no-padding ion-no-margin cursor-pointer"  
+        <div
+          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
           *ngFor = "let task of expedientegbstore.list"
           (click)="goToExpediente(task.SerialNumber)"
         >
@@ -55,15 +55,15 @@
       </ion-list>
     </div>
 
-    <div 
-      *ngIf="!skeletonLoader && expedientegbstore.list.length == 0 && expedientegbstore.list.length == 0" 
+    <div
+      *ngIf="!skeletonLoader && expedientegbstore.list.length == 0 && expedientegbstore.list.length == 0"
       class="empty-list d-flex height-100 align-center justify-content-center"
     >
       <span>Lista vazia</span>
     </div>
-    
+
     <div *ngIf="skeletonLoader && expedientegbstore.list.length == 0">
-    
+
       <ion-list>
         <ion-item>
           <ion-thumbnail slot="end">

src/app/shared/gabinete-digital/expedients/expedients.page.scss

@@ -25,7 +25,7 @@
   }
   .ion-item-class{
     padding: 0;
-  
+
   }
   .label-text{
     width: 100%;
@@ -40,7 +40,7 @@ ion-item{
     //border-radius: 15px;
     //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
     //Sborder: solid 1px #e9e9e9;
-    background-color: var(--white);
+    //background-color: var(--white);
     margin: 0 auto;
     //padding: 10px;
     overflow: auto;
@@ -53,6 +53,7 @@ ion-item{
   margin: 10px 0 10px 0;
   background:  #dae3f3;
   border-radius: 20px;
+  border: 1px solid red;
 }
 .div-content-pendentes{
   width: 100%;
@@ -75,7 +76,7 @@ ion-item{
   .div-icon ion-icon{
     display: block;
     margin: 0 auto;
-  
+
   }
   .div-content-expediente p, .div-content-pendentes p{
     font-size: 14pt;
@@ -102,7 +103,7 @@ ion-item{
   border-radius: 15px;
   box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
   border:1px solid #e9e9e9 !important;
-  background-color: var(--white);
+  //background-color: transparent;
   margin-bottom: 10px !important;
   padding: 15px;
 }
@@ -156,7 +157,7 @@ ion-item{
   .exp-workflow{
     float: left;
     margin: 0 !important;
-  
+
     .label{
       border-radius: 15px;
       background: #ffb703;
@@ -219,4 +220,4 @@ ion-item{
   font-size: 45px;
   float: right;
   margin-right: 10px;
-}
+}

src/app/shared/gabinete-digital/generic/task-list/task-list.page.html

@@ -5,7 +5,7 @@
     <div *ngIf="taskList.length >= 0">
       <ion-list part="divo">
         <div
-          class="expediente ion-no-padding ion-no-margin cursor-pointer"
+          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
           *ngFor = "let task of taskList; let i = index"
           (click)="viewTaskDetail.emit(task)"
         >

src/app/shared/gabinete-digital/pedidos/pedidos.page.html

@@ -35,7 +35,7 @@
         <!-- *ngFor = "let task of pedidosstore.listparecer; let i = index"
         (click)="viewExpedientDetail(task.SerialNumber)" -->
         <div
-          class="expediente ion-no-padding ion-no-margin cursor-pointer"
+          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
           *ngFor = "let task of pedidosstore.listparecer"
           (click)="goToPedido(task.SerialNumber)"
         >
@@ -72,7 +72,7 @@
     <div *ngIf="pedidosstore.listdeferimento.length >= 1">
       <ion-list *ngSwitchCase="'deferimento'">
         <div
-          class="expediente ion-no-padding ion-no-margin cursor-pointer"
+          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
           *ngFor = "let task of pedidosstore.listdeferimento"
           (click)="goToPedido(task.SerialNumber)"
         >

src/app/shared/gabinete-digital/pedidos/pedidos.page.scss

@@ -39,8 +39,8 @@ ion-item{
 .item {
     //border-radius: 15px;
     //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
-    //Sborder: solid 1px #e9e9e9;
-    background-color: var(--white);
+    //border: solid 1px #e9e9e9;
+    //background-color: var(--white);
     margin: 0 auto;
     //padding: 10px;
     overflow: hidden;

src/app/shared/header/header.page.html

@@ -1,4 +1,4 @@
-<div class=" pb-10 ion-toolbar text-white">
+<div class="main-tab pb-10 ion-toolbar text-white">
 
 
   <div class="mobile d-flex  div-top-header justify-space-between">

src/app/shared/header/header.page.scss

@@ -59,6 +59,9 @@
     position: absolute;
   }
 }
+.main-tab{
+  //border: 1px solid red;
+}
 
 
 .desktop{
@@ -82,6 +85,9 @@
   user-select: none;
 }
 
+.tab:hover{
+  border-top: 7px solid white;
+}
 .active{
   border-top: 7px solid white;
 }