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

fix

Browse Source
This commit is contained in:
Peter Maquiran
2023-03-09 16:35:54 +01:00
parent 789c2f4e8b
commit b8a1734abb
5 changed files with 64 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/group-messages/group-messages.page.ts
+22 -17
View File
@@ -546,6 +546,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
else if (res.data == 'edit') {
this.editGroup(this.roomId);
} else if (res.data == 'addUser') {
this.addContacts();
}
});
}
@@ -820,25 +823,27 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
async addContacts() {
if(this.isAdmin) {
const modal = await this.modalController.create({
component: GroupContactsPage,
componentProps: {
isCreated: this.isGroupCreated,
room: this.room,
members: this.members,
name: this.room.name,
},
cssClass: 'contacts',
backdropDismiss: false
});
const modal = await this.modalController.create({
component: GroupContactsPage,
componentProps: {
isCreated: this.isGroupCreated,
room: this.room,
members: this.members,
name: this.room.name,
},
cssClass: 'contacts',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then(() => {
this.getRoomInfo();
});
}
await modal.present();
modal.onDidDismiss().then(() => {
this.getRoomInfo();
});
}
async editGroup(roomId) {
src/app/shared/chat/group-messages/group-messages.page.ts
+23 -18
View File
@@ -528,7 +528,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
});
await modal.present();
modal.onDidDismiss().then(res => {
console.log(res)
if (res.data == 'leave') {
this.getRoomInfo();
this.closeAllDesktopComponents.emit();
@@ -546,6 +546,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
//this.closeAllDesktopComponents.emit();
this.openEditGroupPage.emit(this.roomId);
} else if (res.data == 'addUser') {
this.openGroupContactsPage();
}
else {
@@ -616,24 +619,26 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
}
async addContacts() {
if(this.isAdmin) {
const modal = await this.modalController.create({
component: GroupContactsPage,
componentProps: {
isCreated: this.isGroupCreated,
room: this.room,
members: this.members,
name: this.room.name,
},
cssClass: 'contacts',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then(() => {
//this.getRoomInfo();
});
}
const modal = await this.modalController.create({
component: GroupContactsPage,
componentProps: {
isCreated: this.isGroupCreated,
room: this.room,
members: this.members,
name: this.room.name,
},
cssClass: 'contacts',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then(() => {
//this.getRoomInfo();
});
}
src/app/shared/popover/chat-popover/chat-popover.page.html
+1 -1
View File
@@ -6,7 +6,7 @@
</button>
</div>
<div class="buttons">
<button class="btn-cancel" shape="round" >Adicionar</button>
<button *ngIf="isAdmin" (click)="addUser()" class="btn-cancel" shape="round" >Adicionar</button>
<button (click)="leaveGroup()" class="btn-cancel" shape="round" >Sair do Grupo</button>
<button *ngIf="isAdmin" (click)="openChangeGroupName()" class="btn-cancel btn-cancel mt-10" shape="round" >Alterar nome do grupo</button>
<div class="solid"></div>
src/app/shared/popover/chat-popover/chat-popover.page.ts
+12 -6
View File
@@ -5,8 +5,6 @@ import { ToastService } from 'src/app/services/toast.service';
import { ThemeService } from 'src/app/services/theme.service'
import { SetRoomOwnerPage } from 'src/app/modals/set-room-owner/set-room-owner.page';
import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
import { HttpErrorResponse } from '@angular/common/http';
import { SessionStore } from 'src/app/store/session.service';
@Component({
@@ -41,11 +39,11 @@ export class ChatPopoverPage implements OnInit {
close(action:any){
if( window.innerWidth < 701){
this.popoverController.dismiss(action);
this.modalController.dismiss(action);
this.modalController.dismiss(action)
}
else{
this.popoverController.dismiss(action);
this.modalController.dismiss(action);
this.modalController.dismiss(action)
}
}
@@ -126,16 +124,24 @@ export class ChatPopoverPage implements OnInit {
}
});
this.popoverController.dismiss('delete');
this.modalController.dismiss('delete');
this.modalController.dismiss('delete')
}
async openChangeGroupName(){
if( window.innerWidth < 701){
this.popoverController.dismiss('edit');
this.modalController.dismiss('edit')
}
else{
this.modalController.dismiss('edit');
this.popoverController.dismiss('edit');
this.modalController.dismiss('edit')
}
}
async addUser() {
this.popoverController.dismiss('addUser');
this.modalController.dismiss('addUser')
}
}
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "0b4cafda2",
"SHA": "0b4cafda22aba43e3e2acb6f454b2a8ae51ef467",
"shortSHA": "789c2f4e8",
"SHA": "789c2f4e8b10fe5ecb2975baf9b1a328f8f72607",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu Mar 9 15:15:06 2023 +0100'",
"lastCommitMessage": "remove all date",
"lastCommitNumber": "4854",
"lastCommitTime": "'Thu Mar 9 15:18:19 2023 +0100'",
"lastCommitMessage": "remove json text",
"lastCommitNumber": "4855",
"change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.html\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.ts",
"changeAuthor": "peter.maquiran"
}