\r\n {{header}} \r\n
\r\n\r\n \r\n
\r\n \r\n {{user.first}} {{user.last}}
\r\n![](\\\"assets/images/icons-arrow-arrow-down-25.svg\\\"){kind=icon}
\\r\\n ![](\\\"assets/images/icons-chat-send.svg\\\"){kind=icon}
\\r\\n 
\\r\\n
+
{{header}}
-
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
index f109751bd..9ed6da903 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -1,6 +1,9 @@
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
-import { ModalController } from '@ionic/angular';
+import { ModalController, NavParams } from '@ionic/angular';
+import { AuthService } from 'src/app/services/auth.service';
+import { ChatService } from 'src/app/services/chat.service';
+import { NewGroupPage } from '../../new-group/new-group.page';
import { GroupMessagesPage } from '../group-messages.page';
@Component({
@@ -10,112 +13,89 @@ import { GroupMessagesPage } from '../group-messages.page';
})
export class GroupContactsPage implements OnInit {
showLoader: boolean;
+ loggedUser: any;
users = [];
contact: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
headers: HttpHeaders;
options:any;
-
- contacts: Contact[] = [
- {
- first: 'Ana',
- last: 'Manuel',
- url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
- },
- {
- first: 'Abdullah',
- last: 'Hill',
- url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
- },
- {
- first: 'Batur',
- last: 'Oymen',
- url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
- },
- {
- first: 'Bianca',
- last: 'Costa',
- url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
- },
- {
- first: 'Zaya',
- last: 'Mary',
- url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
- },
- {
- first: 'Tiago',
- last: 'Kayaya',
- url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
- }
-];
+ listContacts: any[];
+ contacts: any;
+ textSearch:string;
+ room:any;
+ dm:any;
+ isGroupCreated:boolean;
+ groupName:string;
+ selectedUserList:any;
constructor(
private modalController: ModalController,
private http: HttpClient,
+ private chatService: ChatService,
+ private authService: AuthService,
+ private navParams: NavParams,
)
- {
- this.headers = new HttpHeaders();
- this.headers = this.headers.set('Access-Control-Allow-Origin' , '*');
- this.headers = this.headers.set('Access-Control-Allow-Methods', 'POST, GET, OPTIONS, PUT');
- this.headers = this.headers.set('Accept','application/json');
- this.headers = this.headers.set('content-type','application/json');
-
-
+ {
+ this.authService.userData$.subscribe((res:any)=>{
+ this.loggedUser=res;
+ });
+ this.textSearch="";
+ this.dm=null;
+ this.room=null;
+ this.isGroupCreated = this.navParams.get('isCreated');
+ this.groupName = this.navParams.get('name');
+ this.room = this.navParams.get('room');
}
ngOnInit() {
this.loadUsers();
-
+ console.log(this.groupName);
+ console.log(this.isGroupCreated);
}
loadUsers(){
this.options = {
headers: this.headers,
};
- /* this.http.get('https://randomuser.me/api/?results=100', this.options)
- .subscribe(res => {
- this.users = res['results'].sort((a,b) => {
- if(a.name.first < b.name.first){
+ this.chatService.getAllUsers().subscribe((res:any)=>{
+ console.log(res.users);
+ res.users.forEach(user =>{
+ let usr = {
+ "_id": user._id,
+ "username": user.username,
+ "name":user.name,
+ "isChecked": false,
+ }
+ if(this.listContacts == null){
+ this.listContacts = new Array();
+ }
+ this.listContacts.push(usr);
+ });
+
+ this.contacts = this.listContacts.filter(data => data.username != this.loggedUser.me.username);
+ this.users = this.contacts.sort((a,b) => {
+ if(a.name < b.name){
return -1;
}
- if(a.name.first > b.name.first){
+ if(a.name > b.name){
return 1;
}
return 0;
});
- console.log(res);
console.log(this.users);
- }); */
- this.users = this.contacts.sort((a,b) => {
- if(a.first < b.first){
- return -1;
- }
- if(a.first > b.first){
- return 1;
- }
- return 0;
+
+ this.showLoader = false;
});
}
separateLetter(record, recordIndex, records){
- /* if(recordIndex == 0){
- return record.name.first[0];
- }
-
- let first_prev = records[recordIndex - 1].name.first[0];
- let first_current = record.name.first[0];
-
- if(first_prev != first_current){
- return first_current;
- }
- return null; */
if(recordIndex == 0){
- return record.first[0];
+ return record.name[0];
}
- let first_prev = records[recordIndex - 1].first[0];
- let first_current = record.first[0];
+ let first_prev = records[recordIndex - 1].name[0];
+ let first_current = record.name[0];
if(first_prev != first_current){
return first_current;
@@ -126,26 +106,108 @@ export class GroupContactsPage implements OnInit {
doRefresh(event){
}
- close(){
+
+ async close(){
this.modalController.dismiss();
+ if(this.isGroupCreated){
+ console.log('go to conversa');
+ }
+ else{
+ this.modalController.dismiss();
+ console.log('go to new group page');
+ const modal = await this.modalController.create({
+ component: NewGroupPage,
+ componentProps: {
+ name:this.groupName,
+ duration:'',
+ },
+ cssClass: 'new-group',
+ backdropDismiss: false,
+ });
+ await modal.present();
+
+ }
+
}
onChange(event){
-
+ this.textSearch = event.detail.value;
}
clicked(){
console.log('clicked');
}
- async groupMessages(){
+ selectedContact(user:any){
+ /* this.groupName = this.room.name; */
+ user.isChecked = !user.isChecked;
+
+
+ }
+ addContacts(room:any){
+ console.log(room);
+ this.selectedUserList = this.users.filter(function(contact) {
+ return contact.isChecked == true;
+ });
+ console.log( this.selectedUserList);
+ this.selectedUserList.forEach(user=>{
+ let body ={
+ "roomId":room._id,
+ "userId":user._id,
+
+ }
+ this.chatService.addUserToGroup(body).subscribe(res=>{
+ console.log(res['success']);
+ });
+ });
+ }
+
+ createGroup(){
+ if(!this.isGroupCreated){
+ let body = { "name":this.groupName, }
+ this.chatService.addGroup(body).subscribe(res=>{
+ console.log('group created');
+ console.log(res['group']);
+ this.addContacts(res['group']);
+ this.openGroupMessages(res['group']);
+
+ });
+
+ }
+ else{
+ this.addContacts(this.room);
+ this.openGroupMessages(this.room);
+ /* this.chatService.getGroupInfo(this.room._id).subscribe(res=>{
+ console.log(res);
+
+ this.addContacts(res['group']);
+ this.openGroupMessages(res['group']);
+ }) */
+
+ }
+ }
+
+ async newGroup(){
+ this.close();
+ const modal = await this.modalController.create({
+ component: NewGroupPage,
+ cssClass: 'new-group',
+ backdropDismiss: false,
+ });
+ await modal.present();
+ modal.onDidDismiss();
+ }
+
+ async openGroupMessages(room:any){
+ this.close();
const modal = await this.modalController.create({
component: GroupMessagesPage,
- componentProps: {},
- cssClass: 'contacts',
+ componentProps: {
+ room: room,
+ },
+ cssClass: 'group-messages',
backdropDismiss: false
});
await modal.present();
-
modal.onDidDismiss();
}
diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index ca0a8e4b8..207ee50e3 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -4,19 +4,19 @@
{{user.first}} {{user.last}}
+{{user.name}}
- Grupo de Trabalho A
+ {{room.name}}
+
@@ -31,59 +31,13 @@
A conversa original mantêm-se como chat individual
-
- {{contact}}
+
+ {{member.name}},
-
-
diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss
index cbe5a62e7..7606ec8d5 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.scss
+++ b/src/app/pages/chat/group-messages/group-messages.page.scss
@@ -95,20 +95,19 @@
font-family: Roboto;
overflow: auto;
- .incoming, .outgoing{
+ .incoming-true, .incoming-false{
width: 305px;
padding: 15px 20px;
border-radius: 10px;
}
- .incoming{
+ .incoming-true{
margin: 10px 75px 10px 20px;
background: #ebebeb;
float: left;
-
}
}
- .outgoing{
+ .incoming-false{
margin: 10px 20px 10px 75px;
background: #e4f4fe;
float: right;
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 5399545da..3aadb96a8 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -1,9 +1,12 @@
import { Component, OnInit } from '@angular/core';
-import { ActionSheetController, MenuController, ModalController, PopoverController } from '@ionic/angular';
+import { ActionSheetController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { AuthService } from 'src/app/services/auth.service';
+import { ChatService } from 'src/app/services/chat.service';
import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
import { ChatPopoverPage } from 'src/app/shared/popover/chat-popover/chat-popover.page';
import { ContactsPage } from '../new-group/contacts/contacts.page';
import { NewGroupPage } from '../new-group/new-group.page';
+import { GroupContactsPage } from './group-contacts/group-contacts.page';
@Component({
selector: 'app-group-messages',
@@ -11,8 +14,14 @@ import { NewGroupPage } from '../new-group/new-group.page';
styleUrls: ['./group-messages.page.scss'],
})
export class GroupMessagesPage implements OnInit {
-
+ isGroupCreated:boolean;
+ loggedUser: any;
message:any;
+ messages:any;
+
+
+ room:any;
+ members:any;
contacts: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
constructor(
@@ -20,9 +29,72 @@ export class GroupMessagesPage implements OnInit {
private modalController: ModalController,
private actionSheetController: ActionSheetController,
public popoverController: PopoverController,
- ) { }
+ private chatService: ChatService,
+ private navParams: NavParams,
+ private authService: AuthService,
+ ) {
+ this.isGroupCreated = true;
+ this.room = this.navParams.get('room');
+ }
ngOnInit() {
+ this.authService.userData$.subscribe((res:any)=>{
+ this.loggedUser=res;
+ console.log(this.loggedUser);
+ });
+ this.getGroupContacts();
+ this.loadGroupMessages()
+ }
+ close(){
+ this.modalController.dismiss();
+ }
+ getGroupContacts(){
+ //If group is private call getGroupMembers
+ if(this.room.t === 'p'){
+ this.chatService.getGroupMembers(this.room._id).subscribe(res=>{
+ console.log(res);
+ this.members = res['members'];
+ });
+ }
+ //Otherwise call getChannelMembers for públic groups
+ else{
+ this.chatService.getChannelMembers(this.room._id).subscribe(res=>{
+ console.log(res);
+ this.members = res['members'];
+ });
+ }
+ }
+ loadGroupMessages(){
+
+ //If group is private call getGroupMembers
+ if(this.room.t === 'p'){
+ this.chatService.getPrivateGroupMessages(this.room._id).subscribe(res=>{
+ console.log(res);
+ let msgOnly = res['messages'].filter(data => data.t != 'au');
+ this.messages = msgOnly.reverse();
+ });
+ }
+ //Otherwise call getChannelMembers for públic groups
+ else{
+ this.chatService.getPublicGroupMessages(this.room._id).subscribe(res=>{
+ console.log(res);
+ this.messages = res['messages'].reverse();
+ });
+ }
+ }
+ sendMessage(){
+
+ let body = {
+ "message":
+ {
+ "rid": this.room._id, "msg": this.message
+ }
+ }
+
+ this.chatService.sendMessage(body).subscribe(res=> {
+ this.loadGroupMessages();
+ });
+ this.message = "";
}
async actionSheet() {
@@ -54,23 +126,39 @@ export class GroupMessagesPage implements OnInit {
component: ChatPopoverPage,
cssClass: 'chat-popover',
event: ev,
+ componentProps: {
+ room: this.room,
+ },
translucent: true
});
- return await popover.present();
+ await popover.present();
+ popover.onDidDismiss().then(res=>{
+ if(res.data){
+ this.modalController.dismiss();
+ };
+
+ });
}
async openChatOptions(ev: any) {
const popover = await this.popoverController.create({
component: ChatOptionsPopoverPage,
cssClass: 'chat-options-popover',
event: ev,
+ componentProps: {
+ room: this.room,
+ },
translucent: true
});
return await popover.present();
}
async addContacts(){
+ this.close();
const modal = await this.modalController.create({
- component: ContactsPage,
- componentProps: {},
+ component: GroupContactsPage,
+ componentProps: {
+ isCreated: this.isGroupCreated,
+ room: this.room,
+ },
cssClass: 'contacts',
backdropDismiss: false
});
diff --git a/src/app/pages/chat/messages/messages.page.scss b/src/app/pages/chat/messages/messages.page.scss
index c485116ff..64f00a658 100644
--- a/src/app/pages/chat/messages/messages.page.scss
+++ b/src/app/pages/chat/messages/messages.page.scss
@@ -116,14 +116,12 @@
width: 305px;
padding: 15px 20px;
border-radius: 10px;
-
}
.incoming-true{
margin: 10px 75px 10px 20px;
background: #ebebeb;
float: left;
-
}
}
.incoming-false{
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index ce5a3f1a5..ba034b2c4 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -46,10 +46,10 @@ export class MessagesPage implements OnInit, AfterViewChecked {
/* console.log(this.dm); */
- setInterval(()=>{
+ /* setInterval(()=>{ */
this.checkUserPresence();
this.loadMessages();
- }, 2000);
+ /* }, 2000); */
this.getChatMembers();
diff --git a/src/app/pages/chat/new-group/new-group.page.html b/src/app/pages/chat/new-group/new-group.page.html
index 5dbfe0769..8aa56b1cc 100644
--- a/src/app/pages/chat/new-group/new-group.page.html
+++ b/src/app/pages/chat/new-group/new-group.page.html
@@ -17,7 +17,7 @@
Adicionar intervenientes
-
-
-
+
@@ -12,7 +12,7 @@
-
+
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts
index 07c0841ee..e7e1b18f0 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.ts
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts
@@ -1,5 +1,6 @@
import { Component, OnInit } from '@angular/core';
-import { PopoverController } from '@ionic/angular';
+import { NavParams, PopoverController } from '@ionic/angular';
+import { ChatService } from 'src/app/services/chat.service';
@Component({
selector: 'app-chat-popover',
@@ -7,15 +8,54 @@ import { PopoverController } from '@ionic/angular';
styleUrls: ['./chat-popover.page.scss'],
})
export class ChatPopoverPage implements OnInit {
+ room:any;
constructor(
private popoverController: PopoverController,
- ) { }
+ private navParams: NavParams,
+ private chatService: ChatService,
+ ) {
+ this.room = this.navParams.get('room');
+ }
ngOnInit() {
+ console.log(this.room);
+
}
close(){
this.popoverController.dismiss();
}
+ //Top menu options
+ //Close
+ leaveGroup(){
+ let body = { "roomId":this.room._id, }
+ if(this.room.t === 'p'){
+ this.chatService.closeGroup(body).subscribe(res=>{
+ console.log(res);
+ });
+ }
+ else{
+ this.chatService.closeChannel(body).subscribe(res=>{
+ console.log(res);
+ });
+ }
+ this.popoverController.dismiss(true);
+ }
+ //Delete
+ deleteGroup(){
+ let body = { "roomId":this.room._id, }
+ if(this.room.t === 'p'){
+ this.chatService.deleteGroup(body).subscribe(res=>{
+ console.log(res);
+ });
+ }
+ else{
+ this.chatService.deleteChannel(body).subscribe(res=>{
+ console.log(res);
+ });
+ }
+ this.popoverController.dismiss(true);
+ }
+
}
+
-
@@ -106,7 +60,7 @@
- Secretário Assuntos sociais
- 14:23
+ {{msg.u.username}}
+ {{msg._updatedAt | date: 'HH:mm' }}
- 
- Investidura Filipe Nyusi
-
-
-
-
-
- Secretário Assuntos sociais
- 14:23
-
-
- Caros colegas, partilho o momento de confraternização do presidente Filipe Nyusi e de dua excelência, o presidente da república
-
-
-
-
- Presidente da República
- 14:23
-
-
- Pois é, momentos históricos
-
-
-
-
- Ministro do interior
- 16:23
-
-
- Grande momento
-
-
-
-
- Secretário Assuntos sociais
- 14:23
-
-
- Caros colegas, partilho o momento de confraternização do presidente Filipe Nyusi e de dua excelência, o presidente da república
-
-
-
- Secretário Assuntos sociais
- 14:23
-
-
- Caros colegas, partilho o momento de confraternização do presidente Filipe Nyusi e de dua excelência, o presidente da república
+ {{msg.msg}}
-
{{ attendee.Name }}
{{ attendee.EmailAddress }}
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/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index c84865057..ecc6680a0 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -84,8 +84,7 @@ export class ExpedienteDetailPage implements OnInit { } } - viewDocument() - { + viewDocument(){ const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); const browser = this.iab.create(url,"_blank"); browser.show(); diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 962278a8d..3bbb3788a 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -67,7 +67,7 @@ export class LoginPage implements OnInit { async Login(){ - /* try { */ + try { //Go to our home in home/feed. //this.router.navigate(['/home/events']); if(this.validateInput()){ @@ -91,9 +91,9 @@ export class LoginPage implements OnInit { //this.toastService.presentToast('Preencha todos campos'); this.presentAlert('Por favor, insira o seu nome de utilizador e palavra-passe.'); } - /* } catch (error) { + } catch (error) { error - this.presentAlert('Ocorreu um erro ao fazer login. Contacte o administrador de sistema. '+ error); - } */ + this.presentAlert('Ocorreu um erro ao fazer login. Contacte o administrador de sistema. '); + } } } diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index f400ca1ca..76c0ea9df 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -56,9 +56,7 @@ export class ChatService { }); } */ - getAllDirectMessages(){ - return this.http.get(environment.apiChatUrl+'im.list', this.options); - } + getAllChannels(){ return this.http.get(environment.apiChatUrl+'channels.list', this.options); } @@ -69,6 +67,13 @@ export class ChatService { getAllRooms(){ return this.http.get(environment.apiChatUrl+'rooms.get', this.options); } + customsRooms(params:any){ + let opts = { + headers: this.headers, + params: params + } + return this.http.get(environment.apiChatUrl+'rooms.get', opts); + } getAllPrivateGroups(){ return this.http.get(environment.apiChatUrl+'groups.list', this.options); } @@ -96,7 +101,9 @@ export class ChatService { loadJoinedRooms(){ return this.http.get(environment.apiChatUrl+'im.list', this.options); } - + getAllDirectMessages(){ + return this.http.get(environment.apiChatUrl+'im.list', this.options); + } //Load messages from roomId getRoomMessages(roomId:any){ @@ -147,5 +154,79 @@ export class ChatService { } return this.http.get(environment.apiChatUrl+'im.messages', opts); } + + /* 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'; + params = params.set("roomId", roomId); + let opts = { + headers: this.headers, + params: params + } + return this.http.get(url, opts); + } + getChannelMembers(roomId:string){ + let params = new HttpParams(); + let url=environment.apiChatUrl+'channels.members'; + params = params.set("roomId", roomId); + + let opts = { + headers: this.headers, + params: params + } + return this.http.get(url, opts); + } + /* GROUP MESSAGES */ + getPrivateGroupMessages(roomId:any){ + + let params = new HttpParams(); + params = params.set("roomId", roomId); + + let opts = { + headers: this.headers, + params: params + } + return this.http.get(environment.apiChatUrl+'groups.history', opts); + } + getPublicGroupMessages(roomId:any){ + let params = new HttpParams(); + params = params.set("roomId", roomId); + + let opts = { + headers: this.headers, + params: params + } + return this.http.get(environment.apiChatUrl+'channels.history', opts); + } + closeGroup(body:any){ + return this.http.post(environment.apiChatUrl+'groups.close', body, this.options); + } + closeChannel(body:any){ + return this.http.post(environment.apiChatUrl+'channels.close', body, this.options); + } + deleteGroup(body:any){ + return this.http.post(environment.apiChatUrl+'groups.delete', body, this.options); + } + deleteChannel(body:any){ + return this.http.post(environment.apiChatUrl+'channels.delete', body, this.options); + } + addUserToGroup(body:any){ + return this.http.post(environment.apiChatUrl+'groups.invite', body, this.options); + } + getGroupInfo(roomId:any){ + let params = new HttpParams(); + params = params.set("roomId", roomId); + + let opts = { + headers: this.headers, + params: params + } + return this.http.get(environment.apiChatUrl+'groups.info', opts); + } + } diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index 93794cd0d..99e7c0640 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -1,7 +1,7 @@