C2026-012 Manage Security - Remove cancel from the prompts related to deleting groups/users/members.

good for testing

PROMS/VEPROMS User Interface/dlgManageSecurity.cs

@@ -216,7 +216,7 @@ namespace VEPROMS
 				MembershipInfo mi = (MembershipInfo)lstMembers.SelectedItem;
 				string selectedUserID = mi.MyUserUserID;
 				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)
+				if (MessageBox.Show(this, msg, "Confirm Group Member Removal", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
 				{
 					if (mi.MyGroup.GroupName == "Administrators" && mi.MyGroup.GroupMemberships.Count(mm => mm.EndDate == null || mm.EndDate == string.Empty) == 1)
 					{
@@ -255,7 +255,7 @@ namespace VEPROMS
 				MessageBox.Show("There are still users who are members of this group.  You need to delete all members in order to delete this group.", "Group Has Members", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 				return;
 			}
-			if (MessageBox.Show("Are you sure you want to delete this group?", "Confirm Deleting Group", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question) == DialogResult.Yes)
+			if (MessageBox.Show("Are you sure you want to delete this group?", "Confirm Deleting Group", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
 			{
 				Group.Delete(gi.GID);
 				LoadRefreshGroupUsers();
@@ -397,7 +397,7 @@ namespace VEPROMS
 			}
 			int nummemberships = ui.UserMemberships.Count(mi => mi.EndDate == null || mi.EndDate == string.Empty);
 			string mem_text = nummemberships > 0 ? "\r\nNote that this will remove all memberships that this user has." : "";
-			if (MessageBox.Show($"Are you sure you want to delete this user?{mem_text}", "Confirm Deleting User", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question) == DialogResult.Yes)
+			if (MessageBox.Show($"Are you sure you want to delete this user?{mem_text}", "Confirm Deleting User", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
 			{
 				foreach (MembershipInfo minfo in ui.UserMemberships.Where(mi => mi.EndDate == null || mi.EndDate == string.Empty))
                 {
@@ -477,7 +477,7 @@ namespace VEPROMS
 		{
 			MembershipInfo mi = (MembershipInfo)lstGroups.SelectedItem;
 			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)
+			if (MessageBox.Show(this, msg, "Confirm Group Member Removal", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
 			{
                 if (mi.MyGroup.GroupName == "Administrators" && mi.MyGroup.GroupMemberships.Count(mm => mm.EndDate == null || mm.EndDate == string.Empty) == 1)
                 {

PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs

@@ -3312,7 +3312,26 @@ namespace VEPROMS.CSLA.Library
 				return retval;
 			}
 		}
-		public string DisplayNumber
+
+        //B2026-011 Improve the resolution of unit numbers in multi-unit background documents when printing.
+		// for enhanced documents, when copying content, need to not resolve the 
+		//unit designators until print time
+        public string DisplayTextKeepSpecialCharsKeepUnitSpecific
+        {
+            get
+            {
+                string str = MyContent.Text;
+                foreach (string key in SpecialCharacters.Keys)
+                    str = str.Replace(key, SpecialCharacters[key]);
+                string retval = ConvertToDisplayText(str);
+                foreach (string key in SpecialCharacters.Keys)
+                    retval = retval.Replace(SpecialCharacters[key], key);
+                return retval;
+            }
+        }
+
+
+        public string DisplayNumber
 		{
 			get
 			{
@@ -8357,8 +8376,11 @@ namespace VEPROMS.CSLA.Library
 					if (seds != null && seds.Count != 0)
 					{
 						ItemInfo srcItem = ItemInfo.Get(seds[0].ItemID);
-						// B2022-049: Copy/paste of enhanced procedure and bad links between source and enhanced.  Null reference check
-						if (srcItem != null && srcItem.DisplayTextKeepSpecialChars != ii.DisplayTextKeepSpecialChars)
+                        // B2022-049: Copy/paste of enhanced procedure and bad links between source and enhanced.  Null reference check
+                        //B2026-011 Improve the resolution of unit numbers in multi-unit background documents when printing.
+                        // for enhanced documents, when copying content, need to not resolve the 
+                        //unit designators until print time
+                        if (srcItem != null && srcItem.DisplayTextKeepSpecialCharsKeepUnitSpecific != ii.DisplayTextKeepSpecialCharsKeepUnitSpecific)
 						{
 							if (retiil == null) retiil = new ItemInfoList(ii);
 							else retiil.AddItem(ii);
@@ -8384,7 +8406,10 @@ namespace VEPROMS.CSLA.Library
 						ItemInfo srcItem = ItemInfo.Get(seds[0].ItemID);
 						using (Item enhItem = Item.Get(ii.ItemID))
 						{
-							enhItem.MyContent.Text = srcItem.DisplayTextKeepSpecialChars;
+                            //B2026-011 Improve the resolution of unit numbers in multi-unit background documents when printing.
+                            // for enhanced documents, when copying content, need to not resolve the 
+                            //unit designators until print time
+                            enhItem.MyContent.Text = srcItem.DisplayTextKeepSpecialCharsKeepUnitSpecific;
 							enhItem.Save();
 						}
 					}