GID.MetrologicalAuthority, GID.WaterMeterAuthority added and used in MetrologyDlg, ProcedureDlg (KEMPNO_50), ver. 2.18.1302

This commit is contained in:
Milan Hanajik
2019-09-05 08:52:34 +02:00
parent 6079c8419f
commit 6fdb030b9f
6 changed files with 50 additions and 6 deletions
+5 -1
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -26,7 +26,11 @@ namespace TBF
InitializeComponent();
/// SharedDlgButtons configuration
#if KEMPNO_50
sharedButtons.RequiredGroupMembership = new Users.Grp.GID[] { Users.Grp.GID.MetrologicalAuthority };
#else
sharedButtons.RequiredGroupMembership = new Users.Grp.GID[] { Users.Grp.GID.Metrologists };
#endif
sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove;
sharedButtons.Unlocked += unlockButton_Click;
sharedButtons.OKClicked += okButton_Click;
+11 -3
View File
@@ -65,8 +65,12 @@ namespace TBF
InitializeComponent();
/// SharedDlgButtons configuration
#if KEMPNO_50
sharedButtons.RequiredGroupMembership = new Users.Grp.GID[] { Users.Grp.GID.TestingSpecialists, Users.Grp.GID.WaterMeterAuthority };
#else
sharedButtons.RequiredGroupMembership = new Users.Grp.GID[] { Users.Grp.GID.TestingSpecialists, Users.Grp.GID.Metrologists };
sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove |
#endif
sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove |
SharedButtons.Buttons.Up | SharedButtons.Buttons.Down;
sharedButtons.Unlocked += Unlocked;
sharedButtons.OKClicked += okButton_Click;
@@ -105,10 +109,14 @@ namespace TBF
this.usedNames = usedNames;
this.openUnlocked = openUnlocked;
#if KEMPNO_50
sharedButtons.RequiredGroupMembership = procedure.Protected ? new Users.Grp.GID[] { Users.Grp.GID.WaterMeterAuthority }
: new Users.Grp.GID[] { Users.Grp.GID.TestingSpecialists, Users.Grp.GID.WaterMeterAuthority };
#else
sharedButtons.RequiredGroupMembership = procedure.Protected ? new Users.Grp.GID[] { Users.Grp.GID.Metrologists }
: new Users.Grp.GID[] { Users.Grp.GID.TestingSpecialists, Users.Grp.GID.Metrologists };
/// Prepare a list of components and a list of all valves in the test bench
#endif
/// Prepare a list of components and a list of all valves in the test bench
using (NHibernate.ISession session = Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config))
{
TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(session);
+8
View File
@@ -33,6 +33,10 @@ namespace Users
Administrators, // application / network / database administrator
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
TraceabilityManagement,
#endif
#if KEMPNO_50
MetrologicalAuthority,
WaterMeterAuthority,
#endif
NrOfGroups, // Number of groups (this is not a GroupID)
None, // Not a GroupID, can be used to indicate no group membership is required
@@ -57,6 +61,10 @@ namespace Users
case GID.Administrators: return Strings.administrator;
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
case GID.TraceabilityManagement: return Strings.production_tracing_administrator;
#endif
#if KEMPNO_50
case GID.MetrologicalAuthority: return Strings.metrological_authority;
case GID.WaterMeterAuthority: return Strings.water_meter_authority;
#endif
default: return Strings.invalid;
}
+2 -2
View File
@@ -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.1280.0")]
[assembly: AssemblyFileVersion("2.18.1280.0")]
[assembly: AssemblyVersion("2.18.1302.0")]
[assembly: AssemblyFileVersion("2.18.1302.0")]
+18
View File
@@ -240,6 +240,15 @@ namespace Users.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to metrological authority.
/// </summary>
internal static string metrological_authority {
get {
return ResourceManager.GetString("metrological_authority", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to metrologist.
/// </summary>
@@ -419,5 +428,14 @@ namespace Users.Resources {
return ResourceManager.GetString("Warning", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to water meter authority.
/// </summary>
internal static string water_meter_authority {
get {
return ResourceManager.GetString("water_meter_authority", resourceCulture);
}
}
}
}
+6
View File
@@ -237,4 +237,10 @@
<data name="production_tracing_administrator" xml:space="preserve">
<value>production tracing administrator</value>
</data>
<data name="metrological_authority" xml:space="preserve">
<value>metrological authority</value>
</data>
<data name="water_meter_authority" xml:space="preserve">
<value>water meter authority</value>
</data>
</root>