marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sentinel statusfertigung moved

Browse Source
This commit is contained in:
Stoyan Zlatev 2025-02-04 15:28:27 +01:00
parent 5c49945186
commit fb0fcdaee3
9 changed files with 98 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/LaaPackages

@ -1 +1 @@
Subproject commit 466fafaf46e31503975195fc911d6182971fa10b
Subproject commit fc6d1c60141d1dcce304443fe14f62a94e9dc123

14
LaaProductionWeb/Data/LaaProduction.Data.Cordonel/Sentinel/Sentinel.cs
View File

@ -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)

1
LaaProductionWeb/LaaProduction.SharedModels/LDAPLoginModel.cs
View File

@ -1,6 +1,5 @@
namespace LaaProduction.SharedModels
{
using System;
using System.ComponentModel.DataAnnotations;
public class LDAPLoginModel

1
LaaProductionWeb/LaaProduction.SharedModels/LDAPRegisterModel.cs
View File

@ -1,6 +1,5 @@
namespace LaaProduction.SharedModels
{
using System;
using System.ComponentModel.DataAnnotations;
public class LDAPRegisterModel

12
LaaProductionWeb/LaaProductionWeb.sln
View File

@ -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

1
LaaProductionWeb/LaaProductionWeb/API/LoginController.cs
View File

@ -4,7 +4,6 @@
using LaaProduction.SharedModels;
using LaaProductionWeb.App_Infrastructure;
using System;
using System.Net;
using System.Web.Http;

108
LaaProductionWeb/LaaProductionWeb/Hubs/RemoteControl.cs
View File

@ -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);
}
}

21
LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj
View File

@ -175,27 +175,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\Common\OmniPlus\InspectionUI.RemoteControl\Interfaces\IFlowMessage.cs">
<Link>Hubs\Interfaces\IFlowMessage.cs</Link>
</Compile>
<Compile Include="..\..\Common\OmniPlus\InspectionUI.RemoteControl\Interfaces\IInfoMessage.cs">
<Link>Hubs\Interfaces\IInfoMessage.cs</Link>
</Compile>
<Compile Include="..\..\Common\OmniPlus\InspectionUI.RemoteControl\Interfaces\IReferenceMessage.cs">
<Link>Hubs\Interfaces\IReferenceMessage.cs</Link>
</Compile>
<Compile Include="..\..\Common\OmniPlus\InspectionUI.RemoteControl\Interfaces\IRemoteConnectionEvents.cs">
<Link>Hubs\Contracts\IRemoteConnectionEvents.cs</Link>
</Compile>
<Compile Include="..\..\Common\OmniPlus\InspectionUI.RemoteControl\Messages\FlowMessage.cs">
<Link>Hubs\Messages\FlowMessage.cs</Link>
</Compile>
<Compile Include="..\..\Common\OmniPlus\InspectionUI.RemoteControl\Messages\InfoMessage.cs">
<Link>Hubs\Messages\InfoMessage.cs</Link>
</Compile>
<Compile Include="..\..\Common\OmniPlus\InspectionUI.RemoteControl\Messages\ReferenceMessage.cs">
<Link>Hubs\Messages\ReferenceMessage.cs</Link>
</Compile>
<Compile Include="API\APIExtensions.cs" />
<Compile Include="API\ControllerBase.cs" />
<Compile Include="API\Cordonel\ProductionOrdersController.cs" />

37
LaaProductionWeb/LaaProductionWeb/Views/Shared/_Layout.cshtml
View File

@ -58,9 +58,9 @@
}
@*@if (this.User.IsInRole(EmployeesRoles.WEB_Approvals))*@
{
<li class="nav-item">
<a class="nav-link text-smallcaps" href="~/StandardRequirements">@UITranslations.CordonelRequirements</a>
</li>
<li class="nav-item">
<a class="nav-link text-smallcaps" href="~/StandardRequirements">@UITranslations.CordonelRequirements</a>
</li>
}
@if (this.User.IsInRole(EmployeesRoles.WEB_Equipments))
{
@ -119,13 +119,36 @@
</div>
</nav>
}
else
{
<main class="h-100 scrollable">
@this.RenderBody()
</main>
<nav class="navbar navbar-expand-lg navbar-dark bg-dark shadow-sm">
<div class="container-fluid">
<a class="navbar-brand text-smallcaps" href="~/">
<img src="https://sensusglobal.wpenginepowered.com/favicon-32x32.png" height="24" />
</a>
<button class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#mainnav" aria-controls="mainnav" aria-expanded="false">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="mainnav">
<ul class="navbar-nav ms-auto mb-2 mb-lg-0">
<li class="nav-item align-self-center">
<a class="nav-link text-smallcaps" href="~/">
Anmelen
</a>
</li>
</ul>
</div>
</div>
</nav>
}
<main class="h-100 scrollable">
@this.RenderBody()
</main>
@*<script src="~/App_Content/js/bootstrap.bundle.min.js"></script>
<script src="~/App_Content/js/jsbarcode.all.min.js"></script>*@
<script src="~/App_Content/js/jsbarcode.all.min.js"></script>*@
<script src="https://cdn.jsdelivr.net/npm/jsbarcode@3.11.6/dist/JsBarcode.all.min.js"></script>
<script src="~/App_Content/js/scripts.js"></script>