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

remove sqlite and unused import

Browse Source
This commit is contained in:
Peter Maquiran
2023-06-11 13:36:27 +01:00
parent f7b54a04ba
commit acb79bb62e
26 changed files with 438 additions and 1256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/chat.page.ts
+112 -111
View File
@@ -425,108 +425,109 @@ export class ChatPage implements OnInit {
});
}
getDirectMessagesDB() {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.storageservice.get("rooms").then((rooms) =>{
// getDirectMessagesDB() {
// if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
// this.storageservice.get("rooms").then((rooms) =>{
this.userDirectMessages = rooms.sort((a, b) => {
var dateA = new Date(a._updatedAt).getTime();
var dateB = new Date(b._updatedAt).getTime();
return dateB - dateA;
});
//
// this.userDirectMessages = rooms.sort((a, b) => {
// var dateA = new Date(a._updatedAt).getTime();
// var dateB = new Date(b._updatedAt).getTime();
// return dateB - dateA;
// });
// //
//
}).catch((error) => {
console.error('storage getdirectmessagedb: ',error)
})
// //
// }).catch((error) => {
// console.error('storage getdirectmessagedb: ',error)
// })
this.storageservice.get('chatusers').then((users) => {
this.dmUsers = users.filter(data => data.username != SessionStore.user.UserName);
}).catch((error) => {
console.error('storage getchatusers: ',error)
})
} else {
this.sqlservice.getAllChatRoom().then((rooms: any) => {
//
let roomsArray = [];
rooms.forEach(element => {
let roomListDB = {
_id: element.Id,
uids: this.isJson(element.Uids),
usernames: this.isJson(element.Usernames),
lastMessage: this.isJson(element.LastMessage),
_updatedAt: element.UpdatedAt
}
if(element.customFields == "undefined") {
roomsArray.push(roomListDB)
}
});
// this.storageservice.get('chatusers').then((users) => {
// this.dmUsers = users.filter(data => data.username != SessionStore.user.UserName);
// }).catch((error) => {
// console.error('storage getchatusers: ',error)
// })
// }
// // else {
// // this.sqlservice.getAllChatRoom().then((rooms: any) => {
// // //
// // let roomsArray = [];
// // rooms.forEach(element => {
// // let roomListDB = {
// // _id: element.Id,
// // uids: this.isJson(element.Uids),
// // usernames: this.isJson(element.Usernames),
// // lastMessage: this.isJson(element.LastMessage),
// // _updatedAt: element.UpdatedAt
// // }
// // if(element.customFields == "undefined") {
// // roomsArray.push(roomListDB)
// // }
// // });
this.userDirectMessages = roomsArray.sort((a, b) => {
var dateA = new Date(a._updatedAt).getTime();
var dateB = new Date(b._updatedAt).getTime();
return dateB - dateA;
});
//
// // this.userDirectMessages = roomsArray.sort((a, b) => {
// // var dateA = new Date(a._updatedAt).getTime();
// // var dateB = new Date(b._updatedAt).getTime();
// // return dateB - dateA;
// // });
// // //
//
})
// // //
// // })
this.sqlservice.getAllChatUsers().then((userslist: any) => {
//
let chatusersArray = [];
userslist.forEach(element => {
// // this.sqlservice.getAllChatUsers().then((userslist: any) => {
// // //
// // let chatusersArray = [];
// // userslist.forEach(element => {
let userListDB = {
_id: element.Id,
name: element.Name,
username: element.Username
}
// // let userListDB = {
// // _id: element.Id,
// // name: element.Name,
// // username: element.Username
// // }
chatusersArray.push(userListDB);
});
// // chatusersArray.push(userListDB);
// // });
this.dmUsers = chatusersArray.filter(data => data.username != SessionStore.user.UserName);
// // this.dmUsers = chatusersArray.filter(data => data.username != SessionStore.user.UserName);
})
}
}
// // })
// // }
// }
transformDataRoomList(data) {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
let roomsArray = [];
data.forEach(element => {
let roomList = {
_id: element._id,
uids: element.uids,
usernames: element.usernames,
lastMessage: element.lastMessage,
_updatedAt: element._updatedAt
}
// transformDataRoomList(data) {
// if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
// let roomsArray = [];
// data.forEach(element => {
// let roomList = {
// _id: element._id,
// uids: element.uids,
// usernames: element.usernames,
// lastMessage: element.lastMessage,
// _updatedAt: element._updatedAt
// }
//
roomsArray.push(roomList)
});
// //
// roomsArray.push(roomList)
// });
this.storageservice.remove('rooms');
this.storageservice.store('rooms', roomsArray);
// this.storageservice.remove('rooms');
// this.storageservice.store('rooms', roomsArray);
} else {
data.forEach(element => {
let roomList = {
id: element._id,
uids: element.uids,
usernames: element.usernames,
lastMessage: element.lastMessage,
updatedat: element._updatedAt
}
// } else {
// data.forEach(element => {
// let roomList = {
// id: element._id,
// uids: element.uids,
// usernames: element.usernames,
// lastMessage: element.lastMessage,
// updatedat: element._updatedAt
// }
//
this.sqlservice.addChatListRoom(roomList);
});
}
}
// //
// // this.sqlservice.addChatListRoom(roomList);
// });
// }
// }
async transformDataUserList(users) {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
@@ -552,7 +553,7 @@ export class ChatPage implements OnInit {
username: element.username
}
//
this.sqlservice.addChatListUsers(chatusers);
// this.sqlservice.addChatListUsers(chatusers);
});
}
}
@@ -605,30 +606,30 @@ export class ChatPage implements OnInit {
console.error('storage getgrupDb: ',error)
})
} else {
this.sqlservice.getAllChatRoom().then((rooms: any) => {
// this.sqlservice.getAllChatRoom().then((rooms: any) => {
let roomsArray = [];
rooms.forEach(element => {
let fddf = this.isJson(element.LastMessage);
let roomListDB = {
_id: element.Id,
customFields: this.isJson(element.customFields),
name: element.name,
lastMessage: this.isJson(element.LastMessage),
_updatedAt: element.UpdatedAt
}
if(element.customFields != "undefined") {
roomsArray.push(roomListDB)
}
});
// let roomsArray = [];
// rooms.forEach(element => {
// let fddf = this.isJson(element.LastMessage);
// let roomListDB = {
// _id: element.Id,
// customFields: this.isJson(element.customFields),
// name: element.name,
// lastMessage: this.isJson(element.LastMessage),
// _updatedAt: element.UpdatedAt
// }
// if(element.customFields != "undefined") {
// roomsArray.push(roomListDB)
// }
// });
this.allGroups = roomsArray.sort((a, b) => {
var dateA = new Date(a._updatedAt).getTime();
var dateB = new Date(b._updatedAt).getTime();
return dateB - dateA;
});
//
})
// this.allGroups = roomsArray.sort((a, b) => {
// var dateA = new Date(a._updatedAt).getTime();
// var dateB = new Date(b._updatedAt).getTime();
// return dateB - dateA;
// });
// //
// })
}
}
@@ -669,7 +670,7 @@ export class ChatPage implements OnInit {
updatedat: element._updatedAt
}
this.sqlservice.addChatListRoom(roomList);
// this.sqlservice.addChatListRoom(roomList);
});
}
src/app/pages/chat/group-messages/group-messages.page.ts
+29 -29
View File
@@ -142,7 +142,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.setStatus('online');
this.getChatMembers();
this.getRoomMessageDB(this.roomId);
// this.getRoomMessageDB(this.roomId);
this.getGroupContacts({});
}
@@ -891,38 +891,38 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
*/
getRoomMessageDB(roomId) {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
} else {
this.sqlservice.getAllChatMSG(roomId).then((msg: any) => {
// getRoomMessageDB(roomId) {
// if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
// } else {
// this.sqlservice.getAllChatMSG(roomId).then((msg: any) => {
let chatmsgArray = [];
let array = []
msg.forEach(element => {
// let chatmsgArray = [];
// let array = []
// msg.forEach(element => {
let msgChat = {
_id: element.Id,
attachments: this.isJson(element.Attachments),
channels: this.isJson(element.Channels),
file: this.isJson(element.File),
mentions: this.isJson(element.Mentions),
msg: element.Msg,
rid: element.Rid,
ts: element.Ts,
u: this.isJson(element.U),
_updatedAt: element.UpdatedAt,
image_url: this.isJson(element.image_url)
}
// let msgChat = {
// _id: element.Id,
// attachments: this.isJson(element.Attachments),
// channels: this.isJson(element.Channels),
// file: this.isJson(element.File),
// mentions: this.isJson(element.Mentions),
// msg: element.Msg,
// rid: element.Rid,
// ts: element.Ts,
// u: this.isJson(element.U),
// _updatedAt: element.UpdatedAt,
// image_url: this.isJson(element.image_url)
// }
chatmsgArray.push(msgChat)
});
// chatmsgArray.push(msgChat)
// });
// this.messages = chatmsgArray;
// // this.messages = chatmsgArray;
})
}
}
// })
// }
// }
isJson(str) {
try {
@@ -956,7 +956,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}, */
}
this.sqlservice.addChatMSG(chatmsg)
// this.sqlservice.addChatMSG(chatmsg)
});
}
@@ -979,7 +979,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
//this.messages = msgOnly.reverse();
//
this.transformDataMSG(msgOnly.reverse());
this.getRoomMessageDB(this.roomId);
// this.getRoomMessageDB(this.roomId);
// Reconnect in one second
if (this.route.url != "/home/chat") {
src/app/pages/chat/messages/messages.page.ts
+25 -25
View File
@@ -895,37 +895,37 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
getRoomMessageDB(roomId) {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
} else {
this.sqlservice.getAllChatMSG(roomId).then((msg: any) => {
// getRoomMessageDB(roomId) {
// if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
// } else {
// this.sqlservice.getAllChatMSG(roomId).then((msg: any) => {
let chatmsgArray = [];
msg.forEach(element => {
// let chatmsgArray = [];
// msg.forEach(element => {
let msgChat = {
_id: element.Id,
attachments: this.isJson(element.Attachments),
channels: this.isJson(element.Channels),
file: this.isJson(element.File),
mentions: this.isJson(element.Mentions),
msg: element.Msg,
rid: element.Rid,
ts: element.Ts,
u: this.isJson(element.U),
_updatedAt: element.UpdatedAt,
image_url: this.isJson(element.image_url)
}
// let msgChat = {
// _id: element.Id,
// attachments: this.isJson(element.Attachments),
// channels: this.isJson(element.Channels),
// file: this.isJson(element.File),
// mentions: this.isJson(element.Mentions),
// msg: element.Msg,
// rid: element.Rid,
// ts: element.Ts,
// u: this.isJson(element.U),
// _updatedAt: element.UpdatedAt,
// image_url: this.isJson(element.image_url)
// }
chatmsgArray.push(msgChat)
});
// chatmsgArray.push(msgChat)
// });
})
}
}
// })
// }
// }
isJson(str) {
try {
@@ -961,7 +961,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
}, */
}
this.sqlservice.addChatMSG(chatmsg)
// this.sqlservice.addChatMSG(chatmsg)
});
}