diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll index 8a4537fe..5dc9bd01 100644 Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ diff --git a/Step.Config/ServerConfigController.cs b/Step.Config/ServerConfigController.cs index c4cf064e..4c1a30bb 100644 --- a/Step.Config/ServerConfigController.cs +++ b/Step.Config/ServerConfigController.cs @@ -351,11 +351,7 @@ namespace Step.Config XDocument xmlConfigFile = GetXmlHandlerWithValidator(MAINTENANCES_CONFIG_SCHEMA_PATH, MAINTENANCES_CONFIG_PATH); ReadAssistanceConfig(); - - var ci = new CultureInfo("en-US"); - var formats = new[] { "M-d-yyyy HH:mm", "dd-MM-yyyy HH:mm", "MM-dd-yyyy HH:mm", "M/d/yyyy HH:mm", "dd/MM/yyyy HH:mm", "MM/dd/yyyy HH:mm" } - .ToArray(); - + MaintenancesConfig = xmlConfigFile .Descendants("maintenances") .Elements("maintenance") @@ -367,7 +363,7 @@ namespace Step.Config y => y.Attribute("langKey").Value, y => y.Value ), Intervall = TimeSpan.FromMinutes(Convert.ToDouble(x.Element("interval").Value)), - Deadline = DateTime.ParseExact(x.Element("deadline").Value, formats, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal), + Deadline = DateTime.ParseExact(x.Element("deadline").Value, DATE_TIME_FORMATS, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal), Type = x.Element("type").Value, CouterId = Convert.ToInt32(x.Element("counterId").Value), LocalizedDescription = x.Element("localizedDescription").Elements().ToDictionary( // Read localization of description diff --git a/Step.Model/Constants.cs b/Step.Model/Constants.cs index ae951abe..8487d34d 100644 --- a/Step.Model/Constants.cs +++ b/Step.Model/Constants.cs @@ -301,5 +301,23 @@ namespace Step.Model public const string JOB_MAIN_FILENAME = "main.cnc"; public const string JOB_METADATA_FILENAME = "metadata.json"; public static string[] JOB_EXTENSIONS = { ".job", ".zip" }; + + public static string[] DATE_TIME_FORMATS = new[] { + "M-d-yyyy HH:mm", + "dd-MM-yyyy HH:mm", + "MM-dd-yyyy HH:mm", + "M/d/yyyy HH:mm", + "dd/MM/yyyy HH:mm", + "MM/dd/yyyy HH:mm" + }; + + public static string[] DATE_FORMATS = new[] { + "M-d-yyyy", + "dd-MM-yyyy", + "MM-dd-yyyy", + "M/d/yyyy", + "dd/MM/yyyy", + "MM/dd/yyyy" + }; } } \ No newline at end of file diff --git a/Step.NC/NcAdapter.cs b/Step.NC/NcAdapter.cs index 998068d1..bae47fb6 100644 --- a/Step.NC/NcAdapter.cs +++ b/Step.NC/NcAdapter.cs @@ -68,6 +68,7 @@ namespace Step.NC case NC_VENDOR.OSAI: return new Nc_Osai(NcConfig.NcIpAddress, NcConfig.NcPort, 2000); } + return null; } @@ -230,8 +231,8 @@ namespace Step.NC // Max process number genericData.ProcessNumber = procNum; // Get Installation Date - genericData.InstallationDate = DateTime.Parse(NcConfig.InstallationDate); - // Get PLC version + genericData.InstallationDate = DateTime.ParseExact(NcConfig.InstallationDate, DATE_FORMATS, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal); + // Get PLC version genericData.PlcVersion = "1.0.0"; // Get PLC version cmsError = numericalControl.NC_RUnitOfMeasure(ref tmpInfo); diff --git a/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.ts b/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.ts index 99720c69..cf7e741f 100644 --- a/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.ts +++ b/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.ts @@ -35,6 +35,9 @@ export default class MachineInfoDialog extends Vue { get ncReady() { return this.$store.state.machineStatus.ncReady; } + getFormattedDate(date){ + return moment(date).format("L") + } get getDateFormat() { return (moment() as any)._locale._longDateFormat.L; } diff --git a/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.vue b/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.vue index 7f519d50..ad889ca3 100644 --- a/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.vue +++ b/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.vue @@ -11,7 +11,7 @@
- +