From dab689687712184c05b4a365901ce39039216af9 Mon Sep 17 00:00:00 2001 From: Kim Huebel Date: Sat, 10 Apr 2021 19:49:14 +0100 Subject: [PATCH] Added individual links to Target-Entries in TG_List.csv Added as new column like: YSF,0,40,DL Multimode 263,https://c4fm.ysfreflector.de/Germany/ --- html/data/TG_List.csv | 36 ++++++++++++++++++------------------ html/js/functions.js | 8 ++++++-- html/js/version.js | 2 +- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/html/data/TG_List.csv b/html/data/TG_List.csv index 230cb9a..e7fac7f 100644 --- a/html/data/TG_List.csv +++ b/html/data/TG_List.csv @@ -1,18 +1,18 @@ -MODE,TS,TG,LABEL -DMR,1,263,DL Multimode BM -DMR,2,8021,Pegasus DMR-DL -DMR,2,2625,RLP/SL BM -YSF,0,1,Local Parrot -YSF,0,2,DEV Reflector -YSF,0,10,YSF2DMR TG26250 -YSF,0,40,DL Multimode 263 -YSF,0,41,DL-RAMSES -YSF,0,42,DL-RAMSES-II -YSF,0,43,DL-RAMSES-III -YSF,0,44,DL-PEGASUS -YSF,0,45,DL-SAAR -YSF,0,46,DE-Twitterrunde -YSF,0,47,DE-Westpfalz -YSF,0,48,DE-Deutschland -YSF,0,49,America Link -YSF,0,99,Network Parrot +MODE,TS,TG,LABEL,URL +DMR,1,263,DL Multimode BM, +DMR,2,8021,Pegasus DMR-DL, +DMR,2,2625,RLP/SL BM, +YSF,0,1,Local Parrot, +YSF,0,2,DEV Reflector, +YSF,0,10,YSF2DMR TG26250, +YSF,0,40,DL Multimode 263,https://c4fm.ysfreflector.de/Germany/ +YSF,0,41,DL-RAMSES, +YSF,0,42,DL-RAMSES-II, +YSF,0,43,DL-RAMSES-III, +YSF,0,44,DL-PEGASUS, +YSF,0,45,DL-SAAR,https://c4fm.ysfreflector.de/DL-Saar/ +YSF,0,46,DE-Twitterrunde,https://c4fm.ysfreflector.de/Twitterrunde/ +YSF,0,47,DE-Westpfalz,https://westpfalz.ysfreflector.de +YSF,0,48,DE-Deutschland, +YSF,0,49,America Link, +YSF,0,99,Network Parrot, diff --git a/html/js/functions.js b/html/js/functions.js index 3748716..fd1555c 100644 --- a/html/js/functions.js +++ b/html/js/functions.js @@ -160,7 +160,11 @@ function resolveTarget(mode, timeslot, target) { break; } if (retval.length > 0) { - return retval[0][3]; + if (retval[0][4] != "") { + return ''+retval[0][3]+''; + } else { + return retval[0][3]; + } } else { return target; } @@ -890,7 +894,7 @@ function processData(data) { var allRows = data.split(/\r?\n|\r/); for (var singleRow = 1; singleRow < allRows.length; singleRow++) { var rowCells = allRows[singleRow].split(','); - talkgroups.push([rowCells[0], rowCells[1], rowCells[2], rowCells[3]]); + talkgroups.push([rowCells[0], rowCells[1], rowCells[2], rowCells[3], rowCells[4]]); } logIt("Parsed TGs: " + talkgroups); } \ No newline at end of file diff --git a/html/js/version.js b/html/js/version.js index 88b8ebc..7326a46 100644 --- a/html/js/version.js +++ b/html/js/version.js @@ -1 +1 @@ -var dashboard_version = "2021-04-06 16:21:54"; +var dashboard_version = "2021-04-10 19:49:13";