remove sqlite and unused import

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
+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);
});
}