admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-01-28 19:55:11 +00:00
parent 20a887612d
commit 1b81188806
6 changed files with 29 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/AyaNova/Controllers/AuthorizationRolesController.cs
View File

@@ -23,7 +23,7 @@ namespace AyaNova.Api.Controllers
public class AuthorizationRolesController : ControllerBase
{
private readonly AyContext ct;
private readonly ILogger<AyaTypeController> log;
private readonly ILogger<AuthorizationRolesController> log;
private readonly ApiServerState serverState;
@@ -33,7 +33,7 @@ namespace AyaNova.Api.Controllers
/// <param name="dbcontext"></param>
/// <param name="logger"></param>
/// <param name="apiServerState"></param>
public AuthorizationRolesController(AyContext dbcontext, ILogger<AyaTypeController> logger, ApiServerState apiServerState)
public AuthorizationRolesController(AyContext dbcontext, ILogger<AuthorizationRolesController> logger, ApiServerState apiServerState)
{
ct = dbcontext;
log = logger;

82
server/AyaNova/Controllers/AyaTypeController.cs
View File

@@ -1,82 +0,0 @@
using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.Logging;
using Microsoft.AspNetCore.Authorization;
using AyaNova.Models;
using AyaNova.Api.ControllerHelpers;
using AyaNova.Biz;
namespace AyaNova.Api.Controllers
{
/// <summary>
/// AyaType list controller
/// </summary>
[ApiController]
[ApiVersion("8.0")]
[Route("api/v{version:apiVersion}/[controller]")]
[Produces("application/json")]
[Authorize]
public class AyaTypeController : ControllerBase
{
private readonly AyContext ct;
private readonly ILogger<AyaTypeController> log;
private readonly ApiServerState serverState;
/// <summary>
/// ctor
/// </summary>
/// <param name="dbcontext"></param>
/// <param name="logger"></param>
/// <param name="apiServerState"></param>
public AyaTypeController(AyContext dbcontext, ILogger<AyaTypeController> logger, ApiServerState apiServerState)
{
ct = dbcontext;
log = logger;
serverState = apiServerState;
}
/// <summary>
/// Get name value list of AyaNova business object types
/// </summary>
/// <returns>List</returns>
[HttpGet]
public ActionResult GetAyaTypes()
{
if (!serverState.IsOpen)
{
return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason));
}
List<NameIdItem> l = new List<NameIdItem>();
var values = Enum.GetValues(typeof(AyaType));
foreach (AyaType t in values)
{
string name = t.ToString();
if (t.HasAttribute(typeof(AttachableAttribute)))
{
name += " [Attachable]";
}
l.Add(new NameIdItem() { Name = name, Id = (long)t });
}
return Ok(ApiOkResponse.Response(l, true));
}
}
}

4
server/AyaNova/Controllers/DataListController.cs
View File

