diff --git a/server/AyaNova/Controllers/PickListController.cs b/server/AyaNova/Controllers/PickListController.cs
index 878ced22..f2f19a38 100644
--- a/server/AyaNova/Controllers/PickListController.cs
+++ b/server/AyaNova/Controllers/PickListController.cs
@@ -47,9 +47,10 @@ namespace AyaNova.Api.Controllers
///
/// The AyaType object type to select from
/// The query to filter the returned list by
+ /// Include inactive objects in the returned list
/// Filtered list
[HttpGet("List")]
- public async Task GetList([FromQuery]AyaType ayaType, [FromQuery]string query)
+ public async Task GetList([FromQuery]AyaType ayaType, [FromQuery]string query, [FromQuery] bool inactive)
{
if (!serverState.IsOpen)
{
@@ -68,7 +69,7 @@ namespace AyaNova.Api.Controllers
var UserRoles = UserRolesFromContext.Roles(HttpContext.Items);
- var o = await biz.GetPickListAsync(ayaType, query, UserRoles);
+ var o = await biz.GetPickListAsync(ayaType, query, inactive, UserRoles);
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
@@ -96,7 +97,7 @@ namespace AyaNova.Api.Controllers
var o = biz.GetListOfAllPickListTypes(TranslationId);
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
-
+
return Ok(ApiOkResponse.Response(o, true));
}
diff --git a/server/AyaNova/PickList/PickListFetcher.cs b/server/AyaNova/PickList/PickListFetcher.cs
index c2f5837f..a5b80040 100644
--- a/server/AyaNova/PickList/PickListFetcher.cs
+++ b/server/AyaNova/PickList/PickListFetcher.cs
@@ -17,7 +17,7 @@ namespace AyaNova.PickList
{
- internal static async Task> GetResponseAsync(AyaType ayaType, string autoCompleteQuery, AyContext ct, AuthorizationRoles userRoles)
+ internal static async Task> GetResponseAsync(AyaType ayaType, string autoCompleteQuery, bool includeInactive, AyContext ct, AuthorizationRoles userRoles)
{
var PickList = PickListFactory.GetAyaPickList(ayaType);
@@ -55,7 +55,7 @@ namespace AyaNova.PickList
//BUILD THE QUERY
- var q = PickListSqlBuilder.Build(PickList, TemplateColumnNames, autoCompleteQuery);
+ var q = PickListSqlBuilder.Build(PickList, TemplateColumnNames, autoCompleteQuery, includeInactive);
diff --git a/server/AyaNova/biz/PickListBiz.cs b/server/AyaNova/biz/PickListBiz.cs
index 0d725811..cc3da8f9 100644
--- a/server/AyaNova/biz/PickListBiz.cs
+++ b/server/AyaNova/biz/PickListBiz.cs
@@ -56,10 +56,10 @@ namespace AyaNova.Biz
//get picklist
- internal async Task> GetPickListAsync(AyaType ayaType, string query, AuthorizationRoles userRoles)
+ internal async Task> GetPickListAsync(AyaType ayaType, string query, bool inactive, AuthorizationRoles userRoles)
{
- List items = await PickListFetcher.GetResponseAsync(ayaType, query, ct, userRoles);
+ List items = await PickListFetcher.GetResponseAsync(ayaType, query, inactive, ct, userRoles);
return items;
}