mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
improve
This commit is contained in:
@@ -18,9 +18,9 @@
|
||||
</div>
|
||||
<div class="div-icon">
|
||||
|
||||
<button (click)="openChatDebuggingPageModal()" title="Nova Conversa Individual" class="btn-no-color font-12">
|
||||
<!-- <button (click)="openChatDebuggingPageModal()" title="Nova Conversa Individual" class="btn-no-color font-12">
|
||||
Dev
|
||||
</button>
|
||||
</button> -->
|
||||
<button title="Nova Conversa Individual" class="btn-no-color" (click)="openContactsPage()">
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src="assets/images/theme/gov/icons-chat-new-conversation.svg"></ion-icon>
|
||||
@@ -213,6 +213,7 @@
|
||||
(addGroupMessage)="openGroupContactsPage($event)"
|
||||
(closeAllDesktopComponents)="closeAllDesktopComponents()"
|
||||
[style.display]="showNewGroup ? 'flex' : 'none'"
|
||||
*ngIf="showNewGroup"
|
||||
class=" height-100 flex-column">
|
||||
</app-new-group>
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ import { MessagesPage } from './messages/messages.page';
|
||||
import { NewGroupPage } from './new-group/new-group.page';
|
||||
import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page';
|
||||
import { Subject } from "rxjs/Rx";
|
||||
import { NavigationStart, Router } from '@angular/router';
|
||||
import { NavigationStart, Router, NavigationEnd } from '@angular/router';
|
||||
import { EventPerson } from 'src/app/models/eventperson.model';
|
||||
import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
|
||||
import { environment } from 'src/environments/environment';
|
||||
@@ -142,30 +142,29 @@ export class ChatPage implements OnInit {
|
||||
this.hideRefreshButton();
|
||||
this.getChatMembers();
|
||||
|
||||
let t = this.showDateDuration(new Date());
|
||||
|
||||
this.checkCreateGroup();
|
||||
|
||||
this.router.events.forEach((event) => {
|
||||
|
||||
if (event instanceof NavigationEnd && event.url == '/home/chat' ||
|
||||
event instanceof NavigationEnd && event.url == "/home/chat?gbCreateGroup=true") {
|
||||
this.checkCreateGroup();
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
checkCreateGroup() {
|
||||
if (this.dataService.get("newGroup")) {
|
||||
this.openNewGroupPage();
|
||||
}
|
||||
else{
|
||||
else {
|
||||
this.closeAllDesktopComponents();
|
||||
this.showEmptyComponent = true;
|
||||
}
|
||||
|
||||
/* this.router.events.forEach((event) => {
|
||||
if (event instanceof NavigationStart || event.url.endsWith('/home/chat')) {
|
||||
if (this.dataService.get("newGroup")) {
|
||||
this.openNewGroupPage();
|
||||
}
|
||||
else{
|
||||
this.closeAllDesktopComponents();
|
||||
this.showEmptyComponent = true;
|
||||
}
|
||||
}
|
||||
else{
|
||||
this.dataService.set("newGroup", false);
|
||||
}
|
||||
}); */
|
||||
|
||||
}
|
||||
|
||||
numSequence(n: number): Array<number> {
|
||||
@@ -174,7 +173,6 @@ export class ChatPage implements OnInit {
|
||||
|
||||
ngOnDestroy() {
|
||||
this.setStatus('offline');
|
||||
this.dataService.set("newGroup", false);
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user