mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
fix route
This commit is contained in:
@@ -34,7 +34,7 @@
|
|||||||
<ion-label style="margin-bottom: 2px;" class="overflow-visible font-12-em">Acções</ion-label>
|
<ion-label style="margin-bottom: 2px;" class="overflow-visible font-12-em">Acções</ion-label>
|
||||||
</ion-tab-button>
|
</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/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-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>
|
<ion-label class="font-12-em">Chat</ion-label>
|
||||||
|
|||||||
@@ -59,6 +59,12 @@ export class ProfilePage implements OnInit {
|
|||||||
public NotificationHolderService: NotificationHolderService
|
public NotificationHolderService: NotificationHolderService
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
window['e'] = () => {
|
||||||
|
console.log(
|
||||||
|
this.zone.run(() => this.router.navigate(['/home/chat']))
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
router.events.subscribe((val) => {
|
router.events.subscribe((val) => {
|
||||||
this.isProfileOpen = false
|
this.isProfileOpen = false
|
||||||
@@ -293,7 +299,11 @@ export class ProfilePage implements OnInit {
|
|||||||
let navigationExtras: NavigationExtras = { queryParams: { "roomId": IdObject, } };
|
let navigationExtras: NavigationExtras = { queryParams: { "roomId": IdObject, } };
|
||||||
|
|
||||||
this.zone.run(() => this.router.navigate(['/home/chat']));
|
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);
|
this.deleteNotification(index);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
<div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
|
<div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
|
||||||
<div class="buttons">
|
<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 class="solid"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="buttons">
|
<div class="buttons">
|
||||||
|
|||||||
+3
-1
@@ -18,6 +18,7 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart
|
|||||||
import { TaskService } from 'src/app/services/task.service'
|
import { TaskService } from 'src/app/services/task.service'
|
||||||
import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page';
|
import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page';
|
||||||
import { PopupQuestionPage } from 'src/app/modals/popup-question/popup-question.page';
|
import { PopupQuestionPage } from 'src/app/modals/popup-question/popup-question.page';
|
||||||
|
import { PermissionService } from 'src/app/services/permission.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-diploma-assinar',
|
selector: 'app-diploma-assinar',
|
||||||
@@ -52,7 +53,8 @@ export class DiplomaAssinarPage implements OnInit {
|
|||||||
private httpErroHandle: HttpErrorHandle,
|
private httpErroHandle: HttpErrorHandle,
|
||||||
private despachoService: DespachoService,
|
private despachoService: DespachoService,
|
||||||
public TaskService: TaskService,
|
public TaskService: TaskService,
|
||||||
private toastController: ToastController
|
private toastController: ToastController,
|
||||||
|
public p: PermissionService,
|
||||||
) {
|
) {
|
||||||
this.activatedRoute.paramMap.subscribe(params => {
|
this.activatedRoute.paramMap.subscribe(params => {
|
||||||
if(params["params"].SerialNumber) {
|
if(params["params"].SerialNumber) {
|
||||||
|
|||||||
@@ -761,6 +761,8 @@ export class RoomService {
|
|||||||
cloneMessage.msg = currentDateMessage
|
cloneMessage.msg = currentDateMessage
|
||||||
cloneMessage.dateLabel = true
|
cloneMessage.dateLabel = true
|
||||||
cloneMessage.delate = false
|
cloneMessage.delate = false
|
||||||
|
cloneMessage.file = undefined
|
||||||
|
cloneMessage.attachments = undefined
|
||||||
|
|
||||||
if(new Date().toLocaleDateString() == currentDateMessage) {
|
if(new Date().toLocaleDateString() == currentDateMessage) {
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
<button (click)="openAddNoteModal('Concluir diploma')" class="btn-cancel" shape="round" >Concluir</button>
|
<button (click)="openAddNoteModal('Concluir diploma')" class="btn-cancel" shape="round" >Concluir</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
|
<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>
|
||||||
<div class="buttons width-100">
|
<div class="buttons width-100">
|
||||||
<button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
|
<button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
|
||||||
|
|||||||
Reference in New Issue
Block a user