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

src/app/app.component.ts

@@ -15,6 +15,7 @@ import { StorageService } from 'src/app/services/storage.service';
 import { MessageModel } from './models/beast-orm';
 import  { InativityService } from "src/app/services/inativity.service";
 import { ThemeService } from 'src/app/services/theme.service';
+import { environment } from 'src/environments/environment';
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -51,6 +52,7 @@ export class AppComponent {
   ) {
     // this.createCacheFolder()
     this.initializeApp();
+    console.log('version:'+ environment.version)
   }
 
   // async createCacheFolder(){

src/app/guards/auth.guard.ts

@@ -48,6 +48,7 @@ export class AuthGuard implements CanActivate {
         }
         
       } else if ( pathname.startsWith('/home/gabinete-digital')) {
+        console.log('gabinete');
 
         if(this.p.userPermission(this.p.permissionList.Gabinete.access)) {
           return true;

src/app/guards/login.guard.ts

@@ -22,6 +22,9 @@ export class LoginGuard implements CanActivate {
       if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) {
         this.router.navigate(['/home/events']);
         return false
+      } else if(SessionStore.exist && !SessionStore.user.Inactivity && SessionStore.user.LoginPreference == 'Pin' && SessionStore.forceToLoginWithForceToLogInWithPassword && !this.platform.is('desktop') && !this.platform.is('mobileweb')) {
+        SessionStore.forceToLoginWithForceToLogInWithPassword = false
+        return true
       } else if(SessionStore.exist && !SessionStore.hasPin && !this.platform.is('desktop') && !this.platform.is('mobileweb') ) {
         this.router.navigate(['/pin']);
         return false

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

@@ -17,7 +17,7 @@
         <div *ngIf="!SessionStore.hasPin" class="title">Digite o novo PIN</div>
 
         <div class="terminal">
-          <div class="d-flex pt-25 align-center justify-center pin-4">
+          <div  class="d-flex pt-25 align-center justify-center pin-4">
             <div class="dot" [class.dot-active]="code.length >= 1"></div>
             <div class="dot" [class.dot-active]="code.length >= 2"></div>
             <div class="dot" [class.dot-active]="code.length >= 3"></div>
@@ -25,19 +25,19 @@
           </div>
 
           
-          <div  class="d-flex align-center justify-center">
+          <div [class.hide]="code.length == 4"  class="d-flex align-center justify-center">
             <div class="circle" (click)="setCode('1')">1</div> <div class="circle" (click)="setCode('2')">2</div> <div class="circle" (click)="setCode('3')">3</div>
           </div>
 
-          <div class="d-flex align-center justify-center">
+          <div [class.hide]="code.length == 4" class="d-flex align-center justify-center">
             <div class="circle" (click)="setCode('4')">4</div> <div class="circle" (click)="setCode('5')">5</div> <div class="circle" (click)="setCode('6')">6</div>
           </div>
 
-          <div class="d-flex align-center justify-center">
+          <div [class.hide]="code.length == 4" class="d-flex align-center justify-center">
             <div class="circle" (click)="setCode('7')">7</div> <div class="circle" (click)="setCode('8')">8</div> <div class="circle" (click)="setCode('9')">9</div>
           </div>
 
-          <div class="d-flex align-center justify-center">
+          <div [class.hide]="code.length == 4" class="d-flex align-center justify-center">
             <div class="circle" (click)="setCode('0')">0</div>
           </div>
 

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

@@ -348,3 +348,8 @@ ion-item{
   
 
 }
+
+
+.hide {
+  opacity: 0 !important;
+}

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

@@ -205,6 +205,8 @@ export class InactivityPage implements OnInit {
 
   enterWithPasswordButton() {
     this.enterWithPassword = true
+    SessionStore.forceToLoginWithForceToLogInWithPassword = true
+
     this.router.navigate(['/']);
   }
 

src/app/services/chat.service.ts

@@ -392,9 +392,13 @@ export class ChatService {
       }
 
 
-    } else {
+    } else if (!this.headers) {
       this.setheader()
-      await this.refreshtoken();
+      this.refreshtoken()
+    } else {
+      setTimeout(async ()=>{
+        await this.refreshtoken();
+      }, 4000)
     }
 
   }

src/app/shared/popover/request-options/request-options.page.ts

@@ -84,7 +84,7 @@ export class RequestOptionsPage implements OnInit {
       this.toastService._successMessage()
       this.close();
       loader.remove()
-    },()=>{
+    }, ()=> {
       loader.remove()
 
       this.toastService._badRequest('Processo não encontrado')

src/app/store/session.service.ts

@@ -14,6 +14,8 @@ class SessionService {
   // local storage keyName
   private keyName: string;
 
+  forceToLoginWithForceToLogInWithPassword = false
+
   constructor() {
 
     this.keyName = (SHA1(this.constructor.name)).toString()

src/environments/environment.prod.ts

@@ -1,7 +1,7 @@
 export const environment = {
   // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
-  // apiURL: 'https://gd-api.oapr.gov.ao/api/',
+  apiURL: 'https://gd-api.oapr.gov.ao/api/',
-  apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
+  //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
   // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
   // apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
   // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',

src/environments/environment.ts

@@ -1,7 +1,7 @@
 export const environment = {
   // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
-  // apiURL: 'https://gd-api.oapr.gov.ao/api/',
+  apiURL: 'https://gd-api.oapr.gov.ao/api/',
-  apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
+  //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
   // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
   // apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
   // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',
@@ -16,4 +16,5 @@ export const environment = {
   defaultuserpwd: 'M@p2022', //tabteste@006,
   chatOffline: true,
   presidencia: false,
+  version: '1.0.1'
 };