This commit is contained in:
Peter Maquiran
2023-08-14 12:15:18 +01:00
parent fa6450f328
commit 0f3416cc30
7 changed files with 28 additions and 11 deletions
+1 -1
View File
@@ -187,7 +187,7 @@
<app-empty-chat [texto]="emptyTextDescription"
class="height-100 flex-column"
[style.display]="showEmptyComponent ? 'flex' : 'none'"
[style.display]="showEmptyComponent && !showContacts && !showNewGroup && !showEditGroup && !showGroupContacts && !showGroupMessages && !showNewEvent ? 'flex' : 'none'"
#messagecontainer>
</app-empty-chat>
+2 -1
View File
@@ -282,7 +282,7 @@ export class ChatPage implements OnInit {
}
}
openContactsPage() {
this.segment = 'Contactos';
this.idSelected = '';
this.closeAllDesktopComponents();
@@ -295,6 +295,7 @@ export class ChatPage implements OnInit {
}
}
openNewGroupPage() {
this.segment = 'Grupos';
this.idSelected = '';
if (window.innerWidth < 701) {
this.newGroup();
@@ -83,7 +83,7 @@
</div>
</div>
<div *ngIf="segmentVista == 'listview' " class="d-flex px-20 justify-content-end width-100">
<div *ngIf="segmentVista == 'listview' " class="d-flex px-20-rem pb-20 justify-content-end width-100">
<div title="Pesquisa" class="d-flex align-center cursor-pointer width-100 justify-end">
<!-- <div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35-rem" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
@@ -706,6 +706,22 @@ export class ChatSystemService {
}
}
async createGroup__(name, customFields = {}) {
const res: any = await this.createPrivateRoom(name, SessionStore.user.UserName, customFields);
console.log('room is created', res)
if(res?.result?.rid) {
try {
await this.getAllRooms();
return res
} catch (e) {}
console.log('room is loaded')
return res
} else {
return res
}
}
getGroupByName(name ) {
return this._group.find( e=> e.name == name)
}
+1 -1
View File
@@ -44,7 +44,7 @@ export class TaskService {
AllProcess = []
showLoader: boolean = false
showLoaderNum = 0
showLoaderNum: number = 0
loadCount = false
loadNum = 0
@@ -180,7 +180,7 @@
</ion-item-sliding>
</div>
<div *ngIf="!TaskService.showLoaderNum != 0 && AllProcess.length == 0"
<div *ngIf="TaskService.showLoaderNum == 0 && AllProcess.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center">
<span>Lista vazia</span>
</div>
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "cd4fda997",
"SHA": "cd4fda997ccace9519e23ba34643390ebb83fb85",
"shortSHA": "fa6450f32",
"SHA": "fa6450f3285f9d28851e8debc4cf9e05bcdf6c4e",
"branch": "developer",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Aug 14 10:17:05 2023 +0100'",
"lastCommitMessage": "fix",
"lastCommitNumber": "5149",
"lastCommitTime": "'Mon Aug 14 11:00:35 2023 +0100'",
"lastCommitMessage": "changes",
"lastCommitNumber": "5152",
"change": "",
"changeStatus": "On branch developer\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/pages/events/attendees/attendees.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified: src/app/pages/search/organic-entity/organic-entity.page.html\n\tmodified: src/app/pages/search/organic-entity/organic-entity.page.ts\n\tmodified: src/app/pages/search/search.page.html\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/pages/search/sender/sender.page.html\n\tmodified: src/app/pages/search/sender/sender.page.ts\n\tmodified: src/app/services/events/attendees/attendees.page.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/services/search.service.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.module.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified: src/firebase-messaging-sw.js\n\tmodified: version/git-version.ts",
"changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/chat/chat.page.html\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html",
"changeAuthor": "peter.maquiran"
}