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

fix route

Browse Source
This commit is contained in:
Peter Maquiran
2023-09-22 16:16:35 +01:00
parent c655d720d5
commit aaa11f98b2
6 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home.page.html
+1 -1
View File
@@ -34,7 +34,7 @@
<ion-label style="margin-bottom: 2px;" class="overflow-visible font-12-em">Acções</ion-label>
</ion-tab-button>
<ion-tab-button *ngIf="p.userPermission([permissionList.Chat.access])" tab="chat" [class.active]="ActiveTabService.pages.chat">
<ion-tab-button *ngIf="p.userPermission([permissionList.Chat.access])" (click)="goto('/home/chat')" [class.active]="ActiveTabService.pages.chat">
<ion-icon *ngIf="!ActiveTabService.pages.chat" class="nav-icon font-30-em" src="assets/images/icons-nav-chat-inactive.svg"></ion-icon>
<ion-icon *ngIf="ActiveTabService.pages.chat" class="nav-icon font-30-em" src="assets/images/nav-hover/icons-nav-chat-active.svg"></ion-icon>
<ion-label class="font-12-em">Chat</ion-label>
src/app/modals/profile/profile.page.ts
+11 -1
View File
@@ -59,6 +59,12 @@ export class ProfilePage implements OnInit {
public NotificationHolderService: NotificationHolderService
) {
window['e'] = () => {
console.log(
this.zone.run(() => this.router.navigate(['/home/chat']))
)
}
router.events.subscribe((val) => {
this.isProfileOpen = false
@@ -293,7 +299,11 @@ export class ProfilePage implements OnInit {
let navigationExtras: NavigationExtras = { queryParams: { "roomId": IdObject, } };
this.zone.run(() => this.router.navigate(['/home/chat']));
this.zone.run(() => this.router.navigate(['/home/chat'], navigationExtras));
setTimeout(() => {
this.zone.run(() => this.router.navigate(['/home/chat'], navigationExtras));
}, 200);
this.deleteNotification(index);
}
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+1 -1
View File
@@ -17,7 +17,7 @@
<div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
<div class="buttons">
<button (click)="AssinarDraft()" class="btn-cancel" shape="round" >Assinar</button>
<button *ngIf="p.userRole('PR')" (click)="AssinarDraft()" class="btn-cancel" shape="round" >Assinar</button>
<div class="solid"></div>
</div>
<div class="buttons">
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+3 -1
View File
@@ -18,6 +18,7 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart
import { TaskService } from 'src/app/services/task.service'
import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page';
import { PopupQuestionPage } from 'src/app/modals/popup-question/popup-question.page';
import { PermissionService } from 'src/app/services/permission.service';
@Component({
selector: 'app-diploma-assinar',
@@ -52,7 +53,8 @@ export class DiplomaAssinarPage implements OnInit {
private httpErroHandle: HttpErrorHandle,
private despachoService: DespachoService,
public TaskService: TaskService,
private toastController: ToastController
private toastController: ToastController,
public p: PermissionService,
) {
this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].SerialNumber) {
src/app/services/chat/room.service.ts
+2
View File
@@ -761,6 +761,8 @@ export class RoomService {
cloneMessage.msg = currentDateMessage
cloneMessage.dateLabel = true
cloneMessage.delate = false
cloneMessage.file = undefined
cloneMessage.attachments = undefined
if(new Date().toLocaleDateString() == currentDateMessage) {
src/app/shared/popover/deploma-options/deploma-options.page.html
+1 -1
View File
@@ -22,7 +22,7 @@
<button (click)="openAddNoteModal('Concluir diploma')" class="btn-cancel" shape="round" >Concluir</button>
</div>
<div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
<button (click)="AssinarNew()" class="btn-cancel" shape="round" >Assinar</button>
<button *ngIf="p.userRole('PR')" (click)="AssinarNew()" class="btn-cancel" shape="round" >Assinar</button>
</div>
<div class="buttons width-100">
<button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>