This commit is contained in:
Peter Maquiran
2023-01-30 15:24:37 +01:00
parent 31fa9fe87c
commit 261478a204
4 changed files with 39 additions and 15 deletions
+29 -3
View File
@@ -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, NavigationEnd } from '@angular/router';
import { NavigationStart, Router, NavigationEnd, ActivatedRoute } from '@angular/router';
import { EventPerson } from 'src/app/models/eventperson.model';
import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
import { environment } from 'src/environments/environment';
@@ -113,6 +113,7 @@ export class ChatPage implements OnInit {
private platform: Platform,
private storageservice: StorageService,
public ChatSystemService: ChatSystemService,
private activatedRoute: ActivatedRoute,
) {
this.headers = new HttpHeaders();
@@ -141,14 +142,39 @@ export class ChatPage implements OnInit {
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url == '/home/chat' ||
event instanceof NavigationEnd && event.url == "/home/chat?gbCreateGroup=true") {
this.checkCreateGroup();
}
});
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url.startsWith('/home/chat')) {
this.routeCheck()
}
});
this.routeCheck()
}
routeCheck() {
const urlParams = new URLSearchParams(window.location.search);
const roomId = urlParams.get('roomId');
if(roomId) {
const room = this.ChatSystemService.getRoomById(roomId);
if(room.isGroup) {
this.segment = 'Grupos'
this.openGroupMessagesPage(roomId)
} else {
this.segment = 'Contactos'
this.openMessagesPage(roomId)
}
}
}
checkCreateGroup() {
@@ -330,8 +330,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
async goToEvent(event: any) {
// console.log(event)
let classs;
if (window.innerWidth < 701) {
@@ -166,8 +166,8 @@ export class GabineteDigitalPage implements OnInit {
}
const pathname = window.location.pathname
//this.router.events.forEach((event) => {
//if (event instanceof NavigationEnd && event.url == pathname) {
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url == pathname) {
this.waitForDomService.selector({
selector: 'app-gabinete-digital ion-content .aside-wrapper',
callback: () => {
@@ -180,8 +180,8 @@ export class GabineteDigitalPage implements OnInit {
}
}
})
//}
//});
}
});
this.hideRefreshButton();
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "9fea5d848",
"SHA": "9fea5d8488ddc4e3eb55d0be1821d0e21ec6974a",
"shortSHA": "31fa9fe87",
"SHA": "31fa9fe87c98776b5e9b0b63a24b73ad82ba3989",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Wed Jan 25 15:49:16 2023 +0100'",
"lastCommitMessage": "fix search",
"lastCommitNumber": "4690",
"lastCommitTime": "'Mon Jan 30 14:04:57 2023 +0100'",
"lastCommitMessage": "Despacho",
"lastCommitNumber": "4691",
"change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/modals/document-detail/document-detail.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tmodified: src/app/shared/popover/request-options/request-options.page.html\n\tmodified: src/app/shared/popover/searched-document-options/searched-document-options.page.html\n\tmodified: src/environments/environment.ts\n\tmodified: src/environments/suport/oapr.ts",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts",
"changeAuthor": "peter.maquiran"
}