Bug 40504: (QA follow-up): Add 'managed by' filter
This adds a 'Managed by:' filter input on the left side filters. Signed-off-by: Jeremy Evans <Jeremy.Evans@ukhsa.gov.uk> Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@openfifth.co.uk>
This commit is contained in:
parent
2a9e51c9b2
commit
eaf50203b2
|
|
@ -48,6 +48,10 @@
|
|||
<label for="illfilter_patron">Patron:</label>
|
||||
<input type="text" name="illfilter_patron" id="illfilter_patron" />
|
||||
</li>
|
||||
<li>
|
||||
<label for="illfilter_managed_by">Managed by:</label>
|
||||
<input type="text" name="illfilter_managed_by" id="illfilter_managed_by" />
|
||||
</li>
|
||||
</ol>
|
||||
</fieldset>
|
||||
<fieldset class="action">
|
||||
|
|
|
|||
|
|
@ -159,6 +159,7 @@ $(document).ready(function () {
|
|||
},
|
||||
"-or": function () {
|
||||
let patron = $("#illfilter_patron").val();
|
||||
let managed_by = $("#illfilter_managed_by").val();
|
||||
let status = $("#illfilter_status").val();
|
||||
let status_alias = $("#illfilter_status_alias").val();
|
||||
let filters = [];
|
||||
|
|
@ -174,6 +175,13 @@ $(document).ready(function () {
|
|||
subquery_and.push(patronquery);
|
||||
}
|
||||
|
||||
if (managed_by) {
|
||||
let managed_byquery = buildPatronSearchQuery(managed_by, {
|
||||
table_prefix: "manager",
|
||||
});
|
||||
subquery_and.push(managed_byquery);
|
||||
}
|
||||
|
||||
if (status && status.length > 0) {
|
||||
subquery_and.push({ "me.status": { "=": status } });
|
||||
}
|
||||
|
|
@ -270,6 +278,7 @@ $(document).ready(function () {
|
|||
illfilter_datemodified_end: "#illfilter_datemodified_end",
|
||||
illfilter_branchname: "#illfilter_branchname",
|
||||
illfilter_patron: "#illfilter_patron",
|
||||
illfilter_managed_by: "#illfilter_managed_by",
|
||||
};
|
||||
|
||||
let table_id = "#ill-requests";
|
||||
|
|
@ -591,6 +600,7 @@ $(document).ready(function () {
|
|||
"illfilter_backend",
|
||||
"illfilter_branchname",
|
||||
"illfilter_patron",
|
||||
"illfilter_managed_by",
|
||||
"illfilter_keyword",
|
||||
];
|
||||
filters.forEach(filter => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue