merge

src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html

@@ -227,7 +227,11 @@
             </div>
             <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('dateOccurrence')?.invalid  && validateFrom ">
 
+<<<<<<< HEAD
 
+=======
+             
+>>>>>>> develop_bitOut-fix
               <mat-form-field   appearance="none" floatLabel="never" class="width-100" value="false" interface="action-sheet" required>
                 <mat-select placeholder="Selecione repetição*"
                   [(ngModel)]="EventRecurrenceType"

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

@@ -12,7 +12,6 @@
         </div>
 
       </div>
-
       <div class=" align-center justify-center d-flex flex-column width-100">
         <div *ngIf="SessionStore.hasPin" class="title">Digite o PIN</div>
         <div *ngIf="!SessionStore.hasPin" class="title">Digite o novo PIN</div>

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

@@ -39,38 +39,9 @@ export class InactivityPage implements OnInit {
 
   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']
-
-    // 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
-    // }
 
   }
 
@@ -162,8 +133,8 @@ export class InactivityPage implements OnInit {
       if(!SessionStore.hasPin) {
         // 
         this.storePin()
+        this.pinLogin()
       } else {
-        // 
         this.pinLogin()
       }
     }
@@ -184,7 +155,7 @@ export class InactivityPage implements OnInit {
 
       setTimeout(() => {
         this.clearCode()
-      }, 1000)
+      }, 5000)
 
     } else {
       this.toastService._badRequest('Pin incorreto')
@@ -219,7 +190,7 @@ export class InactivityPage implements OnInit {
         }
 
 
-      }, 5000)
+      }, 100)
 
     }
 
@@ -227,29 +198,9 @@ export class InactivityPage implements OnInit {
 
   storePin() {
 
-    setTimeout(() => {
     const code = this.code.join('');
     SessionStore.setPin(code);
 
-      if(this.p.userPermission(this.p.permissionList.Agenda.access) || this.p.userPermission(this.p.permissionList.Gabinete.access)){
-        //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']);
-        }
-      }
-      //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)){
-        this.router.navigate(['/home/publications']);
-      }
-
-    }, 5000)
-
   }
 
   enterWithPasswordButton() {

src/app/store/session.service.ts

@@ -56,6 +56,11 @@ class SessionService {
     return this._user.Inactivity
   }
 
+
+  isUserActive() {
+    return this._user.Inactivity
+  }
+
   setInativity(value: boolean) {
     this._user.Inactivity = value
     this._user.UrlBeforeInactivity = ''

src/environments/environment.prod.ts

@@ -1,6 +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: '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,6 +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: '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',