mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
Prettified Code!
This commit is contained in:
parent
f79cdf8f65
commit
8a48f1d04a
1 changed files with 41 additions and 38 deletions
|
@ -765,19 +765,14 @@ ipcRenderer.on("action-new-msg-received", (event, arg) => {
|
||||||
add_obj_to_database(obj);
|
add_obj_to_database(obj);
|
||||||
update_chat_obj_by_uuid(obj.uuid);
|
update_chat_obj_by_uuid(obj.uuid);
|
||||||
|
|
||||||
db
|
db.find({
|
||||||
.find({
|
selector: {
|
||||||
selector: {
|
dxcallsign: obj.dxcallsign,
|
||||||
dxcallsign: obj.dxcallsign,
|
},
|
||||||
},
|
}).then(function (result) {
|
||||||
})
|
// handle result
|
||||||
.then(function (result) {
|
console.log(result);
|
||||||
// handle result
|
});
|
||||||
console.log(result);
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//handle ping
|
//handle ping
|
||||||
} else if (item.ping == "received") {
|
} else if (item.ping == "received") {
|
||||||
|
@ -1414,22 +1409,25 @@ update_chat = function (obj) {
|
||||||
console.log("element already exists......");
|
console.log("element already exists......");
|
||||||
console.log(obj);
|
console.log(obj);
|
||||||
|
|
||||||
if (!obj.status == "broadcast_transmit" || !obj.status == "broadcast_received") {
|
if (
|
||||||
document.getElementById("msg-" + obj._id + "-status").innerHTML =
|
!obj.status == "broadcast_transmit" ||
|
||||||
get_icon_for_state(obj.status);
|
!obj.status == "broadcast_received"
|
||||||
|
) {
|
||||||
|
document.getElementById("msg-" + obj._id + "-status").innerHTML =
|
||||||
|
get_icon_for_state(obj.status);
|
||||||
|
|
||||||
document
|
document
|
||||||
.getElementById("msg-" + obj._id + "-progress")
|
.getElementById("msg-" + obj._id + "-progress")
|
||||||
.setAttribute("aria-valuenow", obj.percent);
|
.setAttribute("aria-valuenow", obj.percent);
|
||||||
document
|
document
|
||||||
.getElementById("msg-" + obj._id + "-progress")
|
.getElementById("msg-" + obj._id + "-progress")
|
||||||
.setAttribute("style", "width:" + obj.percent + "%;");
|
.setAttribute("style", "width:" + obj.percent + "%;");
|
||||||
document.getElementById(
|
document.getElementById(
|
||||||
"msg-" + obj._id + "-progress-information"
|
"msg-" + obj._id + "-progress-information"
|
||||||
).innerHTML = obj.percent + "% - " + obj.bytesperminute + " Bpm";
|
).innerHTML = obj.percent + "% - " + obj.bytesperminute + " Bpm";
|
||||||
|
|
||||||
document.getElementById("msg-" + obj._id + "-attempts").innerHTML =
|
document.getElementById("msg-" + obj._id + "-attempts").innerHTML =
|
||||||
obj.attempt + "/" + max_retry_attempts;
|
obj.attempt + "/" + max_retry_attempts;
|
||||||
}
|
}
|
||||||
if (obj.status == "transmitted") {
|
if (obj.status == "transmitted") {
|
||||||
//document.getElementById('msg-' + obj._id + '-progress').classList.remove("progress-bar-striped");
|
//document.getElementById('msg-' + obj._id + '-progress').classList.remove("progress-bar-striped");
|
||||||
|
@ -1447,7 +1445,10 @@ update_chat = function (obj) {
|
||||||
document.getElementById(
|
document.getElementById(
|
||||||
"msg-" + obj._id + "-progress-information"
|
"msg-" + obj._id + "-progress-information"
|
||||||
).innerHTML = "TRANSMITTED - " + obj.bytesperminute + " Bpm";
|
).innerHTML = "TRANSMITTED - " + obj.bytesperminute + " Bpm";
|
||||||
} else if (!obj.status == "broadcast_transmit" || !obj.status == "broadcast_received") {
|
} else if (
|
||||||
|
!obj.status == "broadcast_transmit" ||
|
||||||
|
!obj.status == "broadcast_received"
|
||||||
|
) {
|
||||||
document
|
document
|
||||||
.getElementById("msg-" + obj._id + "-progress")
|
.getElementById("msg-" + obj._id + "-progress")
|
||||||
.classList.add("progress-bar-striped");
|
.classList.add("progress-bar-striped");
|
||||||
|
@ -1755,17 +1756,19 @@ add_obj_to_database = function (obj) {
|
||||||
.catch(function (err) {
|
.catch(function (err) {
|
||||||
console.log("already exists");
|
console.log("already exists");
|
||||||
console.log(err);
|
console.log(err);
|
||||||
console.log(obj)
|
console.log(obj);
|
||||||
db.upsert(obj.uuid, function (doc) {
|
db.upsert(obj.uuid, function (doc) {
|
||||||
doc = obj
|
doc = obj;
|
||||||
return doc;
|
return doc;
|
||||||
}).then(function (response) {
|
})
|
||||||
console.log("upsert");
|
.then(function (response) {
|
||||||
console.log(response);
|
console.log("upsert");
|
||||||
}).catch(function (err) {;
|
console.log(response);
|
||||||
console.log(err)
|
})
|
||||||
|
.catch(function (err) {
|
||||||
|
console.log(err);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
};
|
};
|
||||||
/* users database functions */
|
/* users database functions */
|
||||||
addUserToDatabaseIfNotExists = function (obj) {
|
addUserToDatabaseIfNotExists = function (obj) {
|
||||||
|
@ -2067,7 +2070,7 @@ async function updateAllChat(clear) {
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
.then(async function (result) {
|
.then(async function (result) {
|
||||||
console.log(result)
|
console.log(result);
|
||||||
// handle result async
|
// handle result async
|
||||||
//document.getElementById("blurOverlay").classList.add("bg-primary");
|
//document.getElementById("blurOverlay").classList.add("bg-primary");
|
||||||
console.log(result);
|
console.log(result);
|
||||||
|
|
Loading…
Reference in a new issue