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

add progress bar

Browse Source
This commit is contained in:
tiago.kayaya
2021-01-27 16:01:49 +01:00
parent 585f5a1fb0
commit 942eeb2bde
44 changed files with 448 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/chat.page.html
+5
View File
@@ -18,6 +18,11 @@
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="main-content">
<ion-toolbar >
<ion-segment [(ngModel)]="segment" (ionChange)="onSegmentChange()">
src/app/pages/chat/chat.page.ts
+21 -13
View File
@@ -17,12 +17,13 @@ import { NewchatPage } from './newchat/newchat.page';
})
export class ChatPage implements OnInit {
showLoader: boolean;
headers: HttpHeaders;
options:any;
X_User_Id:any;
X_Auth_Token:any;
showLoader: boolean;
loggedUser: any;
/* Set segment variable */
segment:string;
@@ -55,18 +56,27 @@ export class ChatPage implements OnInit {
console.log(this.loggedUser);
});
this.doRefresh();
this.load();
}
onSegmentChange(){
this.doRefresh();
this.load();
}
doRefresh(){
/* setInterval(()=>{ */
this.getDirectMessages();
this.getGroups();
/* this.customRoom(); */
/* }, 2000); */
doRefresh(ev:any){
this.load();
ev.target.complete();
}
load(){
switch (this.segment)
{
case "Contactos":
this.getDirectMessages();
break;
case "Grupos":
this.getGroups();
break;
}
}
customRoom(){
let params = new HttpParams();
@@ -85,11 +95,10 @@ export class ChatPage implements OnInit {
this.userDirectMessages = res.ims.sort((a,b)=>{
var dateA = new Date(a._updatedAt).getTime();
var dateB = new Date(b._updatedAt).getTime();
this.showLoader = false;
return dateB - dateA;
});
console.log(this.userDirectMessages);
this.showLoader = false;
});
}
getChatMembers(){
@@ -107,11 +116,10 @@ export class ChatPage implements OnInit {
this.allGroups = all.sort((a,b)=>{
var dateA = new Date(a._updatedAt).getTime();
var dateB = new Date(b._updatedAt).getTime();
this.showLoader = false;
return dateB - dateA;
});
console.log(this.allGroups);
this.showLoader = false;
});
});
}
src/app/pages/chat/edit-group/edit-group.page.html
+1 -1
View File
@@ -6,7 +6,7 @@
<ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
<div class="middle">
<ion-label class="title">Alterar Nome do grupo</ion-label>
<ion-label class="title">Alterar assunto</ion-label>
</div>
<app-btn-seguinte *ngIf="groupName" (click)="changeGroupName()"></app-btn-seguinte>
</div>
src/app/pages/chat/edit-group/edit-group.page.ts
+1 -2
View File
@@ -41,9 +41,8 @@ export class EditGroupPage implements OnInit {
"name": name,
}
this.chatService.renameGroup(body).subscribe(res=>{
console.log(res);
this.modalController.dismiss(res['group']);
});
this.close();
}
else{
console.log("Invalid name!");
src/app/pages/chat/group-messages/group-messages.page.html
+6 -1
View File
@@ -26,6 +26,11 @@
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="welcome-text">
<ion-label>Esta conversa passou a grupo</ion-label><br />
<ion-label>A conversa original mantêm-se como chat individual</ion-label>
@@ -33,7 +38,7 @@
<div *ngFor="let msg of messages" class="messages">
<div *ngIf="msg.t != 'r'" class='incoming-{{msg.u.username!=loggedUser.me.username}}'>
<div class="title">
<ion-label>{{msg.u.username}}</ion-label>
<ion-label>{{msg.u.name}}</ion-label>
<span class="time">{{msg._updatedAt | date: 'HH:mm' }}</span>
</div>
<div>
src/app/pages/chat/group-messages/group-messages.page.ts
+21 -9
View File
@@ -14,6 +14,7 @@ import { GroupContactsPage } from './group-contacts/group-contacts.page';
styleUrls: ['./group-messages.page.scss'],
})
export class GroupMessagesPage implements OnInit {
showLoader: boolean;
isGroupCreated:boolean;
loggedUser: any;
message:any;
@@ -44,25 +45,30 @@ export class GroupMessagesPage implements OnInit {
this.loggedUser=res;
console.log(this.loggedUser);
});
this.doRefresh();
this.load();
}
load(){
this.getGroupContacts();
this.loadGroupMessages();
}
close(){
this.modalController.dismiss();
}
doRefresh(/* event */) {
this.getGroupContacts();
this.loadGroupMessages()
/* event.target.complete(); */
doRefresh(ev:any){
this.load();
ev.target.complete();
}
getGroupContacts(){
this.showLoader = true;
//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'];
this.showLoader = false;
});
}
//Otherwise call getChannelMembers for públic groups
@@ -70,17 +76,19 @@ export class GroupMessagesPage implements OnInit {
this.chatService.getChannelMembers(this.room._id).subscribe(res=>{
console.log(res);
this.members = res['members'];
this.showLoader = false;
});
}
}
loadGroupMessages(){
this.showLoader = true;
//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();
this.showLoader = false;
});
}
//Otherwise call getChannelMembers for públic groups
@@ -118,9 +126,13 @@ export class GroupMessagesPage implements OnInit {
});
await popover.present();
popover.onDidDismiss().then(res=>{
console.log(res);
if(res.data){
this.doRefresh();
this.modalController.dismiss();
this.roomName = res.data.name.split('-').join(' ');
console.log(this.roomName);
this.load();
/* this.modalController.dismiss(); */
};
});
@@ -155,7 +167,7 @@ export class GroupMessagesPage implements OnInit {
await modal.present();
modal.onDidDismiss().then(()=>{
this.doRefresh();
this.load();
});
}
src/app/pages/chat/messages/messages.page.html
+5
View File
@@ -24,6 +24,11 @@
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="messages" #scrollMe>
<!-- <ion-infinite-scroll position="top" threshold="25%" (ionInfinite)="loadMoreMessages($event)">
<ion-infinite-scroll-content loadindSpiniter="crescent" loadingText="Carregando...">
src/app/pages/chat/messages/messages.page.ts
+14 -10
View File
@@ -13,6 +13,7 @@ import { ContactsPage } from '../new-group/contacts/contacts.page';
styleUrls: ['./messages.page.scss'],
})
export class MessagesPage implements OnInit, AfterViewChecked {
showLoader: boolean;
@ViewChild('scrollMe') private myScrollContainer: ElementRef;
@@ -43,21 +44,21 @@ export class MessagesPage implements OnInit, AfterViewChecked {
this.loggedUser=res;
console.log(this.loggedUser);
});
/* console.log(this.dm); */
/* setInterval(()=>{ */
this.loadMessages();
/* }, 2000); */
this.load();
/* }, 9000); */
}
load(){
this.loadMessages();
this.getChatMembers();
}
loadUser(){
console.log('working');
doRefresh(ev:any){
this.load();
ev.target.complete();
}
ngAfterViewChecked() {
this.scrollToBottom();
}
@@ -86,6 +87,7 @@ export class MessagesPage implements OnInit, AfterViewChecked {
}
loadMessages(){
this.showLoader = true;
this.chatService.getRoomMessages(this.dm._id).subscribe(res => {
/* console.log(res); */
this.messages = res['messages'].reverse();
@@ -94,10 +96,12 @@ export class MessagesPage implements OnInit, AfterViewChecked {
})
}
getChatMembers(){
this.showLoader = true;
this.chatService.getMembers(this.dm._id).subscribe(res=> {
this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username)
console.log(res);
console.log(this.dmUsers);
this.showLoader = false;
});
}
src/app/pages/login/login.page.ts
+5 -5
View File
@@ -52,15 +52,15 @@ export class LoginPage implements OnInit {
await alert.present();
}
loginRocketChat(){
loginRocketChat(user:any){
let postData = {
"user": this.username,
"password": this.password
"user": user.username,
"password": user.password,
}
this.authService.loginChat(postData).subscribe((res: any) =>{
console.log(res.data);
this.storageService.store(AuthConnstants.AUTH, res.data);
console.log('Logged user \n'+res.data);
console.log('Login to Rocket chat OK');
},(error:any) =>{
console.log('Network error');
@@ -84,7 +84,7 @@ export class LoginPage implements OnInit {
if (await this.authService.login(this.userattempt)){
console.log(this.userattempt);
this.loginRocketChat();
this.loginRocketChat(this.userattempt);
this.router.navigate(['/home/events']);
}
else
src/app/shared/popover/chat-popover/chat-popover.page.ts
+3 -2
View File
@@ -70,8 +70,9 @@ export class ChatPopoverPage implements OnInit {
});
await modal.present();
modal.onDidDismiss().then(()=>{
return true;
modal.onDidDismiss().then((res)=>{
console.log(res.data);
this.popoverController.dismiss(res.data);
});
}