diff --git a/Client/Browser_Tools/BrowserJSObject.cs b/Client/Browser_Tools/BrowserJSObject.cs index 9d290353..048ba332 100644 --- a/Client/Browser_Tools/BrowserJSObject.cs +++ b/Client/Browser_Tools/BrowserJSObject.cs @@ -44,6 +44,7 @@ namespace CMS_Client.Browser_Tools AddFunction("maximizeForm").Execute += maximizeForm; AddFunction("closeForm").Execute += closeForm; AddFunction("forceStepFocus").Execute += forceStepFocus; + AddFunction("forceNcFocus").Execute += forceNcFocus; AddFunction("reloadBrokenPage").Execute += reloadBrokenPage; AddFunction("setNcWindowState").Execute += setNcWindowState; @@ -190,6 +191,13 @@ namespace CMS_Client.Browser_Tools NcWindow.ForceStepFocus(); } + public void forceNcFocus(object sender, CfrV8HandlerExecuteEventArgs e) + { + //NcWindow.ForceNcRedraw(); + NcWindow.ForceNcFocus(); + mainForm.ShowNCWindow(); + } + // Get the option of virtual Keyb configured private void isVirtualKeybConfigured(object sender, CfrV8HandlerExecuteEventArgs e) { diff --git a/Client/View/NcWindow.cs b/Client/View/NcWindow.cs index c2a8d695..ff8f70ac 100644 --- a/Client/View/NcWindow.cs +++ b/Client/View/NcWindow.cs @@ -262,7 +262,7 @@ namespace CMS_Client.View //If the NC is Siemens Exit from Function and lets the HMI to continue his life if (!forced && Config.VendorHmiConfig.Type == 2) { - HideNcWindow(); + MinimizeNcWindow(); return; } //If FollowNcWindow is OFF, set the Border and lets the HMI to continue his life @@ -310,11 +310,20 @@ namespace CMS_Client.View + //Minimize Nc Window + public static void MinimizeNcWindow() + { + if (windowstarted) + ShowWindow(ncprocess.MainWindowHandle, WS_MINIMIZE); + } + + + //Hide Nc Window public static void HideNcWindow() { if (windowstarted) - ShowWindow(ncprocess.MainWindowHandle, WS_MINIMIZE); + ShowWindow(ncprocess.MainWindowHandle, WS_HIDE); } @@ -366,7 +375,17 @@ namespace CMS_Client.View if (windowstarted) ForceFocus(ncprocess.MainWindowHandle); } + + //Force NC Focus + public static void ForceNcRedraw() + { + if (windowstarted){ + HideNcWindow(); + ShowNcWindow(); + } + } + //Force NC Focus @@ -1203,7 +1222,7 @@ namespace CMS_Client.View private static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert); [DllImport("user32.dll", SetLastError = true)] - static extern IntPtr SendMessage(IntPtr hWnd, UInt32 Msg, IntPtr wParam, StringBuilder lParam); + static extern IntPtr SendMessage(IntPtr hWnd, UInt32 Msg, IntPtr wParam, IntPtr lParam); [DllImport("user32.dll", SetLastError = true)] [return: MarshalAs(UnmanagedType.Bool)] diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll index ac96ecb9..f9e9f8df 100644 Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ diff --git a/Step.Config/Config/AlarmsConfig.xml b/Step.Config/Config/AlarmsConfig.xml index 454d2102..8570c0be 100644 --- a/Step.Config/Config/AlarmsConfig.xml +++ b/Step.Config/Config/AlarmsConfig.xml @@ -8,7 +8,7 @@ 2 2 - false + true 3 diff --git a/Step.Config/Config/serverConfig.xml b/Step.Config/Config/serverConfig.xml index 562bbb4b..3df48864 100644 --- a/Step.Config/Config/serverConfig.xml +++ b/Step.Config/Config/serverConfig.xml @@ -2,7 +2,11 @@ DEMO +<<<<<<< HEAD true +======= + false +>>>>>>> develop localhost 8080 Ares 37 OF diff --git a/Step.Config/ServerConfigController.cs b/Step.Config/ServerConfigController.cs index ce6e86c1..651f5480 100644 --- a/Step.Config/ServerConfigController.cs +++ b/Step.Config/ServerConfigController.cs @@ -47,7 +47,7 @@ namespace Step.Config { // Create new instance XmlSchemaSet readerSettings = new XmlSchemaSet(); - + // Add Schema from Assembly Assembly myAssembly = Assembly.GetExecutingAssembly(); using (Stream schemaStream = myAssembly.GetManifestResourceStream(configSchemaFilePath)) @@ -61,7 +61,7 @@ namespace Step.Config // Open file reader XDocument xmlConfigFile = XDocument.Load(BASE_PATH + "\\" + configFilePath); // Validate file - xmlConfigFile.Validate(readerSettings, ValidationHandler, true); + xmlConfigFile.Validate(readerSettings, ValidationHandler); return xmlConfigFile; } @@ -120,14 +120,14 @@ namespace Step.Config private static void ValidationHandler(object sender, ValidationEventArgs e) { if (e.Severity == XmlSeverityType.Warning) - { + { ExceptionManager.Manage(ERROR_LEVEL.WARNING, e.Message); - } + } else if (e.Severity == XmlSeverityType.Error) - { + { ExceptionManager.Manage(ERROR_LEVEL.FATAL, - "Error while reading file: " + e.Exception.SourceUri + - "\n Error: " + e.Message + // "Error while reading file: " + e.Exception.SourceUri + + "Error while reading configuration file: " + e.Message ); } } diff --git a/Step.Core/ThreadsFunctions.cs b/Step.Core/ThreadsFunctions.cs index 16eafe95..d2269c3f 100644 --- a/Step.Core/ThreadsFunctions.cs +++ b/Step.Core/ThreadsFunctions.cs @@ -24,10 +24,52 @@ public static class ThreadsFunctions private static long ReadAxesNamesTimer = 0, ReadAxesNamesTimes = 0; private static long ReadHeadsTimer = 0, ReadHeadsTimes = 0; private static long ReadToolDataTimer = 0, ReadToolDataTimes = 0; + private static long WatchdogTimer = 0, WatchdogTimes = 0; + private static Thread ConnThread; - #region Nc functions threads + #region Functions + + public static void ManageWatchdog() + { + NcHandler ncHandler = new NcHandler(); + Stopwatch sw = new Stopwatch(); + + try + { + CmsError libraryError = ncHandler.Connect(); + if (libraryError.errorCode != 0) + ManageLibraryError(libraryError); + + while (true) + { + sw.Restart(); + + // Check if client is connected + if (ncHandler.numericalControl.NC_IsConnected()) + { + // Manage watchdog + libraryError = ncHandler.ManageWatchdog(); + } + else + TryNcConnection(); + + sw.Stop(); + + //Update thread timer + WatchdogTimer += sw.ElapsedMilliseconds; + WatchdogTimes++; + + // Wait + Thread.Sleep(CalcSleepTime(500, (int)sw.ElapsedMilliseconds)); + } + } + catch (ThreadAbortException) + { + ncHandler.Dispose(); + } + } public static void ReadAlarms() { @@ -115,7 +157,6 @@ public static class ThreadsFunctions } } - // Read processes part program status public static void ReadProcessesPPStatus() { NcHandler ncHandler = new NcHandler(); @@ -146,10 +187,18 @@ public static class ThreadsFunctions ManageLibraryError(libraryError); else { - // Send processes through signalR - MessageServices.Current.Publish(SEND_PROCESSES_DATA, null, processesPPData); - // Send ncSoftKeys through signalR - MessageServices.Current.Publish(SEND_NC_SOFTKEYS_DATA, null, ncSoftKeys); + libraryError = ncHandler.GetM155Data(out List m155Data); + if (libraryError.errorCode != 0) + ManageLibraryError(libraryError); + else + { + // Send processes through signalR + MessageServices.Current.Publish(SEND_PROCESSES_DATA, null, processesPPData); + // Send ncSoftKeys through signalR + MessageServices.Current.Publish(SEND_NC_SOFTKEYS_DATA, null, ncSoftKeys); + // Send m155 through signalR + MessageServices.Current.Publish(SEND_M155_DATA, null, m155Data); + } } } } @@ -450,7 +499,7 @@ public static class ThreadsFunctions try { // Try connection - CmsError libraryError = ncHandler.Connect(); + CmsError libraryError = ncHandler.Connect(); if (libraryError.errorCode != 0) ManageLibraryError(libraryError); @@ -666,7 +715,7 @@ public static class ThreadsFunctions } } - #endregion Nc functions threads + #endregion Functions #region SupportFunctions diff --git a/Step.Database/Controllers/AlarmsController.cs b/Step.Database/Controllers/AlarmsController.cs index a83bbb0e..87a0b57b 100644 --- a/Step.Database/Controllers/AlarmsController.cs +++ b/Step.Database/Controllers/AlarmsController.cs @@ -7,6 +7,8 @@ using System.Data.Entity; using System.IO; using System.Linq; using static Step.Model.Constants; +using static Step.Config.ServerConfig; +using System.Diagnostics; namespace Step.Database.Controllers { @@ -26,24 +28,46 @@ namespace Step.Database.Controllers dbCtx.Dispose(); } - public List GetPaginatedWithFilter(string message, List types, int page, int pageSize, DateTime startDate, DateTime endDate, List userIds) + public List GetPaginatedWithFilter(string title, List types, int page, int pageSize, DateTime startDate, DateTime endDate, List userIds, Dictionary plcMessages) { - var occurrences = dbCtx + bool ifNoUser = false; + var index = userIds.IndexOf(-1); + if (userIds.IndexOf(-1) != -1) + ifNoUser = true; + + List ncAlarmDescIds = dbCtx + .AlarmDescriptions + .Where(x => x.Title.Contains(title)) + .Select(x => x.AlarmId) + .ToList(); + + // Get Plc messages ids + List plcAlarmDescIds = + plcMessages + .Where(x => x.Value.Contains(title)) + .Select(x => x.Key) + .ToList(); + + // Query + var occurrencesQuery = dbCtx .AlarmOccurrences .OrderBy(x => x.AlarmOccurrenceId) - .Include("Users") + .Include("Users") .Where(x => - x.TimeStamp >= startDate && x.TimeStamp <= endDate - && types.Contains(x.Type) - && x.Users.Any(y => userIds.Any(z => z == y.UserId)) - ) - .Skip(page * pageSize) + x.TimeStamp >= startDate && x.TimeStamp <= endDate // Filter by date + && types.Contains(x.Type) // Type + && ( (ifNoUser && x.Users.Count() == 0) || x.Users.Any(y => userIds.Any(z => z == y.UserId))) // Check user + && + ((x.Source == ALARM_SOURCE.NC && ncAlarmDescIds.Contains(x.AlarmDescriptionId.Value)) // Check if message is contained in NC messages + || (x.Source == ALARM_SOURCE.PLC && plcAlarmDescIds.Contains(x.PlcMessageId.Value))) // Check if message is contained in PLC messages + ) + .Skip(page * pageSize) // Paginate .Take(pageSize) - .Include("AlarmDescription") + .Include("AlarmDescription") // Include foreign key .ToList(); - - return occurrences - .Select(x => (DTOAlarmHistoricModel)x) + + return occurrencesQuery + .Select(x => (DTOAlarmHistoricModel)x) // Convert to DTOALarmHistoricModel .ToList(); } @@ -73,7 +97,7 @@ namespace Step.Database.Controllers { dbCtx.AlarmUsers.AddRange(loggedUser); - dbCtx.SaveChangesAsync(); // TODO check if it is the best solutions + dbCtx.SaveChanges(); // TODO check if it is the best solutions } public DTOAlarmsData GetAlarmsData(int pageSize) diff --git a/Step.Database/Controllers/NcToolManagerController.cs b/Step.Database/Controllers/NcToolManagerController.cs index 429c0a94..d286e847 100644 --- a/Step.Database/Controllers/NcToolManagerController.cs +++ b/Step.Database/Controllers/NcToolManagerController.cs @@ -147,14 +147,6 @@ namespace Step.Database.Controllers List dtoShanks = dbShanks .Select(x => (DTONcShankModel)x) .ToList(); - // new List(); - //foreach (var shank in dbShanks) - //{ - // //dbCtx.Shanks.Attach(shank); - // DTONcShankModel dtoShank = (DTONcShankModel)shank; - - // dtoShanks.Add(dtoShank); - //} return dtoShanks; } @@ -447,7 +439,10 @@ namespace Step.Database.Controllers // Set ids with new positions shank.MagazineId = magazineId; shank.PositionId = positionId; - + // Set original Ids + shank.OriginMagazineId = magazineId; + shank.OriginPositionId = positionId; + dbCtx.SaveChanges(); return FindMagazinePosition(magazineId, positionId); @@ -459,6 +454,9 @@ namespace Step.Database.Controllers // set id to null shank.MagazineId = null; shank.PositionId = null; + + shank.OriginMagazineId = null; + shank.OriginPositionId = null; dbCtx.SaveChanges(); diff --git a/Step.Database/Controllers/SessionsController.cs b/Step.Database/Controllers/SessionsController.cs index 098d32f6..1cee1f81 100644 --- a/Step.Database/Controllers/SessionsController.cs +++ b/Step.Database/Controllers/SessionsController.cs @@ -35,6 +35,8 @@ namespace Step.Database.Controllers .Sessions .Include("MachineUser") .Select(x => x.MachineUser) + .GroupBy(x => x.MachineUserId) + .Select(x => x.FirstOrDefault()) .ToList(); } diff --git a/Step.Database/Migrations/201810240848483_InitMigration.resx b/Step.Database/Migrations/201810240848483_InitMigration.resx deleted file mode 100644 index a9ea712c..00000000 --- a/Step.Database/Migrations/201810240848483_InitMigration.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 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 - - - dbo - - \ No newline at end of file diff --git a/Step.Database/Migrations/201810240848483_InitMigration.Designer.cs b/Step.Database/Migrations/201811300854588_InitMigration.Designer.cs similarity index 92% rename from Step.Database/Migrations/201810240848483_InitMigration.Designer.cs rename to Step.Database/Migrations/201811300854588_InitMigration.Designer.cs index 2f4b482d..3b07427a 100644 --- a/Step.Database/Migrations/201810240848483_InitMigration.Designer.cs +++ b/Step.Database/Migrations/201811300854588_InitMigration.Designer.cs @@ -13,7 +13,7 @@ namespace Step.Database.Migrations string IMigrationMetadata.Id { - get { return "201810240848483_InitMigration"; } + get { return "201811300854588_InitMigration"; } } string IMigrationMetadata.Source diff --git a/Step.Database/Migrations/201810240848483_InitMigration.cs b/Step.Database/Migrations/201811300854588_InitMigration.cs similarity index 98% rename from Step.Database/Migrations/201810240848483_InitMigration.cs rename to Step.Database/Migrations/201811300854588_InitMigration.cs index a1dea918..9ee3de80 100644 --- a/Step.Database/Migrations/201810240848483_InitMigration.cs +++ b/Step.Database/Migrations/201811300854588_InitMigration.cs @@ -56,6 +56,7 @@ namespace Step.Database.Migrations type = c.Int(nullable: false), processes = c.Int(nullable: false), timestamp = c.DateTime(nullable: false, precision: 0), + plc_message_id = c.Int(), }) .PrimaryKey(t => t.id) .ForeignKey("dbo.alarm_description", t => t.alarm_id) @@ -142,10 +143,12 @@ namespace Step.Database.Migrations c => new { magazine_id = c.Byte(), - position_id = c.Byte(), + position_id = c.Int(), id = c.Short(nullable: false), balluf = c.Int(), magazine_position_type = c.Byte(nullable: false), + origin_magazine_id = c.Byte(), + origin_position_id = c.Int(), }) .PrimaryKey(t => t.id) .ForeignKey("dbo.magazine_position", t => new { t.magazine_id, t.position_id }) @@ -156,7 +159,7 @@ namespace Step.Database.Migrations c => new { magazine_id = c.Byte(nullable: false), - position_id = c.Byte(nullable: false), + position_id = c.Int(nullable: false), type = c.Byte(nullable: false), disabled = c.Boolean(nullable: false), }) diff --git a/Step.Database/Migrations/201811300854588_InitMigration.resx b/Step.Database/Migrations/201811300854588_InitMigration.resx new file mode 100644 index 00000000..36ec683e --- /dev/null +++ b/Step.Database/Migrations/201811300854588_InitMigration.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + + dbo + + \ No newline at end of file diff --git a/Step.Database/Migrations/Configuration.cs b/Step.Database/Migrations/Configuration.cs index ad8d7737..e81afc8e 100644 --- a/Step.Database/Migrations/Configuration.cs +++ b/Step.Database/Migrations/Configuration.cs @@ -25,22 +25,22 @@ namespace Step.Database.Migrations ); context.FunctionsAccess.AddOrUpdate( - // General Function - new FunctionAccessModel() { Name = GENERAL, Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 100, ReadLevelMin = 1, PlcId = 0 }, - new FunctionAccessModel() { Name = USER_FUNCTIONS, Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 }, - new FunctionAccessModel() { Name = NC_DATA, Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 10, ReadLevelMin = 1, PlcId = 0 }, - new FunctionAccessModel() { Name = ALARM_CMD, Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 1 }, - new FunctionAccessModel() { Name = STARTUP_ICONS, Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 2 }, + // General Function, if plcId is 0 then the functionality is not connected to the NC + new FunctionAccessModel() { Name = GENERAL, Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 100, ReadLevelMin = 1, PlcId = 0}, + new FunctionAccessModel() { Name = USER_FUNCTIONS, Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0}, + new FunctionAccessModel() { Name = NC_DATA, Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 10, ReadLevelMin = 1, PlcId = 0}, + new FunctionAccessModel() { Name = ALARM_CMD, Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 1}, + new FunctionAccessModel() { Name = STARTUP_ICONS, Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 2}, // Under hood - new FunctionAccessModel() { Name = PROCESS_CMD, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 3 }, - new FunctionAccessModel() { Name = NC_SOFTKEY, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 4 }, - new FunctionAccessModel() { Name = USER_SOFTKEY, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 5 }, - new FunctionAccessModel() { Name = HEADS_CMD, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 6 }, - new FunctionAccessModel() { Name = AXES_SELECTION, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 7 }, + new FunctionAccessModel() { Name = PROCESS_CMD, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 3}, + new FunctionAccessModel() { Name = NC_SOFTKEY, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 4}, + new FunctionAccessModel() { Name = USER_SOFTKEY, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 5}, + new FunctionAccessModel() { Name = HEADS_CMD, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 6}, + new FunctionAccessModel() { Name = AXES_SELECTION, Area = UNDER_HOOD, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 7}, - new FunctionAccessModel() { Name = TOOL_MANAGER, Area = TOOLING_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 8 }, - new FunctionAccessModel() { Name = MAINTENANCE, Area = MAINTENANCE_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 9 } + new FunctionAccessModel() { Name = TOOL_MANAGER, Area = TOOLING_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 8}, + new FunctionAccessModel() { Name = MAINTENANCE, Area = MAINTENANCE_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 9} ); context.SaveChanges(); diff --git a/Step.Database/Step.Database.csproj b/Step.Database/Step.Database.csproj index f928b102..fba70262 100644 --- a/Step.Database/Step.Database.csproj +++ b/Step.Database/Step.Database.csproj @@ -81,9 +81,9 @@ - - - 201810240848483_InitMigration.cs + + + 201811300854588_InitMigration.cs @@ -119,8 +119,8 @@ - - 201810240848483_InitMigration.cs + + 201811300854588_InitMigration.cs diff --git a/Step.Model/Constants.cs b/Step.Model/Constants.cs index 01a735d9..94d630dd 100644 --- a/Step.Model/Constants.cs +++ b/Step.Model/Constants.cs @@ -185,6 +185,7 @@ namespace Step.Model public const string UPDATE_TOOLS_DATA = "UPDATE_TOOLS_DATA"; public const string NC_MAGAZINE_IS_ACTIVE = "UPDATE_NC_MAGAZINE_STATUS"; public const string SEND_QUEUE_DATA = "SEND_QUEUE_DATA"; + public const string SEND_M155_DATA = "SEND_M155_DATA"; public const string BROADCAST_DATA = "BROADCAST_DATA"; diff --git a/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs b/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs index 99d36695..54b781fb 100644 --- a/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs +++ b/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs @@ -4,8 +4,6 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using System.Text; -using System.Threading.Tasks; using static Step.Model.Constants; namespace Step.Model.DTOModels.AlarmModels @@ -21,15 +19,15 @@ namespace Step.Model.DTOModels.AlarmModels public string Description { get; set; } public ALARM_SOURCE Source { get; set; } - + public ALARM_TYPE Type { get; set; } - + public List Processes { get; set; } - + public DateTime TimeStamp { get; set; } public List Users { get; set; } - + public static explicit operator DTOAlarmHistoricModel(AlarmOccurrencesModel obj) { List processes = new List(); @@ -55,29 +53,35 @@ namespace Step.Model.DTOModels.AlarmModels }; } } - + public class DTOAlarmsFilterModel { [Required] public int Page { get; set; } + [Required] public int PageSize { get; set; } - [Required] + public string Title { get; set; } + [Required] public List Type { get; set; } + [Required] public DateTime? StartDate { get; set; } + [Required] public DateTime EndDate { get; set; } + [Required] - public List UserIds { get; set; } + public List UserIds { get; set; } + + public string Language { get; set; } } - + public struct DTOAlarmsData { public int Pages; public DateTime FirstDate; } - -} +} \ No newline at end of file diff --git a/Step.Model/DTOModels/DTOProcessDataModel.cs b/Step.Model/DTOModels/DTOProcessDataModel.cs index 592ce9fa..9bbde251 100644 --- a/Step.Model/DTOModels/DTOProcessDataModel.cs +++ b/Step.Model/DTOModels/DTOProcessDataModel.cs @@ -60,7 +60,7 @@ namespace Step.Model.DTOModels { public override bool Equals(object obj) { - var item = obj as ProcessModel; + ProcessModel item = obj as ProcessModel; if (item == null) return false; @@ -84,4 +84,24 @@ namespace Step.Model.DTOModels return base.GetHashCode(); } } + + public class DTOM155InputModel : M155InputIsNeededModel + { + public new string Type; + public override bool Equals(object obj) + { + DTOM155InputModel item = obj as DTOM155InputModel; + + if (item == null) + return false; + + if (Process != item.Process) + return false; + + if (Type != item.Type) + return false; + + return true; + } + } } \ No newline at end of file diff --git a/Step.Model/DTOModels/ToolModels/DTONcMagazinePositionModel.cs b/Step.Model/DTOModels/ToolModels/DTONcMagazinePositionModel.cs index bd0aac05..4df92b93 100644 --- a/Step.Model/DTOModels/ToolModels/DTONcMagazinePositionModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTONcMagazinePositionModel.cs @@ -12,7 +12,7 @@ namespace Step.Model.DTOModels.ToolModels { public byte MagazineId { get; set; } - public byte PositionId { get; set; } + public int PositionId { get; set; } [Required] public bool Disabled { get; set; } diff --git a/Step.Model/DTOModels/ToolModels/DTONcShankModel.cs b/Step.Model/DTOModels/ToolModels/DTONcShankModel.cs index c4a0b2df..03ce7fc5 100644 --- a/Step.Model/DTOModels/ToolModels/DTONcShankModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTONcShankModel.cs @@ -38,9 +38,15 @@ namespace Step.Model.DTOModels.ToolModels [Range(1, byte.MaxValue)] public byte? MagazineId { get; set; } + [Range(1, ushort.MaxValue)] + public int? PositionId { get; set; } + [Range(1, byte.MaxValue)] - public byte? PositionId { get; set; } + public byte? OriginMagazineId { get; set; } + [Range(1, ushort.MaxValue)] + public int? OriginPositionId { get; set; } + public List ChildsTools { get; set; } public static explicit operator DTONcShankModel(DbNcShankModel obj) @@ -60,6 +66,8 @@ namespace Step.Model.DTOModels.ToolModels MagazinePositionType = obj.MagazinePositionType, MagazineId = obj.MagazineId, PositionId = obj.PositionId, + OriginMagazineId = obj.OriginMagazineId, + OriginPositionId = obj.OriginPositionId, ChildsTools = tools }; } @@ -72,7 +80,9 @@ namespace Step.Model.DTOModels.ToolModels Balluf = obj.Balluf, MagazinePositionType = obj.MagazinePositionType, MagazineId = obj.MagazineId, - PositionId = obj.PositionId + PositionId = obj.PositionId, + OriginMagazineId = obj.OriginMagazineId, + OriginPositionId = obj.OriginPositionId, }; } } diff --git a/Step.Model/DatabaseModels/AlarmOccurrencesModel.cs b/Step.Model/DatabaseModels/AlarmOccurrencesModel.cs index 02511096..d68a1d06 100644 --- a/Step.Model/DatabaseModels/AlarmOccurrencesModel.cs +++ b/Step.Model/DatabaseModels/AlarmOccurrencesModel.cs @@ -28,6 +28,9 @@ namespace Step.Model.DatabaseModels [Column("timestamp")] public DateTime TimeStamp { get; set; } + + [Column("plc_message_id")] + public int? PlcMessageId { get; set; } public AlarmDescriptionsModel AlarmDescription { get; set; } public List Users { get; set; } diff --git a/Step.Model/DatabaseModels/NcMagazinePositionModel.cs b/Step.Model/DatabaseModels/NcMagazinePositionModel.cs index 55c75ca5..f9a4a233 100644 --- a/Step.Model/DatabaseModels/NcMagazinePositionModel.cs +++ b/Step.Model/DatabaseModels/NcMagazinePositionModel.cs @@ -12,7 +12,7 @@ namespace Step.Model.DatabaseModels public byte MagazineId { get; set; } [Key, Column("position_id", Order = 1)] - public byte PositionId { get; set; } + public int PositionId { get; set; } [Column("type")] public byte Type { get; set; } @@ -25,7 +25,7 @@ namespace Step.Model.DatabaseModels return new NcMagazinePositionModel() { MagazineId = obj.MagazineId, - PositionId = obj.PositionId, + PositionId = (ushort)obj.PositionId, Disabled = obj.Disabled ? (byte)1 : (byte)0, Type = obj.Type }; diff --git a/Step.Model/DatabaseModels/NcShankModel.cs b/Step.Model/DatabaseModels/NcShankModel.cs index 49d9ef96..4684751e 100644 --- a/Step.Model/DatabaseModels/NcShankModel.cs +++ b/Step.Model/DatabaseModels/NcShankModel.cs @@ -24,7 +24,14 @@ namespace Step.Model.DatabaseModels public byte? MagazineId { get; set; } [ForeignKey("MagazinePosition"), Column("position_id", Order = 1)] - public byte? PositionId { get; set; } + public int? PositionId { get; set; } + + [Column("origin_magazine_id")] + public byte? OriginMagazineId { get; set; } + + [Column("origin_position_id")] + public int? OriginPositionId { get; set; } + public DbNcMagazinePositionModel MagazinePosition { get; set; } @@ -34,12 +41,14 @@ namespace Step.Model.DatabaseModels { return new NcShankModel() { - ShankId = obj.ShankId, + ShankId = (ushort)obj.ShankId, Balluf = obj.Balluf == null ? (ushort)0 : (ushort)obj.Balluf.Value, MagazineId = obj.MagazineId == null ? (byte)0 : obj.MagazineId.Value, - PositionId = obj.PositionId == null ? (byte)0 : obj.PositionId.Value, + PositionId = obj.PositionId == null ? (ushort)0 : (ushort)obj.PositionId.Value, MagazinePositionType = obj.MagazinePositionType, - }; + OriginMagazineId = obj.OriginMagazineId == null ? (byte)0 : obj.OriginMagazineId.Value, + OriginPositionId = obj.OriginPositionId == null ? (ushort)0 : (ushort)obj.OriginPositionId.Value, + }; } } } \ No newline at end of file diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs index e3b3c19d..e1fa7161 100644 --- a/Step.NC/NcHandler.cs +++ b/Step.NC/NcHandler.cs @@ -15,6 +15,7 @@ using Step.Utils; using System; using System.Collections.Generic; using System.Data.Entity; +using System.Diagnostics; using System.Globalization; using System.IO; using System.Linq; @@ -30,8 +31,8 @@ namespace Step.NC public Nc numericalControl; public NcHandler() => - // Choose NC - numericalControl = SetNumericalControl(); + // Choose NC + numericalControl = SetNumericalControl(); public void Dispose() { @@ -87,7 +88,7 @@ namespace Step.NC CmsError cmsError = NO_ERROR; if (File.Exists(path)) - cmsError = LocalPartProgramFileInfo(path, out fileInfo); + cmsError = LocalPartProgramFileInfo(path, out fileInfo); else cmsError = numericalControl.FILES_RGetFileInfo(path, ref fileInfo); @@ -120,10 +121,10 @@ namespace Step.NC return FILE_NOT_FOUND_ERROR; string base64Img = model.Metadata.Generics.Images.Count() > 0 ? model.Metadata.Generics.Images[0].Base64 : ""; - + fileInfo = new DTOActiveImageAndNameDataModel() { - Image = base64Img, + Image = base64Img, Name = Path.GetFileName(path) // TODO: Get From NC }; @@ -139,13 +140,13 @@ namespace Step.NC fileInfo = new DTOActiveImageAndNameDataModel() { - Image = SupportFunctions.FindImageBase64String(IMAGES_PATH, name), + Image = SupportFunctions.FindImageBase64String(IMAGES_PATH, name), Name = Path.GetFileName(name) // TODO: Get From NC }; } return NO_ERROR; - } + } public CmsError LocalPartProgramFileInfo(string path, out InfoFile fileInfo) { @@ -164,7 +165,7 @@ namespace Step.NC // Populate fileInfo content fileInfo.Content = new List(); - while ((line = fileRead.ReadLine()) != null && count < 10) + while ((line = fileRead.ReadLine()) != null && count < 10) { fileInfo.Content.Add(line); count++; @@ -250,7 +251,7 @@ namespace Step.NC }; return cmsError; - } + } public CmsError UploadPartProgram(string localPath, string fileName, out string newFilePath) { @@ -430,34 +431,6 @@ namespace Step.NC return NO_ERROR; } - //public CmsError SwapQueueItems(int processId, int item1Index, int item2Index) - //{ - // item1Index = item1Index - 1; - // item2Index = item2Index - 1; - - // // Check if there is a queue - // if (!PartProgramQueue.ContainsKey(processId)) - // return INCORRECT_PARAMETERS_ERROR; - // // Check if items exists - // if (PartProgramQueue[processId].ElementAtOrDefault(item1Index) == null || PartProgramQueue[processId].ElementAtOrDefault(item2Index) == null) - // return INCORRECT_PARAMETERS_ERROR; - - // // Create a item - // DTOQueueModel tmp = PartProgramQueue[processId][item1Index]; - - // // Swap item 1 with 2 - // PartProgramQueue[processId][item1Index] = PartProgramQueue[processId][item2Index]; - // // Swap 2 with tmp - // PartProgramQueue[processId][item2Index] = tmp; - - // // Swap ids - // PartProgramQueue[processId][item2Index].Id = item2Index + 1; - // // Swap 2 with tmp - // PartProgramQueue[processId][item1Index].Id = item1Index + 1; - - // return NO_ERROR; - //} - public CmsError MoveQueueItems(int processId, int itemId, int newIndex, out List queue) { itemId = itemId - 1; @@ -578,6 +551,11 @@ namespace Step.NC #region Read Data + public CmsError ManageWatchdog() + { + return numericalControl.PLC_RWManageWatchdog(); + } + public CmsError GetNcGenericData(out DTONcGenericDataModel genericData) { genericData = new DTONcGenericDataModel(MachineConfig.Model); @@ -1327,7 +1305,7 @@ namespace Step.NC public CmsError ReadAxisData(out List axesNames) { axesNames = new List(); - List plcAxes = new List(); + List plcAxes = new List(); // Read selected process ushort selectedProcess = 0; CmsError cmsError = numericalControl.PROC_RSelectedProcess(ref selectedProcess); @@ -1343,7 +1321,7 @@ namespace Step.NC { Id = x.Id, Name = x.Name, - IsSelectable = x.IsSelectable + IsSelectable = x.IsSelectable }).ToList(); } @@ -1464,6 +1442,26 @@ namespace Step.NC return cmsError; } + public CmsError GetM155Data(out List data) + { + data = new List(); + List ncData = new List(); + CmsError cmsError = numericalControl.PLC_ROperatorInputIsNeeded(ref ncData); + if (cmsError.IsError()) + return cmsError; + + data = ncData.Select(x => new DTOM155InputModel() + { + Buttons = x.Buttons, + IsNeeded = x.IsNeeded, + Message = x.Message, + Process = x.Process, + Type = x.Type.ToString() + }).ToList(); + + return NO_ERROR; + } + #endregion Read Data #region Write data @@ -1537,6 +1535,11 @@ namespace Step.NC return numericalControl.NC_SetScreenVisible((Nc.SCREEN_PAGE)screen); } + public CmsError WriteM155Data(int process, double responseValue) + { + return numericalControl.PLC_WOperatorInputResponse(process, responseValue); + } + #endregion Write data #region Siemens Tools @@ -2227,7 +2230,7 @@ namespace Step.NC .Where(x => x.MagazineId != null) .Select(x => (NcShankModel)x) .ToList(); - + // Update shanks CmsError cmsError = numericalControl.TOOLS_WUpdateShanks(shanks); if (cmsError.IsError()) return cmsError; @@ -2236,6 +2239,7 @@ namespace Step.NC List positions = toolsManager.FindMagazinesPositions() .Select(x => (NcMagazinePositionModel)x) .ToList(); + // Update positions cmsError = numericalControl.TOOLS_WUpdateMagazinePositions(positions); if (cmsError.IsError()) return cmsError; @@ -2248,15 +2252,17 @@ namespace Step.NC .ToList(); // Update tools - cmsError = numericalControl.TOOLS_WUpdateTools(tools); + cmsError = numericalControl.TOOLS_WUpdateTools(tools); if (cmsError.IsError()) return cmsError; + // Get families List families = toolsManager .FindFamilies() .Select(x => (NcFamilyModel)x) .Where(x => tools.Any(y => y.FamilyId == x.FamilyId)) // Find only families of mounted tools .ToList(); + // Update families cmsError = numericalControl.TOOLS_WUpdateFamilies(families); if (cmsError.IsError()) diff --git a/Step.Utils/supportFunctions.cs b/Step.Utils/supportFunctions.cs index 3889b66e..80a221ad 100644 --- a/Step.Utils/supportFunctions.cs +++ b/Step.Utils/supportFunctions.cs @@ -131,12 +131,13 @@ namespace Step.Utils public static string FindImageBase64String(string directoryPath, string imageName) { + string fileName = Path.GetFileNameWithoutExtension(imageName); foreach (string ext in VALID_IMAGE_EXTENSIONS) { - if (File.Exists(directoryPath + "\\" + imageName + ext)) + if (File.Exists(directoryPath + "\\" + fileName + ext)) { // Convert image to a base 64 string - return "data:image/" + ext + ";base64," + Convert.ToBase64String(File.ReadAllBytes(directoryPath + "\\" + imageName + ext)); + return "data:image/" + ext + ";base64," + Convert.ToBase64String(File.ReadAllBytes(directoryPath + "\\" + fileName + ext)); } } diff --git a/Step/Attributes/WebApiAuthorizeAttribute.cs b/Step/Attributes/WebApiAuthorizeAttribute.cs index 68369299..cb2e88de 100644 --- a/Step/Attributes/WebApiAuthorizeAttribute.cs +++ b/Step/Attributes/WebApiAuthorizeAttribute.cs @@ -8,6 +8,7 @@ using Step.Config; using Step.Model.DatabaseModels; using static Step.Config.ServerConfig; using static Step.Model.Constants; +using static Step.Listeners.SignalRStaticObjects; namespace Step { @@ -79,6 +80,15 @@ namespace Step if (functionAccess.WriteLevelMin > machineUser.Role.Level) return false; // Not authorized } + + // Check if PLC bit exists + if(functionAccess.PlcId != 0) + { + // Check if functionality is enabled by PLC + var functionalityIsEnabled = LastRuntimeFunctionality.Where(x => x.Name == functionName).FirstOrDefault(); + if (functionalityIsEnabled == null || functionalityIsEnabled.Enabled == false) + return false; + } } else return false; diff --git a/Step/Controllers/SignalR/NcHub.cs b/Step/Controllers/SignalR/NcHub.cs index 9b38245b..7a922d10 100644 --- a/Step/Controllers/SignalR/NcHub.cs +++ b/Step/Controllers/SignalR/NcHub.cs @@ -210,5 +210,17 @@ namespace Step.Controllers.SignalR throw new HubException(libraryError.localizationKey); } } + + [SignalRAuthorize(FunctionAccess = GENERAL, Action = ACTIONS.WRITE)] + public void WriteM155Response(int process, double responseVal) + { + using (NcHandler ncHandler = new NcHandler()) + { + ncHandler.Connect(); + CmsError cmsError = ncHandler.WriteM155Data(process, responseVal); + if (cmsError.IsError()) + throw new HubException(cmsError.localizationKey); + } + } } } \ No newline at end of file diff --git a/Step/Controllers/WebApi/ApiAlarmController.cs b/Step/Controllers/WebApi/ApiAlarmController.cs index 4b21186a..493b8d1c 100644 --- a/Step/Controllers/WebApi/ApiAlarmController.cs +++ b/Step/Controllers/WebApi/ApiAlarmController.cs @@ -1,10 +1,10 @@ using Step.Database.Controllers; using Step.Model.DatabaseModels; using Step.Model.DTOModels.AlarmModels; +using Step.NC; using Step.Provider; using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; using System.IO; using System.Linq; using System.Net; @@ -19,28 +19,23 @@ namespace Step.Controllers.WebApi [RoutePrefix("api/alarm")] public class ApiAlarmController : ApiController { - //[Route(""), HttpGet] - //public IHttpActionResult GetAll(int page, int pageSize) - //{ - // using (AlarmsController alarm = new AlarmsController()) - // { - // var a = alarm.GetPaginated(page, pageSize); - - // return Ok(a); - // } - //} - [Route("paginated"), HttpPost] - public IHttpActionResult GetDataPaginated([FromBody]DTOAlarmsFilterModel data) + public IHttpActionResult GetDataPaginated([FromBody]DTOAlarmsFilterModel filter) { - Validate(data); - var a = ModelState.Values.Select(x => x.Errors); if (!ModelState.IsValid) return BadRequest(ModelState); + Dictionary plcMessages = new Dictionary(); + using (NcHandler ncHandler = new NcHandler()) + { + // Read data + ncHandler.numericalControl.NC_GetTranslatedPlcMessages(filter.Language, ref plcMessages); + } + + using (AlarmsController alarm = new AlarmsController()) { - var alarms = alarm.GetPaginatedWithFilter(data.Title, data.Type, data.Page - 1, data.PageSize, data.StartDate.Value, data.EndDate, data.UserIds); + var alarms = alarm.GetPaginatedWithFilter(filter.Title, filter.Type, filter.Page - 1, filter.PageSize, filter.StartDate.Value, filter.EndDate, filter.UserIds, plcMessages); return Ok(alarms); } @@ -165,7 +160,6 @@ namespace Step.Controllers.WebApi #endregion Note - #region Attachment [Route("{alarmDescId:int}/attachments"), HttpGet] diff --git a/Step/Controllers/WebApi/FavoriteUserSoftKeyController.cs b/Step/Controllers/WebApi/FavoriteUserSoftKeyController.cs index 2d56b122..0b5f81e1 100644 --- a/Step/Controllers/WebApi/FavoriteUserSoftKeyController.cs +++ b/Step/Controllers/WebApi/FavoriteUserSoftKeyController.cs @@ -16,7 +16,7 @@ namespace Step.Controllers.WebApi public class FavoriteUserSoftkeyController : ApiController { [Route("favorite"), HttpGet] - [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.MAINTENANCE, Action = ACTIONS.WRITE)] + [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.USER_SOFTKEY, Action = ACTIONS.WRITE)] public IHttpActionResult GetFavoriteSoftkeys() { var identity = User.Identity as ClaimsIdentity; @@ -32,7 +32,7 @@ namespace Step.Controllers.WebApi } [Route("favorite"), HttpPut] - [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.MAINTENANCE, Action = ACTIONS.WRITE)] + [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.USER_SOFTKEY, Action = ACTIONS.WRITE)] public IHttpActionResult PutFavoriteSoftkeys(List favoriteSoftkeyIds) { var identity = User.Identity as ClaimsIdentity; diff --git a/Step/Controllers/WebApi/LanguageController.cs b/Step/Controllers/WebApi/LanguageController.cs index 8c43ae29..e426bdb9 100644 --- a/Step/Controllers/WebApi/LanguageController.cs +++ b/Step/Controllers/WebApi/LanguageController.cs @@ -121,13 +121,12 @@ namespace Step.Controllers.WebApi { using (NcHandler ncHandler = new NcHandler()) { - CmsError cmsError = ncHandler.Connect(); Dictionary returnValue = new Dictionary(); Dictionary messages = new Dictionary(); // Read data from CN - cmsError = ncHandler.numericalControl.NC_GetTranslatedPlcMessages(language, ref messages); - + ncHandler.numericalControl.NC_GetTranslatedPlcMessages(language, ref messages); // Avoid checking error because in the worst case "messages" is empty + // Id start from 1 for (int i = 1; i <= 1024; i++) { diff --git a/Step/Listeners/Database/SignalRDatabaseHandler.cs b/Step/Listeners/Database/SignalRDatabaseHandler.cs index dc702e79..e59d61ef 100644 --- a/Step/Listeners/Database/SignalRDatabaseHandler.cs +++ b/Step/Listeners/Database/SignalRDatabaseHandler.cs @@ -141,6 +141,7 @@ namespace Step.Listeners.Database alarmNewOccurrences.AddRange(differences.PlcAlarms.Select(x => { int processesByte = 0; + // Convert list to byte x.Process.ForEach(y => processesByte |= (1 << y)); return new AlarmOccurrencesModel() @@ -149,7 +150,8 @@ namespace Step.Listeners.Database Type = x.IsWarning ? ALARM_TYPE.WARNING : ALARM_TYPE.ERROR, Processes = processesByte, TimeStamp = x.DateTime, - Source = ALARM_SOURCE.PLC + Source = ALARM_SOURCE.PLC, + PlcMessageId = (int)x.Id }; })); diff --git a/Step/Listeners/ListenersHandler.cs b/Step/Listeners/ListenersHandler.cs index 51c15a8c..498292b4 100644 --- a/Step/Listeners/ListenersHandler.cs +++ b/Step/Listeners/ListenersHandler.cs @@ -86,7 +86,10 @@ namespace Step.Listeners SignalRListener.SendPartProgramQueue(a); SignalRDatabaseHandler.UpdateQueue(a); })); - + infos.Add(MessageServices.Current.Subscribe(SEND_M155_DATA, (a, b) => + { + SignalRListener.SendM155Data(a); + })); // Database infos.Add(MessageServices.Current.Subscribe(UPDATE_TOOLS_DATA, (a, b) => @@ -100,6 +103,7 @@ namespace Step.Listeners SignalRListener.BroadcastData(); })); } + public static void Stop() { diff --git a/Step/Listeners/SignalR/SignalRListener.cs b/Step/Listeners/SignalR/SignalRListener.cs index 7c55ae3b..3d636350 100644 --- a/Step/Listeners/SignalR/SignalRListener.cs +++ b/Step/Listeners/SignalR/SignalRListener.cs @@ -232,6 +232,18 @@ namespace Step.Listeners.SignalR } } + public static void SendM155Data(object data) + { + List dtoM155Data = data as List; + + if (!LastM155Data.SequenceEqual(dtoM155Data)) + { + LastM155Data = dtoM155Data; + var context = GlobalHost.ConnectionManager.GetHubContext(); + context.Clients.Group("ncData").m155Data(dtoM155Data); + } + } + private volatile static object _broadcastlock = new Object(); public static void BroadcastData() @@ -282,6 +294,8 @@ namespace Step.Listeners.SignalR context.Clients.Group("ncData").magazineIsActive(LastNcMagazineIsActive); // Send PP Queue context.Clients.Group("ncData").partProgramQueue(LastPartProgramQueue); + // Send m155 data + context.Clients.Group("ncData").m155Data(LastM155Data); Debug.WriteLine(string.Format("{0} {1} Broadcast..completed", DateTime.Now.ToString("dd/MM/yyyy HH:mm:ss"), DateTime.Now.Millisecond)); Monitor.Exit(_broadcastlock); diff --git a/Step/Listeners/SignalRStaticObjects.cs b/Step/Listeners/SignalRStaticObjects.cs index fdd2363c..dfa6669c 100644 --- a/Step/Listeners/SignalRStaticObjects.cs +++ b/Step/Listeners/SignalRStaticObjects.cs @@ -21,6 +21,7 @@ namespace Step.Listeners public static DTOActiveProgramDataModel LastProgramData = new DTOActiveProgramDataModel(); public static Dictionary LastNcMagazineIsActive = new Dictionary(); public static List LastPartProgramQueue = new List(); + public static List LastM155Data = new List(); public static bool LastIsNcConnected = false; } diff --git a/Step/program.cs b/Step/program.cs index 752edef4..9765ae6c 100644 --- a/Step/program.cs +++ b/Step/program.cs @@ -38,7 +38,7 @@ namespace Step ServerControlWindow.Start(); // Create unhandled exception handler - // AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(ExceptionHandler); + AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(ExceptionHandler); // Read config ServerConfigController.ReadStartupConfig(); @@ -117,7 +117,12 @@ namespace Step private static void ExceptionHandler(object sender, UnhandledExceptionEventArgs args) { using (NcHandler ncHandler = new NcHandler()) - ncHandler.Disconnect(); + { + if (ncHandler.numericalControl.NC_IsConnected()) + { + ncHandler.Disconnect(); + } + } LogException((Exception)args.ExceptionObject, ERROR_LEVEL.FATAL); } diff --git a/Step/wwwroot/assets/styles/base/alarms.less b/Step/wwwroot/assets/styles/base/alarms.less index 48f9dbc1..b77e51b5 100644 --- a/Step/wwwroot/assets/styles/base/alarms.less +++ b/Step/wwwroot/assets/styles/base/alarms.less @@ -9,16 +9,12 @@ top: 40px; background-color: #fff; padding: 0 0; - z-index: 949; + z-index: 800; box-sizing: border-box; display: flex; flex-wrap: nowrap; overflow: hidden; transition: width 200ms ease-in-out, height 200ms ease-in-out, padding 200ms ease-in-out, background-color 200ms ease-in-out,box-shadow 0ms 0ms; - &.coveredByModal{ - z-index: 500; - filter: blur(10px); - } &.expanded { width: 494px; diff --git a/Step/wwwroot/assets/styles/base/header.less b/Step/wwwroot/assets/styles/base/header.less index c2a7eae2..6fe25205 100644 --- a/Step/wwwroot/assets/styles/base/header.less +++ b/Step/wwwroot/assets/styles/base/header.less @@ -9,14 +9,10 @@ height: @header-height; width: calc(~"100% - 152px"); position: absolute; - z-index: 950; + z-index: 801; top: 0; right: 0; left: 0; - &.coveredByModal{ - z-index: 200; - filter: blur(10px); - } button { font-size: 28px; justify-content: center; diff --git a/Step/wwwroot/assets/styles/base/layout.less b/Step/wwwroot/assets/styles/base/layout.less index 63278682..0143bd16 100644 --- a/Step/wwwroot/assets/styles/base/layout.less +++ b/Step/wwwroot/assets/styles/base/layout.less @@ -117,14 +117,15 @@ body { height: calc(~'100vh - 80px'); background-color: @background-color; z-index: 100; - transition: transform 0.8s cubic-bezier(0.22, 0.61, 0.36, 1); + transition: transform 0.5s ease-out; .handle { display: none; } &.liftedUp { - transition: transform 0.8s cubic-bezier(0.22, 0.61, 0.36, 1), box-shadow 0.1s ease-out 1.0s; + transition: transform 0.5s ease-out, box-shadow 0.1s ease-out 0.5s; box-shadow: 2px 3px 5px 0 rgba(0, 0, 0, 0.2); } + } #main-view.turn-up, @@ -139,7 +140,7 @@ body { width: 100vw; // box-shadow: 2px 3px 5px 0 rgba(0, 0, 0, 0.4); box-shadow: none; z-index: 250; - transition: transform 0.8s cubic-bezier(0.22, 0.61, 0.36, 1); + transition: transform 0.5s ease-out; .handle { background-color: @background-color; display: block; diff --git a/Step/wwwroot/assets/styles/base/modals.less b/Step/wwwroot/assets/styles/base/modals.less index 41e6cb4f..af5ddbcd 100644 --- a/Step/wwwroot/assets/styles/base/modals.less +++ b/Step/wwwroot/assets/styles/base/modals.less @@ -338,6 +338,10 @@ background-color: @color-backdrop; z-index: 900; + &.nc { + z-index: 700; + } + &.internal { height: calc(~"100vh - 80px"); } @@ -1332,6 +1336,58 @@ justify-content: flex-end; border-top: solid 2px @color-whitethree; } + + .box-description{ + box-sizing: border-box; + padding-top: 10px; + height: 120px; + width: 100%; + border-top: solid 2px #e7e7e7; + } + .box-image{ + display: flex; + justify-content: flex-start; + flex-flow: column; + min-height: 415px; + width: 100%; + margin-top: 16px; + .box-image-container{ + display: flex; + justify-content: center; + align-items: center; + min-height: 329px; + width: 100%; + margin: 25px auto 23px auto; + img{ + max-width: 577px; + max-height: 329px; + box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.4); + } + } + .linenumber{ + display: flex; + justify-content: center; + align-items: center; + div{ + width: 32px; + height: 18px; + button{ + margin: auto 4px; + border: none; + padding: 0; + background: none; + font-size: 18px; + line-height: 1; + color: @color-greyish-brown; + } + .target{ + color: @color-clear-blue; + font-weight: 600; + } + + } + } + } } .@{modal}.modal-job-add-parameter { diff --git a/Step/wwwroot/assets/styles/base/nc.less b/Step/wwwroot/assets/styles/base/nc.less index ef2f17e6..6583732d 100644 --- a/Step/wwwroot/assets/styles/base/nc.less +++ b/Step/wwwroot/assets/styles/base/nc.less @@ -9,6 +9,15 @@ background-color: #4e585e; box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.5); height: 784px; + + &.noproc{ + width: 1038px; + left:50px; + + #nc-hmi{ + left: -2px !important; + } + } } #nc-hmi{ diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index ea1aaf82..8a90348c 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -288,6 +288,9 @@ background-color: rgba(217, 217, 217, 0.5); z-index: 900; } +.backdrop.nc { + z-index: 700; +} .backdrop.internal { height: calc(100vh - 80px); } @@ -1414,6 +1417,64 @@ justify-content: flex-end; border-top: solid 2px #e7e7e7; } +.modal.modal-load-program .box-description, +.modal.modal-add-element-queue .box-description { + box-sizing: border-box; + padding-top: 10px; + height: 120px; + width: 100%; + border-top: solid 2px #e7e7e7; +} +.modal.modal-load-program .box-image, +.modal.modal-add-element-queue .box-image { + display: flex; + justify-content: flex-start; + flex-flow: column; + min-height: 415px; + width: 100%; + margin-top: 16px; +} +.modal.modal-load-program .box-image .box-image-container, +.modal.modal-add-element-queue .box-image .box-image-container { + display: flex; + justify-content: center; + align-items: center; + min-height: 329px; + width: 100%; + margin: 25px auto 23px auto; +} +.modal.modal-load-program .box-image .box-image-container img, +.modal.modal-add-element-queue .box-image .box-image-container img { + max-width: 577px; + max-height: 329px; + box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.4); +} +.modal.modal-load-program .box-image .linenumber, +.modal.modal-add-element-queue .box-image .linenumber { + display: flex; + justify-content: center; + align-items: center; +} +.modal.modal-load-program .box-image .linenumber div, +.modal.modal-add-element-queue .box-image .linenumber div { + width: 32px; + height: 18px; +} +.modal.modal-load-program .box-image .linenumber div button, +.modal.modal-add-element-queue .box-image .linenumber div button { + margin: auto 4px; + border: none; + padding: 0; + background: none; + font-size: 18px; + line-height: 1; + color: #4b4b4b; +} +.modal.modal-load-program .box-image .linenumber div .target, +.modal.modal-add-element-queue .box-image .linenumber div .target { + color: #1791ff; + font-weight: 600; +} .modal.modal-job-add-parameter { width: 704px; height: 608px; @@ -2612,15 +2673,11 @@ fieldset[disabled] .form-group.is-focused .togglebutton label { height: 80px; width: calc(100% - 152px); position: absolute; - z-index: 950; + z-index: 801; top: 0; right: 0; left: 0; } -#app > header.coveredByModal { - z-index: 200; - filter: blur(10px); -} #app > header button { font-size: 28px; justify-content: center; @@ -3222,18 +3279,13 @@ footer .container button.big:before { top: 40px; background-color: #fff; padding: 0 0; - z-index: 949; + z-index: 800; box-sizing: border-box; display: flex; flex-wrap: nowrap; overflow: hidden; transition: width 200ms ease-in-out, height 200ms ease-in-out, padding 200ms ease-in-out, background-color 200ms ease-in-out, box-shadow 0ms 0ms; } -#alarm-list.coveredByModal, -#service-list.coveredByModal { - z-index: 500; - filter: blur(10px); -} #alarm-list.expanded, #service-list.expanded { width: 494px; @@ -3881,6 +3933,13 @@ footer .container button.big:before { box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.5); height: 784px; } +.hmi-container.noproc { + width: 1038px; + left: 50px; +} +.hmi-container.noproc #nc-hmi { + left: -2px !important; +} #nc-hmi { position: absolute; top: 0; @@ -13846,13 +13905,13 @@ body { height: calc(100vh - 80px); background-color: #d8d8d8; z-index: 100; - transition: transform 0.8s cubic-bezier(0.22, 0.61, 0.36, 1); + transition: transform 0.5s ease-out; } #main-view .handle { display: none; } #main-view.liftedUp { - transition: transform 0.8s cubic-bezier(0.22, 0.61, 0.36, 1), box-shadow 0.1s ease-out 1s; + transition: transform 0.5s ease-out, box-shadow 0.1s ease-out 0.5s; box-shadow: 2px 3px 5px 0 rgba(0, 0, 0, 0.2); } #main-view.turn-up, @@ -13866,7 +13925,7 @@ body { width: 100vw; box-shadow: none; z-index: 250; - transition: transform 0.8s cubic-bezier(0.22, 0.61, 0.36, 1); + transition: transform 0.5s ease-out; } #main-view-handler .handle { background-color: #d8d8d8; diff --git a/Step/wwwroot/src/App.vue b/Step/wwwroot/src/App.vue index f97ea1e8..9a73a2ad 100644 --- a/Step/wwwroot/src/App.vue +++ b/Step/wwwroot/src/App.vue @@ -1,15 +1,15 @@ +<<<<<<< HEAD +======= + + +>>>>>>> develop diff --git a/Step/wwwroot/src/app.business-logic.ts b/Step/wwwroot/src/app.business-logic.ts index 6f985840..31e6b9d7 100644 --- a/Step/wwwroot/src/app.business-logic.ts +++ b/Step/wwwroot/src/app.business-logic.ts @@ -23,11 +23,13 @@ let HMIvisibleInProduction = false let oldHMIvisible = false; let HMIAlarmsVisible = false; let HMIModalsVisible = false; +let HMIModalsNcVisible = false; let HMIDragging = false; let HMIshowTimeout; let HMIAlarmsTimeout; let HMIModalsTimeout; let HMIDraggingTimeout; +let HMIModalsNcTimeout; let HMIScreenshotInterval; let HMIprodTimeout; let RerenderInterval; @@ -36,7 +38,12 @@ const messageService = Factory.Get(MessageService); messageService.subscribeToChannel("show-user-info", () => { ModalHelper.ShowModal(UserInfoDialog); }); messageService.subscribeToChannel("show-machine-info", () => { ModalHelper.ShowModal(MachineInfoDialog); }); +<<<<<<< HEAD messageService.subscribeToChannel("show-axes-calibration", () => { ModalHelper.ShowModal(AxesCalibration, null, true); }); +======= +messageService.subscribeToChannel("show-axes-calibration", () => { ModalHelper.ShowNcModal(AxesCalibration); }); +messageService.subscribeToChannel("hide-axes-calibration", () => { ModalHelper.HideNcModal(AxesCalibration); }); +>>>>>>> develop @@ -165,6 +172,14 @@ if (typeof cmsClient != "undefined") { showModal() }); + Factory.Get(MessageService).subscribeToChannel("HMI-show-modal-nc", args => { + clearTimeout(HMIModalsNcTimeout); + if (args[0] > 0) + HMIModalsNcTimeout = setTimeout(showNcModal, args[0]); + else + showNcModal() + }); + Factory.Get(MessageService).subscribeToChannel("HMI-hide-modal", args => { clearTimeout(HMIModalsTimeout); if (args[0] > 0) @@ -173,6 +188,14 @@ if (typeof cmsClient != "undefined") { hideModal() }); + Factory.Get(MessageService).subscribeToChannel("HMI-hide-modal-nc", args => { + clearTimeout(HMIModalsNcTimeout); + if (args[0] > 0) + HMIModalsNcTimeout = setTimeout(hideNcModal, args[0]); + else + hideNcModal() + }); + Factory.Get(MessageService).subscribeToChannel("HMI-start-drag", args => { clearTimeout(HMIDraggingTimeout); if (args[0] > 0) @@ -206,6 +229,10 @@ function hideModal() { HMIModalsVisible = false; ElaborateHMIStatus(); } +function hideNcModal() { + HMIModalsNcVisible = false; + ElaborateHMIStatus(); +} function stopDrag() { HMIDragging = false; ElaborateHMIStatus(); @@ -229,6 +256,10 @@ function showModal() { HMIModalsVisible = true; ElaborateHMIStatus(); } +function showNcModal() { + HMIModalsNcVisible = true; + ElaborateHMIStatus(); +} function startDrag() { HMIDragging = true; ElaborateHMIStatus(); @@ -248,12 +279,12 @@ function ElaborateHMIStatus() { clearInterval(HMIScreenshotInterval); cmsClient.setNcWindowState(0); } - else if (hmiv && !HMIAlarmsVisible && !HMIModalsVisible && !HMIDragging) { + else if (hmiv && !HMIAlarmsVisible && !HMIModalsVisible && !HMIDragging && !HMIModalsNcVisible) { if (HMIScreenshotInterval) clearInterval(HMIScreenshotInterval); cmsClient.setNcWindowState(1); } - else if (hmiv && (HMIAlarmsVisible || HMIModalsVisible || HMIDragging)) { + else if (hmiv && (HMIAlarmsVisible || HMIModalsVisible || HMIDragging || HMIModalsNcVisible)) { cmsClient.setNcWindowState(0); } } diff --git a/Step/wwwroot/src/app_modules/alarms/components/alarms-list.ts b/Step/wwwroot/src/app_modules/alarms/components/alarms-list.ts index fdbcf6bc..282af794 100644 --- a/Step/wwwroot/src/app_modules/alarms/components/alarms-list.ts +++ b/Step/wwwroot/src/app_modules/alarms/components/alarms-list.ts @@ -10,7 +10,7 @@ import { Hub } from "src/services"; declare let $: any; -@Component({ name: "alarms-list", components: { alarmItem, alarmDetail }, props: {modalOpened: Boolean, showHeaderOnBlur: Boolean} }) +@Component({ name: "alarms-list", components: { alarmItem, alarmDetail }, props: {applyBlur: Boolean} }) export default class alarmsList extends Vue { $store: any; $route: any; diff --git a/Step/wwwroot/src/app_modules/alarms/components/alarms-list.vue b/Step/wwwroot/src/app_modules/alarms/components/alarms-list.vue index a977a297..2cbc2962 100644 --- a/Step/wwwroot/src/app_modules/alarms/components/alarms-list.vue +++ b/Step/wwwroot/src/app_modules/alarms/components/alarms-list.vue @@ -1,6 +1,6 @@