From c2209e580834f143064767e894a5f4ba8aecb973 Mon Sep 17 00:00:00 2001 From: Lucio Maranta Date: Fri, 28 Sep 2018 11:15:57 +0200 Subject: [PATCH] Refactor job editor models Fix --- Client/Browser_Tools/BrowserJSObject.cs | 56 +++++++++---------- .../Models/Metadata/CustomParam.cs | 6 +- .../Models/Metadata/GenericsParam.cs | 4 +- Client/Browser_Tools/Models/MetadataToFile.cs | 12 ++-- 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Client/Browser_Tools/BrowserJSObject.cs b/Client/Browser_Tools/BrowserJSObject.cs index 910f4fa7..d11c46f2 100644 --- a/Client/Browser_Tools/BrowserJSObject.cs +++ b/Client/Browser_Tools/BrowserJSObject.cs @@ -27,7 +27,7 @@ namespace CMS_Client.Browser_Tools // The first letter of All PUBLIC Variables and Methods must be Lower-Case (CEF Settings) private MainForm mainForm; - private static readonly string[] _validExtensions = { "", ".txt", ".cnc", ".ini", ".mpf", ".spf", ".job" }; + private static readonly string[] _validExtensions = { "", ".txt", ".cnc", ".ini", ".mpf", ".spf", ".job", ".zip" }; private static readonly string[] _validImages = { ".jpg", ".jpeg", ".png" }; private static string jobPath = ""; @@ -72,8 +72,8 @@ namespace CMS_Client.Browser_Tools AddFunction("delImageFromJob").Execute += delImageFromJob; AddFunction("addPPToJob").Execute += addPPToJob; AddFunction("delPPFromJob").Execute += delPPFromJob; - AddFunction("getJobMetadata").Execute += getJobMetadata; - AddFunction("saveJobMetadata").Execute += saveJobMetadata; + AddFunction("readJobMetadata").Execute += readJobMetadata; + AddFunction("updateJobMetadata").Execute += updateJobMetadata; } #endregion CONSTRUCTOR_METHOD @@ -328,7 +328,7 @@ namespace CMS_Client.Browser_Tools { if (_validExtensions.Contains(Path.GetExtension(item).ToLower())) { - bool isJob = Path.GetExtension(item) == "job"; + bool isJob = Path.GetExtension(item) == "job" || Path.GetExtension(item) == "zip"; filelist.Add(new Models.File { Name = Path.GetFileName(item), @@ -360,7 +360,7 @@ namespace CMS_Client.Browser_Tools //Check the arguments numbers if (e.Arguments.Length < 1 || e.Arguments[0] == null) { - e.SetReturnValue(Constants.UPLOAD_PAGE + "INVALID_ARGUMENTS"); + e.SetReturnValue(UPLOAD_PAGE + "INVALID_ARGUMENTS"); return; } @@ -576,7 +576,7 @@ namespace CMS_Client.Browser_Tools #region JOB_METHODS - // Read job data + // Read all the job data public void openJob(object sender, CfrV8HandlerExecuteEventArgs e) { JobToStep job = new JobToStep(); @@ -640,10 +640,10 @@ namespace CMS_Client.Browser_Tools } else { - job.metadata.generics.Description = metasFromFile.Description; - job.metadata.generics.ExecutionTime = metasFromFile.ExecutionTime; - job.metadata.tools = metasFromFile.Tools; - job.metadata.customs = metasFromFile.Customs; + job.metadata.generics.description = metasFromFile.description; + job.metadata.generics.executionTime = metasFromFile.executionTime; + job.metadata.tools = metasFromFile.tools; + job.metadata.customs = metasFromFile.customs; } } } @@ -665,7 +665,7 @@ namespace CMS_Client.Browser_Tools } } - public void getJobMetadata(object sender, CfrV8HandlerExecuteEventArgs e) + public void readJobMetadata(object sender, CfrV8HandlerExecuteEventArgs e) { // Get file path string filePath = e.Arguments[0].StringValue; @@ -717,10 +717,10 @@ namespace CMS_Client.Browser_Tools } else { - jobData.metadata.generics.Description = metasFromFile.Description; - jobData.metadata.generics.ExecutionTime = metasFromFile.ExecutionTime; - jobData.metadata.tools = metasFromFile.Tools; - jobData.metadata.customs = metasFromFile.Customs; + jobData.metadata.generics.description = metasFromFile.description; + jobData.metadata.generics.executionTime = metasFromFile.executionTime; + jobData.metadata.tools = metasFromFile.tools; + jobData.metadata.customs = metasFromFile.customs; } } } @@ -732,7 +732,7 @@ namespace CMS_Client.Browser_Tools } } - public void saveJobMetadata(object sender, CfrV8HandlerExecuteEventArgs e) + public void updateJobMetadata(object sender, CfrV8HandlerExecuteEventArgs e) { MetadataToFile metafile = new MetadataToFile(); @@ -745,10 +745,10 @@ namespace CMS_Client.Browser_Tools } // Set meta data - metafile.Description = job.metadata.generics.Description; - metafile.ExecutionTime = job.metadata.generics.ExecutionTime; - metafile.Tools = job.metadata.tools; - metafile.Customs = job.metadata.customs; + metafile.description = job.metadata.generics.description; + metafile.executionTime = job.metadata.generics.executionTime; + metafile.tools = job.metadata.tools; + metafile.customs = job.metadata.customs; // Open zipArchive in update mode using (ZipArchive zipArchive = ZipFile.Open(e.Arguments[0].StringValue, ZipArchiveMode.Update)) @@ -826,10 +826,10 @@ namespace CMS_Client.Browser_Tools } //Metadata - metafile.Description = job.metadata.generics.Description; - metafile.ExecutionTime = job.metadata.generics.ExecutionTime; - metafile.Tools = job.metadata.tools; - metafile.Customs = job.metadata.customs; + metafile.description = job.metadata.generics.description; + metafile.executionTime = job.metadata.generics.executionTime; + metafile.tools = job.metadata.tools; + metafile.customs = job.metadata.customs; using (StreamWriter file = System.IO.File.CreateText(JOB_OPENING_PATH + JOB_METADATA_FILENAME)) { @@ -895,10 +895,10 @@ namespace CMS_Client.Browser_Tools if (!String.IsNullOrEmpty(jobPath)) { //Metadata - metafile.Description = job.metadata.generics.Description; - metafile.ExecutionTime = job.metadata.generics.ExecutionTime; - metafile.Tools = job.metadata.tools; - metafile.Customs = job.metadata.customs; + metafile.description = job.metadata.generics.description; + metafile.executionTime = job.metadata.generics.executionTime; + metafile.tools = job.metadata.tools; + metafile.customs = job.metadata.customs; using (StreamWriter file = System.IO.File.CreateText(JOB_OPENING_PATH + JOB_METADATA_FILENAME)) { JsonSerializer serializer = new JsonSerializer diff --git a/Client/Browser_Tools/Models/Metadata/CustomParam.cs b/Client/Browser_Tools/Models/Metadata/CustomParam.cs index 13774abc..efe1dd16 100644 --- a/Client/Browser_Tools/Models/Metadata/CustomParam.cs +++ b/Client/Browser_Tools/Models/Metadata/CustomParam.cs @@ -8,10 +8,10 @@ namespace CMS_Client.Browser_Tools.Models.Metadata { public class CustomParam { - public string Name; - public string Type; + public string name; + public string type; public List selectionList; - public int Value; + public int value; public CustomParam() { diff --git a/Client/Browser_Tools/Models/Metadata/GenericsParam.cs b/Client/Browser_Tools/Models/Metadata/GenericsParam.cs index d18ba2ae..a4262461 100644 --- a/Client/Browser_Tools/Models/Metadata/GenericsParam.cs +++ b/Client/Browser_Tools/Models/Metadata/GenericsParam.cs @@ -9,8 +9,8 @@ namespace CMS_Client.Browser_Tools.Models.Metadata public class GenericsParam { public List images; - public string Description; - public TimeSpan ExecutionTime; + public string description; + public TimeSpan executionTime; public GenericsParam() { diff --git a/Client/Browser_Tools/Models/MetadataToFile.cs b/Client/Browser_Tools/Models/MetadataToFile.cs index d17d5706..673460c9 100644 --- a/Client/Browser_Tools/Models/MetadataToFile.cs +++ b/Client/Browser_Tools/Models/MetadataToFile.cs @@ -9,15 +9,15 @@ namespace CMS_Client.Browser_Tools.Models { public class MetadataToFile { - public string Description; - public TimeSpan ExecutionTime; - public List Tools; - public List Customs; + public string description; + public TimeSpan executionTime; + public List tools; + public List customs; public MetadataToFile() { - Tools = new List(); - Customs = new List(); + tools = new List(); + customs = new List(); } } }