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

src/app/pages/chat/chat.page.html

@@ -111,7 +111,7 @@
             </ion-item-sliding>
           </ion-list>
           <ion-list *ngSwitchCase="'Grupos'">
-              <ion-item-sliding *ngIf="!wsChatMethodsService.loadingWholeList">
+              <ion-item-sliding >
                   <div *ngFor="let group of wsChatMethodsService._group"
                   [class.item-active]="group.id ==idSelected"
                   class="item item-hover d-flex">
@@ -150,7 +150,7 @@
                     </div>
                   </div>
               </ion-item-sliding>
-              <ion-item-sliding *ngIf="wsChatMethodsService.loadingWholeList || wsChatMethodsService.groupCount < 1">
+              <ion-item-sliding *ngIf="wsChatMethodsService.groupCount < 1">
                 <div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
                   <div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-group-chat-grey.svg"></ion-icon></div>
                   <div class="item-content flex-grow-1 cursor-pointer">

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

@@ -650,7 +650,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       temporaryData: formData,
       attachments: [{
         "title": capturedImageTitle,
-        //"image_url": capturedImage, // rocketchat
         "text": "description",
         "title_link_download": false,
       }]

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

@@ -15,7 +15,7 @@
   </div>
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
-      <ion-segment-button value="validar">
+      <ion-segment-button value="validar" *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">
         Por validar ...
       </ion-segment-button>
       <ion-segment-button value="assinados">
@@ -30,14 +30,14 @@
     <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
       <ion-refresher-content></ion-refresher-content>
     </ion-refresher>
-  
+
     <div class="width-100" [ngSwitch]="segment">
       <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
-      <div *ngIf="diplomasList">
+      <div *ngIf="diplomasList && p.userPermission([p.permissionList.Gabinete.md_tasks])">
 
         <ion-list *ngSwitchCase="'validar'">
-          <ion-item 
-              class="expediente ion-no-padding cursor-pointer"  
+          <ion-item
+              class="expediente ion-no-padding cursor-pointer"
               *ngFor = "let task of diplomasList"
               (click)="goToDiploma(task.SerialNumber)"
               lines="none"
@@ -69,12 +69,12 @@
               </div>
           </ion-item>
         </ion-list>
-  
+
       </div>
       <div *ngIf="diplomasAssinadoList">
         <ion-list *ngSwitchCase="'assinados'">
-          <ion-item 
-            class="expediente ion-no-padding cursor-pointer"  
+          <ion-item
+            class="expediente ion-no-padding cursor-pointer"
             *ngFor = "let task of diplomasAssinadoList"
             (click)="goToDiploma(task.SerialNumber)"
             lines="none"
@@ -109,15 +109,15 @@
       </div>
     </div>
 
-    <div 
-      *ngIf="!skeletonLoader && diplomasList.length == 0 && diplomasAssinadoList.length == 0" 
+    <div
+      *ngIf="!skeletonLoader && diplomasList.length == 0 && diplomasAssinadoList.length == 0"
       class="empty-list d-flex height-100 align-center justify-content-center"
     >
       <span>Lista vazia</span>
     </div>
 
     <div *ngIf="skeletonLoader && diplomasAssinadoList.length == 0 && skeletonLoader && diplomasList.length == 0">
-    
+
       <ion-list>
         <ion-item>
           <ion-thumbnail slot="end">

src/app/pages/inactivity/inactivity.page.ts

@@ -205,9 +205,16 @@ export class InactivityPage implements OnInit {
       setTimeout(()=>{
 
         if(this.p.userPermission(this.p.permissionList.Agenda.access) || this.p.userPermission(this.p.permissionList.Gabinete.access)){
-          this.router.navigate(['/home/events'], {replaceUrl: true});
+          //When user has got access to Agenda but does not have their own calendar, goes to Agenda
+          if(this.p.userPermission(this.p.permissionList.Agenda.access) &&  SessionStore.user.OwnerCalendars.length == 0){
+            this.router.navigate(['/home/agenda']);
+          }
+          else{
+            this.router.navigate(['/home/events']);
+          }
         }
-        else if(this.p.userPermission(this.p.permissionList.Chat.access) && this.p.userPermission(this.p.permissionList.Actions.access)){
+        //If user has access permission to both Chat and Action, goes to Chat by default.
+        else if((this.p.userPermission(this.p.permissionList.Chat.access) && this.p.userPermission(this.p.permissionList.Actions.access)) || this.p.userPermission(this.p.permissionList.Chat.access)){
           this.router.navigate(['/home/chat']);
         }
         else if(this.p.userPermission(this.p.permissionList.Actions.access)){
@@ -228,9 +235,16 @@ export class InactivityPage implements OnInit {
       SessionStore.setPin(code);
 
       if(this.p.userPermission(this.p.permissionList.Agenda.access) || this.p.userPermission(this.p.permissionList.Gabinete.access)){
-        this.router.navigate(['/home/events']);
+        //When user has got access to Agenda but does not have their own calendar, goes to Agenda
+        if(this.p.userPermission(this.p.permissionList.Agenda.access) &&  SessionStore.user.OwnerCalendars.length == 0){
+          this.router.navigate(['/home/agenda']);
+        }
+        else{
+          this.router.navigate(['/home/events']);
+        }
       }
-      else if(this.p.userPermission(this.p.permissionList.Chat.access) && this.p.userPermission(this.p.permissionList.Actions.access)){
+      //If user has access permission to both Chat and Action, goes to Chat by default.
+      else if((this.p.userPermission(this.p.permissionList.Chat.access) && this.p.userPermission(this.p.permissionList.Actions.access)) || this.p.userPermission(this.p.permissionList.Chat.access)){
         this.router.navigate(['/home/chat']);
       }
       else if(this.p.userPermission(this.p.permissionList.Actions.access)){

src/app/pages/login/login.page.ts

@@ -163,9 +163,16 @@ export class LoginPage implements OnInit {
       this.router.navigate([pathName]);
     } else {
       if(this.p.userPermission(this.p.permissionList.Agenda.access) || this.p.userPermission(this.p.permissionList.Gabinete.access)){
-        this.router.navigate(['/home/events']);
+        //When user has got access to Agenda but does not have their own calendar, goes to Agenda
+        if(this.p.userPermission(this.p.permissionList.Agenda.access) &&  SessionStore.user.OwnerCalendars.length == 0){
+          this.router.navigate(['/home/agenda']);
+        }
+        else{
+          this.router.navigate(['/home/events']);
+        }
       }
-      else if(this.p.userPermission(this.p.permissionList.Chat.access) && this.p.userPermission(this.p.permissionList.Actions.access)){
+      //If user has access permission to both Chat and Action, goes to Chat by default.
+      else if((this.p.userPermission(this.p.permissionList.Chat.access) && this.p.userPermission(this.p.permissionList.Actions.access)) || this.p.userPermission(this.p.permissionList.Chat.access)){
         this.router.navigate(['/home/chat']);
       }
       else if(this.p.userPermission(this.p.permissionList.Actions.access)){