diff --git a/gui/package.json b/gui/package.json
index 8724d429..70be361e 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -1,6 +1,6 @@
{
"name": "FreeDATA",
- "version": "0.3.1-alpha.1",
+ "version": "0.3.2-alpha.1",
"description": "FreeDATA ",
"main": "main.js",
"scripts": {
diff --git a/gui/preload-chat.js b/gui/preload-chat.js
index b7ec523b..20ce0429 100644
--- a/gui/preload-chat.js
+++ b/gui/preload-chat.js
@@ -26,6 +26,12 @@ const dateFormatShort = new Intl.DateTimeFormat('en-GB', {
second: 'numeric',
hour12: false,
});
+
+const dateFormatHours = new Intl.DateTimeFormat('en-GB', {
+ hour: 'numeric',
+ minute: 'numeric',
+ hour12: false,
+});
// split character
const split_char = '\0;'
// global for our selected file we want to transmit
@@ -146,10 +152,10 @@ db.post({
timestamp: Math.floor(Date.now() / 1000),
dxcallsign: dxcallsign.toUpperCase(),
dxgrid: '---',
- msg: 'NULL',
- checksum: 'NULL',
+ msg: 'null',
+ checksum: 'null',
type: 'newchat',
- status: 'NULL',
+ status: 'null',
uuid: uuid
}).then(function(response) {
@@ -198,9 +204,9 @@ db.post({
_id: uuid,
timestamp: Math.floor(Date.now() / 1000),
dxcallsign: dxcallsign,
- dxgrid: 'NULL',
+ dxgrid: 'null',
msg: chatmessage,
- checksum: 'NULL',
+ checksum: 'null',
type: "transmit",
status: 'transmit',
uuid: uuid,
@@ -425,7 +431,21 @@ update_chat = function(obj) {
var dxcallsign = obj.dxcallsign;
var timestamp = dateFormat.format(obj.timestamp * 1000);
var timestampShort = dateFormatShort.format(obj.timestamp * 1000);
+ var timestampHours = dateFormatHours.format(obj.timestamp * 1000);
+
var dxgrid = obj.dxgrid;
+
+ // define shortmessage
+ if (obj.msg == 'null' || obj.msg == 'NULL'){
+ var shortmsg = obj.type;
+ } else {
+ var shortmsg = obj.msg;
+ var maxlength = 45;
+ var shortmsg = shortmsg.length > maxlength ? shortmsg.substring(0, maxlength - 3) + "..." : shortmsg;
+
+
+
+ }
try {
console.log(Object.keys(obj._attachments)[0].length)
if (typeof(obj._attachments) !== 'undefined' && Object.keys(obj._attachments)[0].length > 0) {
@@ -459,6 +479,12 @@ update_chat = function(obj) {
//document.getElementById('chatModuleDxCall').value = dxcallsign;
selected_callsign = dxcallsign;
}
+
+
+
+
+
+
var new_callsign = `
@@ -468,10 +494,13 @@ update_chat = function(obj) {
${dxcallsign}
- ${dxgrid}
+ ${dxgrid}
+ ${timestampHours}
+ ${shortmsg}
-
+
`;
@@ -488,6 +517,20 @@ update_chat = function(obj) {
var element = document.getElementById("message-container");
element.scrollTo(0, element.scrollHeight);
});
+
+ // if callsign entry already exists - update
+ } else {
+
+ // gridsquare - update only on receive
+ if (obj.type !== 'transmit'){
+ document.getElementById('chat-' + dxcallsign +'-list-dxgrid').innerHTML = dxgrid;
+ }
+ // time
+ document.getElementById('chat-' + dxcallsign +'-list-time').innerHTML = timestampHours;
+ // short message
+ document.getElementById('chat-' + dxcallsign +'-list-shortmsg').innerHTML = shortmsg;
+
+
}
// APPEND MESSAGES TO CALLSIGN
if (obj.status == 'transmit') {
@@ -640,9 +683,9 @@ function getObjByID(id) {
{
"timestamp": 1648139683,
"dxcallsign": "DN2LS-0",
- "dxgrid": "NULL",
+ "dxgrid": "null",
"msg": "",
- "checksum": "NULL",
+ "checksum": "null",
"type": "transmit",
"status": "transmit",
"uuid": "5b72a46c-49cf-40d6-8936-a64c95bc3da7",
diff --git a/gui/src/chat-module.html b/gui/src/chat-module.html
index e8a4a29b..1a075251 100644
--- a/gui/src/chat-module.html
+++ b/gui/src/chat-module.html
@@ -84,7 +84,7 @@