jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolves #179: filter noticeboard by job queue

Browse Source
This commit is contained in:
Gary Sharp
2025-10-31 17:45:04 +11:00
parent 8424a9a9a2
commit 529bba5c72
17 changed files with 582 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/Public/Views/HeldDevices/Index.cshtml
+1 -1
View File
@@ -14,7 +14,7 @@
{
<tr>
<td class="id">
@item.DeviceComputerNameFriendly
@item.DeviceName
</td>
<td class="description">
@if (item.UserId != null)
Disco.Web/Areas/Public/Views/HeldDevices/Index.generated.cs
+9 -9
View File
@@ -114,7 +114,7 @@ WriteLiteral(" ");
#line 17 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.DeviceComputerNameFriendly);
Write(item.DeviceName);
#line default
@@ -448,15 +448,15 @@ WriteLiteral("\r\n");
#line hidden
WriteLiteral(" </td>\r\n <td");
WriteAttribute("class", Tuple.Create(" class=\"", 3397), Tuple.Create("\"", 3455)
, Tuple.Create(Tuple.Create("", 3405), Tuple.Create("timestamp", 3405), true)
WriteAttribute("class", Tuple.Create(" class=\"", 3381), Tuple.Create("\"", 3439)
, Tuple.Create(Tuple.Create("", 3389), Tuple.Create("timestamp", 3389), true)
#line 81 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
, Tuple.Create(Tuple.Create("", 3414), Tuple.Create<System.Object, System.Int32>(item.IsAlert ? " Alert" : string.Empty
, Tuple.Create(Tuple.Create("", 3398), Tuple.Create<System.Object, System.Int32>(item.IsAlert ? " Alert" : string.Empty
#line default
#line hidden
, 3414), false)
, 3398), false)
);
WriteLiteral(">Since ");
@@ -650,15 +650,15 @@ WriteLiteral("\r\n");
#line hidden
WriteLiteral(" </td>\r\n <td");
WriteAttribute("class", Tuple.Create(" class=\"", 5022), Tuple.Create("\"", 5080)
, Tuple.Create(Tuple.Create("", 5030), Tuple.Create("timestamp", 5030), true)
WriteAttribute("class", Tuple.Create(" class=\"", 5006), Tuple.Create("\"", 5064)
, Tuple.Create(Tuple.Create("", 5014), Tuple.Create("timestamp", 5014), true)
#line 119 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
, Tuple.Create(Tuple.Create("", 5039), Tuple.Create<System.Object, System.Int32>(item.IsAlert ? " Alert" : string.Empty
, Tuple.Create(Tuple.Create("", 5023), Tuple.Create<System.Object, System.Int32>(item.IsAlert ? " Alert" : string.Empty
#line default
#line hidden
, 5039), false)
, 5023), false)
);
WriteLiteral(">Ready ");
Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.cshtml
+36
View File
@@ -353,6 +353,42 @@
});
}
break;
case 'jobqueueinclude': // FILTER: Job Queue Include
var jobQueues = value.split(",").map(function (v) { return parseInt(v); });
if (jobQueues.length > 0) {
filters.push(function (heldDeviceItem) {
// true if any JobQueueId is included
if (!heldDeviceItem.JobQueueIds)
return false; // not in any queues
var include = false;
$.each(jobQueues, function (i, v) {
if ($.inArray(v, heldDeviceItem.JobQueueIds) >= 0) {
include = true;
return false; // break
}
});
return include;
});
}
break;
case 'jobqueueexclude': // FILTER: Job Queue Exclude
var jobQueues = value.split(",").map(function (v) { return parseInt(v); });
if (jobQueues.length > 0) {
filters.push(function (heldDeviceItem) {
// true if any JobQueueId is excluded
if (!heldDeviceItem.JobQueueIds)
return true; // not in any queues
var exclude = false;
$.each(jobQueues, function (i, v) {
if ($.inArray(v, heldDeviceItem.JobQueueIds) >= 0) {
exclude = true;
return false; // break
}
});
return !exclude;
});
}
break;
}
});
Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.generated.cs
+81 -51
View File
@@ -409,58 +409,88 @@ WriteLiteral(">\r\n <li data-bind=\"css: { alert: IsAlert }\">\r\n
"luded\r\n return $.inArray(heldDeviceItem.D" +
"eviceProfileId, deviceProfiles) < 0;\r\n });\r\n " +
" }\r\n break;\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\r\n function connectionError() {\r\n try {\r\n " +
" $(\'body\').addClass(\'status-error\');\r\n } catch (e) {\r" +
"\n // Ignore\r\n }\r\n\r\n window.setT" +
"imeout(function () {\r\n window.location.reload(true);\r\n " +
" }, 10000);\r\n }\r\n\r\n // Helpers\r\n functi" +
"on 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 ko" +
"Array.sort(sortFunction);\r\n\r\n // Don\'t rotate if small & sort" +
"ed 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 removeItemFromA" +
"rray(koArray, deviceSerialNumber) {\r\n var items = koArray();\r\n " +
" for (var i = 0; i < items.length; i++) {\r\n if (i" +
"tems[i].DeviceSerialNumber == deviceSerialNumber) {\r\n koA" +
"rray.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" +
" case \'jobqueueinclude\': // FILTER: Job Queue Include\r\n " +
" var jobQueues = value.split(\",\").map(function (v) { " +
"return parseInt(v); });\r\n if (jobQueues.length > " +
"0) {\r\n filters.push(function (heldDeviceItem)" +
" {\r\n // true if any JobQueueId is include" +
"d\r\n if (!heldDeviceItem.JobQueueIds)\r\n " +
" return false; // not in any queues\r\n " +
" var include = false;\r\n " +
" $.each(jobQueues, function (i, v) {\r\n " +
" if ($.inArray(v, heldDeviceItem.JobQueueIds) >= 0) {\r\n " +
" include = true;\r\n " +
" return false; // break\r\n " +
" }\r\n });\r\n " +
" return include;\r\n });\r" +
"\n }\r\n break;\r\n " +
" case \'jobqueueexclude\': // FILTER: Job Queue Exclude\r\n " +
" var jobQueues = value.split(\",\").map(function (v) " +
"{ return parseInt(v); });\r\n if (jobQueues.length " +
"> 0) {\r\n filters.push(function (heldDeviceIte" +
"m) {\r\n // true if any JobQueueId is exclu" +
"ded\r\n if (!heldDeviceItem.JobQueueIds)\r\n " +
" return true; // not in any queues\r\n " +
" var exclude = false;\r\n " +
" $.each(jobQueues, function (i, v) {\r\n " +
" if ($.inArray(v, heldDeviceItem.JobQueueIds) >= 0) {\r\n " +
" exclude = true;\r\n " +
" return false; // break\r\n " +
" }\r\n });\r\n " +
" return !exclude;\r\n })" +
";\r\n }\r\n break;\r\n " +
" }\r\n });\r\n\r\n if (filt" +
"ers.length > 0)\r\n itemFilters = filters;\r\n " +
" else\r\n itemFilters = null;\r\n }\r\n " +
" }\r\n\r\n function connectionError() {\r\n try {\r\n " +
" $(\'body\').addClass(\'status-error\');\r\n } catch (e" +
") {\r\n // Ignore\r\n }\r\n\r\n window." +
"setTimeout(function () {\r\n window.location.reload(true);\r\n " +
" }, 10000);\r\n }\r\n\r\n // Helpers\r\n fu" +
"nction rotateArray(koArray, element) {\r\n var items = koArray();\r\n" +
"\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, heldDeviceItem) {\r" +
"\n var items = koArray();\r\n var startIndex = findUn" +
"sortedArrayTopIndex(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 (va" +
"r i = 0; i < startIndex; i++) {\r\n var s = sortFunction(he" +
"ldDeviceItem, items[i]);\r\n if (s <= 0)\r\n " +
" return i;\r\n }\r\n return startInd" +
"ex;\r\n } else {\r\n return -1;\r\n }" +
"\r\n }\r\n function sortFunction(l, r) {\r\n retu" +
"rn 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 functio" +
"n isReadyForReturn(i) {\r\n return i.ReadyForReturn && !i.WaitingFo" +
"rUserAction;\r\n }\r\n function isWaitingForUserAction(i) {\r\n " +
" return i.WaitingForUserAction;\r\n }\r\n functi" +
"on getQueryStringParameters() {\r\n\r\n if (window.location.search.le" +
"ngth === 0)\r\n return null;\r\n\r\n var params = {}" +
";\r\n window.location.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] && dec" +
"odeURIComponent(parts[1].replace(/\\+/g, \" \"));\r\n });\r\n " +
" return params;\r\n }\r\n\r\n init();\r\n });\r\n </sc" +
"ript>\r\n</body>\r\n</html>\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 removeItemF" +
"romArray(koArray, deviceSerialNumber) {\r\n var items = koArray();\r" +
"\n for (var i = 0; i < items.length; i++) {\r\n i" +
"f (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, heldDeviceItem" +
") {\r\n var items = koArray();\r\n var startIndex = fi" +
"ndUnsortedArrayTopIndex(items);\r\n for (var i = startIndex; i < it" +
"ems.length; i++) {\r\n var s = sortFunction(heldDeviceItem, ite" +
"ms[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 = sortFunctio" +
"n(heldDeviceItem, items[i]);\r\n if (s <= 0)\r\n " +
" return i;\r\n }\r\n return star" +
"tIndex;\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 retu" +
"rn !i.ReadyForReturn && !i.WaitingForUserAction;\r\n }\r\n fun" +
"ction isReadyForReturn(i) {\r\n return i.ReadyForReturn && !i.Waiti" +
"ngForUserAction;\r\n }\r\n function isWaitingForUserAction(i) " +
"{\r\n return i.WaitingForUserAction;\r\n }\r\n fu" +
"nction getQueryStringParameters() {\r\n\r\n if (window.location.searc" +
"h.length === 0)\r\n return null;\r\n\r\n var params " +
"= {};\r\n window.location.search.substr(1).split(\"&\").forEach(funct" +
"ion (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 " +
"</script>\r\n</body>\r\n</html>\r\n");
}
}