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

Fix queue manager

Browse Source 
Added move items
Added client upload
This commit is contained in:
Lucio Maranta
2018-09-11 11:06:54 +02:00
parent b46d043a85
commit dc1093ae11
5 changed files with 150 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/Controllers/WebApi/NcFileController.cs
+32 -15
View File
@@ -170,7 +170,7 @@ namespace Step.Controllers.WebApi
}
List<FormItem> formItems = await MultipartHandler.ManageMultiPartFileAsync(Request);
DTOQueueModel queueItem = new DTOQueueModel();
foreach (FormItem item in formItems)
{
if (item.IsAFile)
@@ -189,7 +189,7 @@ namespace Step.Controllers.WebApi
if (repsParam == null || !Int32.TryParse(repsParam.Value, out int reps))
return BadRequest();
CmsError cmsError = ncHandler.UploadPartProgramAddToQueue(TEMP_FILE, item.FileName, reps, out ActiveProgramDataModel programData);
CmsError cmsError = ncHandler.UploadPartProgramAddToQueue(TEMP_FILE, item.FileName, reps, out queueItem);
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
}
@@ -201,7 +201,7 @@ namespace Step.Controllers.WebApi
}
}
return Ok();
return Ok(queueItem);
}
[Route("queue/{processId:int}/remove/{itemId:int}"), HttpDelete]
@@ -219,38 +219,55 @@ namespace Step.Controllers.WebApi
return Ok();
}
[Route("queue/{processId:int}/swap"), HttpPut]
public IHttpActionResult SwapQueueItems(int processId, SwapItems itemsPositions)
[Route("queue/{processId:int}/move"), HttpPut]
public IHttpActionResult MoveQueueItems(int processId, MoveItems itemsPositions)
{
using (NcHandler ncHandler = new NcHandler())
{
CmsError cmsError = ncHandler.SwapQueueItems(processId, itemsPositions.Item1Position, itemsPositions.Item2Position);
CmsError cmsError = ncHandler.MoveQueueItems(processId, itemsPositions.OldPosition, itemsPositions.NewPosition, out List<DTOQueueModel> queue);
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
}
return Ok();
return Ok(queue);
}
}
[Route("queue/{processId:int}/edit/{positionId:int}"), HttpPut]
public IHttpActionResult EditQueueItem(int processId, int positionId, SwapItems reps)
public IHttpActionResult EditQueueItem(int processId, int positionId, RepsModel reps)
{
using (NcHandler ncHandler = new NcHandler())
{
CmsError cmsError = ncHandler.EditQueueItemReps(processId, positionId, reps.Reps );
CmsError cmsError = ncHandler.EditQueueItemReps(processId, positionId, reps.Reps, out DTOQueueModel queueItem);
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
return Ok(queueItem);
}
return Ok();
}
public class SwapItems
[Route("queue/{processId:int}/empty"), HttpPut]
public IHttpActionResult EmptyQueue(int processId)
{
public int Item1Position;
using (NcHandler ncHandler = new NcHandler())
{
CmsError cmsError = ncHandler.EmptyQueue(processId);
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
public int Item2Position;
return Ok();
}
}
public class MoveItems
{
public int OldPosition;
public int NewPosition;
}
public class RepsModel
{
public int Reps;
}