diff --git a/Common/LaaPackages b/Common/LaaPackages index 466fafaf..fc6d1c60 160000 --- a/Common/LaaPackages +++ b/Common/LaaPackages @@ -1 +1 @@ -Subproject commit 466fafaf46e31503975195fc911d6182971fa10b +Subproject commit fc6d1c60141d1dcce304443fe14f62a94e9dc123 diff --git a/LaaProductionWeb/Data/LaaProduction.Data.Cordonel/Sentinel/Sentinel.cs b/LaaProductionWeb/Data/LaaProduction.Data.Cordonel/Sentinel/Sentinel.cs index 45ad2cf0..5577b031 100644 --- a/LaaProductionWeb/Data/LaaProduction.Data.Cordonel/Sentinel/Sentinel.cs +++ b/LaaProductionWeb/Data/LaaProduction.Data.Cordonel/Sentinel/Sentinel.cs @@ -64,7 +64,7 @@ this.TryCompareMeterSize(productionData, requirements, eolProgress, apps, metrologyValues); this.TryCompareLUTCRCVersion(requirements, eolProgress, apps); this.TryCompareAppsAndFWVersion(requirements, eolProgress, apps, appsVersionsCrcs); - this.TryCompareMetrologyValues(requirements, eolProgress, apps, metrologyValues); + this.TryCompareMetrologyValues(requirements, eolProgress, apps, metrologyValues, productionData); this.TryCompareRadioSignalStreight(requirements, eolProgress, rssiValues); this.TryCompareBatteryLimits(requirements, apps, eolProgress); this.TryCompareRadioSystemState(requirements, apps, eolProgress); @@ -495,13 +495,18 @@ } } - internal void TryCompareMetrologyValues(CordonelRequirements requirements, EOLProgressModel eolProgress, CordonelAppsDictionary apps, CordonelMetrologyValues metrologyValues) + internal void TryCompareMetrologyValues(CordonelRequirements requirements, EOLProgressModel eolProgress, CordonelAppsDictionary apps, CordonelMetrologyValues metrologyValues, CordonelProductionData productionData) { if (requirements.SkipCalibration == true) { return; } + if (productionData.StatusFertigung != 30) + { + this.ThrowSentinelException(nameof(TryGetUniqueProductionData), $"{nameof(productionData.StatusFertigung)} != 30"); + } + var checkCalibration = eolProgress.ProductionStatusCalibrationChecked == EOLStatus.OK; var checkZeroFlow = eolProgress.ProductionStatusZeroFlowChecked == EOLStatus.OK; var errors = metrologyValues.CompareWithErrors(apps, checkCalibration, checkZeroFlow).ToList(); @@ -1041,11 +1046,6 @@ } productionData = productionDataArray[0]; - - if (productionData.StatusFertigung != 30) - { - this.ThrowSentinelException(nameof(TryGetUniqueProductionData), $"{nameof(productionData.StatusFertigung)} != 30"); - } } internal void TryMakeSAPExport(int pcbId) diff --git a/LaaProductionWeb/LaaProduction.SharedModels/LDAPLoginModel.cs b/LaaProductionWeb/LaaProduction.SharedModels/LDAPLoginModel.cs index 9b6bc347..6ebf7f91 100644 --- a/LaaProductionWeb/LaaProduction.SharedModels/LDAPLoginModel.cs +++ b/LaaProductionWeb/LaaProduction.SharedModels/LDAPLoginModel.cs @@ -1,6 +1,5 @@ namespace LaaProduction.SharedModels { - using System; using System.ComponentModel.DataAnnotations; public class LDAPLoginModel diff --git a/LaaProductionWeb/LaaProduction.SharedModels/LDAPRegisterModel.cs b/LaaProductionWeb/LaaProduction.SharedModels/LDAPRegisterModel.cs index 99c21c25..747d0bfc 100644 --- a/LaaProductionWeb/LaaProduction.SharedModels/LDAPRegisterModel.cs +++ b/LaaProductionWeb/LaaProduction.SharedModels/LDAPRegisterModel.cs @@ -1,6 +1,5 @@ namespace LaaProduction.SharedModels { - using System; using System.ComponentModel.DataAnnotations; public class LDAPRegisterModel diff --git a/LaaProductionWeb/LaaProductionWeb.sln b/LaaProductionWeb/LaaProductionWeb.sln index 836dbc57..5cb3b83a 100644 --- a/LaaProductionWeb/LaaProductionWeb.sln +++ b/LaaProductionWeb/LaaProductionWeb.sln @@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaProduction.Search", "Laa EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaProduction.SharedModels", "LaaProduction.SharedModels\LaaProduction.SharedModels.csproj", "{0BF77588-2684-459D-8C71-DBBC6B05E9EE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaProductionWeb", "LaaProductionWeb\LaaProductionWeb.csproj", "{DBBFBA08-138C-4115-85F6-FE6DA4E190AC}" -EndProject Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "LaaProductionVFM", "LaaProductionVFM\", "{9E2662A4-8E1A-4445-B663-0FECEFBF22B0}" ProjectSection(WebsiteProperties) = preProject TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.8.1" @@ -62,6 +60,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaPackages.SqlClient", "La EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaPackages.Features.Cordonel", "LaaPackages\LaaPackages.Features.Cordonel\LaaPackages.Features.Cordonel.csproj", "{8BEFD3AC-BB21-4B62-8D9A-CF8CBFD439EB}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaProductionWeb", "LaaProductionWeb\LaaProductionWeb.csproj", "{DBBFBA08-138C-4115-85F6-FE6DA4E190AC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -84,10 +84,6 @@ Global {0BF77588-2684-459D-8C71-DBBC6B05E9EE}.Debug|Any CPU.Build.0 = Debug|Any CPU {0BF77588-2684-459D-8C71-DBBC6B05E9EE}.Release|Any CPU.ActiveCfg = Release|Any CPU {0BF77588-2684-459D-8C71-DBBC6B05E9EE}.Release|Any CPU.Build.0 = Release|Any CPU - {DBBFBA08-138C-4115-85F6-FE6DA4E190AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBBFBA08-138C-4115-85F6-FE6DA4E190AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBBFBA08-138C-4115-85F6-FE6DA4E190AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBBFBA08-138C-4115-85F6-FE6DA4E190AC}.Release|Any CPU.Build.0 = Release|Any CPU {9E2662A4-8E1A-4445-B663-0FECEFBF22B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9E2662A4-8E1A-4445-B663-0FECEFBF22B0}.Debug|Any CPU.Build.0 = Debug|Any CPU {9E2662A4-8E1A-4445-B663-0FECEFBF22B0}.Release|Any CPU.ActiveCfg = Debug|Any CPU @@ -136,6 +132,10 @@ Global {8BEFD3AC-BB21-4B62-8D9A-CF8CBFD439EB}.Debug|Any CPU.Build.0 = Debug|Any CPU {8BEFD3AC-BB21-4B62-8D9A-CF8CBFD439EB}.Release|Any CPU.ActiveCfg = Release|Any CPU {8BEFD3AC-BB21-4B62-8D9A-CF8CBFD439EB}.Release|Any CPU.Build.0 = Release|Any CPU + {DBBFBA08-138C-4115-85F6-FE6DA4E190AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DBBFBA08-138C-4115-85F6-FE6DA4E190AC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DBBFBA08-138C-4115-85F6-FE6DA4E190AC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DBBFBA08-138C-4115-85F6-FE6DA4E190AC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/LaaProductionWeb/LaaProductionWeb/API/LoginController.cs b/LaaProductionWeb/LaaProductionWeb/API/LoginController.cs index 29a499f5..e3117ff2 100644 --- a/LaaProductionWeb/LaaProductionWeb/API/LoginController.cs +++ b/LaaProductionWeb/LaaProductionWeb/API/LoginController.cs @@ -4,7 +4,6 @@ using LaaProduction.SharedModels; using LaaProductionWeb.App_Infrastructure; - using System; using System.Net; using System.Web.Http; diff --git a/LaaProductionWeb/LaaProductionWeb/Hubs/RemoteControl.cs b/LaaProductionWeb/LaaProductionWeb/Hubs/RemoteControl.cs index 2b036fcd..7142a7db 100644 --- a/LaaProductionWeb/LaaProductionWeb/Hubs/RemoteControl.cs +++ b/LaaProductionWeb/LaaProductionWeb/Hubs/RemoteControl.cs @@ -1,77 +1,77 @@ namespace LaaProductionWeb.Hubs { - using InspectionUI.RemoteControl.Interfaces; - using InspectionUI.RemoteControl.Messages; + //using InspectionUI.RemoteControl.Interfaces; + //using InspectionUI.RemoteControl.Messages; using Microsoft.AspNet.SignalR; - using System; - using System.Threading.Tasks; + //using System; + //using System.Threading.Tasks; - public class RemoteControl : Hub, IRemoteConnectionEvents + public class RemoteControl : Hub//, IRemoteConnectionEvents { - protected string ConnectionId - => this.Context.ConnectionId; + //protected string ConnectionId + // => this.Context.ConnectionId; - protected string GroupName - => this.Context - .QueryString - .Get(nameof(GroupName)); + //protected string GroupName + // => this.Context + // .QueryString + // .Get(nameof(GroupName)); - public void Disposed() - { - var groupName = this.GroupName; + //public void Disposed() + //{ + // var groupName = this.GroupName; - this.Clients - .OthersInGroup(groupName) - .Disposed(); + // this.Clients + // .OthersInGroup(groupName) + // .Disposed(); - this.Groups - .Remove(this.ConnectionId, groupName); - } + // this.Groups + // .Remove(this.ConnectionId, groupName); + //} - public override async Task OnConnected() - => await this.Groups.Add(this.ConnectionId, this.GroupName); + //public override async Task OnConnected() + // => await this.Groups.Add(this.ConnectionId, this.GroupName); - public override async Task OnDisconnected(bool stopCalled) - => await this.Groups.Remove(this.ConnectionId, this.GroupName); + //public override async Task OnDisconnected(bool stopCalled) + // => await this.Groups.Remove(this.ConnectionId, this.GroupName); - public override async Task OnReconnected() - => await this.Groups.Add(this.ConnectionId, this.GroupName); + //public override async Task OnReconnected() + // => await this.Groups.Add(this.ConnectionId, this.GroupName); - public void StartFlow(FlowMessage message) - => this.Clients - .OthersInGroup(this.GroupName) - .StartFlow(message); + //public void StartFlow(FlowMessage message) + // => this.Clients + // .OthersInGroup(this.GroupName) + // .StartFlow(message); - public void GetFlow(FlowMessage message) - => this.Clients - .OthersInGroup(this.GroupName) - .GetFlow(message); + //public void GetFlow(FlowMessage message) + // => this.Clients + // .OthersInGroup(this.GroupName) + // .GetFlow(message); - public void StopFlow(FlowMessage message) - => this.Clients - .OthersInGroup(this.GroupName) - .StopFlow(message); + //public void StopFlow(FlowMessage message) + // => this.Clients + // .OthersInGroup(this.GroupName) + // .StopFlow(message); - public void StartRM(ReferenceMessage message) - => this.Clients - .OthersInGroup(this.GroupName) - .StartRM(message); + //public void StartRM(ReferenceMessage message) + // => this.Clients + // .OthersInGroup(this.GroupName) + // .StartRM(message); - public void GetRM(ReferenceMessage message) - => this.Clients - .OthersInGroup(this.GroupName) - .GetRM(message); + //public void GetRM(ReferenceMessage message) + // => this.Clients + // .OthersInGroup(this.GroupName) + // .GetRM(message); - public void StopRM(ReferenceMessage message) - => this.Clients - .OthersInGroup(this.GroupName) - .StopRM(message); + //public void StopRM(ReferenceMessage message) + // => this.Clients + // .OthersInGroup(this.GroupName) + // .StopRM(message); - public void GetInfo(InfoMessage message) - => this.Clients - .OthersInGroup(this.GroupName) - .GetInfo(message); + //public void GetInfo(InfoMessage message) + // => this.Clients + // .OthersInGroup(this.GroupName) + // .GetInfo(message); } } \ No newline at end of file diff --git a/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj b/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj index 0854e971..cf72c3db 100644 --- a/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj +++ b/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj @@ -175,27 +175,6 @@ - - Hubs\Interfaces\IFlowMessage.cs - - - Hubs\Interfaces\IInfoMessage.cs - - - Hubs\Interfaces\IReferenceMessage.cs - - - Hubs\Contracts\IRemoteConnectionEvents.cs - - - Hubs\Messages\FlowMessage.cs - - - Hubs\Messages\InfoMessage.cs - - - Hubs\Messages\ReferenceMessage.cs - diff --git a/LaaProductionWeb/LaaProductionWeb/Views/Shared/_Layout.cshtml b/LaaProductionWeb/LaaProductionWeb/Views/Shared/_Layout.cshtml index c29636a5..b356555f 100644 --- a/LaaProductionWeb/LaaProductionWeb/Views/Shared/_Layout.cshtml +++ b/LaaProductionWeb/LaaProductionWeb/Views/Shared/_Layout.cshtml @@ -58,9 +58,9 @@ } @*@if (this.User.IsInRole(EmployeesRoles.WEB_Approvals))*@ { -
  • - @UITranslations.CordonelRequirements -
    • +
  • + @UITranslations.CordonelRequirements +
    • } @if (this.User.IsInRole(EmployeesRoles.WEB_Equipments)) { @@ -119,13 +119,36 @@ } + else + { -
    - @this.RenderBody() -
    + + } + +
    + @this.RenderBody() +
    @* - *@ + *@