diff --git a/WebSites/pvs/dashboard.json b/WebSites/pvs/dashboard.json
index 6fa5ad963c7d1d2bc00824a90efef48220518fac..b3dba51df0cc98b72608581b0c674aaf3ab19716 100644
--- a/WebSites/pvs/dashboard.json
+++ b/WebSites/pvs/dashboard.json
@@ -53,7 +53,7 @@
{
"type": "html",
"settings": {
- "html": "<script>\nfunction clickPress(event) {\n if (event.which == 13) {\n freeboard.showLoadingIndicator(true);\n document.getElementById('result_pv').innerHTML=\"\";\n document.getElementById('result_de').innerHTML=\"\";\n document.getElementById('result_ar').innerHTML=\"\";\n document.getElementById('result_cf').innerHTML=\"\";\n var searchVar = document.getElementById(\"searchBar\").value;\n var searchURL = \"/data/api/v1/channelfinder/\"+searchVar.replace(\" \",\",\")+\"/simple\";\n $.get(searchURL).done(function(data) {\n if (data == \"No PV found.\") {\n var result = \"No PV found.\";\n }\n else {\n var result = \"\";\n for (var i = 0; i < data.length; i++) {\n result = result.concat('<a href=\"#\" onclick=\"searchPV('+\"'\"+data[i]+\"'\"+')\">'+data[i]+'</a><br>');\n };\n }\n\t\t\tdocument.getElementById(\"result_div\").innerHTML=result;\n freeboard.showLoadingIndicator(false);\n });\n\t};\n};\n\nfunction searchPV(PVname) {\n\tfreeboard.showLoadingIndicator(true);\n\t$.get(\"/data/api/v1/caget/\"+PVname).done(function(data) {\n var result = '<table style=\"width:100%\">';\n\t\tfor (var key in data[PVname]) {\n result = result.concat(\"<tr><td>\"+key+\"</td><td>\"+data[PVname][key]+\"</td><td></tr>\");\n }\n\t\tresult = result.concat(\"</table>\");\n\t\tdocument.getElementById('result_pv').innerHTML = result;\n });\n $.get(\"/data/api/v1/caget/\"+PVname+\".DESC\").done(function(data) {\n document.getElementById('result_de').innerHTML=data[PVname+\".DESC\"][\"value\"];\n });\n \n\t$.get(\"/data/api/v1/archiver/\"+PVname).done(function(data) {\n var result = '<table style=\"width:100%\">';\n for (var key in data) {\n result = result.concat(\"<tr><td>\"+key+\"</td><td>\"+data[key]+\"</td><td></tr>\");\n }\n result = result.concat(\"</table>\");\n document.getElementById('result_ar').innerHTML = result;\n if (data[\"status\"] == \"Being archived\") {\n document.getElementById('result_ar').innerHTML = document.getElementById('result_ar').innerHTML.concat('<p><a target=\"_blank\" href=\"/plot/retrieval/ui/viewer/archViewer.html?pv='+PVname+'\">See archived data</a>');\n }\n\t\tfreeboard.showLoadingIndicator(false);\n });\n\t$.get(\"/data/api/v1/channelfinder/\"+PVname+\"/raw\").done(function(data) {\n var result = '<table style=\"width:100%\">';\n result = result.concat(\"<tr><td>PV Name:</td><td>\"+data[0][\"name\"]+\"</td></tr>\");\n\t\tresult = result.concat(\"<tr><td>Owner:</td><td>\"+data[0][\"owner\"]+\"</td></tr>\");\n\t\tresult = result.concat(\"<tr><td><p></td></tr>\");\n\t\tresult = result.concat(\"<tr><td>Properties</td></tr>\");\n\t\tresult = result.concat(\"<tr><td>Name</td><td>Owner</td><td>Value</td></tr>\");\n\t\tfor (var prop in data[0][\"properties\"]) {\n \tresult = result.concat(\"<tr><td>\"+data[0][\"properties\"][prop][\"name\"]+\"</td><td>\"+data[0][\"properties\"][prop][\"owner\"]+\"</td><td>\"+data[0][\"properties\"][prop][\"value\"]+\"</td></tr>\");\n }\n\t\tresult = result.concat(\"<tr><td><p></td></tr>\");\n result = result.concat(\"<tr><td>Tags</td></tr>\");\n for (var tag in data[0][\"tags\"]) {\n result = result.concat(\"<tr><td>\"+data[0][\"tags\"][tag]+\"</tr></td>\");\n }\n result = result.concat(\"</table>\");\n\t\tdocument.getElementById('result_cf').innerHTML = result;\n });\n \n};\n</script>\n<center><input id=\"searchBar\" type=\"text\" onkeypress=\"clickPress(event)\" placeholder=\"Search for a PV\"></input></center>\n\n",
+ "html": "<script>\nfunction clickPress(event) {\n if (event.which == 13) {\n freeboard.showLoadingIndicator(true);\n document.getElementById('result_pv').innerHTML=\"\";\n document.getElementById('result_ar').innerHTML=\"\";\n document.getElementById('result_cf').innerHTML=\"\";\n\n var searchVar = document.getElementById(\"searchBar\").value;\n var searchURL = \"/data/api/v1/channelfinder/\"+searchVar.replace(\" \",\",\")+\"/simple\";\n $.get(searchURL).done(function(data) {\n if (data == \"No PV found.\") {\n var result = \"No PV found.\";\n }\n else {\n var result = \"\";\n for (var i = 0; i < data.length; i++) {\n result = result.concat('<a href=\"#\" onclick=\"searchPV('+\"'\"+data[i]+\"'\"+')\">'+data[i]+'</a><br>');\n };\n }\n\t\t\tdocument.getElementById(\"result_div\").innerHTML=result;\n freeboard.showLoadingIndicator(false);\n });\n\t};\n};\n\nfunction searchPV(PVname) {\n\tfreeboard.showLoadingIndicator(true);\n $.get(\"/data/api/v2/pvget/\"+PVname);\n setTimeout(() => {$.get(\"/data/api/v2/pvget/\"+PVname).done(function(data) {\n var result = '<pre>' + JSON.stringify(data[PVname], null, 2) + '</pre>';\n result = result.replace(/\"/g,'');\n result = result.replace(/{/g,'');\n result = result.replace(/}/g,'');\n\t\tresult = result.replace(/,/g,'');\n\t\tdocument.getElementById('result_pv').innerHTML = result;\n freeboard.showLoadingIndicator(false);\n });},5000);\n \n\t$.get(\"/data/api/v1/archiver/\"+PVname)\n\tsetTimeout(() => {$.get(\"/data/api/v1/archiver/\"+PVname).done(function(data) {\n var result = '<table style=\"width:100%\">';\n for (var key in data) {\n result = result.concat(\"<tr><td>\"+key+\"</td><td>\"+data[key]+\"</td><td></tr>\");\n }\n result = result.concat(\"</table>\");\n document.getElementById('result_ar').innerHTML = result;\n if (data[\"status\"] == \"Being archived\") {\n document.getElementById('result_ar').innerHTML = document.getElementById('result_ar').innerHTML.concat('<p><a target=\"_blank\" href=\"/plot/retrieval/ui/viewer/archViewer.html?pv='+PVname+'\">See archived data</a>');\n }\n });},4500);\n\n\t$.get(\"/data/api/v1/channelfinder/\"+PVname+\"/raw\").done(function(data) {\n var result = '<table style=\"width:100%\">';\n result = result.concat(\"<tr><td>PV Name:</td><td>\"+data[0][\"name\"]+\"</td></tr>\");\n\t\tresult = result.concat(\"<tr><td>Owner:</td><td>\"+data[0][\"owner\"]+\"</td></tr>\");\n\t\tresult = result.concat(\"<tr><td><p></td></tr>\");\n\t\tresult = result.concat(\"<tr><td>Properties</td></tr>\");\n\t\tresult = result.concat(\"<tr><td>Name</td><td>Owner</td><td>Value</td></tr>\");\n\t\tfor (var prop in data[0][\"properties\"]) {\n \tresult = result.concat(\"<tr><td>\"+data[0][\"properties\"][prop][\"name\"]+\"</td><td>\"+data[0][\"properties\"][prop][\"owner\"]+\"</td><td>\"+data[0][\"properties\"][prop][\"value\"]+\"</td></tr>\");\n }\n\t\tresult = result.concat(\"<tr><td><p></td></tr>\");\n result = result.concat(\"<tr><td>Tags</td></tr>\");\n for (var tag in data[0][\"tags\"]) {\n result = result.concat(\"<tr><td>\"+data[0][\"tags\"][tag]+\"</tr></td>\");\n }\n result = result.concat(\"</table>\");\n\t\tdocument.getElementById('result_cf').innerHTML = result;\n });\n \n};\n</script>\n<center><input id=\"searchBar\" type=\"text\" onkeypress=\"clickPress(event)\" placeholder=\"Search for a PV\"></input></center>\n\n",
"height": 1
}
}
@@ -93,34 +93,6 @@
}
]
},
- {
- "title": "Description",
- "width": 1,
- "row": {
- "1": 29,
- "2": 29,
- "3": 29,
- "4": 11,
- "10": 11
- },
- "col": {
- "1": 1,
- "2": 1,
- "3": 1,
- "4": 3,
- "10": 3
- },
- "col_width": 2,
- "widgets": [
- {
- "type": "html",
- "settings": {
- "html": "<div id=\"result_de\" style=\"overflow: visible;\"></div>",
- "height": 5
- }
- }
- ]
- },
{
"title": "PV Info",
"width": 1,
@@ -128,7 +100,7 @@
"1": 41,
"2": 41,
"3": 41,
- "4": 29,
+ "4": 11,
"5": 23,
"6": 23,
"7": 23,
@@ -140,7 +112,7 @@
"1": 1,
"2": 1,
"3": 1,
- "4": 1,
+ "4": 3,
"5": 9,
"6": 9,
"7": 9,
@@ -166,7 +138,7 @@
"1": 59,
"2": 59,
"3": 59,
- "4": 23,
+ "4": 29,
"11": 29,
"12": 29,
"13": 29
@@ -175,7 +147,7 @@
"1": 1,
"2": 1,
"3": 1,
- "4": 3,
+ "4": 1,
"11": 3,
"12": 3,
"13": 3
@@ -198,7 +170,7 @@
"1": 71,
"2": 71,
"3": 71,
- "4": 35,
+ "4": 29,
"11": 29,
"12": 29,
"13": 29