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

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

@@ -32,7 +32,7 @@
             <ion-icon class="icon" slot="end" src="assets/images/icons-default-agenda.svg" ></ion-icon>
             <div class="text">A sua Agenda</div>
           </div>
-          <button class="btn-no-color" [routerLink]="['/home/agenda']">
+          <button title="Ir para a sua Agenda" class="btn-no-color" [routerLink]="['/home/agenda']">
             <ion-icon
             *ngIf="ThemeService.currentTheme == 'default' "
             class="icon-next"
@@ -100,7 +100,7 @@
             <ion-icon class="icon" slot="end" src="assets/images/icons-correspondencias.svg"></ion-icon>
             <div class="text">Correspondência por ler</div>
           </div>
-          <button (click)="viewExpedientListPage()" class="btn-no-color cursor-pointer">
+          <button title="Ir para o Gabinete Digital" (click)="viewExpedientListPage()" class="btn-no-color cursor-pointer">
             <ion-icon
             *ngIf="ThemeService.currentTheme == 'default' "
             class="icon-next"

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

@@ -602,7 +602,7 @@ export class PedidoPage implements OnInit {
     console.log(task);
 
     let classs;
-    if (window.innerWidth <= 800) {
+    if (window.innerWidth < 701) {
       classs = 'book-meeting-modal modal modal-desktop'
     } else {
       classs = 'add-note-modal-no-height showAsideOptions'
@@ -618,7 +618,9 @@ export class PedidoPage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss().then(res => {
-      this.goBack();
+      if(res.data == 'sucess'){
+        this.goBack();
+      }
     });
   }
 

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

@@ -102,8 +102,8 @@ export class LoginPage implements OnInit {
         if (attempt) {
           if (attempt.UserId == SessionStore.user.UserId) {
             await this.authService.SetSession(attempt, this.userattempt);
-            // await this.authService.loginChat();
-            // await this.authService.loginToChatWs()
+            await this.authService.loginChat();
+            await this.authService.loginToChatWs()
             this.getToken();
             SessionStore.setInativity(true);
 
@@ -117,8 +117,8 @@ export class LoginPage implements OnInit {
             await this.authService.SetSession(attempt, this.userattempt);
 
             this.changeProfileService.run()
-            // await this.authService.loginChat();
-            // await this.authService.loginToChatWs()
+            await this.authService.loginChat();
+            await this.authService.loginToChatWs()
             this.getToken();
             this.router.navigateByUrl('/pin', { replaceUrl: true });
           }