diff --git a/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.cshtml b/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.cshtml index 2fad87cf..2e1a71dd 100644 --- a/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.cshtml +++ b/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.cshtml @@ -271,7 +271,7 @@ } break; case 'deviceprofileinclude': - var deviceProfiles = value.split(","); + var deviceProfiles = value.split(",").map(function (v) { return parseInt(v); }); if (deviceProfiles.length > 0) { filters.push(function (heldDeviceItem) { // true if DeviceProfileId is included @@ -280,7 +280,7 @@ } break; case 'deviceprofileexclude': - var deviceProfiles = value.split(","); + var deviceProfiles = value.split(",").map(function (v) { return parseInt(v); }); if (deviceProfiles.length > 0) { filters.push(function (heldDeviceItem) { // true if DeviceProfileId is excluded diff --git a/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.generated.cs b/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.generated.cs index b7fcef3e..3a1b2eef 100644 --- a/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.generated.cs +++ b/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.generated.cs @@ -343,72 +343,73 @@ WriteLiteral("\', null, function (data) {\r\n\r\n var inProce "toLowerCase(), deviceAddresses) < 0;\r\n });\r\n " + " }\r\n break;\r\n " + " case \'deviceprofileinclude\':\r\n " + -" var deviceProfiles = value.split(\",\");\r\n if (" + -"deviceProfiles.length > 0) {\r\n filters.push(f" + -"unction (heldDeviceItem) {\r\n // true if D" + -"eviceProfileId is included\r\n return $.inA" + -"rray(heldDeviceItem.DeviceProfileId, deviceProfiles) >= 0;\r\n " + -" });\r\n }\r\n " + -" break;\r\n case \'deviceprofileexclude\':\r\n " + -" var deviceProfiles = value.split(\",\");\r\n " + -" if (deviceProfiles.length > 0) {\r\n " + -" filters.push(function (heldDeviceItem) {\r\n " + -" // true if DeviceProfileId is excluded\r\n " + -" return $.inArray(heldDeviceItem.DeviceProfileId, deviceProfiles) < 0;\r" + -"\n });\r\n }\r\n " + -" break;\r\n }\r\n " + -" });\r\n }\r\n\r\n if (filters.length > 0)\r\n " + -" itemFilters = filters;\r\n else\r\n ite" + -"mFilters = null;\r\n }\r\n\r\n function connectionError() {\r\n " + -" try {\r\n $(\'body\').addClass(\'status-error\');\r\n " + -" $.connection.hub.stop();\r\n } catch (e) {\r\n " + -" // Ignore\r\n }\r\n\r\n window.setTimeout(" + -"function () {\r\n window.location.href = window.location.href;\r" + -"\n }, 10000);\r\n }\r\n\r\n // Helpers\r\n " + -" function rotateArray(koArray, element) {\r\n var items = koArray(" + -");\r\n\r\n if (items.length <= 1)\r\n return 0;\r\n\r\n " + -" if (element.height() < (element.parent().height() - 30)) {\r\n\r\n " + -" if (findUnsortedArrayTopIndex(items) !== 0)\r\n " + -" koArray.sort(sortFunction);\r\n\r\n // Don\'t rotate if smal" + -"l & sorted correctly\r\n return;\r\n }\r\n\r\n " + -" // Move Last Item to Top\r\n var item = koArray.pop();\r\n " + -" koArray.unshift(item);\r\n }\r\n function removeI" + -"temFromArray(koArray, deviceSerialNumber) {\r\n var items = koArray" + -"();\r\n for (var i = 0; i < items.length; i++) {\r\n " + -" if (items[i].DeviceSerialNumber == deviceSerialNumber) {\r\n " + -" koArray.splice(i, 1);\r\n items = koArray();\r\n " + -" i--;\r\n }\r\n }\r\n }\r\n " + -" function findUnsortedArrayTopIndex(items) {\r\n // Only " + -"one Item\r\n if (items.length <= 1)\r\n return 0;\r" + -"\n\r\n for (var i = 1; i < items.length; i++) {\r\n " + -" var s = sortFunction(items[i - 1], items[i]);\r\n if (s > 0)\r\n" + -" return i;\r\n }\r\n\r\n return 0" + -";\r\n }\r\n function findSortedInsertIndex(koArray, heldDevice" + -"Item) {\r\n var items = koArray();\r\n var startIndex " + -"= findUnsortedArrayTopIndex(items);\r\n for (var i = startIndex; i " + -"< items.length; i++) {\r\n var s = sortFunction(heldDeviceItem," + -" items[i]);\r\n if (s <= 0)\r\n return i;\r" + -"\n }\r\n if (startIndex !== 0) {\r\n " + -" for (var i = 0; i < startIndex; i++) {\r\n var s = sortFun" + -"ction(heldDeviceItem, items[i]);\r\n if (s <= 0)\r\n " + -" return i;\r\n }\r\n return " + -"startIndex;\r\n } else {\r\n return -1;\r\n " + -" }\r\n }\r\n function sortFunction(l, r) {\r\n " + -" return l.DeviceDescription.toLowerCase() == r.DeviceDescription.toLowerCase(" + -") ? 0 : (l.DeviceDescription.toLowerCase() < r.DeviceDescription.toLowerCase() ?" + -" -1 : 1)\r\n }\r\n function isInProcess(i) {\r\n " + -"return !i.ReadyForReturn && !i.WaitingForUserAction;\r\n }\r\n " + -" function isReadyForReturn(i) {\r\n return i.ReadyForReturn && !i.W" + -"aitingForUserAction;\r\n }\r\n function isWaitingForUserAction" + -"(i) {\r\n return i.WaitingForUserAction;\r\n }\r\n " + -" function getQueryStringParameters() {\r\n\r\n if (window.location.s" + -"earch.length === 0)\r\n return null;\r\n\r\n var par" + -"ams = {};\r\n window.location.search.substr(1).split(\"&\").forEach(f" + -"unction (pair) {\r\n if (pair === \"\") return;\r\n " + -" var parts = pair.split(\"=\");\r\n params[parts[0]] = parts[1" + -"] && decodeURIComponent(parts[1].replace(/\\+/g, \" \"));\r\n });\r\n " + -" return params;\r\n }\r\n\r\n init();\r\n });\r\n" + -" \r\n\r\n"); +" var deviceProfiles = value.split(\",\").map(function (v) { return parseInt(v);" + +" });\r\n if (deviceProfiles.length > 0) {\r\n " + +" filters.push(function (heldDeviceItem) {\r\n " + +" // true if DeviceProfileId is included\r\n " + +" return $.inArray(heldDeviceItem.DeviceProfileId, d" + +"eviceProfiles) >= 0;\r\n });\r\n " + +" }\r\n break;\r\n " + +" case \'deviceprofileexclude\':\r\n var devicePr" + +"ofiles = value.split(\",\").map(function (v) { return parseInt(v); });\r\n " + +" if (deviceProfiles.length > 0) {\r\n " + +" filters.push(function (heldDeviceItem) {\r\n " + +" // true if DeviceProfileId is excluded\r\n " + +" return $.inArray(heldDeviceItem.DeviceProfileId, deviceProfiles) <" + +" 0;\r\n });\r\n }\r" + +"\n break;\r\n }\r\n " + +" });\r\n }\r\n\r\n if (filters.length > 0)\r\n " + +" itemFilters = filters;\r\n else\r\n " + +" itemFilters = null;\r\n }\r\n\r\n function connectionError() {\r" + +"\n try {\r\n $(\'body\').addClass(\'status-error\');\r" + +"\n $.connection.hub.stop();\r\n } catch (e) {\r\n " + +" // Ignore\r\n }\r\n\r\n window.setTime" + +"out(function () {\r\n window.location.href = window.location.hr" + +"ef;\r\n }, 10000);\r\n }\r\n\r\n // Helpers\r\n " + +" function rotateArray(koArray, element) {\r\n var items = koAr" + +"ray();\r\n\r\n if (items.length <= 1)\r\n return 0;\r" + +"\n\r\n if (element.height() < (element.parent().height() - 30)) {\r\n\r" + +"\n if (findUnsortedArrayTopIndex(items) !== 0)\r\n " + +" koArray.sort(sortFunction);\r\n\r\n // Don\'t rotate if " + +"small & sorted correctly\r\n return;\r\n }\r\n\r\n " + +" // Move Last Item to Top\r\n var item = koArray.pop();\r" + +"\n koArray.unshift(item);\r\n }\r\n function rem" + +"oveItemFromArray(koArray, deviceSerialNumber) {\r\n var items = koA" + +"rray();\r\n for (var i = 0; i < items.length; i++) {\r\n " + +" if (items[i].DeviceSerialNumber == deviceSerialNumber) {\r\n " + +" koArray.splice(i, 1);\r\n items = koArray();\r\n " + +" i--;\r\n }\r\n }\r\n " + +"}\r\n function findUnsortedArrayTopIndex(items) {\r\n // O" + +"nly one Item\r\n if (items.length <= 1)\r\n return" + +" 0;\r\n\r\n for (var i = 1; i < items.length; i++) {\r\n " + +" var s = sortFunction(items[i - 1], items[i]);\r\n if (s > " + +"0)\r\n return i;\r\n }\r\n\r\n retu" + +"rn 0;\r\n }\r\n function findSortedInsertIndex(koArray, heldDe" + +"viceItem) {\r\n var items = koArray();\r\n var startIn" + +"dex = findUnsortedArrayTopIndex(items);\r\n for (var i = startIndex" + +"; i < items.length; i++) {\r\n var s = sortFunction(heldDeviceI" + +"tem, items[i]);\r\n if (s <= 0)\r\n return" + +" i;\r\n }\r\n if (startIndex !== 0) {\r\n " + +" for (var i = 0; i < startIndex; i++) {\r\n var s = sor" + +"tFunction(heldDeviceItem, items[i]);\r\n if (s <= 0)\r\n " + +" return i;\r\n }\r\n ret" + +"urn startIndex;\r\n } else {\r\n return -1;\r\n " + +" }\r\n }\r\n function sortFunction(l, r) {\r\n " + +" return l.DeviceDescription.toLowerCase() == r.DeviceDescription.toLowerC" + +"ase() ? 0 : (l.DeviceDescription.toLowerCase() < r.DeviceDescription.toLowerCase" + +"() ? -1 : 1)\r\n }\r\n function isInProcess(i) {\r\n " + +" return !i.ReadyForReturn && !i.WaitingForUserAction;\r\n }\r\n " + +" function isReadyForReturn(i) {\r\n return i.ReadyForReturn && " + +"!i.WaitingForUserAction;\r\n }\r\n function isWaitingForUserAc" + +"tion(i) {\r\n return i.WaitingForUserAction;\r\n }\r\n " + +" function getQueryStringParameters() {\r\n\r\n if (window.locati" + +"on.search.length === 0)\r\n return null;\r\n\r\n var" + +" params = {};\r\n window.location.search.substr(1).split(\"&\").forEa" + +"ch(function (pair) {\r\n if (pair === \"\") return;\r\n " + +" var parts = pair.split(\"=\");\r\n params[parts[0]] = par" + +"ts[1] && decodeURIComponent(parts[1].replace(/\\+/g, \" \"));\r\n });\r" + +"\n return params;\r\n }\r\n\r\n init();\r\n }" + +");\r\n \r\n\r\n"); } } diff --git a/Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.cshtml b/Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.cshtml index d42b5a7d..a7631752 100644 --- a/Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.cshtml +++ b/Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.cshtml @@ -271,7 +271,7 @@ } break; case 'deviceprofileinclude': - var deviceProfiles = value.split(","); + var deviceProfiles = value.split(",").map(function (v) { return parseInt(v); }); if (deviceProfiles.length > 0) { filters.push(function (heldDeviceItem) { // true if DeviceProfileId is included @@ -280,7 +280,7 @@ } break; case 'deviceprofileexclude': - var deviceProfiles = value.split(","); + var deviceProfiles = value.split(",").map(function (v) { return parseInt(v); }); if (deviceProfiles.length > 0) { filters.push(function (heldDeviceItem) { // true if DeviceProfileId is excluded diff --git a/Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.generated.cs b/Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.generated.cs index d7d70d61..dd9ce43b 100644 --- a/Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.generated.cs +++ b/Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.generated.cs @@ -343,71 +343,72 @@ WriteLiteral("\', null, function (data) {\r\n\r\n var inProce "ortName.toLowerCase(), deviceAddresses) < 0;\r\n " + " });\r\n }\r\n break;" + "\r\n case \'deviceprofileinclude\':\r\n " + -" var deviceProfiles = value.split(\",\");\r\n " + -" if (deviceProfiles.length > 0) {\r\n filter" + -"s.push(function (heldDeviceItem) {\r\n // t" + -"rue if DeviceProfileId is included\r\n retu" + -"rn $.inArray(heldDeviceItem.DeviceProfileId, deviceProfiles) >= 0;\r\n " + -" });\r\n }\r\n " + -" break;\r\n case \'deviceprofileexclude\':" + -"\r\n var deviceProfiles = value.split(\",\");\r\n " + -" if (deviceProfiles.length > 0) {\r\n " + -" filters.push(function (heldDeviceItem) {\r\n " + -" // true if DeviceProfileId is excluded\r\n " + -" return $.inArray(heldDeviceItem.DeviceProfileId, deviceProfile" + -"s) < 0;\r\n });\r\n " + -" }\r\n break;\r\n }\r\n " + -" });\r\n }\r\n\r\n if (filters.length > 0)\r\n " + -" itemFilters = filters;\r\n else\r\n " + -" itemFilters = null;\r\n }\r\n\r\n function connectionError(" + -") {\r\n try {\r\n $(\'body\').addClass(\'status-error" + -"\');\r\n $.connection.hub.stop();\r\n } catch (e) {" + -"\r\n // Ignore\r\n }\r\n\r\n window.set" + -"Timeout(function () {\r\n window.location.href = window.locatio" + -"n.href;\r\n }, 10000);\r\n }\r\n\r\n // Helpers\r\n " + -" function rotateArray(koArray, element) {\r\n var items = " + -"koArray();\r\n\r\n if (items.length <= 1)\r\n return" + -" 0;\r\n\r\n if (element.height() < (element.parent().height() - 30)) " + -"{\r\n\r\n if (findUnsortedArrayTopIndex(items) !== 0)\r\n " + -" koArray.sort(sortFunction);\r\n\r\n // Don\'t rotate" + -" if small & sorted correctly\r\n return;\r\n }\r\n\r\n" + -" // Move Last Item to Top\r\n var item = koArray.pop" + -"();\r\n koArray.unshift(item);\r\n }\r\n function" + -" removeItemFromArray(koArray, UserId) {\r\n var items = koArray();\r" + -"\n for (var i = 0; i < items.length; i++) {\r\n i" + -"f (items[i].UserId == UserId) {\r\n koArray.splice(i, 1);\r\n" + -" items = koArray();\r\n i--;\r\n " + -" }\r\n }\r\n }\r\n function findUnso" + -"rtedArrayTopIndex(items) {\r\n // Only one Item\r\n if" + -" (items.length <= 1)\r\n return 0;\r\n\r\n for (var " + -"i = 1; i < items.length; i++) {\r\n var s = sortFunction(items[" + -"i - 1], items[i]);\r\n if (s > 0)\r\n retu" + -"rn i;\r\n }\r\n\r\n return 0;\r\n }\r\n " + -" function findSortedInsertIndex(koArray, heldDeviceItem) {\r\n var" + -" items = koArray();\r\n var startIndex = findUnsortedArrayTopIndex(" + -"items);\r\n for (var i = startIndex; i < items.length; i++) {\r\n " + -" var s = sortFunction(heldDeviceItem, items[i]);\r\n " + -" if (s <= 0)\r\n return i;\r\n }\r\n " + -" if (startIndex !== 0) {\r\n for (var i = 0; i < startIn" + -"dex; i++) {\r\n var s = sortFunction(heldDeviceItem, items[" + -"i]);\r\n if (s <= 0)\r\n return i;" + -"\r\n }\r\n return startIndex;\r\n " + -" } else {\r\n return -1;\r\n }\r\n }\r\n " + -" function sortFunction(l, r) {\r\n return l.UserIdFriendly." + -"toLowerCase() == r.UserIdFriendly.toLowerCase() ? 0 : (l.UserIdFriendly.toLowerC" + -"ase() < r.UserIdFriendly.toLowerCase() ? -1 : 1)\r\n }\r\n fun" + -"ction isInProcess(i) {\r\n return !i.ReadyForReturn && !i.WaitingFo" + -"rUserAction;\r\n }\r\n function isReadyForReturn(i) {\r\n " + -" return i.ReadyForReturn && !i.WaitingForUserAction;\r\n }\r\n " + -" function isWaitingForUserAction(i) {\r\n return i.WaitingF" + -"orUserAction;\r\n }\r\n function getQueryStringParameters() {\r" + -"\n\r\n if (window.location.search.length === 0)\r\n " + -" return null;\r\n\r\n var params = {};\r\n window.locati" + -"on.search.substr(1).split(\"&\").forEach(function (pair) {\r\n if" + -" (pair === \"\") return;\r\n var parts = pair.split(\"=\");\r\n " + -" params[parts[0]] = parts[1] && decodeURIComponent(parts[1].replace" + -"(/\\+/g, \" \"));\r\n });\r\n return params;\r\n " + -" }\r\n\r\n init();\r\n });\r\n \r\n\r\n"); +" var deviceProfiles = value.split(\",\").map(function (v) { return pars" + +"eInt(v); });\r\n if (deviceProfiles.length > 0) {\r\n" + +" filters.push(function (heldDeviceItem) {\r\n " + +" // true if DeviceProfileId is included\r\n " + +" return $.inArray(heldDeviceItem.DeviceProf" + +"ileId, deviceProfiles) >= 0;\r\n });\r\n " + +" }\r\n break;\r\n " + +" case \'deviceprofileexclude\':\r\n var " + +"deviceProfiles = value.split(\",\").map(function (v) { return parseInt(v); });\r\n " + +" if (deviceProfiles.length > 0) {\r\n " + +" filters.push(function (heldDeviceItem) {\r\n " + +" // true if DeviceProfileId is excluded\r\n " + +" return $.inArray(heldDeviceItem.DeviceProfileId, devicePro" + +"files) < 0;\r\n });\r\n " + +" }\r\n break;\r\n }\r\n " + +" });\r\n }\r\n\r\n if (filters.length > 0" + +")\r\n itemFilters = filters;\r\n else\r\n " + +" itemFilters = null;\r\n }\r\n\r\n function connectionEr" + +"ror() {\r\n try {\r\n $(\'body\').addClass(\'status-e" + +"rror\');\r\n $.connection.hub.stop();\r\n } catch (" + +"e) {\r\n // Ignore\r\n }\r\n\r\n window" + +".setTimeout(function () {\r\n window.location.href = window.loc" + +"ation.href;\r\n }, 10000);\r\n }\r\n\r\n // Helpers" + +"\r\n function rotateArray(koArray, element) {\r\n var item" + +"s = koArray();\r\n\r\n if (items.length <= 1)\r\n re" + +"turn 0;\r\n\r\n if (element.height() < (element.parent().height() - 3" + +"0)) {\r\n\r\n if (findUnsortedArrayTopIndex(items) !== 0)\r\n " + +" koArray.sort(sortFunction);\r\n\r\n // Don\'t ro" + +"tate if small & sorted correctly\r\n return;\r\n }" + +"\r\n\r\n // Move Last Item to Top\r\n var item = koArray" + +".pop();\r\n koArray.unshift(item);\r\n }\r\n func" + +"tion removeItemFromArray(koArray, UserId) {\r\n var items = koArray" + +"();\r\n for (var i = 0; i < items.length; i++) {\r\n " + +" if (items[i].UserId == UserId) {\r\n koArray.splice(i, 1" + +");\r\n items = koArray();\r\n i--;\r\n " + +" }\r\n }\r\n }\r\n function find" + +"UnsortedArrayTopIndex(items) {\r\n // Only one Item\r\n " + +" if (items.length <= 1)\r\n return 0;\r\n\r\n for (" + +"var i = 1; i < items.length; i++) {\r\n var s = sortFunction(it" + +"ems[i - 1], items[i]);\r\n if (s > 0)\r\n " + +"return i;\r\n }\r\n\r\n return 0;\r\n }\r\n " + +" function findSortedInsertIndex(koArray, heldDeviceItem) {\r\n " + +" var items = koArray();\r\n var startIndex = findUnsortedArrayTopIn" + +"dex(items);\r\n for (var i = startIndex; i < items.length; i++) {\r\n" + +" var s = sortFunction(heldDeviceItem, items[i]);\r\n " + +" if (s <= 0)\r\n return i;\r\n }\r\n " + +" if (startIndex !== 0) {\r\n for (var i = 0; i < sta" + +"rtIndex; i++) {\r\n var s = sortFunction(heldDeviceItem, it" + +"ems[i]);\r\n if (s <= 0)\r\n retur" + +"n i;\r\n }\r\n return startIndex;\r\n " + +" } else {\r\n return -1;\r\n }\r\n }\r" + +"\n function sortFunction(l, r) {\r\n return l.UserIdFrien" + +"dly.toLowerCase() == r.UserIdFriendly.toLowerCase() ? 0 : (l.UserIdFriendly.toLo" + +"werCase() < r.UserIdFriendly.toLowerCase() ? -1 : 1)\r\n }\r\n " + +" function isInProcess(i) {\r\n return !i.ReadyForReturn && !i.Waiti" + +"ngForUserAction;\r\n }\r\n function isReadyForReturn(i) {\r\n " + +" return i.ReadyForReturn && !i.WaitingForUserAction;\r\n }\r" + +"\n function isWaitingForUserAction(i) {\r\n return i.Wait" + +"ingForUserAction;\r\n }\r\n function getQueryStringParameters(" + +") {\r\n\r\n if (window.location.search.length === 0)\r\n " + +" return null;\r\n\r\n var params = {};\r\n window.lo" + +"cation.search.substr(1).split(\"&\").forEach(function (pair) {\r\n " + +" if (pair === \"\") return;\r\n var parts = pair.split(\"=\");\r\n " + +" params[parts[0]] = parts[1] && decodeURIComponent(parts[1].rep" + +"lace(/\\+/g, \" \"));\r\n });\r\n return params;\r\n " + +" }\r\n\r\n init();\r\n });\r\n \r\n\r\n"); } }