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

src/app/Rules/despacho.service.ts

@@ -6,6 +6,7 @@ import { CustomTaskPipe } from '../pipes/custom-task.pipe';
 import { ProcessesService } from '../services/processes.service';
 import { DespachoStore } from '../store/despacho-store.service';
 import { LoaderService } from 'src/app/store/loader.service'
+import { SessionStore } from '../store/session.service';
 @Injectable({
   providedIn: 'root'
 })
@@ -225,6 +226,20 @@ export class DespachoService {
 
   }
 
+  async getListPr() {
+    let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+
+    let despachosPr;
+    switch (SessionStore.user.Profile) {
+      case 'MDGPR':
+        despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
+        break;
+      case 'PR':
+        despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
+        break;
+    }
+  }
+
   sortArrayISODate(myArray: any) {
     return myArray.sort(function(a, b) {
       return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);

src/app/guards/inactivity.guard.ts

@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
 import { Observable } from 'rxjs';
 import { SessionStore } from '../store/session.service';
+import { AlertController, Platform } from '@ionic/angular';
 
 @Injectable({
   providedIn: 'root'
@@ -9,14 +10,18 @@ import { SessionStore } from '../store/session.service';
 export class InactivityGuard implements CanActivate {
 
   constructor(
-    private router:Router
+    private router:Router,
+    private platform: Platform,
   ){}
 
   canActivate(
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
 
-      if(SessionStore.exist && SessionStore.user.Inactivity && !SessionStore.hasPin ) {
+      if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+        this.router.navigate(['/home/events']);
+        return false
+      } else if(SessionStore.exist && SessionStore.user.Inactivity && !SessionStore.hasPin ) {
         return true
       } else if(SessionStore.exist && !SessionStore.user.Inactivity) {
         return true

src/app/guards/login.guard.ts

@@ -3,24 +3,30 @@ import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree, Rout
 import { Observable } from 'rxjs';
 import { LocalstoreService } from '../store/localstore.service';
 import { SessionStore } from '../store/session.service';
+import { AlertController, Platform } from '@ionic/angular';
 
 @Injectable({
   providedIn: 'root'
 })
 export class LoginGuard implements CanActivate {
-  constructor( private router:Router,
+  constructor( private router:Router, private platform: Platform,) {
-    private localstoreService: LocalstoreService) {
 
   }
   canActivate(
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
 
-      if(window.location.pathname == '/' && SessionStore.exist ) {
+      if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) {
         this.router.navigate(['/home/events']);
         return false
+      } else if(SessionStore.exist && !SessionStore.hasPin && !this.platform.is('desktop') && !this.platform.is('mobileweb') ) {
+        this.router.navigate(['/pin']);
+        return false
+      } else if(SessionStore.exist && !SessionStore.user.Inactivity && SessionStore.user.LoginPreference == 'Pin' && !this.platform.is('desktop') && !this.platform.is('mobileweb')) {
+        this.router.navigate(['/inactivity']);
+        return false
       } else {
-        return true;
+        return true
       }
   }
 

src/app/home/home.page.ts

@@ -103,7 +103,8 @@ export class HomePage implements OnInit {
   ngOnInit() {
     /* this.network.checkNetworkConnection;
     this.network.checkNetworkDisconnection; */
-    console.log('Active route ', this.router.url)
+    // console.log('Active route ', this.router.url)
+    
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
       this.webnotification.webconnection();
       this.webnotification.onReceviNotificationWeb();
@@ -165,7 +166,6 @@ export class HomePage implements OnInit {
       'despachos',
       () => {
         this.despachoRule.getList({updateStore: true})
-        
       }
     )
 

src/app/modals/profile/edit-profile/edit-profile.page.html

@@ -53,7 +53,7 @@
         </div>
       </div>
 
-      <div class="login-preference width-100" *ngIf="!production">
+      <div class="login-preference width-100" *ngIf="!platform.is('desktop') && !platform.is('mobileweb')">
         <div class="preference">Preferência Login</div>
 
         <ion-row>
@@ -73,11 +73,6 @@
         </ion-row>
       </div>
 
-      <div hidden class="d-flex width-100 justify-center mt-10">
-        <button hidden (click)="addPin()" class="btn-ok  buttonSize" fill="clear" color="#fff" >
-          <ion-label>Alterar PIN</ion-label>
-        </button>
-      </div>
     </div>
   </div>
 </ion-content>

src/app/modals/profile/edit-profile/edit-profile.page.ts

@@ -4,6 +4,7 @@ import { FingerprintPage } from 'src/app/shared/fingerprint/fingerprint.page';
 import { PinPage } from 'src/app/shared/pin/pin.page';
 import { SessionStore } from 'src/app/store/session.service';
 import { environment } from 'src/environments/environment';
+import { Platform } from '@ionic/angular';
 
 @Component({
   selector: 'app-edit-profile',
@@ -16,7 +17,8 @@ export class EditProfilePage implements OnInit {
   production = environment.production
 
   constructor(private modalController:ModalController,
-    private animationController: AnimationController
+    private animationController: AnimationController,
+    public platform: Platform,
     ) {}
 
   ngOnInit() {}

src/app/modals/profile/profile.page.ts

@@ -11,7 +11,6 @@ import { JsonStore } from '../../services/jsonStore.service';
 import { StorageService } from '../../services/storage.service';
 import { NotificationsService } from '../../services/notifications.service';
 import { SessionStore } from 'src/app/store/session.service';
-import { synchro } from 'src/app/services/socket/synchro.service';
 
 @Component({
   selector: 'app-profile',
@@ -222,7 +221,7 @@ export class ProfilePage implements OnInit {
     SessionStore.setInativity(false)
     
     setTimeout(() => {
-      this.router.navigate(['/login']);
+      this.router.navigateByUrl('/', { replaceUrl: true });
     }, 100)
 
   }

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

@@ -358,9 +358,6 @@ export class AgendaPage implements OnInit {
 
   get CalendarCurrentDay ():any {
 
-    /* console.log(this.viewDate.getDate(), '0_0') */
-    // console.log(this.viewDate.getDate(), '0_0')
-
     return this.viewDate.getDate()
   }
 

src/app/pages/events/events.page.ts

@@ -95,7 +95,7 @@ export class EventsPage implements OnInit {
 
       this.platform.resize.subscribe(async () => {
         //console.log('Resize event detected');
-        console.log('Resize event detected');
+        // console.log('Resize event detected');
 
       });
 

src/app/pages/inactivity/inactivity.page.html

@@ -1,39 +1,8 @@
 <ion-content class="text-white">
 
   <div class="main-wrapper">
-    <div class="wrapper"  *ngIf="SessionStore.user.LoginPreference == 'Password' && SessionStore.hasPin || SessionStore.user.LoginPreference == null && SessionStore.hasPin  || SessionStore.user.LoginPreference == 'None' && SessionStore.hasPin || enterWithPassword">
 
-      <div class="bg-1 d-flex justify-center align-center">
+    <div class="main-content d-flex flex-column  width"  *ngIf="!SessionStore.hasPin || SessionStore.hasPin && SessionStore.user.LoginPreference == 'Pin' && !enterWithPassword " >
-        <div class="bg-2 d-flex justify-center align-center">
-          <div class="bg-3 d-flex justify-center align-center">
-            <div class="bg-4 d-flex justify-center align-center">
-              <div class="div-logo">
-                <img src='assets/images/fullLogo.png' alt='logo'>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <h3 class="center text-white">Inicie a sessão</h3>
-      <form class="form">
-        <p class="form-label text-white">Email</p>
-        <ion-item class="form-input">
-          <ion-input type="text" [(ngModel)]="username" name="input-username"></ion-input>
-        </ion-item>
-        <p class="form-label text-white">Palavra-passe</p>
-        <ion-item class="form-input">
-          <ion-input (keyup.enter)="Login()" type="password" [(ngModel)]="password" name="input-password" ></ion-input>
-        </ion-item>
-        <div class="d-flex pt-25">
-          <button class="btn-ok btn-login" fill="clear" expand="block" shape="round" (click)="Login()">Iniciar</button>
-        </div>
-      </form>
-      <div class="msg-bottom d-flex">
-        <p class="msg-bottom-p">Uma iniciativa do Gabinete do Presidente da República</p>
-      </div>
-    </div>
-
-    <div class="main-content d-flex flex-column  height-100 width"  *ngIf="!SessionStore.hasPin || SessionStore.hasPin && SessionStore.user.LoginPreference == 'Pin' && !enterWithPassword " >
       
       <div class="div-top-header">
 

src/app/pages/inactivity/inactivity.page.scss

@@ -15,7 +15,9 @@ ion-content{
   height: 100vh;
   overflow: auto;
   background: white !important;
-
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .wrapper{
@@ -158,19 +160,15 @@ ion-item{
 }
 
 .terminal {
-    padding-top: 49px;
   justify-content: center;
   display: flex;
   flex-direction: column;
-    align-items: center;
   background-image: url(/assets/background/auth.svg);
   background-position: center;
   background-repeat: no-repeat;
   width: 100%;
-    padding-bottom: 48px;
-    margin-bottom: -58px;
   z-index: 100;
-    margin-top: -80px;
+  background-size: 610px;
 }
 
 .clear{
@@ -197,17 +195,16 @@ ion-item{
 
 .main-content {
   width: 100vw;
-    height: 100vh;
+  /* background-color: white; */
-    background-color: white;
   text-align: center;
   align-items: center;
-    justify-content: center;
+  /* justify-content: center; */
   background-size: 686px 674px;
   background-position: center;
   background-position-y: 110px;
   background-repeat: no-repeat;
   margin: auto;
-    justify-content: space-around;
+  /* justify-content: space-around; */
 }
 
 .voltar{
@@ -238,5 +235,116 @@ ion-item{
 
 .pin-4 {
   z-index: 1000;
-    margin-bottom: 36px;
+  margin-bottom: 107px;
+}
+
+
+
+@media only screen and (min-height: 168px) {
+  .circle{
+    width: 60px;
+    height: 60px;
+    margin-bottom: 7px;
+    margin-right: 7px;
+    margin-left: 7px;
+  }
+  .terminal{
+    margin-top: -33px !important;
+  }
+
+  .pin-4 {
+    position: relative;
+    top: 49px;
+  }
+
+  .clear {
+    padding-top: 10px !important; 
+  }
+
+  .div-top-header {
+    position: unset ;
+    top: unset ;
+  }
+}
+
+@media only screen and (min-height: 640px) {
+  .circle{
+    width: 60px;
+    height: 60px;
+    margin-bottom: 9px;
+    margin-right: 9px;
+    margin-left: 9px;
+  }
+  .terminal{
+    margin-top: -33px !important;
+  }
+
+  .pin-4 {
+    position: relative;
+    top: 49px;
+  }
+
+}
+
+@media only screen and (min-height: 667px) {
+  .circle{
+    width: 60px;
+    height: 60px;
+    margin-bottom: 7px;
+    margin-right: 7px;
+    margin-left: 7px;
+  }
+  .terminal{
+    margin-top: 0px !important;
+  }
+
+  .clear {
+    padding-top: 25px !important;
+  }
+}
+
+@media only screen and (min-height: 731px) {
+  .circle{
+    width: 63px;
+    height: 63px;
+    margin-bottom: 10px;
+    margin-right: 10px;
+    margin-left: 10px;
+  }
+  .terminal{
+    margin-top: -33px !important;
+  }
+
+  .pin-4 {
+    position: relative;
+    top: 35px;
+  }
+
+  .div-top-header {
+    position: absolute !important;
+    top: 0px !important;
+  }
+
+  
+}
+
+@media only screen and (min-height: 832px) {
+  .circle{
+    width: 65px;
+    height: 65px;
+    margin-bottom: 15px;
+    margin-right: 15px;
+    margin-left: 15px;
+  }
+  .terminal{
+    margin-top: -33px !important;
+  }
+
+  .pin-4 {
+    position: relative;
+    top: unset !important;
+    margin-bottom: 107px;
+  }
+  
+
 }

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

@@ -32,7 +32,47 @@ export class InactivityPage implements OnInit {
     public alertController: AlertController
   ) {}
 
-  ngOnInit() {}
+  loop = false
+
+  ngOnInit() {
+    
+
+    // window.addEventListener('resize', (event) => {
+    //   if(this.router.url != '/login') return false
+      
+    //   if(this.loop == false) {
+    //     this.loop = true
+    //     this.runloop()
+    //   }
+
+    // }, true);
+
+  }
+
+  runloop() {
+    // const containerHeight = 651
+
+    // let circleHeight = document.querySelector('.circle')['offsetHeight']
+    // let circleWidth = document.querySelector('.circle')['offsetWidth'] 
+    // console.log(window.innerHeight, ' < ', containerHeight)
+
+    // console.log(circleHeight)
+
+    // document.querySelectorAll('.circle').forEach(e=>{
+    //   e['style']['height'] = (circleHeight -1 )+'px'
+    //   e['style']['width'] = (circleWidth -1 )+'px'
+    // })
+
+    
+    // if( window.innerHeight< containerHeight) {
+    //   setTimeout(()=>{
+    //     this.runloop()
+    //   }, 100)
+    // } else {
+    //   this.loop = false
+    // }
+
+  }
 
   async presentAlert(message: string) {
     const alert = await this.alertController.create({
@@ -70,7 +110,7 @@ export class InactivityPage implements OnInit {
           domainName: environment.domain,
           BasicAuthKey: ""
         }
-        let attempt = await this.authService.login(this.userattempt, false)
+        let attempt = await this.authService.login(this.userattempt, {saveSession: false})
 
         if (attempt) {
           

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

@@ -6,7 +6,6 @@ import { ToastService } from 'src/app/services/toast.service';
 import { environment } from 'src/environments/environment';
 import { AlertController } from '@ionic/angular';
 import { NotificationsService } from 'src/app/services/notifications.service';
-import { LocalstoreService } from 'src/app/store/localstore.service';
 import { SessionStore } from 'src/app/store/session.service';
 
 @Component({
@@ -17,7 +16,7 @@ import { SessionStore } from 'src/app/store/session.service';
 export class LoginPage implements OnInit {
 
   logstatus: boolean;
-  username: string = environment.defaultuser;
+  username: string = SessionStore.user.Email || environment.defaultuser;
   password: string = environment.defaultuserpwd;
   userattempt: UserForm;
   code = []
@@ -32,31 +31,11 @@ export class LoginPage implements OnInit {
     private router: Router,
     private authService: AuthService,
     private toastService: ToastService,
-    public alertController: AlertController,
+    public alertController: AlertController
-    private localstoreService: LocalstoreService
   ) {
   }
 
-  ngOnInit() {
+  ngOnInit() {}
-
-    let userData = this.sessionStore.user
-
-    const loginPreference = userData?.LoginPreference
-    const pin = userData?.PIN
-
-    if (pin) {
-      this.hasPin = true
-    } else {
-      this.hasPin = false
-    }
-
-    if (loginPreference) {
-      this.loginPreference = loginPreference
-    } else {
-      this.loginPreference = ''
-    }
-
-  }
 
   //Function to validade the login inputs
   validateUsername() {
@@ -97,13 +76,23 @@ export class LoginPage implements OnInit {
           domainName: environment.domain,
           BasicAuthKey: ""
         }
-        let attempt = await this.authService.login(this.userattempt)
+
+        let attempt = await this.authService.login(this.userattempt, {saveSession: false})
 
         if (attempt) {
-          await this.authService.loginChat(this.userattempt);
-          await this.getToken();
 
+          if (attempt.UserId == SessionStore.user.UserId) {
+            await this.authService.SetSession(attempt, this.userattempt);
+            this.authService.loginChat(this.userattempt);
+            this.getToken();
+            SessionStore.setInativity(true)
+            this.goback()
+          } else {
+            SessionStore.delete()
+            window.localStorage.clear();
+            await this.authService.SetSession(attempt, this.userattempt);
             this.router.navigate(['/pin']);
+          }
 
         }
       }
@@ -116,4 +105,15 @@ export class LoginPage implements OnInit {
     }
   }
 
+
+  goback() {
+    const pathName = SessionStore.user.UrlBeforeInactivity
+    if(pathName) {
+      this.router.navigate([pathName]);
+    } else {
+      this.router.navigate(['/home/events']);
+    }
+
+  }
+
 }

src/app/services/auth.service.ts

@@ -41,7 +41,7 @@ export class AuthService {
 
     }
 
-    async login(user: UserForm, saveSession = true): Promise<LoginUserRespose> {
+    async login(user: UserForm, {saveSession = true}): Promise<LoginUserRespose> {
       user.BasicAuthKey = 'Basic ' + btoa(user.username + ':' + this.aesencrypt.encrypt(user.password,user.username ));
 
       this.headers = this.headers.set('Authorization',user.BasicAuthKey);

src/app/services/inativity.service.ts

@@ -29,7 +29,7 @@ export class InativityService {
 
     function resetTimer() {
       clearTimeout(t);
-      t = setTimeout(userIsNotActive, 60000 * 5);  // time is in milliseconds
+      t = setTimeout(userIsNotActive, 60000 * 15);  // time is in milliseconds
     }
   }
 }

src/app/services/notification/web-notification-popup.service.ts

@@ -72,8 +72,6 @@ export class WebNotificationPopupService {
   
         });
    
-
-   
       }
     });
 

src/app/store/localstore.service.ts

@@ -6,7 +6,7 @@ import { AES, enc, SHA1 }  from  'crypto-js'
 })
 export class LocalstoreService {
 
-  private prefix = 'v16-'
+  private prefix = 'v17-'
 
   constructor() {