diff --git a/gui/package.json b/gui/package.json index 173ac382..aabee438 100644 --- a/gui/package.json +++ b/gui/package.json @@ -1,6 +1,6 @@ { "name": "FreeDATA", - "version": "0.3.2-alpha.3", + "version": "0.3.3-alpha.1", "description": "FreeDATA ", "main": "main.js", "scripts": { diff --git a/gui/preload-chat.js b/gui/preload-chat.js index e9db6281..187f76b2 100644 --- a/gui/preload-chat.js +++ b/gui/preload-chat.js @@ -52,7 +52,7 @@ var db = new PouchDB(chatDB); var dxcallsigns = new Set(); db.createIndex({ index: { - fields: ['timestamp', 'uuid', 'dxcallsign', 'dxgrid', 'msg', 'checksum', 'type', 'command', 'status', '_attachments'] + fields: ['timestamp', 'uuid', 'dxcallsign', 'dxgrid', 'msg', 'checksum', 'type', 'command', 'status', 'percent', 'bytesperminute', '_attachments'] } }).then(function(result) { // handle result @@ -289,6 +289,8 @@ ipcRenderer.on('action-update-transmission-status', (event, arg) => { checksum: doc.checksum, type: "transmit", status: arg.status, + percent: arg.percent, + bytesperminute: arg.bytesperminute, uuid: doc.uuid, _attachments: doc._attachments }); @@ -474,7 +476,7 @@ update_chat = function(obj) { var filetype = filename.split('.')[1] var filesize = obj._attachments[filename]["length"] + " Bytes"; var fileheader = ` -
${filename} @@ -533,9 +535,13 @@ update_chat = function(obj) { document.getElementById('chat-' + dxcallsign + '-list').addEventListener('click', function() { //document.getElementById('chatModuleDxCall').value = dxcallsign; selected_callsign = dxcallsign; + // scroll to bottom var element = document.getElementById("message-container"); + console.log(element.scrollHeight) element.scrollTo(0, element.scrollHeight); + + }); // if callsign entry already exists - update @@ -553,17 +559,7 @@ update_chat = function(obj) { } // APPEND MESSAGES TO CALLSIGN - if (obj.status == 'transmit') { - var status = ''; - } else if (obj.status == 'transmitting') { - var status = ''; - } else if (obj.status == 'failed') { - var status = ''; - } else if (obj.status == 'success') { - var status = ''; - } else { - var status = ''; - } + if (!(document.getElementById('msg-' + obj._id))) { if (obj.type == 'ping') { var new_message = ` @@ -599,6 +595,7 @@ update_chat = function(obj) {
${message_html}
@@ -614,20 +611,28 @@ update_chat = function(obj) { if (obj.type == 'transmit') { + + console.log('msg-' + obj._id + '-status') var new_message = `
${message_html}
- ${timestamp} - - ${status} + ${timestamp} - + ${obj.bytesperminute} Bytes/min + ${get_icon_for_state(obj.status)}
+ +