diff --git a/TBF/MetrologyDlg.cs b/TBF/MetrologyDlg.cs
index 89db6344a..03d88a5fd 100644
--- a/TBF/MetrologyDlg.cs
+++ b/TBF/MetrologyDlg.cs
@@ -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;
diff --git a/TBF/ProcedureDlg.cs b/TBF/ProcedureDlg.cs
index b7b48349b..d55255929 100644
--- a/TBF/ProcedureDlg.cs
+++ b/TBF/ProcedureDlg.cs
@@ -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);
diff --git a/Users/Grp.cs b/Users/Grp.cs
index c1593fefc..099024232 100644
--- a/Users/Grp.cs
+++ b/Users/Grp.cs
@@ -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;
}
diff --git a/Users/Properties/AssemblyInfo.cs b/Users/Properties/AssemblyInfo.cs
index 2783da422..e46c69309 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.1280.0")]
-[assembly: AssemblyFileVersion("2.18.1280.0")]
+[assembly: AssemblyVersion("2.18.1302.0")]
+[assembly: AssemblyFileVersion("2.18.1302.0")]
diff --git a/Users/Resources/Strings.Designer.cs b/Users/Resources/Strings.Designer.cs
index a076ea282..80e1b4580 100644
--- a/Users/Resources/Strings.Designer.cs
+++ b/Users/Resources/Strings.Designer.cs
@@ -240,6 +240,15 @@ namespace Users.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to metrological authority.
+ ///
+ internal static string metrological_authority {
+ get {
+ return ResourceManager.GetString("metrological_authority", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to metrologist.
///
@@ -419,5 +428,14 @@ namespace Users.Resources {
return ResourceManager.GetString("Warning", resourceCulture);
}
}
+
+ ///
+ /// Looks up a localized string similar to water meter authority.
+ ///
+ internal static string water_meter_authority {
+ get {
+ return ResourceManager.GetString("water_meter_authority", resourceCulture);
+ }
+ }
}
}
diff --git a/Users/Resources/Strings.resx b/Users/Resources/Strings.resx
index b617b7bd0..662eb0673 100644
--- a/Users/Resources/Strings.resx
+++ b/Users/Resources/Strings.resx
@@ -237,4 +237,10 @@
production tracing administrator
+
+ metrological authority
+
+
+ water meter authority
+
\ No newline at end of file