From 2155790ffb1ce4f60878ebd608cf4fc5d1698063 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 20 Jan 2020 08:05:32 +0100 Subject: [PATCH] (1) MainWnd.UpdateMenuItemsVisibility() called after a user change, (2) TBF depends on RestClient project. --- TBF.sln | 1 + TBF/UI/MainWnd.cs | 41 +++++++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/TBF.sln b/TBF.sln index 2c42b64ef..163dae675 100644 --- a/TBF.sln +++ b/TBF.sln @@ -5,6 +5,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TBF", "TBF\TBF.csproj", "{8 ProjectSection(ProjectDependencies) = postProject {EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF} = {EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF} {0C0A1F4D-1363-4544-A7C5-196C76D26CCA} = {0C0A1F4D-1363-4544-A7C5-196C76D26CCA} + {46E3B0E1-209F-4550-B0DD-D7E2C039B3CE} = {46E3B0E1-209F-4550-B0DD-D7E2C039B3CE} EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Results", "Results\Results.csproj", "{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}" diff --git a/TBF/UI/MainWnd.cs b/TBF/UI/MainWnd.cs index 20569935e..232c96bb6 100644 --- a/TBF/UI/MainWnd.cs +++ b/TBF/UI/MainWnd.cs @@ -114,10 +114,7 @@ namespace TBF.UI graphsToolStripMenuItem.Text = Strings.Graphs; #endif - usersTSMenuItem.Visible = Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.Administrators) || - Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.HeadOfLab); - - upgradeTSMenuItem.Visible = Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.Administrators) && Users.GlobalData.CurrentUser.IsPowerUser(); + UpdateMenuItemsVisibility(); #if IPERL iPerlHeadsToolStripMenuItem.Visible = true; @@ -448,6 +445,20 @@ namespace TBF.UI userInfoStatusLabel.Text = string.Format("{0}: {1}{2}, ", Strings.User, Users.GlobalData.CurrentUser.UserName, (Users.GlobalData.AuthorizedAs == Users.Entities.AuthorizedAs.PowerUser) ? "(S)" : ((Users.GlobalData.AuthorizedAs == Users.Entities.AuthorizedAs.LocalUser) ? "(L)" : "(R)")); + + UpdateMenuItemsVisibility(); + } + + void UpdateMenuItemsVisibility() + { + usersTSMenuItem.Visible = Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.Administrators) || + Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.HeadOfLab); + databaseSettingsTSMenuItem.Visible = Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.Administrators) && Users.GlobalData.CurrentUser.IsPowerUser(); ; + upgradeTSMenuItem.Visible = Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.Administrators) && Users.GlobalData.CurrentUser.IsPowerUser(); + clearCountersToolStripMenuItem.Visible = Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.Administrators) || + Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.HeadOfLab) || + Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.TestingSpecialists) || + Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.Metrologists); } public void UpdateStatusP(string statusPStr) @@ -819,22 +830,16 @@ namespace TBF.UI private void clearCountersToolStripMenuItem_Click(object sender, EventArgs e) { - Users.Entities.GID[] reqGrpMembership = new Users.Entities.GID[] - { - Users.Entities.GID.TestingSpecialists, - Users.Entities.GID.Metrologists, - Users.Entities.GID.HeadOfLab, - Users.Entities.GID.Administrators, - }; - - if (new Users.Forms.LoginDlg(reqGrpMembership).ShowDialog() == DialogResult.OK) + if ((Program.LocalSettings != null) && + (Program.LocalSettings.Counters != null) && + MessageBox.Show("Do you really want to clear counter(s)?", + Strings.Confirmation, + MessageBoxButtons.YesNo, + MessageBoxIcon.Exclamation) == DialogResult.Yes) { - if ((Program.LocalSettings != null) && (Program.LocalSettings.Counters != null)) + for (int i = 0; i < Program.LocalSettings.Counters.Length; i++) { - for (int i = 0; i < Program.LocalSettings.Counters.Length; i++) - { - Program.LocalSettings.Counters[i] = 0; - } + Program.LocalSettings.Counters[i] = 0; } } }