From 43cd15ecc6dacd2d9af8bf87d9627be793e21a85 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Sat, 30 Sep 2023 21:57:23 +0200 Subject: [PATCH] timeout indicator now functional --- gui_vue/src/components/chat_conversations.vue | 7 +- gui_vue/src/components/main_active_stats.vue | 238 ++++++++++-------- gui_vue/src/components/main_footer_navbar.vue | 18 +- gui_vue/src/js/chatHandler.js | 34 ++- gui_vue/src/js/sock.js | 1 - gui_vue/src/store/chatStore.js | 5 +- 6 files changed, 181 insertions(+), 122 deletions(-) diff --git a/gui_vue/src/components/chat_conversations.vue b/gui_vue/src/components/chat_conversations.vue index 74a7387b..76f6cff7 100644 --- a/gui_vue/src/components/chat_conversations.vue +++ b/gui_vue/src/components/chat_conversations.vue @@ -44,7 +44,12 @@ function chatSelected(callsign){
{{item}}
- + + + + + +
diff --git a/gui_vue/src/components/main_active_stats.vue b/gui_vue/src/components/main_active_stats.vue index a630a33f..8fc3d43d 100644 --- a/gui_vue/src/components/main_active_stats.vue +++ b/gui_vue/src/components/main_active_stats.vue @@ -137,118 +137,136 @@ const scatterChartData = computed(() => ({ ] } )); - - - - - \ No newline at end of file +
+ + +
+ + +
+ +
+ + + +
+
+
+ +
+
+ +
+
+ +
+
+ + +
+ + diff --git a/gui_vue/src/components/main_footer_navbar.vue b/gui_vue/src/components/main_footer_navbar.vue index f7efbbcb..7f2b11f8 100644 --- a/gui_vue/src/components/main_footer_navbar.vue +++ b/gui_vue/src/components/main_footer_navbar.vue @@ -249,10 +249,10 @@ const settings = useSettingsStore(pinia); aria-valuemax="100" >

- --- + {{state.arq_seconds_until_finish}}s left

@@ -262,11 +262,19 @@ const settings = useSettingsStore(pinia); class="progress-bar progress-bar-striped bg-warning" id="transmission_timeleft" role="progressbar" - :style="{ width: state.arq_transmission_percent + '%' }" - aria-valuenow="1" + :style="{ width: state.arq_seconds_until_timeout_percent + '%' }" + aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" - > + > + +

+ timeout in: {{state.arq_seconds_until_timeout}}s +

+ diff --git a/gui_vue/src/js/chatHandler.js b/gui_vue/src/js/chatHandler.js index ae1f8a50..e28c42a1 100644 --- a/gui_vue/src/js/chatHandler.js +++ b/gui_vue/src/js/chatHandler.js @@ -226,7 +226,7 @@ export function newMessage(dxcallsign, chatmessage, chatFile, chatFileName, chat - +// function for creating a list, accessible by callsign function sortChatList(){ // Create an empty object to store the reordered data dynamically @@ -246,6 +246,26 @@ function sortChatList(){ return reorderedData } +// function for creating a list, accessible by callsign +function sortBeaconList(){ + + // Create an empty object to store the reordered data dynamically + var reorderedData = {}; + var jsonObjects = chat.unsorted_beacon_list + // Iterate through the list of JSON objects and reorder them dynamically + jsonObjects.forEach(obj => { + var dxcallsign = obj.dxcallsign; + if (dxcallsign) { + if (!reorderedData[dxcallsign]) { + reorderedData[dxcallsign] = []; + } + reorderedData[dxcallsign].push(obj); + } + }); + //console.log(reorderedData["DJ2LS-0"]) + return reorderedData +} + //repeat a message export function repeatMessageTransmission(id){ console.log(id) @@ -295,12 +315,18 @@ export async function updateAllChat() { }) .then(async function (result) { for (var item of result.docs) { - chat.callsign_list.add(item.dxcallsign) - chat.unsorted_chat_list.push(item) + if(item.type === 'beacon'){ + chat.callsign_list.add(item.dxcallsign) + chat.unsorted_beacon_list.push(item) + } else { + chat.callsign_list.add(item.dxcallsign) + chat.unsorted_chat_list.push(item) + } } chat.sorted_chat_list = sortChatList() - + console.log(chat.unsorted_beacon_list) + console.log(chat.sorted_beacon_list) console.log(chat.sorted_chat_list["EI7IG-0"]) diff --git a/gui_vue/src/js/sock.js b/gui_vue/src/js/sock.js index 84d9be9c..db6cd413 100644 --- a/gui_vue/src/js/sock.js +++ b/gui_vue/src/js/sock.js @@ -243,7 +243,6 @@ client.on("data", function (socketdata) { arq_n_arq_frames_per_data_frame: data["arq_n_arq_frames_per_data_frame"], arq_bytes_per_minute: data["arq_bytes_per_minute"], - arq_seconds_until_finish: data["arq_seconds_until_finish"], arq_compression_factor: data["arq_compression_factor"], routing_table: data["routing_table"], mesh_signalling_table: data["mesh_signalling_table"], diff --git a/gui_vue/src/store/chatStore.js b/gui_vue/src/store/chatStore.js index 450e3cf6..044a71b6 100644 --- a/gui_vue/src/store/chatStore.js +++ b/gui_vue/src/store/chatStore.js @@ -25,11 +25,14 @@ export const useChatStore = defineStore('chatStore', () => { var sorted_chat_list = ref() var unsorted_chat_list = ref([]) + var sorted_beacon_list = ref() + var unsorted_beacon_list = ref([]) + var chartSpeedPER0 = ref() var chartSpeedPER25 = ref() var chartSpeedPER75 = ref() var beaconDataArray = ref([-3, 10, 8, 5, 3, 0, -5, 10, 8, 5, 3, 0, -5, 10, 8, 5, 3, 0, -5, 10, 8, 5, 3, 0, -5]) var beaconLabelArray = ref(['18:10', '19:00', '23:00', '01:13', '04:25', '08:15', '09:12', '18:10', '19:00', '23:00', '01:13', '04:25', '08:15', '09:12', '18:10', '19:00', '23:00', '01:13', '04:25', '08:15', '09:12', '01:13', '04:25', '08:15', '09:12']) - return {selectedCallsign, inputText, chat_filter, callsign_list, sorted_chat_list, unsorted_chat_list, inputFileName, inputFileSize, inputFileType, inputFile, chartSpeedPER0, chartSpeedPER25, chartSpeedPER75, beaconDataArray, beaconLabelArray }; + return {selectedCallsign, inputText, chat_filter, callsign_list, sorted_chat_list, unsorted_chat_list, inputFileName, inputFileSize, inputFileType, inputFile, chartSpeedPER0, chartSpeedPER25, chartSpeedPER75, beaconDataArray, beaconLabelArray , unsorted_beacon_list, sorted_beacon_list }; });