mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-21 13:55:51 +00:00
fix issues
This commit is contained in:
+8
-3
@@ -371,6 +371,7 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
UsersSelected: attendees,
|
||||
DispatchFolder: this.dispatchFolder,
|
||||
AttachmentList: docs,
|
||||
dataFields: {}
|
||||
}
|
||||
|
||||
let action_despacho = {
|
||||
@@ -405,7 +406,8 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
UserEmail: this.loggeduser.Email,
|
||||
UsersSelected: attendees,
|
||||
DispatchFolder: this.dispatchFolder,
|
||||
AttachmentList: docs
|
||||
AttachmentList: docs,
|
||||
dataFields: {}
|
||||
}
|
||||
|
||||
let action_parecer = {
|
||||
@@ -437,7 +439,8 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
UserEmail: this.loggeduser.Email,
|
||||
UsersSelected: attendees,
|
||||
DispatchFolder: this.dispatchFolder,
|
||||
AttachmentList: docs
|
||||
AttachmentList: docs,
|
||||
dataFields: {}
|
||||
}
|
||||
//
|
||||
let action_deferimento = {
|
||||
@@ -475,6 +478,7 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
UsersSelected: attendees,
|
||||
DispatchFolder: this.dispatchFolder,
|
||||
AttachmentList: docs,
|
||||
dataFields: {}
|
||||
}
|
||||
|
||||
|
||||
@@ -519,7 +523,8 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
UserEmail: this.loggeduser.Email,
|
||||
UsersSelected: attendees,
|
||||
DispatchFolder: this.dispatchFolder,
|
||||
AttachmentList: docs
|
||||
AttachmentList: docs,
|
||||
dataFields: {}
|
||||
}
|
||||
|
||||
let action_parecer_pr = {
|
||||
|
||||
@@ -150,10 +150,12 @@
|
||||
|
||||
</div>
|
||||
|
||||
<!-- {{ segmentVista }}: segmentVista -->
|
||||
<div #scroll [ngSwitch]="segmentVista" class="overflow-y-auto">
|
||||
<!-- This is the list view -->
|
||||
<div *ngSwitchCase="'listview'">
|
||||
|
||||
{{ TaskService.loadCount}}: TaskService.loadCount
|
||||
|
||||
<ion-item-sliding *ngIf="TaskService.loadCount || (AllProcess.length >= 1 && TaskService.loadNum >= 1)">
|
||||
<div class="listview">
|
||||
|
||||
@@ -461,8 +461,11 @@ export class GabineteDigitalPage implements OnInit {
|
||||
async loadAllProcesses() {
|
||||
|
||||
this.skeletonLoader = true
|
||||
await this.TaskService.LoadTask();
|
||||
this.dynamicSearch();
|
||||
try {
|
||||
|
||||
await this.TaskService.LoadTask();
|
||||
this.dynamicSearch();
|
||||
} catch (e) {}
|
||||
this.skeletonLoader = false
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,8 @@ import { UserModule } from 'src/app/module/user/user.module';
|
||||
CommonModule,
|
||||
FormsModule,
|
||||
IonicModule,
|
||||
LoginPageRoutingModule
|
||||
LoginPageRoutingModule,
|
||||
UserModule
|
||||
],
|
||||
declarations: [
|
||||
LoginPage
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { Router } from '@angular/router';
|
||||
import { AuthService } from 'src/app/services/auth.service';
|
||||
import { UserForm } from 'src/app/models/user.model';
|
||||
import { ToastService } from 'src/app/services/toast.service';
|
||||
import { environment } from 'src/environments/environment';
|
||||
@@ -22,6 +21,8 @@ import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.serv
|
||||
import { RoomLocalRepository } from 'src/app/module/chat/data/repository/room/room-local-repository.service'
|
||||
import { MessageLocalDataSourceService } from 'src/app/module/chat/data/repository/message/message-local-data-source.service'
|
||||
import { UserService } from 'src/app/module/user/domain/user.service'
|
||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||
import { LoginError } from 'src/app/core/user/use-case/user-login-use-case.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-login',
|
||||
@@ -47,14 +48,12 @@ export class LoginPage implements OnInit {
|
||||
constructor(
|
||||
private notificatinsservice: NotificationsService,
|
||||
private router: Router,
|
||||
private authService: AuthService,
|
||||
private toastService: ToastService,
|
||||
public alertController: AlertController,
|
||||
private clearStoreService: ClearStoreService,
|
||||
private changeProfileService: ChangeProfileService,
|
||||
public ThemeService: ThemeService,
|
||||
public p: PermissionService,
|
||||
// public ChatSystemService: ChatSystemService,
|
||||
private platform: Platform,
|
||||
private storage: Storage,
|
||||
private storageService: StorageService,
|
||||
@@ -64,7 +63,8 @@ export class LoginPage implements OnInit {
|
||||
private ChatServiceService: ChatServiceService,
|
||||
private RoomLocalRepository: RoomLocalRepository,
|
||||
private MessageLocalDataSourceService: MessageLocalDataSourceService,
|
||||
private UserService:UserService
|
||||
private UserService:UserService,
|
||||
private httpErroHandle: HttpErrorHandle,
|
||||
) { }
|
||||
|
||||
ngOnInit() { }
|
||||
@@ -137,7 +137,7 @@ export class LoginPage implements OnInit {
|
||||
username: newUserName.trim(),
|
||||
password: this.password.trim(),
|
||||
})
|
||||
|
||||
|
||||
|
||||
loader.remove()
|
||||
|
||||
@@ -209,10 +209,11 @@ export class LoginPage implements OnInit {
|
||||
SessionStore.hasPassLogin = true;
|
||||
|
||||
}
|
||||
}/*
|
||||
else{
|
||||
this.toastService._badRequest('Ocorreu um problema por favor valide o username e password');
|
||||
} */
|
||||
} else {
|
||||
if( typeof attempt.error == 'number') {
|
||||
this.httpErroHandle.httpStatusHandle({ status: attempt.error as LoginError})
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
this.toastService._badRequest('Por favor, insira a sua palavra-passe');
|
||||
@@ -234,7 +235,7 @@ export class LoginPage implements OnInit {
|
||||
//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) {
|
||||
if (this.p.userPermission(this.p.permissionList.Agenda.access)) {
|
||||
this.router.navigate(['/home/agenda']);
|
||||
this.router.navigate(['/home/events']);
|
||||
}
|
||||
else {
|
||||
this.router.navigate(['/home/events']);
|
||||
|
||||
Reference in New Issue
Block a user