mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
improved info processing for chat messages
This commit is contained in:
parent
532eeb0e12
commit
539b23cf6d
3 changed files with 13 additions and 7 deletions
|
@ -471,6 +471,10 @@ console.log(filepath.filePaths[0])
|
||||||
|
|
||||||
var filename = path.basename(filepath.filePaths[0])
|
var filename = path.basename(filepath.filePaths[0])
|
||||||
var mimeType = mime.getType(filename)
|
var mimeType = mime.getType(filename)
|
||||||
|
console.log(mimeType)
|
||||||
|
if (mimeType == '' || typeof(mimeType) !== 'null'){
|
||||||
|
mimeType = 'plain/text'
|
||||||
|
}
|
||||||
chat.webContents.send('return-selected-files', {data : data, mime: mimeType, filename: filename})
|
chat.webContents.send('return-selected-files', {data : data, mime: mimeType, filename: filename})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -163,7 +163,6 @@ window.addEventListener('DOMContentLoaded', () => {
|
||||||
db.post({
|
db.post({
|
||||||
|
|
||||||
_id: uuid,
|
_id: uuid,
|
||||||
_rev: doc._rev,
|
|
||||||
timestamp: Math.floor(Date.now() / 1000),
|
timestamp: Math.floor(Date.now() / 1000),
|
||||||
dxcallsign: dxcallsign.toUpperCase(),
|
dxcallsign: dxcallsign.toUpperCase(),
|
||||||
dxgrid: '---',
|
dxgrid: '---',
|
||||||
|
@ -193,6 +192,9 @@ db.post({
|
||||||
console.log(file);
|
console.log(file);
|
||||||
console.log(filename);
|
console.log(filename);
|
||||||
console.log(filetype);
|
console.log(filetype);
|
||||||
|
if (filetype == ''){
|
||||||
|
filetype = 'plain/text'
|
||||||
|
}
|
||||||
var data_with_attachment = chatmessage + split_char + filename + split_char + filetype + split_char + file;
|
var data_with_attachment = chatmessage + split_char + filename + split_char + filetype + split_char + file;
|
||||||
|
|
||||||
|
|
||||||
|
@ -211,7 +213,6 @@ db.post({
|
||||||
ipcRenderer.send('run-tnc-command', Data);
|
ipcRenderer.send('run-tnc-command', Data);
|
||||||
db.post({
|
db.post({
|
||||||
_id: uuid,
|
_id: uuid,
|
||||||
_rev: doc._rev,
|
|
||||||
timestamp: Math.floor(Date.now() / 1000),
|
timestamp: Math.floor(Date.now() / 1000),
|
||||||
dxcallsign: dxcallsign,
|
dxcallsign: dxcallsign,
|
||||||
dxgrid: 'null',
|
dxgrid: 'null',
|
||||||
|
@ -242,7 +243,7 @@ db.post({
|
||||||
// clear input
|
// clear input
|
||||||
document.getElementById('chatModuleMessage').value = ''
|
document.getElementById('chatModuleMessage').value = ''
|
||||||
|
|
||||||
// after adding file data to our attachment varible, delete it from global
|
// after adding file data to our attachment variable, delete it from global
|
||||||
filetype = '';
|
filetype = '';
|
||||||
file = '';
|
file = '';
|
||||||
filename = '';
|
filename = '';
|
||||||
|
@ -256,6 +257,8 @@ db.post({
|
||||||
});
|
});
|
||||||
ipcRenderer.on('return-selected-files', (event, arg) => {
|
ipcRenderer.on('return-selected-files', (event, arg) => {
|
||||||
filetype = arg.mime;
|
filetype = arg.mime;
|
||||||
|
console.log(filetype)
|
||||||
|
|
||||||
file = arg.data;
|
file = arg.data;
|
||||||
filename = arg.filename;
|
filename = arg.filename;
|
||||||
document.getElementById('selectFilesButton').innerHTML = `
|
document.getElementById('selectFilesButton').innerHTML = `
|
||||||
|
@ -429,6 +432,7 @@ update_chat = function(obj) {
|
||||||
} else {
|
} else {
|
||||||
var filename = '';
|
var filename = '';
|
||||||
var fileheader = '';
|
var fileheader = '';
|
||||||
|
var filetype = 'text/plain';
|
||||||
var controlarea_transmit = `
|
var controlarea_transmit = `
|
||||||
<div class="ms-auto" id="msg-${obj._id}-control-area">
|
<div class="ms-auto" id="msg-${obj._id}-control-area">
|
||||||
<button class="btn bg-transparent p-1 m-1"><i class="bi bi-arrow-repeat" id="retransmit-msg-${obj._id}" style="font-size: 1.2rem; color: grey;"></i></button>
|
<button class="btn bg-transparent p-1 m-1"><i class="bi bi-arrow-repeat" id="retransmit-msg-${obj._id}" style="font-size: 1.2rem; color: grey;"></i></button>
|
||||||
|
@ -645,7 +649,7 @@ update_chat = function(obj) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (obj.status == 'failed'){
|
if (obj.status == 'failed'){
|
||||||
document.getElementById('msg-' + obj._id + '-progress').classList.remove("progress-bar-striped");
|
//document.getElementById('msg-' + obj._id + '-progress').classList.remove("progress-bar-striped");
|
||||||
document.getElementById('msg-' + obj._id + '-progress').classList.remove("progress-bar-animated");
|
document.getElementById('msg-' + obj._id + '-progress').classList.remove("progress-bar-animated");
|
||||||
document.getElementById('msg-' + obj._id + '-progress').classList.remove("bg-primary");
|
document.getElementById('msg-' + obj._id + '-progress').classList.remove("bg-primary");
|
||||||
document.getElementById('msg-' + obj._id + '-progress').classList.add("bg-danger");
|
document.getElementById('msg-' + obj._id + '-progress').classList.add("bg-danger");
|
||||||
|
@ -678,11 +682,8 @@ update_chat = function(obj) {
|
||||||
|
|
||||||
// set Attribute to determine if we already created an EventListener for this element
|
// set Attribute to determine if we already created an EventListener for this element
|
||||||
document.getElementById('retransmit-msg-' + obj._id).setAttribute('listenerOnClick', 'true');
|
document.getElementById('retransmit-msg-' + obj._id).setAttribute('listenerOnClick', 'true');
|
||||||
|
|
||||||
document.getElementById('retransmit-msg-' + obj._id).addEventListener("click", () => {
|
document.getElementById('retransmit-msg-' + obj._id).addEventListener("click", () => {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
db.get(obj._id, {
|
db.get(obj._id, {
|
||||||
attachments: true
|
attachments: true
|
||||||
}).then(function(doc) {
|
}).then(function(doc) {
|
||||||
|
|
|
@ -315,6 +315,7 @@ client.on('data', function(socketdata) {
|
||||||
// ARQ TRANSMISSION RECEIVED
|
// ARQ TRANSMISSION RECEIVED
|
||||||
} else if (data['status'] == 'received') {
|
} else if (data['status'] == 'received') {
|
||||||
ipcRenderer.send('request-show-arq-toast-transmission-received', {data: [data]});
|
ipcRenderer.send('request-show-arq-toast-transmission-received', {data: [data]});
|
||||||
|
ipcRenderer.send('request-update-transmission-status', {data: [data]});
|
||||||
|
|
||||||
dataArray = []
|
dataArray = []
|
||||||
messageArray = []
|
messageArray = []
|
||||||
|
|
Loading…
Reference in a new issue