diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll index 0d9b0992..f9e9f8df 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 357441a5..651f5480 100644 --- a/Step.Config/ServerConfigController.cs +++ b/Step.Config/ServerConfigController.cs @@ -127,7 +127,7 @@ namespace Step.Config { ExceptionManager.Manage(ERROR_LEVEL.FATAL, // "Error while reading file: " + e.Exception.SourceUri + - "\n Error while reading configuration file: " + e.Message + "Error while reading configuration file: " + e.Message ); } } 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/Migrations/201811141155184_InitMigration.resx b/Step.Database/Migrations/201811141155184_InitMigration.resx deleted file mode 100644 index 625ea9bd..00000000 --- a/Step.Database/Migrations/201811141155184_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/201811141155184_InitMigration.Designer.cs b/Step.Database/Migrations/201811300854588_InitMigration.Designer.cs similarity index 92% rename from Step.Database/Migrations/201811141155184_InitMigration.Designer.cs rename to Step.Database/Migrations/201811300854588_InitMigration.Designer.cs index e870f286..3b07427a 100644 --- a/Step.Database/Migrations/201811141155184_InitMigration.Designer.cs +++ b/Step.Database/Migrations/201811300854588_InitMigration.Designer.cs @@ -13,7 +13,7 @@ namespace Step.Database.Migrations string IMigrationMetadata.Id { - get { return "201811141155184_InitMigration"; } + get { return "201811300854588_InitMigration"; } } string IMigrationMetadata.Source diff --git a/Step.Database/Migrations/201811141155184_InitMigration.cs b/Step.Database/Migrations/201811300854588_InitMigration.cs similarity index 98% rename from Step.Database/Migrations/201811141155184_InitMigration.cs rename to Step.Database/Migrations/201811300854588_InitMigration.cs index 5b4c3416..9ee3de80 100644 --- a/Step.Database/Migrations/201811141155184_InitMigration.cs +++ b/Step.Database/Migrations/201811300854588_InitMigration.cs @@ -143,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 }) @@ -157,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 74153f72..fba70262 100644 --- a/Step.Database/Step.Database.csproj +++ b/Step.Database/Step.Database.csproj @@ -81,9 +81,9 @@ - - - 201811141155184_InitMigration.cs + + + 201811300854588_InitMigration.cs @@ -119,8 +119,8 @@ - - 201811141155184_InitMigration.cs + + 201811300854588_InitMigration.cs 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/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 f1cb5dc2..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; } @@ -37,8 +44,10 @@ namespace Step.Model.DatabaseModels 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, }; } } diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs index b350b261..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; @@ -2229,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; @@ -2238,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; @@ -2250,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 b8a790b3..cb2e88de 100644 --- a/Step/Attributes/WebApiAuthorizeAttribute.cs +++ b/Step/Attributes/WebApiAuthorizeAttribute.cs @@ -80,11 +80,15 @@ namespace Step if (functionAccess.WriteLevelMin > machineUser.Role.Level) return false; // Not authorized } - - // Check if functionality is enabled by PLC - var functionalityIsEnabled = LastRuntimeFunctionality.Where(x => x.Name == functionName).FirstOrDefault(); - if (functionalityIsEnabled == null || functionalityIsEnabled.Enabled == false) - return false; + + // 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/wwwroot/src/services/hub.ts b/Step/wwwroot/src/services/hub.ts index 8cd42cdc..a481a030 100644 --- a/Step/wwwroot/src/services/hub.ts +++ b/Step/wwwroot/src/services/hub.ts @@ -115,8 +115,7 @@ export class Hub { private static activeProgramData(data) { if(data.path != ""){ fileService.getActiveFileInfo(data.path).then(r => { - var image = r.previewBase64; - processModelActions.setCurrentProgramImage(store, image); + processModelActions.setCurrentProgramImage(store, r.image); processModelActions.setCurrentProgramName(store, r.name); }); }