+
diff --git a/src/app/pages/inactivity/inactivity.page.ts b/src/app/pages/inactivity/inactivity.page.ts
index 27255c30d..09a7d114c 100644
--- a/src/app/pages/inactivity/inactivity.page.ts
+++ b/src/app/pages/inactivity/inactivity.page.ts
@@ -39,41 +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
- // }
}
@@ -165,8 +133,8 @@ export class InactivityPage implements OnInit {
if(!SessionStore.hasPin) {
//
this.storePin()
+ this.pinLogin()
} else {
- //
this.pinLogin()
}
}
@@ -187,7 +155,7 @@ export class InactivityPage implements OnInit {
setTimeout(() => {
this.clearCode()
- }, 1000)
+ }, 5000)
} else {
this.toastService._badRequest('Pin incorreto')
@@ -222,7 +190,7 @@ export class InactivityPage implements OnInit {
}
- }, 5000)
+ }, 100)
}
@@ -230,28 +198,8 @@ 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)
+ const code = this.code.join('');
+ SessionStore.setPin(code);
}
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 5baee9067..8fd964e5f 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -11,7 +11,6 @@ import { ClearStoreService } from 'src/app/services/clear-store.service';
import { ChangeProfileService } from 'src/app/services/change-profile.service';
import { ThemeService } from 'src/app/services/theme.service';
import { PermissionService } from 'src/app/services/permission.service';
-import { PermissionList } from 'src/app/models/permission/permissionList';
import { MessageModel, DeleteMessageModel } from '../../models/beast-orm';
import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-connector.service';
import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
@@ -158,7 +157,7 @@ export class LoginPage implements OnInit {
this.getToken();
- this.router.navigateByUrl('/pin', { replaceUrl: true });
+ this.router.navigateByUrl('/home/events', { replaceUrl: true });
}
}
else{
diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html
index b0a6b8150..e1410f6c7 100644
--- a/src/app/pages/publications/new-action/new-action.page.html
+++ b/src/app/pages/publications/new-action/new-action.page.html
@@ -35,7 +35,6 @@
displayFormat="D MMM YYYY H:mm"
minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
- min="{{minDate}}"
max="2025">
@@ -43,7 +42,6 @@
diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html
index 0136d4e90..8e58da4a8 100644
--- a/src/app/pages/publications/publications.page.html
+++ b/src/app/pages/publications/publications.page.html
@@ -37,7 +37,7 @@