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

- delete group implemented

Browse Source 
- add group in progress
This commit is contained in:
tiago.kayaya
2021-01-20 16:58:04 +01:00
parent bae1f89b73
commit 608eee8cc2
77 changed files with 1795 additions and 2388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/chat.page.ts
+2 -2
View File
@@ -113,8 +113,8 @@ export class ChatPage implements OnInit {
this.publicGroups = res.channels;
let all = this.privateGroups.concat(this.publicGroups);
this.allGroups = all.sort((a,b)=>{
var dateA = new Date(a.lastMessage._updatedAt).getTime();
var dateB = new Date(b.lastMessage._updatedAt).getTime();
var dateA = new Date(a._updatedAt).getTime();
var dateB = new Date(b._updatedAt).getTime();
return dateB - dateA;
});
console.log(this.allGroups);
src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts
+2
View File
@@ -8,6 +8,7 @@ import { GroupContactsPageRoutingModule } from './group-contacts-routing.module'
import { GroupContactsPage } from './group-contacts.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { PipesModule } from 'src/app/pipes/pipes.module';
@NgModule({
imports: [
@@ -15,6 +16,7 @@ import { SharedModule } from 'src/app/shared/shared.module';
FormsModule,
IonicModule,
SharedModule,
PipesModule,
GroupContactsPageRoutingModule
],
declarations: [GroupContactsPage]
src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
+4 -10
View File
@@ -14,7 +14,7 @@
</ion-toolbar>
<ion-toolbar class="toolbar-search">
<div class="search">
<ion-searchbar (ionChange)="onChange($event)" placeholder="Pesquisar por cantacto" ></ion-searchbar>
<ion-searchbar debounce="500" (ionChange)="onChange($event)" placeholder="Pesquisar por cantacto" ></ion-searchbar>
</div>
</ion-toolbar>
</ion-header>
@@ -25,15 +25,9 @@
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="main-content">
<!-- <ion-list>
<ion-item *ngFor="let user of searchedItem">
{{user.name}}
</ion-item>
</ion-list> -->
<ion-virtual-scroll [items]="users" approxItemHeight="70px" [headerFn]="separateLetter">
<div class="main-content">
<ion-virtual-scroll [items]="users | filter:textSearch: 'name'" approxItemHeight="70px" [headerFn]="separateLetter">
<div class="item-divider" *virtualHeader="let header">
<ion-label>{{header}}</ion-label>
@@ -41,7 +35,7 @@
<div *virtualItem="let user" class="item-checkbox">
<ion-checkbox color="primary"></ion-checkbox>
<p>{{user.first}} {{user.last}}</p>
<p>{{user.name}}</p>
<ion-icon name="ellipse"></ion-icon>
</div>
src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
+35 -74
View File
@@ -1,6 +1,8 @@
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
import { ModalController } from '@ionic/angular';
import { AuthService } from 'src/app/services/auth.service';
import { ChatService } from 'src/app/services/chat.service';
import { GroupMessagesPage } from '../group-messages.page';
@Component({
@@ -10,6 +12,7 @@ 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"];
@@ -17,51 +20,24 @@ export class GroupContactsPage implements OnInit {
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',
}
];
contacts: any;
textSearch:string;
room:any;
dm:any;
constructor(
private modalController: ModalController,
private http: HttpClient,
private chatService: ChatService,
private authService: AuthService,
)
{
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;
}
ngOnInit() {
@@ -73,49 +49,29 @@ export class GroupContactsPage implements OnInit {
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);
this.contacts = res.users.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;
@@ -127,16 +83,17 @@ export class GroupContactsPage implements OnInit {
}
close(){
this.modalController.dismiss();
this.modalController.dismiss(true);
}
onChange(event){
this.textSearch = event.detail.value;
}
clicked(){
console.log('clicked');
}
async groupMessages(){
this.close();
const modal = await this.modalController.create({
component: GroupMessagesPage,
componentProps: {},
@@ -145,8 +102,12 @@ export class GroupContactsPage implements OnInit {
});
await modal.present();
modal.onDidDismiss();
modal.onDidDismiss().then(res=>{
if(res.data){
console.log('go to new group');
}
});
}
}
src/app/pages/chat/group-messages/group-messages.page.ts
+7 -1
View File
@@ -122,7 +122,13 @@ export class GroupMessagesPage implements OnInit {
},
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({
src/app/pages/chat/new-group/new-group.page.ts
+3 -2
View File
@@ -2,7 +2,7 @@ import { analyzeAndValidateNgModules } from '@angular/compiler';
import { Component, OnInit } from '@angular/core';
import { ModalController, PickerController, PopoverController } from '@ionic/angular';
import { GroupDurationPage } from 'src/app/shared/popover/group-duration/group-duration.page';
import { ContactsPage } from './contacts/contacts.page';
import { GroupContactsPage } from '../group-messages/group-contacts/group-contacts.page';
@Component({
selector: 'app-new-group',
@@ -34,8 +34,9 @@ export class NewGroupPage implements OnInit {
}
async addContacts(){
this.close();
const modal = await this.modalController.create({
component: ContactsPage,
component: GroupContactsPage,
componentProps: {},
cssClass: 'contacts',
backdropDismiss: false