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 b965541b1c
commit 3fee487c5d
6 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Config/FluentCommon.cs
View File

@ -127,7 +127,7 @@ namespace Config
case Common.GID.Administrators: case Common.GID.Administrators:
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
case Common.GID.TraceabilityManagement: case Common.GID.TraceabilityManagement:
#elif KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_50 || WARSAW_END #elif LANG_PL
case Common.GID.MetrologicalAuthority: case Common.GID.MetrologicalAuthority:
case Common.GID.WaterMeterAuthority: case Common.GID.WaterMeterAuthority:
#endif #endif

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

@ -404,7 +404,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
/// ///

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

@ -1,11 +1,12 @@
/// ///
/// Copyright (c) 2013-2019 Sensus Slovensko a.s. /// Copyright (c) 2013-2023 Sensus Slovensko a.s.
/// ///
using System; using System;
using System.Collections.Generic; 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;
@ -27,7 +28,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

@ -75,7 +75,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 |

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

@ -1,11 +1,12 @@
/// ///
/// Copyright (c) 2019 Sensus Slovensko a.s. /// Copyright (c) 2019-2023 Sensus Slovensko a.s.
/// ///
using System; using System;
using System.Collections.Generic; 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;
@ -27,10 +28,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;

67
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
@ -71,18 +71,36 @@ namespace TBF.UI.Procedures
ProcedureDlg() ProcedureDlg()
{ {
/// Detect display setting: 100% = 96dpi, 125% = 120dpi, 150% = 144dpi. InitializeComponent();
Dpi = (int)this.CreateGraphics().DpiX;
initialMode = Mode.Locked;
InitializeComponent(); /// Detect display setting: 100% = 96dpi, 125% = 120dpi, 150% = 144dpi.
Dpi = (int)this.CreateGraphics().DpiX;
}
public ProcedureDlg(Procedure procedure, IList<string> usedNames, Mode initialMode, Form parentForm)
: this()
{
if (procedure == null) throw new ArgumentNullException("procedure");
LoadedProcedure = procedure;
this.usedNames = usedNames;
this.initialMode = initialMode;
/// SharedDlgButtons configuration /// SharedDlgButtons configuration
sharedButtons.ParentForm = parentForm;
#if LANG_PL
sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.WaterMeterAuthority }
: new GID[] { GID.TestingSpecialists, GID.Metrologists, GID.WaterMeterAuthority };
#else
sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.Metrologists }
: new GID[] { GID.TestingSpecialists, GID.Metrologists };
#endif
sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | sharedButtons.OptionalButtons = SharedButtons.Buttons.Add |
SharedButtons.Buttons.Remove | SharedButtons.Buttons.Remove |
SharedButtons.Buttons.Up | SharedButtons.Buttons.Up |
SharedButtons.Buttons.Down | SharedButtons.Buttons.Down |
SharedButtons.Buttons.Copy; SharedButtons.Buttons.Copy;
#if TURA_SPECIAL || TURA_IPERL || TURA_IPERL_NEW #if TURA_SPECIAL || TURA_IPERL || TURA_IPERL_NEW
/// Custom button 'Načítaj testy iPerl z Oracle' /// Custom button 'Načítaj testy iPerl z Oracle'
sharedButtons.OptionalButtons |= SharedButtons.Buttons.Custom1; sharedButtons.OptionalButtons |= SharedButtons.Buttons.Custom1;
@ -90,15 +108,16 @@ namespace TBF.UI.Procedures
sharedButtons.Custom1Clicked += iPerlWizardButton_Click; sharedButtons.Custom1Clicked += iPerlWizardButton_Click;
#endif #endif
sharedButtons.Unlocked += Unlocked; sharedButtons.Unlocked += Unlocked;
sharedButtons.OKClicked += okButton_Click; sharedButtons.OKClicked += okButton_Click;
sharedButtons.CancelClicked += cancelButton_Click; sharedButtons.CancelClicked += cancelButton_Click;
sharedButtons.AddClicked += addButton_Click; sharedButtons.AddClicked += addButton_Click;
sharedButtons.RemoveClicked += removeButton_Click; sharedButtons.RemoveClicked += removeButton_Click;
sharedButtons.UpClicked += upButton_Click; sharedButtons.UpClicked += upButton_Click;
sharedButtons.DownClicked += downButton_Click; sharedButtons.DownClicked += downButton_Click;
sharedButtons.CopyClicked += copyButton_Click; sharedButtons.CopyClicked += copyButton_Click;
if (initialMode == Mode.PermanentlyLocked) sharedButtons.DisableUnlock();
/// ListViewEx-es configuration /// ListViewEx-es configuration
metrology1ListViewEx.SubItemClicked += new SubItemEventHandler(metrology1ListViewEx_SubItemClicked); metrology1ListViewEx.SubItemClicked += new SubItemEventHandler(metrology1ListViewEx_SubItemClicked);
metrology1ListViewEx.SubItemRightClicked += new SubItemEventHandler(metrology1ListViewEx_SubItemRightClicked); metrology1ListViewEx.SubItemRightClicked += new SubItemEventHandler(metrology1ListViewEx_SubItemRightClicked);
metrology1ListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(metrology1ListViewEx_SubItemEndEditing); metrology1ListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(metrology1ListViewEx_SubItemEndEditing);
@ -116,28 +135,6 @@ namespace TBF.UI.Procedures
parametersListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(parametersListViewEx_SubItemEndEditing); parametersListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(parametersListViewEx_SubItemEndEditing);
SelectedTestIx = -1; SelectedTestIx = -1;
}
public ProcedureDlg(Procedure procedure, IList<string> usedNames, Mode initialMode, Form parentForm)
: this()
{
if (procedure == null) throw new ArgumentNullException("procedure");
LoadedProcedure = procedure;
this.usedNames = usedNames;
this.initialMode = initialMode;
/// Dynamic SharedDlgButtons configuration
sharedButtons.ParentForm = parentForm;
#if KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_50 || WARSAW_END
sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.WaterMeterAuthority }
: new GID[] { GID.TestingSpecialists, GID.WaterMeterAuthority };
#else
sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.Metrologists }
: new GID[] { GID.TestingSpecialists, GID.Metrologists };
#endif
if (initialMode == Mode.PermanentlyLocked) sharedButtons.DisableUnlock();
using (NHibernate.ISession session = TBF.DB.CreateSession(DBKind.Config)) using (NHibernate.ISession session = TBF.DB.CreateSession(DBKind.Config))
{ {
@ -358,7 +355,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;