michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Many changes, Config depends on Users, not vice versa.

Browse Source
This commit is contained in:
Milan Hanajik
2017-03-16 21:53:12 +01:00
parent 7564ed7ba6
commit e245ec80c6
53 changed files with 456 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs
+1 -1
View File
@@ -177,7 +177,7 @@ namespace TBF.BenchControl.ResultsPrinters.Basic
//batch.EndTime.ToShortDateString() + " " + batch.EndTime.ToShortTimeString(),
string.Format("{0:yyyy.MM.dd HH:mm}", batch.EndTime),
batch.ProcedureName,
Config.Data.CurrentUser.UserName,
Users.GlobalData.CurrentUser.UserName,
batch.AmbientTempAve().ToString("F1") + " °C",
Config.Units.ConvertTo(Config.Unit.mbar, batch.AmbientPressAve()).ToString("F0") + " mbar",
batch.AmbientHumiAve().ToString("F0") + " %",
TestBenchFramework/BenchControl/Sequences/MainSeq.cs
+1 -1
View File
@@ -310,7 +310,7 @@ namespace TBF.BenchControl.Sequences
///
BatchRslts = Results.BatchResults.NewFromProcedure(Program.LocalSettings.BatchNr,
(BenchInfo != null) ? BenchInfo.TestBenchId : 1,
Config.Data.CurrentUser.UserName, Config.Data.CurrentUser.Number, Program.Version,
Users.GlobalData.CurrentUser.UserName, Users.GlobalData.CurrentUser.Number, Program.Version,
StateMachine.Procedure, waterMeterData, waterMeterParts);
StateMachine.CycleStartTimeStamp = BatchRslts.Batch.StartTime;
TestBenchFramework/BenchControl/StateMachine.cs
+2 -2
View File
@@ -203,7 +203,7 @@ namespace TBF.BenchControl
{
/// Load the list of components (entities) from the database.
/// Then create the components (derived from IComponent).
components = BenchControl.TbfComponents.LoadComponentsFromDB(Config.FluentCommon.CreateSession(Config.Entities.DBKind.Config));
components = BenchControl.TbfComponents.LoadComponentsFromDB(Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config));
MasterValves = GenericDevices.ValveBase.MasterValves(components);
CoupledValves = GenericDevices.ValveBase.CoupledValves(components);
ExtendedValves = GenericDevices.ValveBase.ExtendedValves(components);
@@ -337,7 +337,7 @@ namespace TBF.BenchControl
public static void LoadProcedure(bool loadPathsOnly)
{
ISession session = Config.FluentCommon.CreateSession(Config.Entities.DBKind.Config);
ISession session = Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config);
WtSession = session;
feedingPaths = session.QueryOver<Config.Entities.FeedingPath>().OrderBy(x => x.ItemNr).Asc.List();
TestBenchFramework/BenchControl/TestMethods/Endurance/CycleDlg.cs
+2 -2
View File
@@ -46,7 +46,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
InitializeComponent();
/// SharedDlgButtons configuration
sharedButtons.RequiredGroupMembership = Config.Grp.GID.Metrologists;
sharedButtons.RequiredGroupMembership = Users.Grp.GID.Metrologists;
sharedButtons.OptionalButtons = TBF.UiControls.SharedButtons.Buttons.Add |
TBF.UiControls.SharedButtons.Buttons.Remove |
TBF.UiControls.SharedButtons.Buttons.Up |
@@ -62,7 +62,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
seqStepsCtrl = new CycleStepsCtrl();
/// Prepare a list of valves for the endurance test
TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(Config.FluentCommon.CreateSession(Config.Entities.DBKind.Config));
TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config));
Valves = new List<IValve>();
for (int bitNr = 0; bitNr < 8; bitNr++)
{