peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 21:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
Peter Maquiran
2022-12-13 17:21:48 +01:00
parent 2beb3d4387
commit 9116ac4d06
14 changed files with 68 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/events/events.page.html
+2 -2
View File
@@ -28,7 +28,7 @@
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<div class="conteiner-box px-20 height-100" ng-swipe-up="swipe($event)">
<div *ngIf="p.userPermission([permissionList.Agenda.access])" class="schedule height-100">
<div *ngIf="p.userPermission([p.permissionList.Agenda.access])" class="schedule height-100">
<div class="schedule-header">
<div class="title">
<ion-icon class="icon" slot="end" src="assets/images/icons-default-agenda.svg" ></ion-icon>
@@ -88,7 +88,7 @@
</div>
</div>
<div *ngIf="p.userPermission([permissionList.Gabinete.access])" class="schedule height-100">
<div *ngIf="p.userPermission([p.permissionList.Gabinete.access])" class="schedule height-100">
<div class="schedule-header">
<div class="title">
<ion-icon class="icon" slot="end" src="assets/images/icons-correspondencias.svg"></ion-icon>
src/app/pages/events/events.page.ts
+1 -4
View File
@@ -14,7 +14,6 @@ import { BackgroundService } from 'src/app/services/background.service';
import { momentG } from 'src/plugin/momentG';
import { ThemeService } from 'src/app/services/theme.service'
import { Storage } from '@ionic/storage';
import { PermissionList } from 'src/app/models/permission/permissionList';
import { PermissionService } from 'src/app/services/permission.service';
import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
import { ChangeProfileService } from 'src/app/services/change-profile.service';
@@ -65,8 +64,6 @@ export class EventsPage implements OnInit {
loggeduser: LoginUserRespose;
permissionList = new PermissionList();
constructor(
private eventService: EventsService,
private router: Router,
@@ -81,7 +78,7 @@ export class EventsPage implements OnInit {
public p: PermissionService,
private changeProfileService: ChangeProfileService,
) {
this.loggeduser = SessionStore.user;
src/app/pages/inactivity/inactivity.page.ts
+1 -1
View File
@@ -123,7 +123,7 @@ export class InactivityPage implements OnInit {
await this.authService.SetSession(attempt, this.userattempt);
if(this.p.userPermission(this.p.permissionList.Chat.access)){
this.authService.loginChat();
// this.authService.loginChat();
}
this.getToken();
src/app/pages/login/login.page.ts
-7
View File
@@ -10,12 +10,10 @@ import { SessionStore } from 'src/app/store/session.service';
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 { StorageService } from 'src/app/services/storage.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 { Storage } from '@ionic/storage';
import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
import { ChatService } from 'src/app/services/chat.service';
@@ -37,7 +35,6 @@ export class LoginPage implements OnInit {
loginPreference: string
sessionStore = SessionStore;
permissionList = new PermissionList();
showPassword = false;
passwordIcon = "eye";
@@ -50,10 +47,8 @@ export class LoginPage implements OnInit {
private clearStoreService: ClearStoreService,
private changeProfileService: ChangeProfileService,
public ThemeService: ThemeService,
private storageservice: StorageService,
public p: PermissionService,
private RochetChatConnectorService: RochetChatConnectorService,
private storage: Storage,
public ChatSystemService: ChatSystemService,
private ChatService: ChatService
) {}
@@ -128,7 +123,6 @@ export class LoginPage implements OnInit {
await this.authService.SetSession(attempt, this.userattempt);
if(attempt.ChatData) {
await this.authService.loginChat(attempt.ChatData.data);
await this.authService.loginToChatWs();
this.ChatService.setheader()
@@ -157,7 +151,6 @@ export class LoginPage implements OnInit {
if(attempt.ChatData) {
await this.authService.loginChat(attempt.ChatData.data);
await this.authService.loginToChatWs();
this.ChatService.setheader();
this.ChatSystemService.loadChat();