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

Merge remote-tracking branch 'origin/develop' into feature/Remove_autoinc_from_db

Browse Source
This commit is contained in:
Lucio Maranta
2018-10-04 17:19:41 +02:00
parent 1191750fe6 3239909610
commit f784af225c
106 changed files with 2232 additions and 1223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/Controllers/SignalR/NcHub.cs
+2 -2
View File
@@ -1,10 +1,10 @@
using Microsoft.AspNet.SignalR;
using CMS_CORE_Library.Models;
using Microsoft.AspNet.SignalR;
using Step.Attributes;
using Step.NC;
using System.Collections.Generic;
using System.Threading.Tasks;
using TeamDev.SDK.MVVM;
using static CMS_CORE_Library.DataStructures;
using static Step.Config.ServerConfig;
using static Step.Model.Constants;
using static Step.Model.Constants.FUNCTIONALITY_NAMES;
Step/Controllers/WebApi/ConfigurationController.cs
+2 -3
View File
@@ -1,12 +1,11 @@
using Step.Database.Controllers;
using CMS_CORE_Library.Models;
using Step.Database.Controllers;
using Step.Model.DTOModels;
using Step.NC;
using System.Collections.Generic;
using System.Linq;
using System.Web.Http;
using static CMS_CORE_Library.DataStructures;
using static Step.Config.ServerConfig;
using static Step.Model.Constants;
namespace Step.Controllers.WebApi
{
Step/Controllers/WebApi/LanguageController.cs
+3 -2
View File
@@ -1,9 +1,10 @@
using Step.Model.DTOModels;
using CMS_CORE_Library.Models;
using Step.Model.DTOModels;
using Step.NC;
using System.Collections.Generic;
using System.Linq;
using System.Web.Http;
using static CMS_CORE_Library.DataStructures;
using static CMS_CORE_Library.Models.DataStructures;
using static Step.Config.ServerConfig;
using static Step.Model.Constants;
using static Step.Utils.LanguageController;
Step/Controllers/WebApi/MaintenanceController.cs
+2 -2
View File
@@ -1,4 +1,5 @@
using Newtonsoft.Json;
using CMS_CORE_Library.Models;
using Newtonsoft.Json;
using Step.Database.Controllers;
using Step.Model.DatabaseModels;
using Step.Model.DTOModels.MaintenanceModels;
@@ -16,7 +17,6 @@ using System.Threading;
using System.Threading.Tasks;
using System.Web;
using System.Web.Http;
using static CMS_CORE_Library.DataStructures;
using static Step.Config.ServerConfig;
using static Step.Model.Constants;
Step/Controllers/WebApi/NcApiController.cs
+2 -2
View File
@@ -1,8 +1,8 @@
using Step.Model.DTOModels;
using CMS_CORE_Library.Models;
using Step.Model.DTOModels;
using Step.NC;
using System.Globalization;
using System.Web.Http;
using static CMS_CORE_Library.DataStructures;
using static Step.Model.Constants;
namespace Step.Controllers.WebApi
Step/Controllers/WebApi/NcFileController.cs
+21 -5
View File
@@ -10,10 +10,11 @@ using static Step.Model.Constants;
using System.Text;
using System.Threading.Tasks;
using System.Web.Http;
using static CMS_CORE_Library.DataStructures;
using System.Linq;
using static Step.Config.ServerConfig;
using System.ComponentModel.DataAnnotations;
using CMS_CORE_Library.Models;
using static CMS_CORE_Library.Models.DataStructures;
namespace Step.Controllers.WebApi
{
@@ -50,6 +51,21 @@ namespace Step.Controllers.WebApi
}
}
[Route("file/active/info"), HttpGet]
public IHttpActionResult GetActiveFileInfo([FromUri]string filePath)
{
using (NcHandler ncHandler = new NcHandler())
{
ncHandler.Connect();
CmsError cmsError = ncHandler.GetActiveFileInfo(filePath, out InfoFile fileInfo);
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
return Ok(fileInfo);
}
}
[Route("file/active"), HttpPut]
public IHttpActionResult SetActiveProgram([FromUri]string filePath)
{
@@ -100,9 +116,9 @@ namespace Step.Controllers.WebApi
{
ncHandler.Connect();
File.WriteAllBytes(TEMP_FILE + item.FileName, item.Data);
File.WriteAllBytes(TEMP_PP_FOLDER + item.FileName, item.Data);
CmsError cmsError = ncHandler.UploadPartProgramAndActivate(TEMP_FILE, item.FileName, out ActiveProgramDataModel programData);
CmsError cmsError = ncHandler.UploadPartProgramAndActivate(TEMP_PP_FOLDER, item.FileName, out ActiveProgramDataModel programData);
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
}
@@ -181,7 +197,7 @@ namespace Step.Controllers.WebApi
{
ncHandler.Connect();
File.WriteAllBytes(QUEUE_TMP_FILE + item.FileName, item.Data);
File.WriteAllBytes(QUEUE_TMP_FOLDER + item.FileName, item.Data);
// Get reps
var repsParam = formItems.Where(x => x.ParameterName == "reps").FirstOrDefault();
@@ -189,7 +205,7 @@ namespace Step.Controllers.WebApi
if (repsParam == null || !Int32.TryParse(repsParam.Value, out int reps))
return BadRequest();
CmsError cmsError = ncHandler.UploadPartProgramAndAddToQueue(QUEUE_TMP_FILE, item.FileName, reps, out queueItem);
CmsError cmsError = ncHandler.UploadPartProgramAndAddToQueue(QUEUE_TMP_FOLDER, item.FileName, reps, out queueItem);
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
}
Step/Controllers/WebApi/NcToolManagerController.cs
+11 -3
View File
@@ -1,4 +1,5 @@
using Step.Database.Controllers;
using CMS_CORE_Library.Models;
using Step.Database.Controllers;
using Step.Model.DatabaseModels;
using Step.Model.DTOModels.ToolModels;
using Step.NC;
@@ -7,7 +8,6 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Web.Http;
using static CMS_CORE_Library.DataStructures;
using static Step.Config.ServerConfig;
using static Step.Model.Constants;
@@ -551,6 +551,8 @@ namespace Step.Controllers.WebApi
if (shankId.ShankId == 0)
return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
DTONcShankModel dtoShank = new DTONcShankModel();
// Check data
DbNcShankModel shank;
using (NcToolManagerController toolsManager = new NcToolManagerController())
@@ -586,6 +588,9 @@ namespace Step.Controllers.WebApi
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
dtoShank = toolsManager.GetShank(shank.ShankId);
}
// Update shank data
@@ -593,7 +598,10 @@ namespace Step.Controllers.WebApi
// Set shankId
magazinePos.ShankId = shank.ShankId;
return Ok(magazinePos);
dtoShank.MagazineId = magazineId;
dtoShank.PositionId = positionId;
return Ok(dtoShank);
}
}
Step/Controllers/WebApi/SiemensToolManagerController.cs
+2 -2
View File
@@ -1,4 +1,5 @@
using Step.Model.DatabaseModels;
using CMS_CORE_Library.Models;
using Step.Model.DatabaseModels;
using Step.Model.DTOModels.ToolModels;
using Step.NC;
using System;
@@ -6,7 +7,6 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Web.Http;
using static CMS_CORE_Library.DataStructures;
namespace Step.Controllers.WebApi
{