Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 10:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Display specific Tx failed msg due to ver mismatch

Browse source
This commit is contained in:
Mashintime 2023-01-21 23:13:23 -05:00
parent e36f23272d
commit 4dbaaf5b63
4 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gui/main.js
View file

@ -624,6 +624,11 @@ ipcMain.on('request-show-arq-toast-transmission-failed',(event,data)=>{
win.webContents.send('action-show-arq-toast-transmission-failed', data);
});
// ARQ TRANSMISSION FAILED
ipcMain.on('request-show-arq-toast-transmission-failed-ver',(event,data)=>{
win.webContents.send('action-show-arq-toast-transmission-failed-ver', data);
});
// ARQ TRANSMISSION RECEIVING
ipcMain.on('request-show-arq-toast-transmission-receiving',(event,data)=>{
win.webContents.send('action-show-arq-toast-transmission-receiving', data);

7
gui/preload-main.js
View file

@ -2576,6 +2576,13 @@ ipcRenderer.on('action-show-arq-toast-transmission-failed', (event, data) => {
toast.show();
});
// ARQ TRANSMISSION FAILED (Version mismatch)
ipcRenderer.on('action-show-arq-toast-transmission-failed-ver', (event, data) => {
document.getElementById("transmission_progress").className = "progress-bar progress-bar-striped bg-danger";
var toast = bootstrap.Toast.getOrCreateInstance(toastARQtransmittingfailedver); // Returns a Bootstrap toast instance
toast.show();
});
// ARQ TRANSMISSION STOPPED
// TODO: RENAME ID -- WRONG
ipcRenderer.on('action-show-arq-toast-transmission-stopped', (event, data) => {

10
gui/sock.js
View file

@ -156,8 +156,8 @@ client.on('data', function(socketdata) {
// split data into chunks if we received multiple commands
socketchunk = socketchunk.split("\n");
data = JSON.parse(socketchunk[0])
//don't think this is needed anymore
//data = JSON.parse(socketchunk[0])
// search for empty entries in socketchunk and remove them
for (i = 0; i < socketchunk.length; i++) {
@ -349,7 +349,11 @@ client.on('data', function(socketdata) {
// ARQ TRANSMISSION FAILED
} else if (data['status'] == 'failed') {
ipcRenderer.send('request-show-arq-toast-transmission-failed', {data: [data]});
if (data['reason'] == 'protocol version missmatch') {
ipcRenderer.send('request-show-arq-toast-transmission-failed-ver', {data: [data]});
} else {
ipcRenderer.send('request-show-arq-toast-transmission-failed', {data: [data]});
}
ipcRenderer.send('request-update-transmission-status', {data: [data]});

7
gui/src/index.html
View file

@ -214,6 +214,13 @@
<button type="button" class="btn-close btn-close-white me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
</div>
</div>
<!-- ARQ TRANSMITTING FAILED -->
<div class="toast align-items-center text-white bg-danger border-0" id="toastARQtransmittingfailedver" role="alert" aria-live="assertive" aria-atomic="true">
<div class="d-flex">
<div class="toast-body">TRANSMITTING FAILED, VERSION MISMATCH!</div>
<button type="button" class="btn-close btn-close-white me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
</div>
</div>
<!-- ARQ TRANSMITTING SUCCESS-->
<div class="toast align-items-center text-white bg-success border-0" id="toastARQtransmittingsuccess" role="alert" aria-live="assertive" aria-atomic="true">
<div class="d-flex">