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

Access rights clean-up for PL

Browse Source
This commit is contained in:
Milan Hanajik 2023-05-19 15:39:27 +02:00
parent e6fc3c25d6
commit 3bc8b55429
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TBF/Rig/Sequences/MainSeq.cs
View File

@ -356,7 +356,7 @@ namespace TBF.Rig.Sequences
} }
while (StateMachine.Procedure == null); /// Make sure a valid procedure is selected while (StateMachine.Procedure == null); /// Make sure a valid procedure is selected
#if KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_50 || WARSAW_END #if LANG_PL
/// ///
/// Approval of a legalizator /// Approval of a legalizator
/// ///

5
TBF/UI/Bench/Metrology/MetrologyDlg.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Windows.Forms; using System.Windows.Forms;
using NHibernate; using NHibernate;
using log4net; using log4net;
using Common;
using Config.Entities; using Config.Entities;
using TBF.Rig; using TBF.Rig;
using TBF.Resources; using TBF.Resources;
@ -34,7 +35,9 @@ namespace TBF.UI.Bench.Metrology
/// SharedDlgButtons configuration /// SharedDlgButtons configuration
sharedButtons.ParentForm = this; sharedButtons.ParentForm = this;
sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.Metrologists, Common.GID.MetrologicalAuthority }; sharedButtons.RequiredGroupMembership = new GID[] { GID.Metrologists,
GID.MetrologicalAuthority,
GID.WaterMeterAuthority };
sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove; sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove;
sharedButtons.Unlocked += unlockButton_Click; sharedButtons.Unlocked += unlockButton_Click;
sharedButtons.OKClicked += okButton_Click; sharedButtons.OKClicked += okButton_Click;

2
TBF/UI/Bench/TestProfiles/TestProfileDlg.cs
View File

@ -71,7 +71,7 @@ namespace TBF.UI.Bench.TestProfiles
/// SharedDlgButtons configuration /// SharedDlgButtons configuration
sharedButtons.ParentForm = parentForm; sharedButtons.ParentForm = parentForm;
sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.MetrologicalAuthority }; sharedButtons.RequiredGroupMembership = new GID[] { GID.MetrologicalAuthority };
sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | sharedButtons.OptionalButtons = SharedButtons.Buttons.Add |
SharedButtons.Buttons.Remove | SharedButtons.Buttons.Remove |
SharedButtons.Buttons.Up | SharedButtons.Buttons.Up |

7
TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Windows.Forms; using System.Windows.Forms;
using NHibernate; using NHibernate;
using log4net; using log4net;
using Common;
using Config.Entities; using Config.Entities;
using TBF.Rig; using TBF.Rig;
using TBF.Resources; using TBF.Resources;
@ -34,10 +35,10 @@ namespace TBF.UI.Bench.Uncertainties
/// SharedDlgButtons configuration /// SharedDlgButtons configuration
sharedButtons.ParentForm = this; sharedButtons.ParentForm = this;
#if KEMPNO_50 #if LANG_PL
sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.MetrologicalAuthority }; sharedButtons.RequiredGroupMembership = new GID[] { GID.MetrologicalAuthority };
#else #else
sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.Metrologists }; sharedButtons.RequiredGroupMembership = new GID[] { GID.Metrologists, GID.MetrologicalAuthority };
#endif #endif
sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove; sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove;
sharedButtons.Unlocked += unlockButton_Click; sharedButtons.Unlocked += unlockButton_Click;

6
TBF/UI/Procedures/ProcedureDlg.cs
View File

@ -1,7 +1,7 @@
/// ///
/// Copyright (c) 2013-2022 Sensus Slovensko a.s. /// Copyright (c) 2013-2022 Sensus Slovensko a.s.
/// ///
#if ORACLE_DB || KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_50 || WARSAW_END #if LANG_PL
#define SHOW_Q_TG #define SHOW_Q_TG
#endif #endif
@ -135,7 +135,7 @@ namespace TBF.UI.Procedures
/// Dynamic SharedDlgButtons configuration /// Dynamic SharedDlgButtons configuration
sharedButtons.ParentForm = parentForm; sharedButtons.ParentForm = parentForm;
#if KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_50 || WARSAW_END #if LANG_PL
sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.WaterMeterAuthority } sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.WaterMeterAuthority }
: new GID[] { GID.TestingSpecialists, GID.WaterMeterAuthority }; : new GID[] { GID.TestingSpecialists, GID.WaterMeterAuthority };
#else #else
@ -360,7 +360,7 @@ namespace TBF.UI.Procedures
LoadUISettings(); LoadUISettings();
/// Enable/disable/show/hide controls in General tab /// Enable/disable/show/hide controls in General tab
#if KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_50 || WARSAW_END #if LANG_PL
altProcNameLabel.Visible = true; altProcNameLabel.Visible = true;
altProcNameTextBox.Visible = true; altProcNameTextBox.Visible = true;
//altProcPeriodLabel.Visible = true; //altProcPeriodLabel.Visible = true;