-
+
diff --git a/src/app/pages/chat/new-group/new-group.page.ts b/src/app/pages/chat/new-group/new-group.page.ts
index 42e5521d2..f68fa0f96 100644
--- a/src/app/pages/chat/new-group/new-group.page.ts
+++ b/src/app/pages/chat/new-group/new-group.page.ts
@@ -1,6 +1,6 @@
import { analyzeAndValidateNgModules } from '@angular/compiler';
import { Component, OnInit } from '@angular/core';
-import { ModalController, PickerController, PopoverController } from '@ionic/angular';
+import { ModalController, NavParams, PickerController, PopoverController } from '@ionic/angular';
import { GroupDurationPage } from 'src/app/shared/popover/group-duration/group-duration.page';
import { GroupContactsPage } from '../group-messages/group-contacts/group-contacts.page';
@@ -10,17 +10,22 @@ import { GroupContactsPage } from '../group-messages/group-contacts/group-contac
styleUrls: ['./new-group.page.scss'],
})
export class NewGroupPage implements OnInit {
+ isGroupCreated:boolean;
showLoader: boolean;
displayDuration: any;
showDuration: boolean;
selectedDuration = ['','',''];
+ groupName:string;
constructor(
private pickerController: PickerController,
private popoverController: PopoverController,
- private modalController: ModalController,
- ) {
-
+ private modalController: ModalController,
+ private navParams: NavParams,
+ )
+ {
+ this.isGroupCreated = false;
+ this.groupName = this.navParams.get('name');
}
ngOnInit() {
@@ -34,16 +39,20 @@ export class NewGroupPage implements OnInit {
}
async addContacts(){
- this.close();
+ this.modalController.dismiss();
+
const modal = await this.modalController.create({
component: GroupContactsPage,
- componentProps: {},
+ componentProps: {
+ isCreated:this.isGroupCreated,
+ name:this.groupName,
+ duration:'',
+ },
cssClass: 'contacts',
backdropDismiss: false
});
await modal.present();
-
modal.onDidDismiss();
}
diff --git a/src/app/pages/events/attendee-modal/attendee-modal.page.ts b/src/app/pages/events/attendee-modal/attendee-modal.page.ts
index 6671e9c40..bd4ca69d2 100644
--- a/src/app/pages/events/attendee-modal/attendee-modal.page.ts
+++ b/src/app/pages/events/attendee-modal/attendee-modal.page.ts
@@ -22,9 +22,11 @@ export class AttendeeModalPage implements OnInit {
}
save(){
- this.modalCtrl.dismiss(this.contacts.filter(function(contact) {
+ this.modalCtrl.dismiss(
+ this.contacts.filter(function(contact) {
return contact.IsRequired == true;
- }));
+ })
+ );
}
close(){
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 7a39937c8..983751144 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -156,6 +156,9 @@ export class ChatService {
}
/* GROUPS */
+ addGroup(body:any){
+ return this.http.post(environment.apiChatUrl+'groups.create', body, this.options);
+ }
getGroupMembers(roomId:string){
let params = new HttpParams();
let url=environment.apiChatUrl+'groups.members';
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 31b168f32..d090a14d9 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,7 +4,7 @@
export const environment = {
production: false,
- apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V3/api/',
+ apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
domain: 'gabinetedigital.local',