diff --git a/Client/Browser_Tools/BrowserJSObject.cs b/Client/Browser_Tools/BrowserJSObject.cs index ccbe27ac..dcaeba59 100644 --- a/Client/Browser_Tools/BrowserJSObject.cs +++ b/Client/Browser_Tools/BrowserJSObject.cs @@ -320,13 +320,17 @@ namespace CMS_Client.Browser_Tools foreach (String item in Directory.GetFiles(p)) { if (_validExtensions.Contains(Path.GetExtension(item).ToLower())) + { + bool isJob = Path.GetExtension(item) == "job"; filelist.Add(new Models.File { Name = Path.GetFileName(item), AbsolutePath = Path.GetFullPath(item), Path = Path.GetFullPath(item), - IsDirectory = false + IsDirectory = false, + IsJob = isJob }); + } } } catch (Exception ex) @@ -565,13 +569,15 @@ namespace CMS_Client.Browser_Tools #region JOB_METHODS - // Read all job + // Read job data public void openJob(object sender, CfrV8HandlerExecuteEventArgs e) { JobToStep job = new JobToStep(); - OpenFileDialog jobOpenFileDialog = new OpenFileDialog(); - jobOpenFileDialog.Filter = "CMS Job Files(*.JOB,*.ZIP)|*.job;*.zip"; - jobOpenFileDialog.Multiselect = false; + OpenFileDialog jobOpenFileDialog = new OpenFileDialog + { + Filter = "CMS Job Files(*.JOB,*.ZIP)|*.job;*.zip", + Multiselect = false + }; if (jobOpenFileDialog.ShowDialog() == DialogResult.OK) { @@ -588,7 +594,7 @@ namespace CMS_Client.Browser_Tools foreach (ZipArchiveEntry entry in archive.Entries) { - // Main program + // Get main program content if (entry.Name.Equals(JOB_MAIN_FILENAME, StringComparison.OrdinalIgnoreCase)) { using (var reader = new StreamReader(entry.Open())) @@ -605,7 +611,7 @@ namespace CMS_Client.Browser_Tools { entry.Open().CopyTo(memstream); bytes = memstream.ToArray(); - job.Metadata.Generics.Images.Add(new Image_param() + job.Metadata.Generics.Images.Add(new ImageParam() { Name = Path.GetFileNameWithoutExtension(entry.Name), Base64 = "data:image/" + Path.GetExtension(entry.Name).ToLower().TrimStart('.') + ";base64," + Convert.ToBase64String(bytes) @@ -634,7 +640,7 @@ namespace CMS_Client.Browser_Tools } } } - //All other files + // All other files else { entry.ExtractToFile(JOB_OPENING_PATH + entry.Name, true); @@ -680,8 +686,10 @@ namespace CMS_Client.Browser_Tools metafile.Customs = job.Metadata.Customs; using (StreamWriter file = System.IO.File.CreateText(JOB_OPENING_PATH + JOB_METADATA_FILENAME)) { - JsonSerializer serializer = new JsonSerializer(); - serializer.Formatting = Formatting.Indented; + JsonSerializer serializer = new JsonSerializer + { + Formatting = Formatting.Indented + }; serializer.Serialize(file, metafile); } @@ -720,7 +728,7 @@ namespace CMS_Client.Browser_Tools System.IO.File.Copy(imageOpenFileDialog.FileName, newImagePath); //Send to Step - e.SetReturnValue(JsonConvert.SerializeObject(new Image_param() + e.SetReturnValue(JsonConvert.SerializeObject(new ImageParam() { Name = Path.GetFileNameWithoutExtension(imageOpenFileDialog.FileName), Base64 = "data:image/" + Path.GetExtension(newImagePath).ToLower().TrimStart('.') + ";base64," + Convert.ToBase64String(System.IO.File.ReadAllBytes(newImagePath)) diff --git a/Client/Browser_Tools/Models/File.cs b/Client/Browser_Tools/Models/File.cs index 2bb3236c..4710cdb0 100644 --- a/Client/Browser_Tools/Models/File.cs +++ b/Client/Browser_Tools/Models/File.cs @@ -8,9 +8,10 @@ namespace CMS_Client.Browser_Tools.Models { public class File { - public String Name; - public String AbsolutePath; - public String Path; - public Boolean IsDirectory; + public string Name; + public string AbsolutePath; + public string Path; + public bool IsDirectory; + public bool IsJob; } } diff --git a/Client/Browser_Tools/Models/Metadata/Custom_Param.cs b/Client/Browser_Tools/Models/Metadata/CustomParam.cs similarity index 80% rename from Client/Browser_Tools/Models/Metadata/Custom_Param.cs rename to Client/Browser_Tools/Models/Metadata/CustomParam.cs index 8ba0f1f2..c1fa013d 100644 --- a/Client/Browser_Tools/Models/Metadata/Custom_Param.cs +++ b/Client/Browser_Tools/Models/Metadata/CustomParam.cs @@ -1,20 +1,21 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CMS_Client.Browser_Tools.Models.Metadata -{ - public class Custom_Param - { - public string Name; - public string Type; - public List SelectionList; - - public Custom_Param() - { - SelectionList = new List(); - } - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CMS_Client.Browser_Tools.Models.Metadata +{ + public class CustomParam + { + public string Name; + public string Type; + public List SelectionList; + public int Value; + + public CustomParam() + { + SelectionList = new List(); + } + } +} diff --git a/Client/Browser_Tools/Models/Metadata/Generic_Params.cs b/Client/Browser_Tools/Models/Metadata/GenericsParam.cs similarity index 62% rename from Client/Browser_Tools/Models/Metadata/Generic_Params.cs rename to Client/Browser_Tools/Models/Metadata/GenericsParam.cs index 1478b9bb..6484626c 100644 --- a/Client/Browser_Tools/Models/Metadata/Generic_Params.cs +++ b/Client/Browser_Tools/Models/Metadata/GenericsParam.cs @@ -1,20 +1,20 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CMS_Client.Browser_Tools.Models.Metadata -{ - public class Generic_Params - { - public List Images; - public string Description; - public TimeSpan ExecutionTime; - - public Generic_Params() - { - Images = new List(); - } - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CMS_Client.Browser_Tools.Models.Metadata +{ + public class GenericsParam + { + public List Images; + public string Description; + public TimeSpan ExecutionTime; + + public GenericsParam() + { + Images = new List(); + } + } +} diff --git a/Client/Browser_Tools/Models/Metadata/Image_param.cs b/Client/Browser_Tools/Models/Metadata/ImageParam.cs similarity index 85% rename from Client/Browser_Tools/Models/Metadata/Image_param.cs rename to Client/Browser_Tools/Models/Metadata/ImageParam.cs index 01a4fcb6..a91005e8 100644 --- a/Client/Browser_Tools/Models/Metadata/Image_param.cs +++ b/Client/Browser_Tools/Models/Metadata/ImageParam.cs @@ -1,14 +1,14 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CMS_Client.Browser_Tools.Models.Metadata -{ - public class Image_param - { - public string Name; - public string Base64; - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CMS_Client.Browser_Tools.Models.Metadata +{ + public class ImageParam + { + public string Name; + public string Base64; + } +} diff --git a/Client/Browser_Tools/Models/Metadata/Metas.cs b/Client/Browser_Tools/Models/Metadata/Metas.cs index 4d2356dc..3f07a344 100644 --- a/Client/Browser_Tools/Models/Metadata/Metas.cs +++ b/Client/Browser_Tools/Models/Metadata/Metas.cs @@ -8,15 +8,15 @@ namespace CMS_Client.Browser_Tools.Models.Metadata { public class Metas { - public Generic_Params Generics; + public GenericsParam Generics; public List Tools; - public List Customs; + public List Customs; public Metas() { - Generics = new Generic_Params(); + Generics = new GenericsParam(); Tools = new List(); - Customs = new List(); + Customs = new List(); } } } diff --git a/Client/Browser_Tools/Models/MetadataToFile.cs b/Client/Browser_Tools/Models/MetadataToFile.cs index 94c5d338..d17d5706 100644 --- a/Client/Browser_Tools/Models/MetadataToFile.cs +++ b/Client/Browser_Tools/Models/MetadataToFile.cs @@ -12,12 +12,12 @@ namespace CMS_Client.Browser_Tools.Models public string Description; public TimeSpan ExecutionTime; public List Tools; - public List Customs; + public List Customs; public MetadataToFile() { Tools = new List(); - Customs = new List(); + Customs = new List(); } } } diff --git a/Client/Client.csproj b/Client/Client.csproj index 877ac70e..e9b071e2 100644 --- a/Client/Client.csproj +++ b/Client/Client.csproj @@ -158,9 +158,9 @@ - - - + + + diff --git a/Step.Config/Config/toolManagerConfig.xml b/Step.Config/Config/toolManagerConfig.xml index cd5ac029..97c13789 100644 --- a/Step.Config/Config/toolManagerConfig.xml +++ b/Step.Config/Config/toolManagerConfig.xml @@ -4,7 +4,7 @@ false false true - true + false true true true diff --git a/Step.Database/Controllers/QueueController.cs b/Step.Database/Controllers/QueueController.cs index 98b49fae..dc0c9d9e 100644 --- a/Step.Database/Controllers/QueueController.cs +++ b/Step.Database/Controllers/QueueController.cs @@ -102,5 +102,14 @@ namespace Step.Database.Controllers QueueRunningIndexes[entity.Process] = entity.Id - 1; } } + + public void UpdateQueueIdsAndSave(int processId) + { + // Fix new ids + for (int i = 0; i < PartProgramQueue[processId].Count(); i++) + PartProgramQueue[processId][i].Id = i + 1; + + UpdateQueue(); + } } } diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs index 838d69aa..04180c34 100644 --- a/Step.NC/NcHandler.cs +++ b/Step.NC/NcHandler.cs @@ -400,15 +400,15 @@ namespace Step.NC // Add in the new position PartProgramQueue[processId].Insert(newIndex, item); - // Insert new ids + // Fix new ids for (int i = 0; i < PartProgramQueue[processId].Count(); i++) PartProgramQueue[processId][i].Id = i + 1; + + using (QueueController queueController = new QueueController()) + queueController.UpdateQueueIdsAndSave(processId); queue = PartProgramQueue[processId]; - using (QueueController queueController = new QueueController()) - queueController.UpdateQueue(); - return NO_ERROR; } @@ -451,10 +451,11 @@ namespace Step.NC if (tmpQueueItem != null) PartProgramQueue[processId].Remove(tmpQueueItem); } - - // Update db + + // Update database data using (QueueController queueController = new QueueController()) - queueController.DeleteItem(processId, id); + queueController.UpdateQueueIdsAndSave(processId); + return NO_ERROR; } diff --git a/Step/Controllers/WebApi/NcFileController.cs b/Step/Controllers/WebApi/NcFileController.cs index 7e6f38a4..e96cba39 100644 --- a/Step/Controllers/WebApi/NcFileController.cs +++ b/Step/Controllers/WebApi/NcFileController.cs @@ -227,7 +227,6 @@ namespace Step.Controllers.WebApi CmsError cmsError = ncHandler.MoveQueueItems(processId, itemsPositions.ObjectId, itemsPositions.NewPosition, out List queue); if (cmsError.IsError()) return BadRequest(cmsError.localizationKey); - return Ok(queue); } @@ -238,6 +237,9 @@ namespace Step.Controllers.WebApi { using (NcHandler ncHandler = new NcHandler()) { + if (reps.Reps < 1) + return BadRequest(INCORRECT_PARAMETERS_ERROR.localizationKey); + CmsError cmsError = ncHandler.EditQueueItemReps(processId, itemId, reps.Reps, out DTOQueueModel queueItem); if (cmsError.IsError()) return BadRequest(cmsError.localizationKey);