diff --git a/PROMS/VEPROMS User Interface/dlgManageSecurity.Designer.cs b/PROMS/VEPROMS User Interface/dlgManageSecurity.Designer.cs index b53241e8..73cb37bc 100644 --- a/PROMS/VEPROMS User Interface/dlgManageSecurity.Designer.cs +++ b/PROMS/VEPROMS User Interface/dlgManageSecurity.Designer.cs @@ -31,11 +31,9 @@ namespace VEPROMS this.components = new System.ComponentModel.Container(); this.tcSecurity = new System.Windows.Forms.TabControl(); this.tpGroupUsers = new System.Windows.Forms.TabPage(); - this.lstUserGroups = new System.Windows.Forms.ListBox(); - this.cmGroupMembers = new System.Windows.Forms.ContextMenuStrip(this.components); - this.addMemberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.removeMemberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.label7 = new System.Windows.Forms.Label(); + this.pnlMembers = new System.Windows.Forms.Panel(); + this.lstMembers = new System.Windows.Forms.ListBox(); + this.lblMembers = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); this.tvFolders = new System.Windows.Forms.TreeView(); this.cmFolders = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -44,33 +42,30 @@ namespace VEPROMS this.createROEToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.createReviewerGroupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.lstUsers = new System.Windows.Forms.ListBox(); - this.cmUsers = new System.Windows.Forms.ContextMenuStrip(this.components); - this.addUserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.editUserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.deleteUserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.label5 = new System.Windows.Forms.Label(); - this.lstGroupUsers = new System.Windows.Forms.ListBox(); - this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.lstGroups = new System.Windows.Forms.ListBox(); this.tpDefault = new System.Windows.Forms.TabPage(); this.label8 = new System.Windows.Forms.Label(); this.pnlGroups = new System.Windows.Forms.Panel(); + this.cmMembers = new System.Windows.Forms.ContextMenuStrip(this.components); + this.removeMemberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.cmUsers = new System.Windows.Forms.ContextMenuStrip(this.components); + this.addUserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.editUserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.deleteUserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.addMemberToolStripMenuItemUser = new System.Windows.Forms.ToolStripMenuItem(); this.cmGroups = new System.Windows.Forms.ContextMenuStrip(this.components); this.deleteGroupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pnlCGU = new System.Windows.Forms.Panel(); - this.pnlCUG = new System.Windows.Forms.Panel(); - this.panel2 = new System.Windows.Forms.Panel(); + this.addMemberToolStripMenuItemGroup = new System.Windows.Forms.ToolStripMenuItem(); this.tcSecurity.SuspendLayout(); this.tpGroupUsers.SuspendLayout(); - this.cmGroupMembers.SuspendLayout(); + this.pnlMembers.SuspendLayout(); this.cmFolders.SuspendLayout(); - this.cmUsers.SuspendLayout(); this.tpDefault.SuspendLayout(); + this.cmMembers.SuspendLayout(); + this.cmUsers.SuspendLayout(); this.cmGroups.SuspendLayout(); - this.pnlCGU.SuspendLayout(); - this.pnlCUG.SuspendLayout(); - this.panel2.SuspendLayout(); this.SuspendLayout(); // // tcSecurity @@ -87,7 +82,7 @@ namespace VEPROMS // tpGroupUsers // this.tpGroupUsers.BackColor = System.Drawing.SystemColors.ButtonFace; - this.tpGroupUsers.Controls.Add(this.panel2); + this.tpGroupUsers.Controls.Add(this.pnlMembers); this.tpGroupUsers.Controls.Add(this.label6); this.tpGroupUsers.Controls.Add(this.tvFolders); this.tpGroupUsers.Controls.Add(this.lstUsers); @@ -101,47 +96,34 @@ namespace VEPROMS this.tpGroupUsers.TabIndex = 2; this.tpGroupUsers.Text = "Folders, Groups and Users"; // - // lstUserGroups + // pnlMembers // - this.lstUserGroups.ContextMenuStrip = this.cmGroupMembers; - this.lstUserGroups.Dock = System.Windows.Forms.DockStyle.Fill; - this.lstUserGroups.FormattingEnabled = true; - this.lstUserGroups.Location = new System.Drawing.Point(0, 19); - this.lstUserGroups.Name = "lstUserGroups"; - this.lstUserGroups.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; - this.lstUserGroups.Size = new System.Drawing.Size(386, 212); - this.lstUserGroups.TabIndex = 9; + this.pnlMembers.Controls.Add(this.lstMembers); + this.pnlMembers.Controls.Add(this.lblMembers); + this.pnlMembers.Location = new System.Drawing.Point(384, 304); + this.pnlMembers.Name = "pnlMembers"; + this.pnlMembers.Size = new System.Drawing.Size(386, 232); + this.pnlMembers.TabIndex = 12; // - // cmGroupMembers + // lstMembers // - this.cmGroupMembers.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.addMemberToolStripMenuItem, - this.removeMemberToolStripMenuItem}); - this.cmGroupMembers.Name = "cmGroupMembers"; - this.cmGroupMembers.Size = new System.Drawing.Size(166, 48); + this.lstMembers.Dock = System.Windows.Forms.DockStyle.Fill; + this.lstMembers.FormattingEnabled = true; + this.lstMembers.Location = new System.Drawing.Point(0, 19); + this.lstMembers.Name = "lstMembers"; + this.lstMembers.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; + this.lstMembers.Size = new System.Drawing.Size(386, 212); + this.lstMembers.TabIndex = 10; + this.lstMembers.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lstMembers_MouseUp); // - // addMemberToolStripMenuItem + // lblMembers // - this.addMemberToolStripMenuItem.Name = "addMemberToolStripMenuItem"; - this.addMemberToolStripMenuItem.Size = new System.Drawing.Size(165, 22); - this.addMemberToolStripMenuItem.Text = "Add Member"; - this.addMemberToolStripMenuItem.Click += new System.EventHandler(this.addMemberToolStripMenuItem_Click); - // - // removeMemberToolStripMenuItem - // - this.removeMemberToolStripMenuItem.Name = "removeMemberToolStripMenuItem"; - this.removeMemberToolStripMenuItem.Size = new System.Drawing.Size(165, 22); - this.removeMemberToolStripMenuItem.Text = "Remove Member"; - this.removeMemberToolStripMenuItem.Click += new System.EventHandler(this.removeMemberToolStripMenuItem_Click); - // - // label7 - // - this.label7.Dock = System.Windows.Forms.DockStyle.Top; - this.label7.Location = new System.Drawing.Point(0, 0); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(386, 19); - this.label7.TabIndex = 8; - this.label7.Text = "Current User Groups"; + this.lblMembers.Dock = System.Windows.Forms.DockStyle.Top; + this.lblMembers.Location = new System.Drawing.Point(0, 0); + this.lblMembers.Name = "lblMembers"; + this.lblMembers.Size = new System.Drawing.Size(386, 19); + this.lblMembers.TabIndex = 2; + this.lblMembers.Text = "Members"; // // label6 // @@ -204,45 +186,15 @@ namespace VEPROMS // this.lstUsers.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); - this.lstUsers.ContextMenuStrip = this.cmUsers; this.lstUsers.FormattingEnabled = true; this.lstUsers.Location = new System.Drawing.Point(630, 21); this.lstUsers.Name = "lstUsers"; this.lstUsers.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; this.lstUsers.Size = new System.Drawing.Size(140, 277); this.lstUsers.TabIndex = 5; + this.lstUsers.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lstUsers_MouseUp); this.lstUsers.SelectedIndexChanged += new System.EventHandler(this.lstUsers_SelectedIndexChanged); // - // cmUsers - // - this.cmUsers.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.addUserToolStripMenuItem, - this.editUserToolStripMenuItem, - this.deleteUserToolStripMenuItem}); - this.cmUsers.Name = "cmUsers"; - this.cmUsers.Size = new System.Drawing.Size(134, 70); - // - // addUserToolStripMenuItem - // - this.addUserToolStripMenuItem.Name = "addUserToolStripMenuItem"; - this.addUserToolStripMenuItem.Size = new System.Drawing.Size(133, 22); - this.addUserToolStripMenuItem.Text = "Add User"; - this.addUserToolStripMenuItem.Click += new System.EventHandler(this.addUserToolStripMenuItem_Click); - // - // editUserToolStripMenuItem - // - this.editUserToolStripMenuItem.Name = "editUserToolStripMenuItem"; - this.editUserToolStripMenuItem.Size = new System.Drawing.Size(133, 22); - this.editUserToolStripMenuItem.Text = "Edit User"; - this.editUserToolStripMenuItem.Click += new System.EventHandler(this.editUserToolStripMenuItem_Click); - // - // deleteUserToolStripMenuItem - // - this.deleteUserToolStripMenuItem.Name = "deleteUserToolStripMenuItem"; - this.deleteUserToolStripMenuItem.Size = new System.Drawing.Size(133, 22); - this.deleteUserToolStripMenuItem.Text = "Delete User"; - this.deleteUserToolStripMenuItem.Click += new System.EventHandler(this.deleteUserToolStripMenuItem_Click); - // // label5 // this.label5.AutoSize = true; @@ -252,26 +204,6 @@ namespace VEPROMS this.label5.TabIndex = 4; this.label5.Text = "Users"; // - // lstGroupUsers - // - this.lstGroupUsers.ContextMenuStrip = this.cmGroupMembers; - this.lstGroupUsers.Dock = System.Windows.Forms.DockStyle.Fill; - this.lstGroupUsers.FormattingEnabled = true; - this.lstGroupUsers.Location = new System.Drawing.Point(0, 19); - this.lstGroupUsers.Name = "lstGroupUsers"; - this.lstGroupUsers.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; - this.lstGroupUsers.Size = new System.Drawing.Size(386, 212); - this.lstGroupUsers.TabIndex = 3; - // - // label4 - // - this.label4.Dock = System.Windows.Forms.DockStyle.Top; - this.label4.Location = new System.Drawing.Point(0, 0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(386, 19); - this.label4.TabIndex = 2; - this.label4.Text = "Current Group Users"; - // // label3 // this.label3.AutoSize = true; @@ -285,13 +217,13 @@ namespace VEPROMS // this.lstGroups.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); - this.lstGroups.ContextMenuStrip = this.cmGroups; this.lstGroups.FormattingEnabled = true; this.lstGroups.Location = new System.Drawing.Point(384, 21); this.lstGroups.Name = "lstGroups"; this.lstGroups.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; this.lstGroups.Size = new System.Drawing.Size(240, 277); this.lstGroups.TabIndex = 0; + this.lstGroups.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lstGroups_MouseUp); this.lstGroups.SelectedIndexChanged += new System.EventHandler(this.lstGroups_SelectedIndexChanged); // // tpDefault @@ -322,46 +254,79 @@ namespace VEPROMS this.pnlGroups.Size = new System.Drawing.Size(299, 526); this.pnlGroups.TabIndex = 4; // + // cmMembers + // + this.cmMembers.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.removeMemberToolStripMenuItem}); + this.cmMembers.Name = "cmGroupMembers"; + this.cmMembers.Size = new System.Drawing.Size(166, 26); + // + // removeMemberToolStripMenuItem + // + this.removeMemberToolStripMenuItem.Name = "removeMemberToolStripMenuItem"; + this.removeMemberToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.removeMemberToolStripMenuItem.Text = "Remove Member"; + this.removeMemberToolStripMenuItem.Click += new System.EventHandler(this.removeMemberToolStripMenuItem_Click); + // + // cmUsers + // + this.cmUsers.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.addUserToolStripMenuItem, + this.editUserToolStripMenuItem, + this.deleteUserToolStripMenuItem, + this.addMemberToolStripMenuItemUser}); + this.cmUsers.Name = "cmUsers"; + this.cmUsers.Size = new System.Drawing.Size(153, 114); + // + // addUserToolStripMenuItem + // + this.addUserToolStripMenuItem.Name = "addUserToolStripMenuItem"; + this.addUserToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.addUserToolStripMenuItem.Text = "Add User"; + this.addUserToolStripMenuItem.Click += new System.EventHandler(this.addUserToolStripMenuItem_Click); + // + // editUserToolStripMenuItem + // + this.editUserToolStripMenuItem.Name = "editUserToolStripMenuItem"; + this.editUserToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.editUserToolStripMenuItem.Text = "Edit User"; + this.editUserToolStripMenuItem.Click += new System.EventHandler(this.editUserToolStripMenuItem_Click); + // + // deleteUserToolStripMenuItem + // + this.deleteUserToolStripMenuItem.Name = "deleteUserToolStripMenuItem"; + this.deleteUserToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.deleteUserToolStripMenuItem.Text = "Delete User"; + this.deleteUserToolStripMenuItem.Click += new System.EventHandler(this.deleteUserToolStripMenuItem_Click); + // + // addMemberToolStripMenuItemUser + // + this.addMemberToolStripMenuItemUser.Name = "addMemberToolStripMenuItemUser"; + this.addMemberToolStripMenuItemUser.Size = new System.Drawing.Size(152, 22); + this.addMemberToolStripMenuItemUser.Text = "Add Member"; + this.addMemberToolStripMenuItemUser.Click += new System.EventHandler(this.addMemberToolStripMenuItem_Click); + // // cmGroups // this.cmGroups.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.deleteGroupToolStripMenuItem}); + this.deleteGroupToolStripMenuItem, + this.addMemberToolStripMenuItemGroup}); this.cmGroups.Name = "cmGroups"; - this.cmGroups.Size = new System.Drawing.Size(144, 26); + this.cmGroups.Size = new System.Drawing.Size(145, 48); // // deleteGroupToolStripMenuItem // this.deleteGroupToolStripMenuItem.Name = "deleteGroupToolStripMenuItem"; - this.deleteGroupToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.deleteGroupToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.deleteGroupToolStripMenuItem.Text = "Delete Group"; this.deleteGroupToolStripMenuItem.Click += new System.EventHandler(this.deleteGroupToolStripMenuItem_Click); // - // pnlCGU + // addMemberToolStripMenuItemGroup // - this.pnlCGU.Controls.Add(this.lstGroupUsers); - this.pnlCGU.Controls.Add(this.label4); - this.pnlCGU.Location = new System.Drawing.Point(0, 0); - this.pnlCGU.Name = "pnlCGU"; - this.pnlCGU.Size = new System.Drawing.Size(386, 232); - this.pnlCGU.TabIndex = 10; - // - // pnlCUG - // - this.pnlCUG.Controls.Add(this.lstUserGroups); - this.pnlCUG.Controls.Add(this.label7); - this.pnlCUG.Location = new System.Drawing.Point(0, 0); - this.pnlCUG.Name = "pnlCUG"; - this.pnlCUG.Size = new System.Drawing.Size(386, 232); - this.pnlCUG.TabIndex = 11; - // - // panel2 - // - this.panel2.Controls.Add(this.pnlCUG); - this.panel2.Controls.Add(this.pnlCGU); - this.panel2.Location = new System.Drawing.Point(384, 304); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(386, 232); - this.panel2.TabIndex = 12; + this.addMemberToolStripMenuItemGroup.Name = "addMemberToolStripMenuItemGroup"; + this.addMemberToolStripMenuItemGroup.Size = new System.Drawing.Size(144, 22); + this.addMemberToolStripMenuItemGroup.Text = "Add Member"; + this.addMemberToolStripMenuItemGroup.Click += new System.EventHandler(this.addMemberToolStripMenuItem_Click); // // dlgManageSecurity // @@ -378,14 +343,12 @@ namespace VEPROMS this.tcSecurity.ResumeLayout(false); this.tpGroupUsers.ResumeLayout(false); this.tpGroupUsers.PerformLayout(); - this.cmGroupMembers.ResumeLayout(false); + this.pnlMembers.ResumeLayout(false); this.cmFolders.ResumeLayout(false); - this.cmUsers.ResumeLayout(false); this.tpDefault.ResumeLayout(false); + this.cmMembers.ResumeLayout(false); + this.cmUsers.ResumeLayout(false); this.cmGroups.ResumeLayout(false); - this.pnlCGU.ResumeLayout(false); - this.pnlCUG.ResumeLayout(false); - this.panel2.ResumeLayout(false); this.ResumeLayout(false); } @@ -396,8 +359,7 @@ namespace VEPROMS private System.Windows.Forms.TabPage tpDefault; private System.Windows.Forms.TabPage tpGroupUsers; private System.Windows.Forms.ListBox lstGroups; - private System.Windows.Forms.ListBox lstGroupUsers; - private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label lblMembers; private System.Windows.Forms.Label label3; private System.Windows.Forms.ContextMenuStrip cmGroups; private System.Windows.Forms.ListBox lstUsers; @@ -406,8 +368,7 @@ namespace VEPROMS private System.Windows.Forms.ToolStripMenuItem addUserToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem editUserToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem deleteUserToolStripMenuItem; - private System.Windows.Forms.ContextMenuStrip cmGroupMembers; - private System.Windows.Forms.ToolStripMenuItem addMemberToolStripMenuItem; + private System.Windows.Forms.ContextMenuStrip cmMembers; private System.Windows.Forms.ToolStripMenuItem removeMemberToolStripMenuItem; private System.Windows.Forms.Label label6; private System.Windows.Forms.TreeView tvFolders; @@ -416,13 +377,12 @@ namespace VEPROMS private System.Windows.Forms.ToolStripMenuItem createWriterGroupToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem createROEToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem createReviewerGroupToolStripMenuItem; - private System.Windows.Forms.ListBox lstUserGroups; - private System.Windows.Forms.Label label7; private System.Windows.Forms.Panel pnlGroups; private System.Windows.Forms.Label label8; private System.Windows.Forms.ToolStripMenuItem deleteGroupToolStripMenuItem; - private System.Windows.Forms.Panel pnlCGU; - private System.Windows.Forms.Panel pnlCUG; - private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel pnlMembers; + private System.Windows.Forms.ListBox lstMembers; + private System.Windows.Forms.ToolStripMenuItem addMemberToolStripMenuItemUser; + private System.Windows.Forms.ToolStripMenuItem addMemberToolStripMenuItemGroup; } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/dlgManageSecurity.cs b/PROMS/VEPROMS User Interface/dlgManageSecurity.cs index 5a924764..583ac706 100644 --- a/PROMS/VEPROMS User Interface/dlgManageSecurity.cs +++ b/PROMS/VEPROMS User Interface/dlgManageSecurity.cs @@ -16,38 +16,14 @@ namespace VEPROMS #region Log4Net private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); #endregion - private User myUser; private GroupInfoList myGroupInfoList; private UserInfoList myUserInfoList; private List myMembershipInfoList; - //private FolderInfo myFolderInfo; private Folder myFolder; - public dlgManageSecurity() { InitializeComponent(); } - - //private void btnApplyPassword_Click(object sender, EventArgs e) - //{ - // string pw = txtVolianPassword.Text; - // if (pw == "V3Pr0m5") - // { - // MessageBox.Show("You have entered the correct password. You will now be defined as the Administrator for VEPROMS", "Correct Password"); - // User user = User.MakeUser(VlnSettings.UserID, "", "", "", "", "", "", "", "", "", "", DateTime.Now, VlnSettings.UserID); - // Group group = Group.GetByGroupName("Administrators"); - // Membership m = Membership.MakeMembership(user, group, null, ""); - // tcSecurity.TabPages.Add(tpGroupUsers); - // tcSecurity.TabPages.Remove(tpDefault); - // SetupSecurity(); - // } - // else - // { - // MessageBox.Show("You have entered an incorrect password", "Incorrect Password"); - // this.Close(); - // } - //} - private void dlgManageSecurity_Load(object sender, EventArgs e) { myFolder = Folder.Get(1); @@ -57,7 +33,6 @@ namespace VEPROMS private void SetupGroups() { pnlGroups.Controls.Clear(); - //GroupInfoList gil = GroupInfoList.Get(); foreach (GroupInfo gi in myGroupInfoList) { RadioButton rb = new RadioButton(); @@ -80,8 +55,7 @@ namespace VEPROMS } } } - - void rb_CheckedChanged(object sender, EventArgs e) + private void rb_CheckedChanged(object sender, EventArgs e) { RadioButton rb = sender as RadioButton; GroupInfo gi = rb.Tag as GroupInfo; @@ -96,7 +70,7 @@ namespace VEPROMS FolderInfo fi = FolderInfo.Get(1); LoadChildFolders(fi, null); } - lstGroupUsers.Items.Clear(); + lstMembers.Items.Clear(); lstUsers.Items.Clear(); lstGroups.Items.Clear(); GroupInfoList.Reset(); @@ -111,7 +85,6 @@ namespace VEPROMS lstGroups.SelectedIndex = -1; lstUsers.SelectedIndex = -1; } - private void LoadChildFolders(FolderInfo fi, TreeNode tn) { if (tn == null) @@ -132,12 +105,11 @@ namespace VEPROMS } } } - private void lstGroups_SelectedIndexChanged(object sender, EventArgs e) { - pnlCGU.BringToFront(); + lblMembers.Text = "Selected Group Users"; myMembershipInfoList = new List(); - lstGroupUsers.Items.Clear(); + lstMembers.Items.Clear(); if (lstGroups.SelectedIndex > -1) { GroupInfo gi = myGroupInfoList[lstGroups.SelectedIndex]; @@ -147,101 +119,84 @@ namespace VEPROMS if (mi.EndDate == null || mi.EndDate == string.Empty) { myMembershipInfoList.Add(mi); - lstGroupUsers.Items.Add(mi.MyUser.UserID); + lstMembers.Items.Add(mi.MyUser.UserID); } } } } - private void addMemberToolStripMenuItem_Click(object sender, EventArgs e) { - if (lstGroups.SelectedIndices.Count < 1) - { - MessageBox.Show(this, "You must select at least one Group to proceed", "Missing Group"); - return; - } - if (lstUsers.SelectedIndices.Count < 1) - { - MessageBox.Show(this, "You must select at least one User to proceed", "Missing User"); - return; - } int groupIndex = lstGroups.SelectedIndex; int userIndex = lstUsers.SelectedIndex; - foreach (int gg in lstGroups.SelectedIndices) - { - foreach (int uu in lstUsers.SelectedIndices) - { - GroupInfo gi = myGroupInfoList[gg]; - UserInfo ui = myUserInfoList[uu]; - bool addOK = true; - if (gi.GroupMembershipCount > 0) - { - foreach (MembershipInfo mi in gi.GroupMemberships) - if (mi.MyUser.UID == ui.UID && (mi.EndDate == null || mi.EndDate == string.Empty)) - { - addOK = false; - break; - } - } - if (addOK) - { - Membership.MakeMembership(User.Get(ui.UID), Group.Get(gi.GID), null, ""); - } - else - MessageBox.Show(this, string.Format("User {0} is already a member of group {1}", ui.UserID, gi.GroupName), "User In Group"); - } - } + GroupInfo gi = myGroupInfoList[groupIndex]; + UserInfo ui = myUserInfoList[userIndex]; + Membership.MakeMembership(User.Get(ui.UID), Group.Get(gi.GID), null, ""); SetupSecurity(); - lstGroups.SelectedIndex = groupIndex; - lstUsers.SelectedIndex = userIndex; + if ((sender as ToolStripMenuItem).Name.EndsWith("Group")) + { + lstUsers.SelectedIndex = userIndex; + lstGroups.SelectedIndex = groupIndex; + } + else + { + lstGroups.SelectedIndex = groupIndex; + lstUsers.SelectedIndex = userIndex; + } } - private void removeMemberToolStripMenuItem_Click(object sender, EventArgs e) { - if (lstGroups.SelectedIndices.Count < 1) - { - MessageBox.Show(this, "You must select at least one Group to proceed", "Missing Group"); - return; - } - if (lstGroupUsers.SelectedIndices.Count < 1) - { - MessageBox.Show(this, "You must select at least one Group Member to proceed", "Missing Group Member"); - return; - } - string msg = lstGroupUsers.SelectedIndices.Count > 1 ? "Are you sure you want to remove these Group Members?" : "Are you sure you want to remove this Group Member?"; + MembershipInfo mi = myMembershipInfoList[lstMembers.SelectedIndex]; + string msg = "Are you sure you want to remove this Group Member?"; if (MessageBox.Show(this, msg, "Confirm Group Member Removal", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question) == DialogResult.Yes) { - foreach (int gg in lstGroups.SelectedIndices) + int groupIndex = lstGroups.SelectedIndex; + int userIndex = lstUsers.SelectedIndex; + if (mi.MyGroup.GroupName == "Administrators") { - GroupInfo gi = myGroupInfoList[gg]; - foreach (MembershipInfo mi in gi.GroupMemberships) + int k = 0; + foreach(MembershipInfo mm in mi.MyGroup.GroupMemberships) + if(mm.EndDate == null || mm.EndDate == string.Empty) + k++; + if (k == 1) { - foreach (int mm in lstGroupUsers.SelectedIndices) - { - MembershipInfo mig = myMembershipInfoList[mm]; - if (mi.MyUser.UID == mig.MyUser.UID) - { - Membership m = Membership.Get(mi.UGID); - m.EndDate = DateTime.Now.ToShortDateString(); - m.Save(); - } - } + MessageBox.Show("You must have at least 1 user assigned to the Adminstrators group", "One Administrator Required", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; } } + Membership m = Membership.Get(mi.UGID); + m.EndDate = DateTime.Now.ToShortDateString(); + m.Save(); SetupSecurity(); + lstGroups.SelectedIndex = groupIndex; + lstUsers.SelectedIndex = userIndex; } + // foreach (int gg in lstGroups.SelectedIndices) + // { + // GroupInfo gi = myGroupInfoList[gg]; + // if (gi.GroupName == "Administrators" && gi.GroupMembershipCount == 1) + // { + // MessageBox.Show("You must have at least 1 user assigned to the Adminstrators group", "Can Not Delete User", MessageBoxButtons.OK, MessageBoxIcon.Warning); + // return; + // } + // foreach (MembershipInfo mi in gi.GroupMemberships) + // { + // foreach (int mm in lstGroupUsers.SelectedIndices) + // { + // MembershipInfo mig = myMembershipInfoList[mm]; + // if (mi.MyUser.UID == mig.MyUser.UID) + // { + // Membership m = Membership.Get(mi.UGID); + // m.EndDate = DateTime.Now.ToShortDateString(); + // m.Save(); + // } + // } + // } + // } + // SetupSecurity(); + //} } - private void addUserToolStripMenuItem_Click(object sender, EventArgs e) { - //to do add user manually - /* - * create new input form - * get userid - * create user - * add to default group - * - */ User u = User.MakeUser("[Enter New UserID]","", "", "", "", "", "", "", "", "", "",DateTime.Now,""); frmManageUser frm = new frmManageUser(); frm.MyUser = u; @@ -257,7 +212,6 @@ namespace VEPROMS u.Delete(); } } - private void editUserToolStripMenuItem_Click(object sender, EventArgs e) { if (lstUsers.SelectedIndex == -1) @@ -276,7 +230,6 @@ namespace VEPROMS } } } - private void deleteUserToolStripMenuItem_Click(object sender, EventArgs e) { if (lstUsers.SelectedIndex == -1) @@ -317,7 +270,6 @@ namespace VEPROMS //end date user memberships //delete user } - private void createGroupMenuItem(object sender, EventArgs e) { try @@ -333,7 +285,6 @@ namespace VEPROMS _MyLog.Warn("createGroupMenuItem", ex); } } - private void AddNewGroup(string txt, FolderInfo fi) { txt = txt.Replace("Create", "").Replace(" a ", "").Replace("Group", "").Trim(); @@ -363,47 +314,38 @@ namespace VEPROMS myGroupInfoList = GroupInfoList.Get(); SetupGroups(); } - private void lstUsers_SelectedIndexChanged(object sender, EventArgs e) { - /* - myMembershipInfoList = new List(); - lstGroupUsers.Items.Clear(); - GroupInfo gi = myGroupInfoList[lstGroups.SelectedIndex]; - if(gi.GroupMembershipCount > 0) - foreach (MembershipInfo mi in gi.GroupMemberships) - { - if (mi.EndDate == null || mi.EndDate == string.Empty) - { - myMembershipInfoList.Add(mi); - lstGroupUsers.Items.Add(mi.MyUser.UserID); - } - } - */ - pnlCUG.BringToFront(); - lstUserGroups.Items.Clear(); - if(lstUsers.SelectedIndex > -1){ - UserInfo ui = myUserInfoList[lstUsers.SelectedIndex]; - if (ui.UserMembershipCount > 0) + lblMembers.Text = "Selected User Groups"; + myMembershipInfoList = new List(); + lstMembers.Items.Clear(); + if (lstUsers.SelectedIndex > -1) { - foreach (MembershipInfo mi in ui.UserMemberships) + UserInfo ui = myUserInfoList[lstUsers.SelectedIndex]; + if (ui.UserMembershipCount > 0) { - if (mi.EndDate == null || mi.EndDate == string.Empty) + foreach (MembershipInfo mi in ui.UserMemberships) { - lstUserGroups.Items.Add(mi.MyGroup.GroupName); + if (mi.EndDate == null || mi.EndDate == string.Empty) + { + myMembershipInfoList.Add(mi); + lstMembers.Items.Add(mi.MyGroup.GroupName); + } } } } - } } - private void tvFolders_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) { tvFolders.SelectedNode = e.Node; } - private void deleteGroupToolStripMenuItem_Click(object sender, EventArgs e) { + if (lstGroups.SelectedIndex < 0) + { + MessageBox.Show("You must select a group to delete", "No Group Selected", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } GroupInfo gi = myGroupInfoList[lstGroups.SelectedIndex]; bool deleteOK = true; if(gi.GroupMembershipCount > 0) @@ -428,5 +370,122 @@ namespace VEPROMS SetupSecurity(); } } + private void lstGroups_MouseUp(object sender, MouseEventArgs e) + { + lstGroups.SelectedIndex = -1; + if (e.Button == MouseButtons.Right) + { + int k = lstGroups.IndexFromPoint(e.Location); + if (k >= 0) + { + lstGroups.SelectedIndex = k; + if (lstUsers.SelectedIndex >= 0) + { + GroupInfo gi = myGroupInfoList[k]; + if (gi.GroupMembershipCount > 0) + { + addMemberToolStripMenuItemGroup.Visible = true; + UserInfo ui = myUserInfoList[lstUsers.SelectedIndex]; + foreach (MembershipInfo mi in gi.GroupMemberships) + { + if (mi.MyUser.UserID == ui.UserID && (mi.EndDate == null || mi.EndDate == string.Empty)) + { + addMemberToolStripMenuItemGroup.Visible = false; + break; + } + } + } + } + else + addMemberToolStripMenuItemGroup.Visible = false; + cmGroups.Show(lstGroups, e.Location); + } + } + else if (e.Button == MouseButtons.Left) + { + int k = lstGroups.IndexFromPoint(e.Location); + if (k >= 0) + { + lstGroups.SelectedIndex = k; + } + } + } + private void lstUsers_MouseUp(object sender, MouseEventArgs e) + { + lstUsers.SelectedIndex = -1; + if (e.Button == MouseButtons.Right) + { + int k = lstUsers.IndexFromPoint(e.Location); + if (k >= 0) + { + lstUsers.SelectedIndex = k; + addUserToolStripMenuItem.Visible = false; + editUserToolStripMenuItem.Visible = deleteUserToolStripMenuItem.Visible = true; + if (lstGroups.SelectedIndex >= 0) + { + UserInfo ui = myUserInfoList[k]; + if(ui.UserMembershipCount > 0) + { + addMemberToolStripMenuItemUser.Visible = true; + GroupInfo gi = myGroupInfoList[lstGroups.SelectedIndex]; + foreach(MembershipInfo mi in ui.UserMemberships) + { + if (mi.MyGroup.GroupName == gi.GroupName && (mi.EndDate == null || mi.EndDate == string.Empty)) + { + addMemberToolStripMenuItemUser.Visible = false; + break; + } + } + } + } + else + addMemberToolStripMenuItemUser.Visible = false; + cmUsers.Show(lstUsers, e.Location); + } + else + { + addUserToolStripMenuItem.Visible = true; + editUserToolStripMenuItem.Visible = deleteUserToolStripMenuItem.Visible = addMemberToolStripMenuItemUser.Visible = false; + cmUsers.Show(lstUsers, e.Location); + } + } + else if (e.Button == MouseButtons.Left) + { + int k = lstUsers.IndexFromPoint(e.Location); + if (k >= 0) + { + lstUsers.SelectedIndex = k; + } + } + } + private void lstMembers_MouseUp(object sender, MouseEventArgs e) + { + lstMembers.SelectedIndex = -1; + if (e.Button == MouseButtons.Right) + { + int k = lstMembers.IndexFromPoint(e.Location); + if (k >= 0) + { + lstMembers.SelectedIndex = k; + addMemberToolStripMenuItemUser.Visible = false; + removeMemberToolStripMenuItem.Visible = true; + cmMembers.Show(lstMembers, e.Location); + } + else + { + addMemberToolStripMenuItemUser.Visible = true; + removeMemberToolStripMenuItem.Visible = false; + cmMembers.Show(lstMembers, e.Location); + } + } + else if (e.Button == MouseButtons.Left) + { + int k = lstMembers.IndexFromPoint(e.Location); + if (k >= 0) + { + lstMembers.SelectedIndex = k; + } + } + } } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/dlgManageSecurity.resx b/PROMS/VEPROMS User Interface/dlgManageSecurity.resx index 3035c385..8f093cb7 100644 --- a/PROMS/VEPROMS User Interface/dlgManageSecurity.resx +++ b/PROMS/VEPROMS User Interface/dlgManageSecurity.resx @@ -117,16 +117,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 222, 17 - - 376, 17 + 341, 17 - - 124, 17 - - + 17, 17 + + 243, 17 + + + 136, 17 + \ No newline at end of file