diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll index 48d3a764..1f68ea67 100644 Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ diff --git a/Step.Core/ThreadsFunctions.cs b/Step.Core/ThreadsFunctions.cs index a050b7a1..5547be46 100644 --- a/Step.Core/ThreadsFunctions.cs +++ b/Step.Core/ThreadsFunctions.cs @@ -756,7 +756,7 @@ public static class ThreadsFunctions sw.Stop(); // Wait - Thread.Sleep(CalcSleepTime(500, (int)sw.ElapsedMilliseconds)); + Thread.Sleep(CalcSleepTime(500, (int)sw.ElapsedMilliseconds)); } } catch (ThreadAbortException) diff --git a/Step.Model/DTOModels/DTOProcessDataModel.cs b/Step.Model/DTOModels/DTOProcessDataModel.cs index 0d542381..76af77c3 100644 --- a/Step.Model/DTOModels/DTOProcessDataModel.cs +++ b/Step.Model/DTOModels/DTOProcessDataModel.cs @@ -58,7 +58,7 @@ namespace Step.Model.DTOModels return true; } - public override int GetHashCode() + public override int GetHashCode() { return base.GetHashCode(); } diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs index 28994ec3..aa3c4bfe 100644 --- a/Step.NC/NcHandler.cs +++ b/Step.NC/NcHandler.cs @@ -438,11 +438,9 @@ namespace Step.NC queueList = new List(); // Check if there is already a pp queue - if (!PartProgramQueue.ContainsKey(selectedProcess)) - return INCORRECT_PARAMETERS_ERROR; - - // Add new process to - queueList = PartProgramQueue[selectedProcess]; + if (PartProgramQueue.ContainsKey(selectedProcess)) + // return INCORRECT_PARAMETERS_ERROR; + queueList = PartProgramQueue[selectedProcess]; return NO_ERROR; } @@ -903,12 +901,13 @@ namespace Step.NC if (cmsError.IsError()) return cmsError; - // Get selectedProcessData + + //// Get selectedProcessData SelectedProcessData selectedData = new SelectedProcessData(); - cmsError = numericalControl.PROC_RSelectedProcessData(processesData.SelectedProcess, ref selectedData); - if(cmsError.IsError()) - return cmsError; - + //cmsError = numericalControl.PROC_RSelectedProcessData(processesData.SelectedProcess, ref selectedData); + //if (cmsError.IsError()) + // return cmsError; + // Set data processesData.QueueStatus = queueStatus.Status; processesData.StartStopQueueEnabled = queueStatus.StartStopQueueEnabled; diff --git a/Step/Controllers/WebApi/ReportController.cs b/Step/Controllers/WebApi/ReportController.cs index 8b0ee35c..3834438e 100644 --- a/Step/Controllers/WebApi/ReportController.cs +++ b/Step/Controllers/WebApi/ReportController.cs @@ -132,5 +132,42 @@ namespace Step.Controllers.WebApi [XmlArrayItem("date", typeof(DTOTimelineDateElement))] public List Occurrences { get; set; } } + + + // Histogram + + public class DTOHistogramModel + { + [XmlArray("programs")] + [XmlArrayItem("program", typeof(DTOTimelineDateElement))] + public List Occurrences { get; set; } + } + + public class DTOHistogramItemModel + { + [XmlElement("name")] + public string ProgName { get; set; } + + [XmlElement("quantity")] + public int Quantity { get; set; } + + [XmlElement("startDate")] + public DateTime StartDate { get; set; } + + [XmlElement("endDate")] + public DateTime EndDate { get; set; } + + [XmlElement("actualT")] + public string ActualT { get; set; } + + [XmlElement("averageT")] + public string AverageT { get; set; } + + [XmlElement("theoricT")] + public string TheoricT { get; set; } + + [XmlElement("deviation")] + public string Deviation { get; set; } + } } } diff --git a/Step/wwwroot/src/modules/base-components/cards/input-box.vue b/Step/wwwroot/src/modules/base-components/cards/input-box.vue index e9147a51..39a641e1 100644 --- a/Step/wwwroot/src/modules/base-components/cards/input-box.vue +++ b/Step/wwwroot/src/modules/base-components/cards/input-box.vue @@ -17,7 +17,7 @@
+ :readonly="'readOnly'" @blur="outFocus">
@@ -51,7 +51,8 @@ export default { return this.value; }, set(v) { - this.$emit("input", v); + if(!this.readOnly) + this.$emit("input", v); } } },