diff --git a/Config/Data.cs b/Config/Data.cs index ae3f3c7cc..9e6df3a55 100644 --- a/Config/Data.cs +++ b/Config/Data.cs @@ -74,7 +74,7 @@ namespace Config public const int CompoundWMsCount = 1; public const int HeatMetersCount = 0; public const int MaxPartNr = WMsCount / LineSize; -#elif TURA_IPERL +#elif TURA_IPERL || TURA_IPERL_NEW public const int WMsCount = 40; public const int LineSize = 20; public const int CompoundWMsCount = 1; diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index fd26bdcea..fa33e5fda 100644 --- a/Config/Properties/AssemblyInfo.cs +++ b/Config/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.18.1268.0")] -[assembly: AssemblyFileVersion("2.18.1268.0")] +[assembly: AssemblyVersion("2.18.1273.0")] +[assembly: AssemblyFileVersion("2.18.1273.0")] diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 75d876e88..573fb0195 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.18.1271.0")] -[assembly: AssemblyFileVersion("2.18.1271.0")] +[assembly: AssemblyVersion("2.18.1273.0")] +[assembly: AssemblyFileVersion("2.18.1273.0")] diff --git a/ResultsBrowser/LocalSettings.cs b/ResultsBrowser/LocalSettings.cs index 6519e4581..7f953894d 100644 --- a/ResultsBrowser/LocalSettings.cs +++ b/ResultsBrowser/LocalSettings.cs @@ -109,7 +109,7 @@ namespace ResultsBrowser public LocalSettings() { -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL Bench1 = "WR10"; Bench2 = "WR11"; Bench3 = "WR13"; diff --git a/ResultsBrowser/Properties/AssemblyInfo.cs b/ResultsBrowser/Properties/AssemblyInfo.cs index b144e66db..a34dd9041 100644 --- a/ResultsBrowser/Properties/AssemblyInfo.cs +++ b/ResultsBrowser/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.18.1258.0")] -[assembly: AssemblyFileVersion("2.18.1258.0")] +[assembly: AssemblyVersion("2.18.1273.0")] +[assembly: AssemblyFileVersion("2.18.1273.0")] diff --git a/TBF/BenchControl/Elde/Common.cs b/TBF/BenchControl/Elde/Common.cs index 52a70b4ea..b232a091c 100644 --- a/TBF/BenchControl/Elde/Common.cs +++ b/TBF/BenchControl/Elde/Common.cs @@ -19,7 +19,7 @@ namespace TBF.BenchControl.Elde EnduranceCycleStop = 13, } -#if FUZHOU_300 || IZRAEL_200 || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || DEWA_300 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 +#if FUZHOU_300 || IZRAEL_200 || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || DEWA_300 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 public enum StatusP : ulong { RefFlowMeterMask = 0x7, /// bits 0,1,2 diff --git a/TBF/BenchControl/Elde/ControlBoardDev.cs b/TBF/BenchControl/Elde/ControlBoardDev.cs index 794db547d..dfea5c680 100644 --- a/TBF/BenchControl/Elde/ControlBoardDev.cs +++ b/TBF/BenchControl/Elde/ControlBoardDev.cs @@ -150,7 +150,7 @@ namespace TBF.BenchControl.Elde {100,500}, {100,500}, {100,500}, {100,500} }; public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[8] { 1, 1, 1, 1, 1, 1, 1, 1 }; -#elif MUNICH || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_50 || CEVAK_40 || TURA_IPERL || TURA_SPECIAL || MURES_40 || FUZHOU_50 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 +#elif MUNICH || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_50 || CEVAK_40 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || MURES_40 || FUZHOU_50 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}}; public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 }; diff --git a/TBF/BenchControl/Elde/ControlComWrap.cs b/TBF/BenchControl/Elde/ControlComWrap.cs index 7830292f9..86f8fe686 100644 --- a/TBF/BenchControl/Elde/ControlComWrap.cs +++ b/TBF/BenchControl/Elde/ControlComWrap.cs @@ -71,7 +71,7 @@ namespace TBF.BenchControl.Elde public UInt128 RRoute { get { return ctrlBrdComponent.rRoute; } } #endif -#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || DEWA_300 || PUCHONG_200 +#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || DEWA_300 || PUCHONG_200 || TURA_IPERL_NEW public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; } public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct) { @@ -405,7 +405,7 @@ namespace TBF.BenchControl.Elde uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses }; ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, pulsesArr, (uint)testMethods, filterConstants, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); -#else /// if TURA_IPERL || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || BADGER_STREDNA_TRAT || PUCHONG_200 +#else /// if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || BADGER_STREDNA_TRAT || PUCHONG_200 uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses }; ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, pulsesArr, (uint)testMethods, Convert.ToSingle(filterConstants[0]), fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); diff --git a/TBF/BenchControl/Elde/Diverter/Diverter.cs b/TBF/BenchControl/Elde/Diverter/Diverter.cs index 03968443a..22c18012e 100644 --- a/TBF/BenchControl/Elde/Diverter/Diverter.cs +++ b/TBF/BenchControl/Elde/Diverter/Diverter.cs @@ -119,7 +119,7 @@ namespace TBF.BenchControl.Elde.Diverter flowMtrNr4Cmd = (divNrFromName == 4) ? 5 : divNrFromName; #elif DEWA_300 || PUCHONG_200 flowMtrNr4Cmd = divNrFromName + 2; /// Div1: 1,2,3, Div2: 4, Div3: 5, Div4: 6, Div5: 7 -#elif TURA_IPERL +#elif TURA_IPERL || TURA_IPERL_NEW flowMtrNr4Cmd = divNrFromName + 16 * divNrFromName; #elif FILIPINY_50 flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 7; diff --git a/TBF/BenchControl/Elde/StartMeasurementOp.cs b/TBF/BenchControl/Elde/StartMeasurementOp.cs index efcc90d73..9fd05a039 100644 --- a/TBF/BenchControl/Elde/StartMeasurementOp.cs +++ b/TBF/BenchControl/Elde/StartMeasurementOp.cs @@ -113,7 +113,7 @@ namespace TBF.BenchControl.Elde void SendStartCommand() { controlBoard.SyncRoute(); -#if TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || SLM_50 +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || BADGER_VELKA_TRAT || SLM_50 int flowMeterIdxAndDiv = flowMeterNr + 16 * diverterNr; #elif BADGER_STREDNA_TRAT int flowMeterIdxAndDiv = flowMeterNr + 8 * (diverterNr - 1); diff --git a/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs b/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs index e91d5aed8..85ac2e9c7 100644 --- a/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs +++ b/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs @@ -173,7 +173,7 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger public Retv WriteLogsToDisk(TextWriter logger, Results.Entities.Batch batch) { -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL /// Obtain one representative water meter data Results.Entities.WaterMeter wm0 = null; diff --git a/TBF/BenchControl/StateMachine.cs b/TBF/BenchControl/StateMachine.cs index 352963f2d..738ad42f6 100644 --- a/TBF/BenchControl/StateMachine.cs +++ b/TBF/BenchControl/StateMachine.cs @@ -67,7 +67,7 @@ namespace TBF.BenchControl /// Time and synchronization -#if TURA_IPERL +#if TURA_IPERL || TURA_IPERL_NEW public const int Period = 2; /// State machine period in sec. #else public const int Period = 1; /// State machine period in sec. diff --git a/TBF/BenchControl/TestBenchSim.cs b/TBF/BenchControl/TestBenchSim.cs index cac6b2850..ae8dae674 100644 --- a/TBF/BenchControl/TestBenchSim.cs +++ b/TBF/BenchControl/TestBenchSim.cs @@ -388,7 +388,7 @@ namespace TBF.BenchControl const ulong Path3 = VI3; const ulong Path4 = VI4; const ulong Path5 = 0; -#elif TORUN_50 || TURA_IPERL +#elif TORUN_50 || TURA_IPERL || TURA_IPERL_NEW const ulong VL11 = (1L << 0); const ulong VL13 = (1L << 1); const ulong VL15 = (1L << 2); @@ -545,7 +545,7 @@ namespace TBF.BenchControl if (Div1sim && (SimRoute & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time); if (Div1sim && (SimRoute & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time); if (Div1sim && (SimRoute & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time); -#elif TORUN_50 || TURA_IPERL /// Path1,2,3,4,5 do WT1, Path6 do WT2 +#elif TORUN_50 || TURA_IPERL || TURA_IPERL_NEW /// Path1,2,3,4,5 do WT1, Path6 do WT2 if (Div1sim && (SimRoute & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time); if (Div1sim && (SimRoute & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time); if (Div1sim && (SimRoute & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time); @@ -695,7 +695,7 @@ namespace TBF.BenchControl if (toTank) { /* throw (new Exception()); */ } break; } -#elif TORUN_50 || TURA_IPERL +#elif TORUN_50 || TURA_IPERL || TURA_IPERL_NEW switch (regulValveNo) { case 1: diff --git a/TBF/Forms/LoginDlgWithBenchSelection.cs b/TBF/Forms/LoginDlgWithBenchSelection.cs index 37bedd9d5..77b9d9268 100644 --- a/TBF/Forms/LoginDlgWithBenchSelection.cs +++ b/TBF/Forms/LoginDlgWithBenchSelection.cs @@ -99,7 +99,7 @@ namespace TBF.Forms smartCardReader = null; /// null = No smart card reader detected -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL try { card = new CardNative(); diff --git a/TBF/Forms/PreviousResultCtrl.cs b/TBF/Forms/PreviousResultCtrl.cs index 9ec9afdc5..6d4f39e86 100644 --- a/TBF/Forms/PreviousResultCtrl.cs +++ b/TBF/Forms/PreviousResultCtrl.cs @@ -102,7 +102,7 @@ namespace TBF.Forms { parent.OnReload(this, new PreviousResultIdEventArgs(BatchNr)); } -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL else if (mode == PreviousResultsMode.Fix) { /// Access only to thise who manage production tracing diff --git a/TBF/MainWnd.Designer.cs b/TBF/MainWnd.Designer.cs index 1aac5bbca..093345c42 100644 --- a/TBF/MainWnd.Designer.cs +++ b/TBF/MainWnd.Designer.cs @@ -693,7 +693,7 @@ namespace TBF #elif TURA_SPECIAL || SLM_50 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageExCtrl processTabPageCtrl; -#elif TURA_IPERL || IZRAEL_50 +#elif TURA_IPERL || TURA_IPERL_NEW || IZRAEL_50 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl48 processTabPageCtrl; #endif diff --git a/TBF/MainWnd.cs b/TBF/MainWnd.cs index d20d1e718..eb6aedce6 100644 --- a/TBF/MainWnd.cs +++ b/TBF/MainWnd.cs @@ -497,7 +497,7 @@ namespace TBF { Users.DB.ConnectionString = Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString; Users.DB.DbType = Config.Data.CurrentBench.ProceduresDBSettings.DbType; -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(Users.DB.CreateSession(), true); string connStr = Users.DB.ConnectionString; int len = connStr.ToUpper().IndexOf("; UID="); @@ -795,7 +795,7 @@ namespace TBF private void statusStrip1_DoubleClick(object sender, EventArgs e) { -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL Users.Grp.GID[] reqGrpMembership = new Users.Grp.GID[] { Users.Grp.GID.Testers, Users.Grp.GID.TestingSpecialists, Users.Grp.GID.Metrologists, Users.Grp.GID.HeadOfLab }; #else Users.Grp.GID[] reqGrpMembership = null; diff --git a/TBF/Program.cs b/TBF/Program.cs index 695891abd..1062fd3eb 100644 --- a/TBF/Program.cs +++ b/TBF/Program.cs @@ -220,7 +220,7 @@ namespace TBF Users.Entities.User loadedUser = null; try { -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL Grp.GID[] reqGrpMembership = new Grp.GID[] { Grp.GID.Testers, Grp.GID.TestingSpecialists, Grp.GID.Metrologists, Grp.GID.HeadOfLab }; #else Grp.GID[] reqGrpMembership = null; diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index bc4ac7e51..2e343c4c5 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.1272.0")] -[assembly: AssemblyFileVersion("2.18.1272.0")] +[assembly: AssemblyVersion("2.18.1273.0")] +[assembly: AssemblyFileVersion("2.18.1273.0")] diff --git a/TBF/Screens/ResultsTabPageCtrl.cs b/TBF/Screens/ResultsTabPageCtrl.cs index 36b373317..3ea8955a5 100644 --- a/TBF/Screens/ResultsTabPageCtrl.cs +++ b/TBF/Screens/ResultsTabPageCtrl.cs @@ -113,7 +113,7 @@ namespace TBF.Screens void OnButtonsEtc(object sender, UiBridge.ButtonsEtcEventArgs args) { reloadPreviousResultsButton.Enabled = ((args.Flags & UiBridge.ButtonsEtc.ProcedureCmbBoxEn) != 0); -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL fixPreviousResultsButton.Visible = ((args.Flags & UiBridge.ButtonsEtc.ProcedureCmbBoxEn) != 0); #endif } @@ -132,7 +132,7 @@ namespace TBF.Screens pictureBox2.BackColor = NokColor; label2.Text = Strings.Failed; -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL label2.Text += " (zopakovať)"; pictureBox3.BackColor = RejectColor; diff --git a/TBF/UiControls/BenchControlPanel.cs b/TBF/UiControls/BenchControlPanel.cs index e937ee569..c0618b2ee 100644 --- a/TBF/UiControls/BenchControlPanel.cs +++ b/TBF/UiControls/BenchControlPanel.cs @@ -248,7 +248,7 @@ namespace TBF.UiControls private void emptyTank1Btn_Click(object sender, EventArgs e) { -#if TURA_IPERL +#if TURA_IPERL || TURA_IPERL_NEW /// Prevent 'Stop draining' by password if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Users.Grp.GID.TestingSpecialists)) { @@ -265,7 +265,7 @@ namespace TBF.UiControls private void emptyTank2Btn_Click(object sender, EventArgs e) { -#if TURA_IPERL +#if TURA_IPERL || TURA_IPERL_NEW /// Prevent 'Stop draining' by password if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Users.Grp.GID.TestingSpecialists)) { @@ -282,7 +282,7 @@ namespace TBF.UiControls private void emptyTank3Btn_Click(object sender, EventArgs e) { -#if TURA_IPERL +#if TURA_IPERL || TURA_IPERL_NEW /// Prevent 'Stop draining' by password if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Users.Grp.GID.TestingSpecialists)) { diff --git a/Users/Forms/EditSelectedUser.cs b/Users/Forms/EditSelectedUser.cs index 646c40603..76486a199 100644 --- a/Users/Forms/EditSelectedUser.cs +++ b/Users/Forms/EditSelectedUser.cs @@ -56,7 +56,7 @@ namespace Users.Forms smartCardReader = null; /// null = No smart card reader detected -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL try { card = new CardNative(); diff --git a/Users/Forms/LoginDlg.cs b/Users/Forms/LoginDlg.cs index 0936f7e58..d6a444645 100644 --- a/Users/Forms/LoginDlg.cs +++ b/Users/Forms/LoginDlg.cs @@ -98,7 +98,7 @@ namespace Users.Forms /// smartCardReader = null; /// null = No smart card reader detected -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL try { card = new CardNative(); diff --git a/Users/Forms/UserManagementDlg.cs b/Users/Forms/UserManagementDlg.cs index 3909befd0..b20efb99a 100644 --- a/Users/Forms/UserManagementDlg.cs +++ b/Users/Forms/UserManagementDlg.cs @@ -57,7 +57,7 @@ namespace Users.Forms listViewUsers.Columns.Add(Strings.User_name, 100); /// column 0 listViewUsers.Columns.Add(Strings.User_code, 70); /// column 1: UserNumberColumn listViewUsers.Columns.Add(Strings.Full_name, 150); /// column 2: NameSurnameColumn -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL listViewUsers.Columns.Add(Strings.Tag, 110); #endif listViewUsers.Columns.Add(Strings.Groups, 370); @@ -83,7 +83,7 @@ namespace Users.Forms { string grps = string.Empty; /// -#if TURA_IPERL +#if TURA_IPERL || TURA_IPERL_NEW foreach (var gid in new Grp.GID[] { Grp.GID.TraceabilityManagement, Grp.GID.Administrators, Grp.GID.HeadOfLab, @@ -112,7 +112,7 @@ namespace Users.Forms ListViewItem item = new ListViewItem(u.UserName); item.SubItems.Add(u.Number.ToString()); item.SubItems.Add(u.FullName); -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL item.SubItems.Add(string.IsNullOrEmpty(u.Tag) ? string.Empty : u.Tag); #endif item.SubItems.Add(grps); diff --git a/Users/Grp.cs b/Users/Grp.cs index eb40e2dd3..c1593fefc 100644 --- a/Users/Grp.cs +++ b/Users/Grp.cs @@ -31,7 +31,7 @@ namespace Users Metrologists, CalibrationSpecialists, Administrators, // application / network / database administrator -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL TraceabilityManagement, #endif NrOfGroups, // Number of groups (this is not a GroupID) @@ -55,7 +55,7 @@ namespace Users case GID.Metrologists: return Strings.metrologist; case GID.CalibrationSpecialists: return Strings.calibration_specialist; case GID.Administrators: return Strings.administrator; -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL case GID.TraceabilityManagement: return Strings.production_tracing_administrator; #endif default: return Strings.invalid; diff --git a/Users/Mappings/UserMap.cs b/Users/Mappings/UserMap.cs index 7e47dd801..510bf89cd 100644 --- a/Users/Mappings/UserMap.cs +++ b/Users/Mappings/UserMap.cs @@ -12,7 +12,7 @@ namespace Users.Mappings Id(x => x.Id); Map(x => x.UserName).Column("Name"); Map(x => x.Number); -#if TURA_IPERL || TURA_SPECIAL +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL Map(x => x.Tag); #endif Map(x => x.Password); diff --git a/Users/Properties/AssemblyInfo.cs b/Users/Properties/AssemblyInfo.cs index 94b674685..0a31f8466 100644 --- a/Users/Properties/AssemblyInfo.cs +++ b/Users/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.18.1234.0")] -[assembly: AssemblyFileVersion("2.18.1234.0")] +[assembly: AssemblyVersion("2.18.1273.0")] +[assembly: AssemblyFileVersion("2.18.1273.0")] diff --git a/packages/ControlBoard/iPerlST-new/ControlComponent3U.dll b/packages/ControlBoard/iPerlST-new/ControlComponent3U.dll new file mode 100644 index 000000000..50f7749c7 Binary files /dev/null and b/packages/ControlBoard/iPerlST-new/ControlComponent3U.dll differ