@@ -21,7 +21,7 @@ namespace AyaNova.Api.Controllers
public class DataListController : ControllerBase
{
private readonly AyContext ct;
private readonly ILogger<AyaTypeController> log;
private readonly ILogger<DataListController> log;
private readonly ApiServerState serverState;
@@ -32,7 +32,7 @@ namespace AyaNova.Api.Controllers
/// <param name="dbcontext"></param>
/// <param name="logger"></param>
/// <param name="apiServerState"></param>
public DataListController(AyContext dbcontext, ILogger<AyaTypeController> logger, ApiServerState apiServerState)
public DataListController(AyContext dbcontext, ILogger<DataListController> logger, ApiServerState apiServerState)
{
ct = dbcontext;
log = logger;

26
server/AyaNova/Controllers/AyaEnumPickListController.cs → server/AyaNova/Controllers/EnumPickListController.cs
View File

@@ -20,10 +20,10 @@ namespace AyaNova.Api.Controllers
[Route("api/v{version:apiVersion}/[controller]")]
[Produces("application/json")]
[Authorize]
public class AyaEnumPickListController : ControllerBase
public class EnumPickListController : ControllerBase
{
private readonly AyContext ct;
private readonly ILogger<AyaTypeController> log;
private readonly ILogger<EnumPickListController> log;
private readonly ApiServerState serverState;
@@ -33,7 +33,7 @@ namespace AyaNova.Api.Controllers
/// <param name="dbcontext"></param>
/// <param name="logger"></param>
/// <param name="apiServerState"></param>
public AyaEnumPickListController(AyContext dbcontext, ILogger<AyaTypeController> logger, ApiServerState apiServerState)
public EnumPickListController(AyContext dbcontext, ILogger<EnumPickListController> logger, ApiServerState apiServerState)
{
ct = dbcontext;
log = logger;
@@ -68,12 +68,28 @@ namespace AyaNova.Api.Controllers
Enum.GetName(t, AyaUiFieldDataType.NoType);
foreach (var dt in Enum.GetValues(t))
{
ReturnList.Add(new NameIdItem() { Name = Enum.GetName(t, dt), Id = (int) dt });
ReturnList.Add(new NameIdItem() { Name = Enum.GetName(t, dt), Id = (int)dt });
}
}
break;
case "ayatype":
{
var values = Enum.GetValues(typeof(AyaType));
foreach (AyaType t in values)
{
string name = t.ToString();
if (t.HasAttribute(typeof(AttachableAttribute)))
{
name += " [Attachable]";
}
ReturnList.Add(new NameIdItem() { Name = name, Id = (long)t });
}
}
break;
case "usertypes":
{
LocaleKeysToFetch.Add("UserTypesAdministrator");
@@ -168,7 +184,7 @@ namespace AyaNova.Api.Controllers
List<KeyValuePair<string, string>> ret = new List<KeyValuePair<string, string>>();
ret.Add(new KeyValuePair<string, string>("usertypes", "AyaNova user account types"));
ret.Add(new KeyValuePair<string, string>("authorizationroles", "AyaNova user account role types"));
ret.Add(new KeyValuePair<string, string>("AyaType", "All AyaNova object types, use the AyaTypeController route to fetch these"));
ret.Add(new KeyValuePair<string, string>("ayatype", "All AyaNova object types"));
ret.Add(new KeyValuePair<string, string>("datatypes", "Types of data used in AyaNova for display and formatting UI purposes"));
return Ok(ApiOkResponse.Response(ret, true));

4
server/AyaNova/Controllers/FormFieldsDefinitionsController.cs
View File

@@ -19,7 +19,7 @@ namespace AyaNova.Api.Controllers
public class FormFieldsDefinitionsController : ControllerBase
{
private readonly AyContext ct;
private readonly ILogger<AyaTypeController> log;
private readonly ILogger<FormFieldsDefinitionsController> log;
private readonly ApiServerState serverState;
@@ -29,7 +29,7 @@ namespace AyaNova.Api.Controllers
/// <param name="dbcontext"></param>
/// <param name="logger"></param>
/// <param name="apiServerState"></param>
public FormFieldsDefinitionsController(AyContext dbcontext, ILogger<AyaTypeController> logger, ApiServerState apiServerState)
public FormFieldsDefinitionsController(AyContext dbcontext, ILogger<FormFieldsDefinitionsController> logger, ApiServerState apiServerState)
{
ct = dbcontext;
log = logger;

4
server/AyaNova/Controllers/TagListController.cs
View File

@@ -22,7 +22,7 @@ namespace AyaNova.Api.Controllers
public class TagListController : ControllerBase
{
private readonly AyContext ct;
private readonly ILogger<AyaTypeController> log;
private readonly ILogger<TagListController> log;
private readonly ApiServerState serverState;
@@ -32,7 +32,7 @@ namespace AyaNova.Api.Controllers
/// <param name="dbcontext"></param>
/// <param name="logger"></param>
/// <param name="apiServerState"></param>
public TagListController(AyContext dbcontext, ILogger<AyaTypeController> logger, ApiServerState apiServerState)
public TagListController(AyContext dbcontext, ILogger<TagListController> logger, ApiServerState apiServerState)
{
ct = dbcontext;
log = logger;