Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

Browse Source
This commit is contained in:
Nicola Carminati
2018-05-09 10:51:01 +02:00
parent 7d23e417b7 54cdb69cb0
commit dbd7e1ac98
1 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/Controllers/WebApi/ToolTableController.cs
+29 -18
View File
@@ -147,12 +147,39 @@ namespace Step.Controllers.WebApi
}
[Route("family"), HttpPost]
public IHttpActionResult AddFamily([FromBody] dynamic body)
public IHttpActionResult AddFamily([FromBody] DTOFamilyModel family)
{
if (String.IsNullOrEmpty(family.Name))
return BadRequest();
using (NcHandler ncHandler = new NcHandler())
{
ncHandler.Connect();
CmsError libraryError = ncHandler.AddFamily(body.name.ToString(), out FamilyModel family);
CmsError libraryError = ncHandler.AddFamily(family.Name, out FamilyModel newFamily);
if (libraryError.IsError())
if (libraryError.errorCode != CMS_ERROR_CODES.NOT_CONNECTED)
return BadRequest(libraryError.message);
return Ok(newFamily);
}
}
public struct DTOFamilyModel
{
public string Name;
}
[Route("family/{oldName}"), HttpPut]
public IHttpActionResult PutFamily(string oldName, [FromBody]DTOFamilyModel family)
{
if (String.IsNullOrEmpty(family.Name))
return BadRequest();
using (NcHandler ncHandler = new NcHandler())
{
ncHandler.Connect();
CmsError libraryError = ncHandler.UpdateFamilyName(oldName, family.Name);
if (libraryError.IsError())
if (libraryError.errorCode != CMS_ERROR_CODES.NOT_CONNECTED)
return BadRequest(libraryError.message);
@@ -161,22 +188,6 @@ namespace Step.Controllers.WebApi
}
}
[Route("family/{oldName}"), HttpPut]
public IHttpActionResult PutFamily(string oldName, [FromBody]dynamic body)
{
using (NcHandler ncHandler = new NcHandler())
{
ncHandler.Connect();
CmsError libraryError = ncHandler.UpdateFamilyName(oldName, body.name.ToString());
if (libraryError.IsError())
if (libraryError.errorCode != CMS_ERROR_CODES.NOT_CONNECTED)
return BadRequest(libraryError.message);
return Ok();
}
}
[Route("family/{name}"), HttpDelete]
public IHttpActionResult DeleteFamily(string name)
{