B2025-014 PROMS – RO Update Admin Tool Error when updating RO containing carats/deltas

While testing an update for C2025-0011, using BNPP data and ROs, the update ro values crashes at the next to the last procedure set which is folder called "PROMS Tests." It crashes with a null reference as it is not able to detect the format. This is to change this to use the “ActiveFormat” of the Working Folder instead of utilizing “MyFormat”.

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs

@@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
 //      Build YYMM (two digit year, two digit month)
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
-[assembly: AssemblyVersion("2.3.2404.1611")]
-[assembly: AssemblyFileVersion("2.3.2404.1611")]
+[assembly: AssemblyVersion("2.3.2410.907")]
+[assembly: AssemblyFileVersion("2.3.2410.907")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -91,6 +91,8 @@ using System.Runtime.CompilerServices;
 
 
 
+
+
 
 
 

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldCombFrm.cs

@@ -377,6 +377,7 @@ namespace ROEditor
 			this.btnOK.TabIndex = 3;
 			this.btnOK.Text = "OK";
 			this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+			this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
 			// 
 			// btnCancel
 			// 
@@ -553,6 +554,7 @@ namespace ROEditor
 			// update the local/internal copy of the schema.
 			if (success != true)
 			{
+				this.DialogResult = DialogResult.Cancel;
 				return; // DO YET process an error.
 			}
 			else		 

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTextFrm.cs

@@ -266,6 +266,7 @@ namespace ROEditor
 
 			if (success != true)
 			{
+				this.DialogResult = DialogResult.Cancel;
 				return; // DO YET process an error.
 			}
 			else		 
@@ -367,6 +368,7 @@ namespace ROEditor
 			// 
 			// btnOK
 			// 
+			this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
 			this.btnOK.Location = new System.Drawing.Point(216, 72);
 			this.btnOK.Name = "btnOK";
 			this.btnOK.Size = new System.Drawing.Size(88, 24);

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTypeDefFrm.cs

@@ -220,6 +220,7 @@ namespace ROEditor
 				return;
 			}
 
+			string origFieldName = myrof.GetFieldname;
 			myrof.SetFieldname(this.tbFieldName.Text);
 			uint ftype=0;
 			if (this.rbSingleLine.Checked == true) 
@@ -247,6 +248,7 @@ namespace ROEditor
 			
 				if (success != true)
 				{
+					this.DialogResult = DialogResult.Cancel;
 					return; // DO YET process an error.
 				}
 				return;
@@ -270,7 +272,9 @@ namespace ROEditor
 			}
 			myrof.SetFieldType(ftype);
 			FieldTextFrm ftxt = new FieldTextFrm(myrof, myrodb, myelem, original_type, editlevel, origname, avlist, iulist);
-			ftxt.ShowDialog();
+			if (ftxt.ShowDialog() == DialogResult.Cancel)
+				myrof.SetFieldname(origFieldName);
+
 			this.Close();
 		}
 		#region Windows Form Designer generated code

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/GroupDefFrm.cs

@@ -100,6 +100,7 @@ using System.Text;
 using RODBInterface;
 using ROFields;
 using VlnStatus;
+using System.Linq;
 
 namespace ROEditor
 {
@@ -245,6 +246,37 @@ namespace ROEditor
 				return CvtFldToUserFld(origGroup);
 			}
 		}
+
+		//CSM C2024-023
+		//Part of 2024 PROMS Upgrades
+		//When the Overall Form is activated
+		//if there are any items that are Fields that are in use
+		//add them as auto-complete options to the
+		//Accessory Page Access - Value Textbox
+		//Typing < will bring up the auto-complete options
+		protected void tbValue_AddAutoComplete(object sender, EventArgs e)
+		{
+            string dummy = "";  // need for RODB_GetFIeldsInUse call, won't be used.
+            ArrayList AvailList, InUseList;
+            //first see if it is a valid 'InUse' Field.
+            AvailList = myrodb.RODB_GetFields(elem, (uint)RecordType.Schema);
+            InUseList = myrodb.RODB_GetFieldsInUse(elem, AvailList, "FieldsInUse", ref dummy, false);
+
+			//if any ROField items are in use, 
+			//use LINQ to get a string array of the FieldNames
+			if (InUseList.Count > 0)
+			{
+				string[] InUseListFieldNames = InUseList.OfType<ROField>().Select(x => $"<{x.GetFieldname}>").ToArray();
+				AutoCompleteStringCollection allowedTypes = new AutoCompleteStringCollection();
+				allowedTypes.AddRange(InUseListFieldNames);
+				tbValue.AutoCompleteCustomSource = allowedTypes;
+				tbValue.AutoCompleteMode = AutoCompleteMode.Suggest;
+				tbValue.AutoCompleteSource = AutoCompleteSource.CustomSource;
+
+			}
+
+        }
+
 		private void FillInData()
 		{
 			this.tbGroup.Text = DetermineGroupName();
@@ -401,6 +433,7 @@ namespace ROEditor
 			// 
 			// btnOK
 			// 
+			this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
 			this.btnOK.Location = new System.Drawing.Point(24, 248);
 			this.btnOK.Name = "btnOK";
 			this.btnOK.Size = new System.Drawing.Size(144, 24);
@@ -432,6 +465,7 @@ namespace ROEditor
 			this.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
 			this.Name = "GroupDefFrm";
 			this.Text = "Group Definition";
+			this.Activated += new EventHandler(tbValue_AddAutoComplete);
 			this.groupBox1.ResumeLayout(false);
 			this.ResumeLayout(false);
 

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs

@@ -151,7 +151,7 @@ namespace ROEditor
 		private string origMenuItem;
 		StringBuilder parseerror;
 		private int hi, lo;
-		private Label lb_chkApplc; 
+		private Label lb_chkApplc;
 		private int dbtype;
 		//  C2021-026 returns true is Parent/Child info was passed into the RO Editor
 		public bool PCApplicabilityEnabled
@@ -188,33 +188,33 @@ namespace ROEditor
 				lboxInUse.Visible = true;
 				lb_chkApplc.Visible = false;
 			}
-			if (editlevel==(uint)RecordType.GroupSchema)this.Text = "Subgroup Definition";
+			if (editlevel == (uint)RecordType.GroupSchema) this.Text = "Subgroup Definition";
 			FillInData(grptxt);
 		}
 
 		/// <summary>
 		/// Clean up any resources being used.
 		/// </summary>
-		protected override void Dispose( bool disposing )
+		protected override void Dispose(bool disposing)
 		{
-			if( disposing )
+			if (disposing)
 			{
-				if(components != null)
+				if (components != null)
 				{
 					components.Dispose();
 				}
 			}
-			base.Dispose( disposing );
+			base.Dispose(disposing);
 		}
-		
+
 		private void FillInAvailable()
 		{
 			ROField rof;
-			
+
 			// put the items in the AvailList box.
-			for (int i=0; i< AvailList.Count; i++)
+			for (int i = 0; i < AvailList.Count; i++)
 			{
-				rof = (ROField) AvailList[i];
+				rof = (ROField)AvailList[i];
 				if (rof.GetFieldname != null)   // DO YET: Why null?
 					this.lboxAvail.Items.Add(rof.GetFieldname);
 			}
@@ -277,7 +277,7 @@ namespace ROEditor
 			_initializing = false;
 		}
 
-		
+
 		private void DoValueTextBoxes()
 		{
 			string menuitm, retval;
@@ -297,7 +297,7 @@ namespace ROEditor
 					else
 						parent = null;
 				}
-				if (menuitm !="")
+				if (menuitm != "")
 					this.tbMenuVal.Text = CvtFldToUserFld(menuitm);
 				else
 					this.tbMenuVal.Text = "";
@@ -310,21 +310,21 @@ namespace ROEditor
 				this.lblRetVal.Visible = true;
 				VlnXmlElement parent;
 				parent = (VlnXmlElement) elem.ParentNode;
-				while (parent != null && (menuitm == "" || retval==""))
+				while (parent != null && (menuitm == "" || retval == ""))
 				{
 					// walk up tree to get parent and check for data there
 					if (menuitm == "") menuitm = parent.GetAttribute("MenuItem");
 					if (retval == "") retval = parent.GetAttribute("RetVal");
 					if (parent.Name != "RO_Root")
-						parent = (VlnXmlElement) parent.ParentNode;
+						parent = (VlnXmlElement)parent.ParentNode;
 					else
 						parent = null;
 				}
-				if (menuitm!="")
+				if (menuitm != "")
 					this.tbMenuVal.Text = CvtFldToUserFld(menuitm);
 				else
 					this.tbMenuVal.Text = "";
-				if (retval!="")
+				if (retval != "")
 					this.tbRetVal.Text = CvtFldToUserFld(retval);
 				else
 					this.tbRetVal.Text = "";
@@ -332,7 +332,7 @@ namespace ROEditor
 		}
 
 		private void FillInData(string grptxt)
-		{	
+		{
 			this.lblGroupText.Text = grptxt;
 			DoValueTextBoxes();
 			SetUpListBoxes();
@@ -344,24 +344,27 @@ namespace ROEditor
 
 			lboxAvail.GotFocus += new EventHandler(this.lboxAvail_GotFocus);
 
+			lboxInUse.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lboxInUse_MouseUp);
+			lboxInUseCB.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lboxInUseCB_MouseUp);
+
 			// save copies of local data, so if there is a change, we know we must save them.
-			origRetVal=this.tbRetVal.Text;
-			origMenuItem=this.tbMenuVal.Text;
-			
+			origRetVal = this.tbRetVal.Text;
+			origMenuItem = this.tbMenuVal.Text;
+
 			// if this is a database level definition & it's a user defined database,
 			// the okay button is disabled until a field is used.
-			if (elem.ParentNode.Name == "RO_Root" && dbtype==3)
+			if (elem.ParentNode.Name == "RO_Root" && dbtype == 3)
 			{
 				string attr;
-				if (editlevel==(uint)RecordType.Schema)
+				if (editlevel == (uint)RecordType.Schema)
 					attr = elem.GetAttribute("FieldsInUse");
 				else
 					attr = elem.GetAttribute("GroupFieldsInUse");
-				if (attr==null || attr=="") btnOK.Enabled=false;
+				if (attr == null || attr == "") btnOK.Enabled = false;
 			}
-		}	
+		}
 
-		protected void lboxInUse_GotFocus (object sender, EventArgs e)
+		protected void lboxInUse_GotFocus(object sender, EventArgs e)
 		{
 			lboxAvail.ClearSelected();
 			this.btnRemove.Enabled = true;
@@ -375,7 +378,7 @@ namespace ROEditor
 			this.btnAdd.Enabled = false;
 			this.btnEdit.Enabled = true;
 		}
-		protected void lboxAvail_GotFocus (object sender, EventArgs e)
+		protected void lboxAvail_GotFocus(object sender, EventArgs e)
 		{
 			if (PCApplicabilityEnabled)
 				lboxInUseCB.ClearSelected();
@@ -385,6 +388,103 @@ namespace ROEditor
 			this.btnRemove.Enabled = false;
 			this.btnEdit.Enabled = true;
 		}
+
+		//CSM C2024-024
+		//Simple Selection of Fields to add to Return Values and Menu Values.
+		//Part of 2024 PROMS Upgrades
+		//Add Context Menu for In Use Listbox
+		//Will allow user to right click Selected Items
+		//and add then to the Return Value / Menu Value Text Boxes
+		//without re-typing them
+		protected void lboxInUse_MouseUp(object sender, MouseEventArgs e)
+		{
+			if (e.Button == MouseButtons.Right && lboxInUse.SelectedItems.Count > 0)
+			{
+				ContextMenuStrip cn = new ContextMenuStrip();
+				if (tbRetVal.Visible)
+				{
+					var AddToReturnItem = new ToolStripMenuItem("Add to Return Value");
+					AddToReturnItem.Click += new EventHandler(lboxInUse_Click);
+					AddToReturnItem.Name = "Add to Return Value";
+					cn.Items.Add(AddToReturnItem);
+				}
+				var AddToMenuItem = new ToolStripMenuItem("Add to Menu Value");
+				AddToMenuItem.Click += new EventHandler(lboxInUse_Click);
+				AddToMenuItem.Name = "Add to Menu Value";
+				cn.Items.Add(AddToMenuItem);
+				this.lboxInUse.ContextMenuStrip = cn;
+				cn.Show(Control.MousePosition.X, Control.MousePosition.Y);
+			}
+		}
+		private void lboxInUse_Click(object sender, EventArgs e)
+		{
+			switch (((ToolStripMenuItem)sender).Name)
+			{
+				case "Add to Return Value":
+					if (tbRetVal.Text == "")
+						tbRetVal.Text += $"<{lboxInUse.SelectedItem}>";
+					else
+						tbRetVal.Text += $" - <{lboxInUse.SelectedItem}>";
+					break;
+				case "Add to Menu Value":
+					if (tbMenuVal.Text == "")
+						tbMenuVal.Text += $"<{lboxInUse.SelectedItem}>";
+					else
+						tbMenuVal.Text += $" - <{lboxInUse.SelectedItem}>";
+					break;
+
+			}
+		}
+
+		//CSM C2024-024
+		//Simple Selection of Fields to add to Return Values and Menu Values.
+		//Part of 2024 PROMS Upgrades
+		//Add Context Menu for In Use ComboBox
+		//(Replaces In Use Listbox when Applicability
+		//to allow for selection of items per Unit)
+		//Will allow user to right click Selected Items
+		//and add then to the Return Value / Menu Value Text Boxes
+		//without re-typing them
+		protected void lboxInUseCB_MouseUp(object sender, MouseEventArgs e)
+		{
+			if (e.Button == MouseButtons.Right && lboxInUseCB.SelectedItems.Count > 0)
+			{
+				ContextMenuStrip cn = new ContextMenuStrip();
+				if (tbRetVal.Visible)
+				{
+					var AddToReturnItem = new ToolStripMenuItem("Add to Return Value");
+					AddToReturnItem.Click += new EventHandler(lboxInUseCB_Click);
+					AddToReturnItem.Name = "Add to Return Value";
+					cn.Items.Add(AddToReturnItem);
+				}
+				var AddToMenuItem = new ToolStripMenuItem("Add to Menu Value");
+				AddToMenuItem.Click += new EventHandler(lboxInUseCB_Click);
+				AddToMenuItem.Name = "Add to Menu Value";
+				cn.Items.Add(AddToMenuItem);
+				this.lboxInUseCB.ContextMenuStrip = cn;
+				cn.Show(Control.MousePosition.X, Control.MousePosition.Y);
+			}
+		}
+		private void lboxInUseCB_Click(object sender, EventArgs e)
+		{
+			switch (((ToolStripMenuItem)sender).Name)
+            {
+				case "Add to Return Value":
+					if (tbRetVal.Text == "")
+						tbRetVal.Text += $"<{lboxInUseCB.SelectedItem}>";
+                    else
+						tbRetVal.Text += $" - <{lboxInUseCB.SelectedItem}>";
+					break;
+				case "Add to Menu Value":
+					if (tbMenuVal.Text == "")
+						tbMenuVal.Text += $"<{lboxInUseCB.SelectedItem}>";
+					else
+                        tbMenuVal.Text += $" - <{lboxInUseCB.SelectedItem}>";
+                    break;
+
+			}
+		}
+
 		private void btnRemove_Click(object sender, System.EventArgs e)
 		{
 			//get item in lboxInUse (in use list) and remove it from there
@@ -404,7 +504,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					AvailList.Add(copyrof);
 
-					lboxAvail.Items.Add(copyrof.GetFieldname);
+					lboxAvail.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
 					InUseList.RemoveAt(indx);
 					if (InUseApplcList.Contains(rof)) // C2021-026 remove from the field applicability list
 						InUseApplcList.Remove(rof);
@@ -427,7 +527,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					AvailList.Add(copyrof);
 
-					lboxAvail.Items.Add(copyrof.GetFieldname);
+					lboxAvail.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
 					InUseList.RemoveAt(indx);
 					if (InUseApplcList.Contains(rof)) // C2021-026 remove from the field applicability list
 						InUseApplcList.Remove(rof);
@@ -455,7 +555,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					InUseList.Add(copyrof);
 
-					lboxInUseCB.Items.Add(copyrof.GetFieldname);
+					lboxInUseCB.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
 					AvailList.RemoveAt(indx);
 					lboxAvail.Refresh();
 					lboxInUseCB.Refresh();
@@ -477,7 +577,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					InUseList.Add(copyrof);
 
-					lboxInUse.Items.Add(copyrof.GetFieldname);
+					lboxInUse.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
 					AvailList.RemoveAt(indx);
 					lboxAvail.Refresh();
 					lboxInUse.Refresh();
@@ -640,12 +740,13 @@ namespace ROEditor
 							{
 								ROField rof = (ROField) InUseList[i];
 								rofname = rof.GetFieldname;
-								if (inusename == rofname)
+								if (inusename == rofname || inusename == CvtFldToUserFld(rofname))
 								{
 									found = true;
 									break;
 								}
 							}
+							if (inusename == "u") found = true; //to handle unit designation
 							if (found == false)syntax(inusename+" invalid field name",strt,where);
 							// used to have procini def stuff here.
 							start=where+1;
@@ -745,7 +846,7 @@ namespace ROEditor
 				{
 					ROField rof = (ROField) InUseList[i];
 					rofname = rof.GetFieldname;
-					if (inusename == rofname)
+					if (inusename == rofname || inusename == CvtFldToUserFld(rofname))
 					{
 						found = true;
 						break;
@@ -1096,7 +1197,8 @@ namespace ROEditor
 					return;
 				}
 			}
-			
+
+			string origname = CvtFldToUserFld(rof.GetFieldname);
 			uint ftype = rof.GetFieldType;
 			if (ftype == (uint)FieldTypes.FrmtSingleTxt || ftype == (uint)FieldTypes.VariableTxt ||
 				ftype == (uint)FieldTypes.SingleTxt || ftype == (uint)FieldTypes.Table || 
@@ -1112,6 +1214,10 @@ namespace ROEditor
 				nwcomb.ShowDialog();
 			}
 
+			//need to refresh pull from table for fields in use.
+			_ = myrodb.RODB_GetFields(elem, 0, true);
+			string newname = CvtFldToUserFld(rof.GetFieldname);
+
 			// Update Lists & Text boxes to represent any modified text.
 			if (isInSelList)
 			{
@@ -1125,20 +1231,31 @@ namespace ROEditor
 					rof = (ROField) InUseList[i];
 					if (rof.GetFieldname != null)
 					{
+						string fieldname = CvtFldToUserFld(rof.GetFieldname);
+
 						// C2021-026 if doing Parent/Child enabled RO Editor, put the In Use fields in the Check Box List instead of the normal list
 						if (PCApplicabilityEnabled)
 						{
-							this.lboxInUseCB.Items.Add(rof.GetFieldname);
+							this.lboxInUseCB.Items.Add(fieldname);
 							if (rof.FieldTypeCanDoApplicability())
 							{
 								if (ContainedInUseApplicList(rof))
-									this.lboxInUseCB.SetItemCheckState(lboxInUseCB.Items.IndexOf(rof.GetFieldname), CheckState.Checked);
+									this.lboxInUseCB.SetItemCheckState(lboxInUseCB.Items.IndexOf(fieldname), CheckState.Checked);
 							}
 						}
 						else
-							this.lboxInUse.Items.Add(rof.GetFieldname);
+							this.lboxInUse.Items.Add(fieldname);
 					}
 				}
+
+				if (origname != newname)
+				{
+					tbMenuVal.Text = tbMenuVal.Text.Replace($"<{origname}>", $"<{newname}>");
+					tbRetVal.Text = tbRetVal.Text.Replace($"<{origname}>", $"<{newname}>");
+					//CSM-C2024-035 This is needed for items like Setpoint Value that may have commas with field lengths in them
+					tbMenuVal.Text = tbMenuVal.Text.Replace($"<{origname},", $"<{newname},");
+					tbRetVal.Text = tbRetVal.Text.Replace($"<{origname},", $"<{newname},");
+				}
 			}
 			else 
 			{
@@ -1148,7 +1265,7 @@ namespace ROEditor
 				{
 					rof = (ROField) AvailList[i];
 					if (rof.GetFieldname != null)
-						this.lboxAvail.Items.Add(rof.GetFieldname);
+						this.lboxAvail.Items.Add(CvtFldToUserFld(rof.GetFieldname));
 				}
 			}
 		}
@@ -1162,8 +1279,11 @@ namespace ROEditor
 			if (rof.GetFieldname != null)
 			{
 				AvailList.Add(rof);
-				lboxAvail.Items.Add(rof.GetFieldname);
+				lboxAvail.Items.Add(CvtFldToUserFld(rof.GetFieldname));
 			}
+
+            //need to refresh pull from table for fields in use.
+            _ = myrodb.RODB_GetFields(elem, 0, true);
 		}
 		// C2021-026 Check/un-check field for Parent/Child values
 		private void lboxInUseCB_ItemCheck(object sender, ItemCheckEventArgs e)
@@ -1397,6 +1517,7 @@ namespace ROEditor
 			this.btnCancel.Size = new System.Drawing.Size(80, 24);
 			this.btnCancel.TabIndex = 10;
 			this.btnCancel.Text = "Cancel";
+
 			// 
 			// RODefFrm
 			// 
@@ -1419,6 +1540,71 @@ namespace ROEditor
 			this.PerformLayout();
 
 		}
+
+		//if User clicked save (DialogResult.OK) close the form
+		//if use did not click save, ask if they are sure they want to close the form
+		//only close if they say "Yes, they want to"
+		protected override void OnFormClosing(FormClosingEventArgs e)
+		{
+			if (this.DialogResult != System.Windows.Forms.DialogResult.OK && IsPendingChange() && !CloseCancel())
+			{
+				e.Cancel = true;
+			}
+		}
+
+		public static bool CloseCancel()
+		{
+			const string message = "Are you sure that you would like to cancel? Information may not be saved.";
+			const string caption = "Cancel";
+			var result = MessageBox.Show(message, caption,
+										 MessageBoxButtons.YesNo,
+										 MessageBoxIcon.Question);
+
+            return result == DialogResult.Yes;
+        }
+
+		//return true if a field has been modified
+		private bool IsPendingChange()
+		{
+			if (origRetVal != this.tbRetVal.Text)
+				return true;
+			
+			if (origMenuItem != this.tbMenuVal.Text)
+				return true;
+
+			// check if in use records have changed
+			string inuserecs = null;
+			ROField rof;
+			for (int i = 0; i < InUseList.Count; i++)
+			{
+				rof = (ROField)InUseList[i];
+				if (rof.GetFieldname != null)   //DO YET: why null?
+				{
+					inuserecs = inuserecs + rof.GetRecID;
+					if (i + 1 < InUseList.Count) inuserecs = inuserecs + " ";
+				}
+			}
+			if (inuserecs != origFieldsInUse)
+				return true;
+
+
+			//check if applicability fields have changed
+			string applicfieldrecs = null;
+			for (int i = 0; i < InUseApplcList.Count; i++)
+			{
+				rof = (ROField)InUseApplcList[i];
+				if (rof.GetFieldname != null)
+				{
+					applicfieldrecs = applicfieldrecs + rof.GetRecID;
+					if (i + 1 < InUseApplcList.Count) applicfieldrecs = applicfieldrecs + " ";
+				}
+			}
+			if (applicfieldrecs != origApplicFields)
+				return true;
+
+			//nothing has changed
+			return false;
+		}
 		#endregion
 	}
 }

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
-        CAAAAk1TRnQBSQFMAgEBAgEAARwBAAEcAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -175,7 +175,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAe
-        CwAAAk1TRnQBSQFMAgEBBgEAARwBAAEcAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CwAAAk1TRnQBSQFMAgEBBgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs

@@ -336,10 +336,10 @@ namespace RODBInterface
 		public abstract bool RODB_GetChildData(VlnXmlElement node, bool CheckChildCount);
 		public abstract bool IsDuplicateAccPageID(VlnXmlElement ro, string newacc);
 		public abstract VlnXmlElement RODB_ReadRO(string tbl, string recid);
-		public abstract bool RODB_WriteRO(VlnXmlElement ro);
+		public abstract bool RODB_WriteRO(VlnXmlElement ro, bool movedRO = false);
 		public abstract bool RODB_InsertRO(VlnXmlElement ro);
 		public abstract ushort RODB_GetFieldType(VlnXmlElement elem, string TableName, string Fld);
-		public abstract ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype);
+		public abstract ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype, bool refresh = false);
 		public abstract string RODB_GetSchemaPiece(string Recid, string table);
 		public abstract bool RODB_NewSchemaPiece(string recid, string parentid, string table, string schpiece, uint rtype);
 		public abstract bool RODB_WriteSchemaPiece(string Recid, string table, string schpiece);
@@ -2120,7 +2120,7 @@ namespace RODBInterface
 			return retele;
 		}
 
-		public override bool RODB_WriteRO(VlnXmlElement ro)
+		public override bool RODB_WriteRO(VlnXmlElement ro, bool movedRO = false)
 		{
 			bool success;
 			if (ro.Name == "vlnGroup")
@@ -2140,6 +2140,13 @@ namespace RODBInterface
 				string dt = string.Format("{0:yyyyMMddHHmmss}", System.DateTime.Now);
 				string xmlstr = GenerateXmlString(ro, false);
 				string strUpdate = "UPDATE " + ro.GetAttribute("Table") + " SET Info = '" + xmlstr + "'";
+				if (movedRO)
+				{
+					VlnXmlElement parent = (VlnXmlElement)ro.ParentNode;
+					ro.SetAttribute("ParentID", parent.GetAttribute("RecID"));
+					strUpdate += ", ParentID = '" + ro.GetAttribute("ParentID") + "'";
+				}
+				
 				strUpdate = strUpdate + ", ModDateTime = '" + dt + "', AccPageID = '" + wraccid + "' WHERE RecID='" + ro.GetAttribute("RecID") + "'";
 				try
 				{
@@ -2192,6 +2199,8 @@ namespace RODBInterface
 				ro.SetAttribute("HasChild", "False");
 				if (ro.HasAttribute("AccPageID"))
 				{
+					// Code is never reached, but this was noticed - this next line should likely be:
+					//    strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, AccPageID, ModDateTime, Info ) ";
 					strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, ModDateTime, AccPageID, Info ) ";
 					strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.Group + ",'" + ro.GetAttribute("ParentID");
 					strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstr + "');";
@@ -2294,11 +2303,16 @@ namespace RODBInterface
 		}
 
 		// For the given element's table, get all of the RO fields defined in this table.
-		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype)
+		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype, bool refresh = false)
 		{
 			string table = elem.GetAttribute("Table");
 			if (!FieldDefinitions.ContainsKey(table))
 				FieldDefinitions.Add(table, RODB_GetFieldsFromDB(elem));
+			else if (refresh)
+			{
+				FieldDefinitions.Remove(table);
+				FieldDefinitions.Add(table, RODB_GetFieldsFromDB(elem));
+			}
 			return FieldDefinitions[table];
 		}
 		private Dictionary<string, ArrayList> _FieldDefinitions = null;
@@ -2391,7 +2405,7 @@ namespace RODBInterface
 				Info = null;
 			DBE.ReaderClose();
 			DBE.CommandDispose();
-			return Info.Replace("&apos;", "\'");
+			return Info?.Replace("&apos;", "\'");
 		}
 
 		public override bool RODB_NewSchemaPiece(string recid, string parentid, string table, string schpiece, uint rtype)
@@ -2653,8 +2667,9 @@ namespace RODBInterface
 					bool isused = RODB_CheckForStandardName(oldname);
 					if (isused == true)
 					{
-						MessageBox.Show("The field name is used to define new Setpoints or Graphics Database.\n The update will be for this local (database) group only.", "Field name modification.");
+                        DialogResult result = MessageBox.Show($"The field name is used to define new Setpoints or Graphics Database.\n\n The update will be for this local (database) group only.\n\n Select OK to update local definition for all items in that table ({GetTopParentName(myelem)}).", "Field name modification.", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
 						changegeneric = false;
+						if(result == DialogResult.Cancel) return false;
 					}
 				}
 
@@ -2666,8 +2681,8 @@ namespace RODBInterface
 					//	Generic definition, i.e. all Groups, and No updates only Local definition, i.e. just this Group  Added a
 					//	Cancel button to Cancel from this dialog and return to previous dialog.  Added more information to the
 					//	dialog to inform user of this
-					string dmsg = "Update Generic definition?\r\n\r\n Yes - updates Generic definitions, \r\n No - updates Local definitions, \r\n Cancel - returns to previous dialog." +
-						"\r\n\r\n 'Generic' updates definition in ALL groups that use the name\r\n 'Local' updates definition only in the selected group.";
+					string dmsg = $"Update Generic definition?\r\n\r\n Yes - updates Generic definitions, \r\n No - updates Local definitions, \r\n Cancel - returns to previous dialog." +
+						$"\r\n\r\n 'Generic' updates definition in ALL groups that use the name\r\n 'Local' updates definition only in the selected group, and will change the definition for all items in that table ({GetTopParentName(myelem)}).";
 					System.Windows.Forms.DialogResult result = MessageBox.Show(dmsg, "Referenced Object Definition", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
 					if (result == DialogResult.Cancel) return false;
 					if (result == DialogResult.No) changegeneric = false;
@@ -2772,6 +2787,19 @@ namespace RODBInterface
 			return success;
 		}
 
+		//CSM-C2024-030
+		//Explain that Local is local to that table (and include Table name in wording displayed to user)
+		public string GetTopParentName(VlnXmlElement elem)
+		{
+		   VlnXmlElement nodetocheck = elem;
+		   while (nodetocheck.GetAttribute("ParentID") != "00000000" && nodetocheck.ParentNode != null)
+			{
+				nodetocheck = (VlnXmlElement) nodetocheck.ParentNode;
+			}
+
+			return nodetocheck.FirstChild.InnerText;
+		}
+
 		public override XmlSchema RODB_GetGroupSchema(VlnXmlElement elem)
 		{
 			XmlSchema myschema;

PROMS/ReferencedObjects/LibSource/RODBInterface/SqlRODB.cs

@@ -1557,7 +1557,7 @@ namespace RODBInterface
 			}
 			return retele;
 		}
-		public override bool RODB_WriteRO(VlnXmlElement ro)
+		public override bool RODB_WriteRO(VlnXmlElement ro, bool movedRO = false)
 		{
 			bool success;
 			if (ro.Name == "vlnGroup")
@@ -1589,6 +1589,13 @@ namespace RODBInterface
 						command.Parameters.AddWithValue("@ModDateTime", dt);
 						command.Parameters.AddWithValue("@AccPageID", wraccid);		// B2020-003: set accpageid to correct value
 						command.Parameters.AddWithValue("@RecID", ro.GetAttribute("RecID"));
+						if (movedRO)
+						{
+							VlnXmlElement parent = (VlnXmlElement)ro.ParentNode;
+							ro.SetAttribute("ParentID", parent.GetAttribute("RecID"));
+							command.Parameters.AddWithValue("@ParentID", ro.GetAttribute("ParentID"));
+						}
+
 						using (SqlDataReader reader = command.ExecuteReader())
 						{
 							success = true;
@@ -1744,13 +1751,18 @@ namespace RODBInterface
 			return ftype;
 		}
 		// For the given element's table, get all of the RO fields defined in this table.
-		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype)
+		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype, bool refresh = false)
 		{
 			string table = elem.GetAttribute("Table");
 			if (!FieldDefinitions.ContainsKey(table))
 			{
 				FieldDefinitions.Add(table, RODB_GetFieldsFromDB(elem));
 			}
+			else if (refresh)
+			{
+				FieldDefinitions.Remove(table);
+				FieldDefinitions.Add(table, RODB_GetFieldsFromDB(elem));
+			}
 			return FieldDefinitions[table];
 		}
 		private Dictionary<string, ArrayList> _FieldDefinitions = null;
@@ -1909,7 +1921,7 @@ namespace RODBInterface
 					command.Parameters.AddWithValue("@RecID", Recid);
 					using (SqlDataReader reader = command.ExecuteReader())
 					{
-						if (DBE.Read())
+						if (reader.Read())
 							Info = reader.GetString(0);
 						else
 							Info = null;

PROMS/ReferencedObjects/LibSource/VlnStatus/StatusMessageFrm.cs

@@ -85,7 +85,7 @@ namespace VlnStatus
 			this.lblStatMsg.Name = "lblStatMsg";
 			this.lblStatMsg.Size = new System.Drawing.Size(420, 81);
 			this.lblStatMsg.TabIndex = 0;
-			this.lblStatMsg.Text = "Put Satus Message Here";
+			this.lblStatMsg.Text = "Put Status Message Here";
 			this.lblStatMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
 			// StatusMessageFrm

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs

@@ -324,29 +324,17 @@ namespace ctlXMLEditLib
 			string ROINI = Directory.GetCurrentDirectory()+ "\\ROAPP.INI";
 
 			// Get the default file extension for graphic files
-//			DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("ROApp","Extention","",5,"ROAPP.INI");
+			//			DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("ROApp","Extention","",5,"ROAPP.INI");
 			// Bug fix: B2006-025
 			//  needed to pass the full path of ROAPP.INI
+			// B2025-007 only use the default file location (remove 16 bit PROMS location)
 			IniReader in1 = new IniReader(ROINI);
-			DefaultGraphicFileExtension = in1.ReadString("ROApp","Extention","");
-			if (DefaultGraphicFileExtension.Equals(""))
-			{
-				string ApplPathUp = ApplicationPath.ToUpper();
-				int idx = ApplPathUp.IndexOf("VE-PROMS.NET\\BIN");
-				if (idx >= 0)
-				{
-					string PromsINI = ApplicationPath.Substring(0, idx);
-					PromsINI += "VE-PROMS\\VEPROMS.INI";
-					IniReader in2 = new IniReader(PromsINI);
-					DefaultGraphicFileExtension = in2.ReadString("Graphics", "defaultext", ".TIF");
-				}
-				else
-					DefaultGraphicFileExtension = ".TIF";
-			}
-//			if (File.Exists(PromsINI))
-//				DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("Graphics","defaultext",".TIF",5,PromsINI);
-//			if (File.Exists("ROAPP.INI"))
-//				DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("ROApp","Extention",".TIF",5,"ROAPP.INI");
+			DefaultGraphicFileExtension = in1.ReadString("ROApp", "Extention");
+			if (string.IsNullOrEmpty(DefaultGraphicFileExtension)) DefaultGraphicFileExtension = in1.ReadString("ROApp", "Extension", ".TIF");
+			//			if (File.Exists(PromsINI))
+			//				DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("Graphics","defaultext",".TIF",5,PromsINI);
+			//			if (File.Exists("ROAPP.INI"))
+			//				DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("ROApp","Extention",".TIF",5,"ROAPP.INI");
 			if (!DefaultGraphicFileExtension.StartsWith("."))
 				DefaultGraphicFileExtension = "." + DefaultGraphicFileExtension;
 
@@ -784,6 +772,7 @@ namespace ctlXMLEditLib
 				dosaveflag = false;
 				return (true);
 			}
+			MessageBox.Show("Save Failed");
 			return (false);
 		}
 
@@ -1129,7 +1118,7 @@ namespace ctlXMLEditLib
 			mylabel.BackColor = chlbckcolor; // PC Applic fields are shaded blue otherwise backcolor is transparent
 			mylabel.Location = new Point(screenx+indent, screeny);
 			mylabel.Name = (pcChildIdx == 0) ? CvtUserFldToFld(element.Name) : CvtUserFldToFld(pcChildFldName); 
-			mylabel.Text = (applicLabel.Length > 0) ? applicLabel : CvtFldToUserFld(element.Name); // C2021-026  applicLabel is the P/C Child name
+			mylabel.Text = (applicLabel.Length > 0) ? applicLabel : CvtFldToUserFld(element.Name).Replace("Image_",""); // C2021-026  applicLabel is the P/C Child name
 			mylabel.AutoSize = true;
 			Controls.Add(mylabel);
 			// add 3 onto screeny so that textbox is slightly below label.
@@ -1484,12 +1473,15 @@ namespace ctlXMLEditLib
 			if (fnamebox.Text != "" && fnamebox.Modified == true)
 			{
 				FileInfo ifi = new FileInfo(fnamebox.Text);
-				if (ifi.Exists == false) 
+				if (ifi.Exists == false)
 				{
-					MessageBoxButtons buttons = MessageBoxButtons.OK;
-					MessageBox.Show( "File does not exist.", 
-						"File Input Error", buttons);
-					return;
+					FileInfo ifi2 = new FileInfo(fnamebox.Text + DefaultGraphicFileExtension);
+					if (!ifi2.Exists)
+					{
+						MessageBox.Show("File does not exist.",
+							"File Input Error", MessageBoxButtons.OK);
+						return;
+					}
 				}
 				bool ok = ValidGraphicsFile(fnamebox.Text);
 				if (ok != true)	
@@ -1696,7 +1688,7 @@ namespace ctlXMLEditLib
 				}
 				catch (Exception ee)
 				{
-					MessageBox.Show("Invalid Height Input",ee.ToString());
+					MessageBox.Show("The Height and Width cannot be empty fields. Enter a number in either field and the other will automatically adjust to a proportional size.", "Invalid Height Input");
 				}
 			}
 		}
@@ -1713,7 +1705,7 @@ namespace ctlXMLEditLib
 				}
 				catch (Exception ee)
 				{
-					MessageBox.Show("Invalid Width Input", ee.ToString());
+					MessageBox.Show("The Height and Width cannot be empty fields. Enter a number in either field and the other will automatically adjust to a proportional size.", "Invalid Width Input");
 				}
 			}
 		}					

PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs

@@ -328,6 +328,18 @@ namespace VEPROMS.Properties {
             }
         }
         
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool cbShwRplWrdsColor {
+            get {
+                return ((bool)(this["cbShwRplWrdsColor"]));
+            }
+            set {
+                this["cbShwRplWrdsColor"] = value;
+            }
+        }
+        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]

PROMS/VEPROMS User Interface/Properties/Settings.settings

@@ -80,6 +80,11 @@
     <Setting Name="UpdateSettings" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+
+    <Setting Name="cbShwRplWrdsColor" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    
     <Setting Name="PasteNoReturns" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>

PROMS/VEPROMS User Interface/ROBuild.Sql

@@ -674,7 +674,8 @@ CREATE PROCEDURE [dbo].[updateInfoAccidByRecid]
 	@RecID char(8),
 	@AccPageID char(32),
 	@Info nvarchar(max),
-	@ModDateTime char(14)
+	@ModDateTime char(14),
+	@ParentID varchar(8) = NULL
 )
 WITH EXECUTE AS OWNER
 AS
@@ -684,7 +685,8 @@ BEGIN TRY -- Try Block
 		SET
 			[Info]=@Info,
 			[ModDateTime]=@ModDateTime,
-			[AccPageID]=@AccPageID
+			[AccPageID]=@AccPageID,
+			[ParentID]=ISNULL(@ParentID, ParentID)
 		WHERE [ROTable]=@ROTable AND [RecID]=@RecID
 	IF @@ROWCOUNT = 0
 	BEGIN

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -163,6 +163,12 @@
     <Compile Include="dlgCheckedOutProcedure.designer.cs">
       <DependentUpon>dlgCheckedOutProcedure.cs</DependentUpon>
     </Compile>
+    <Compile Include="dlgCheckOpenTabs.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="dlgCheckOpenTabs.Designer.cs">
+      <DependentUpon>dlgCheckOpenTabs.cs</DependentUpon>
+    </Compile>
     <Compile Include="DlgCloseTabsOrExit.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -324,6 +330,9 @@
       <SubType>Designer</SubType>
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="dlgCheckOpenTabs.resx">
+      <DependentUpon>dlgCheckOpenTabs.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DlgCloseTabsOrExit.resx">
       <DependentUpon>DlgCloseTabsOrExit.cs</DependentUpon>
     </EmbeddedResource>
@@ -626,4 +635,4 @@
   <PropertyGroup>
     <PreBuildEvent>cmd /c "$(ProjectDir)FixRev.bat"</PreBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

PROMS/VEPROMS User Interface/dlgCheckOpenTabs.Designer.cs

@@ -0,0 +1,116 @@
+
+namespace VEPROMS
+{
+    partial class dlgCheckOpenTabs
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.labelX1 = new DevComponents.DotNetBar.LabelX();
+            this.cbRemember = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.btnOpenTabs = new DevComponents.DotNetBar.ButtonX();
+            this.btnNoTabs = new DevComponents.DotNetBar.ButtonX();
+            this.SuspendLayout();
+            // 
+            // labelX1
+            // 
+            // 
+            // 
+            // 
+            this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelX1.Location = new System.Drawing.Point(23, 2);
+            this.labelX1.Name = "labelX1";
+            this.labelX1.Size = new System.Drawing.Size(363, 78);
+            this.labelX1.TabIndex = 0;
+            this.labelX1.Text = "Would you like for PROMS to reopen the tabs that you had open during your last se" +
+    "ssion?";
+            this.labelX1.WordWrap = true;
+            // 
+            // cbRemember
+            // 
+            // 
+            // 
+            // 
+            this.cbRemember.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbRemember.Location = new System.Drawing.Point(23, 75);
+            this.cbRemember.Name = "cbRemember";
+            this.cbRemember.Size = new System.Drawing.Size(376, 47);
+            this.cbRemember.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.cbRemember.TabIndex = 1;
+            this.cbRemember.Text = "Check this box to not be prompted in the future when opening PROMS. \nNote that th" +
+    "ese settings can be adjusted at any time from the \nOPTIONS menu for PROMS.";
+            // 
+            // btnOpenTabs
+            // 
+            this.btnOpenTabs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnOpenTabs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnOpenTabs.DialogResult = System.Windows.Forms.DialogResult.Yes;
+            this.btnOpenTabs.Location = new System.Drawing.Point(23, 139);
+            this.btnOpenTabs.Name = "btnOpenTabs";
+            this.btnOpenTabs.Size = new System.Drawing.Size(150, 42);
+            this.btnOpenTabs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnOpenTabs.TabIndex = 2;
+            this.btnOpenTabs.Text = "Yes, Open Tabs from Last Session";
+            this.btnOpenTabs.Click += new System.EventHandler(this.btnTabs_Click);
+            // 
+            // btnNoTabs
+            // 
+            this.btnNoTabs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnNoTabs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnNoTabs.DialogResult = System.Windows.Forms.DialogResult.No;
+            this.btnNoTabs.Location = new System.Drawing.Point(216, 139);
+            this.btnNoTabs.Name = "btnNoTabs";
+            this.btnNoTabs.Size = new System.Drawing.Size(150, 42);
+            this.btnNoTabs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnNoTabs.TabIndex = 3;
+            this.btnNoTabs.Text = "No, Do Not Open Tabs from Previous Session";
+            this.btnNoTabs.Click += new System.EventHandler(this.btnTabs_Click);
+            // 
+            // dlgCheckOpenTabs
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(411, 193);
+            this.ControlBox = false;
+            this.Controls.Add(this.btnNoTabs);
+            this.Controls.Add(this.btnOpenTabs);
+            this.Controls.Add(this.cbRemember);
+            this.Controls.Add(this.labelX1);
+            this.Name = "dlgCheckOpenTabs";
+            this.Text = "Open Tabs from Previous Session";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.LabelX labelX1;
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbRemember;
+        private DevComponents.DotNetBar.ButtonX btnOpenTabs;
+        private DevComponents.DotNetBar.ButtonX btnNoTabs;
+    }
+}

PROMS/VEPROMS User Interface/dlgCheckOpenTabs.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace VEPROMS
+{
+    public partial class dlgCheckOpenTabs : Form
+    {
+        public dlgCheckOpenTabs()
+        {
+            InitializeComponent();
+        }
+
+        public bool Remember { get; set; } = false;
+
+        private void btnTabs_Click(object sender, EventArgs e)
+        {
+            Remember = this.cbRemember.Checked;
+            this.Close();
+        }
+    }
+}

PROMS/VEPROMS User Interface/dlgCheckOpenTabs.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
@@ -10,7 +8,6 @@ using System.IO;
 using Volian.Controls.Library;
 using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
-using Volian.Controls.Library;
 using System.Linq;
 
 namespace VEPROMS
@@ -178,6 +175,8 @@ namespace VEPROMS
 			myDocVersions.Clear();
 			FolderInfo fi = FolderInfo.GetTop();
 
+			fi.RefreshChildFolders();
+
 			if (fi.ChildFolderCount > 0)
 			{
 				TreeNode tn = new TreeNode(fi.Name);
@@ -233,7 +232,7 @@ namespace VEPROMS
 				loadedWorkingDraft = true;
 			}
 
-			if (tn.Parent != null && !loadedWorkingDraft)
+			if (tn.Parent != null && !loadedWorkingDraft && fi.FolderDocVersionCount == 0)
 			{
 				tn.Remove();
 			}
@@ -340,6 +339,8 @@ namespace VEPROMS
 						pbProcess.PerformStep();
 						Application.DoEvents();
 					}
+
+					ClearCache();
 				}
 
 				Application.DoEvents();
@@ -387,6 +388,23 @@ namespace VEPROMS
 			this.Cursor = Cursors.Default;
 		}
 
+		//C2025-011 RO Update Admin Tool Memory Enhancements 
+		//Clear what we can from the cache
+		//runs after each section
+		private void ClearCache()
+		{
+			txtProcess.AppendText("Reclaiming memory used during previous sections.");
+
+			PartInfo.ClearPartInfoCache();
+			ItemInfo.ClearItemInfoCache();
+			Item.ClearItemCache();
+			ContentInfo.ClearContentInfoCache();
+			GridInfo.ClearGridInfoCache();
+
+			GC.Collect();
+			GC.WaitForPendingFinalizers();
+		}
+
 		//C2022-028 check for Bad RO Links - we will check all of the RO links found in procedure step text 
 		//B2022-144 Allow to check individual procedures for bad RO links
 		private void CheckROLinks()
@@ -481,12 +499,14 @@ namespace VEPROMS
 		// B2018-002 - Invalid Transitions - Define Transition Refresh Statistics
 		private int numTransProcessed = 0;
 		private int numTransFixed = 0;
+		private int numTransCantFix = 0;
 		private int numTransConverted = 0;
 		// B2018-002 - Invalid Transitions - Initialize Transition Refresh Statistics
 		private void ResetTransNumbers()
 		{
 			numTransProcessed = 0;
 			numTransFixed = 0;
+			numTransCantFix = 0;
 			numTransConverted = 0;
 		}
 		private void RefreshTransitions()
@@ -535,11 +555,12 @@ namespace VEPROMS
 						numTransConverted += ProcedureInfo.TranConvertCount;
 						numTransProcessed += ProcedureInfo.TranCheckCount;
 						numTransFixed += ProcedureInfo.TranFixCount;
+						numTransCantFix += ProcedureInfo.TranCantFixCount; //Bad Transition Link
 						pbProcess.PerformStep();
 						Application.DoEvents();
 					}
 				}
-				if (numTransFixed == 0 && numTransConverted == 0)
+				if (numTransFixed == 0 && numTransConverted == 0 && numTransCantFix == 0)
 				{
 					txtResults.AppendText("No Transitions Needed Updated.");
 					txtResults.AppendText(Environment.NewLine);
@@ -551,16 +572,18 @@ namespace VEPROMS
 				txtProcess.AppendText(string.Format("Transitions Checked: {0}", numTransProcessed));
 				txtProcess.AppendText(Environment.NewLine);
 				// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
-				txtProcess.AppendText(string.Format("Transitions Correct As Is: {0}", numTransProcessed - (numTransConverted + numTransFixed)));
+				txtProcess.AppendText(string.Format("Transitions Correct As Is: {0}", numTransProcessed - (numTransConverted + numTransFixed + numTransCantFix)));
 				txtProcess.AppendText(Environment.NewLine);
 				txtProcess.AppendText(string.Format("Transitions Modified: {0}", numTransFixed));
 				txtProcess.AppendText(Environment.NewLine);
 				txtProcess.AppendText(string.Format("Transitions Converted to text: {0}", numTransConverted));
+				txtProcess.AppendText(Environment.NewLine);
+				txtProcess.AppendText(string.Format("Transitions Unable to be Automatically Fixed (Annotation: Bad Transition Link): {0}", numTransCantFix));
 				Application.DoEvents();
 				if (pil.Count > 0)
 				{
 					StringBuilder sb = new StringBuilder();
-					sb.AppendLine("The batch refresh process was not usccessful for all procedures selected.");
+					sb.AppendLine("The batch refresh process was not successful for all procedures selected.");
 					sb.AppendLine("The following procedures were not able to be refreshed...");
 					sb.AppendLine();
 					sb.AppendLine(sbProcs.ToString());
@@ -579,11 +602,11 @@ namespace VEPROMS
 				}
 			}
 			this.Cursor = Cursors.Default;
-			// B2018-002 - Invalid Transitions - Display Transition Refresh Statisitic
-			if (numTransFixed == 0 && numTransConverted == 0)
+            // B2018-002 - Invalid Transitions - Display Transition Refresh Statistic
+            if (numTransFixed == 0 && numTransConverted == 0 && numTransCantFix == 0)
 				MessageBox.Show(string.Format("{0} Transitions Checked.\n\nNo Transitions Modified.", numTransProcessed), "Refresh Transitions Completed");
 			else
-				MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted), numTransFixed, numTransConverted), "Refresh Transitions Completed");
+				MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.\n\n {4} Transitions unable to be automatically fixed (Annotation: Bad Transition Link).", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted + numTransCantFix), numTransFixed, numTransConverted, numTransCantFix), "Refresh Transitions Completed");
 		}
 
 		// C2017-030 - new Admin Tools user interface
@@ -995,6 +1018,9 @@ namespace VEPROMS
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
 			}
+			//C2025-011 RO Update Admin Tool Memory Enhancements 
+			//clear the list since no longer using it
+			myItems.Clear();
 			DateTime pEnd = DateTime.Now;
 			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
@@ -1081,6 +1107,7 @@ namespace VEPROMS
 				}
 				roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 				ROFst newrofst = ROFstInfo.RefreshROFst(dv, roFstInfo, DoProgressBarRefresh, txtProcess);
+				//ROFst newrofst = ROFstInfo.RefreshROFst(dv, roFstInfo, DoProgressBarRefresh, null);
 				roFstInfo.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 			}
 
@@ -1103,8 +1130,7 @@ namespace VEPROMS
 			ProcedureInfo.RefreshTransitions(pq);//, transitionsToDisconnected, transitionsToNonEditable);
 			TimeSpan ts = DateTime.Now - start;
 			// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
-			txtProcess.AppendText(string.Format("Procedure:  {1}{0}Checked {2} Transitions{0}Fixed {3} Transitions{0}Converted to Text {4} Transitions{0}Elapsed Seconds:{5}{0}{0}", Environment.NewLine, pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ts.TotalSeconds));
-			//Console.WriteLine("\"{0}\"\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\t{7}", pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ts.TotalSeconds, numTransProcessed, numTransFixed, numTransConverted);
+			txtProcess.AppendText(string.Format("Procedure:  {1}{0}Checked {2} Transitions{0}Fixed {3} Transitions{0}Converted to Text {4} Transitions{0}Cant Fix (Annotation: Bad Transition Link) {5} Transitions{0}Elapsed Seconds:{6}{0}{0}", Environment.NewLine, pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ProcedureInfo.TranCantFixCount, ts.TotalSeconds));
 			if (myFixes.Length > 0)
 			{
 				txtResults.AppendText(myFixes.ToString());
@@ -1970,7 +1996,20 @@ namespace VEPROMS
 					pil.Add(myProcedures[tn]);
 			return pil;
 		}
-	}
+		
+		//C2025-011 RO Update Admin Tool Memory Enhancements
+		private void txtProcess_TextChanged(object sender, EventArgs e)
+        {
+			//clears the stack to help with memory - should never need to undo text changes to this.
+			txtProcess.ClearUndo();
+		}
+
+        private void txtResults_TextChanged(object sender, EventArgs e)
+        {
+			//clears the stack to help with memory - should never need to undo text changes to this.
+			txtResults.ClearUndo();
+		}
+    }
 }
 
 

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -183,19 +183,19 @@ It is recommended that this be done during off hours.
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="warningBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
-        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
-        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
-        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
-        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
-        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
-        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
-        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
-        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
-        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
-        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
-        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
-        zJwL4b/EAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="swUpdateROVals.SuperTooltip" xml:space="preserve">
@@ -230,36 +230,36 @@ If more than one procedure is selected, it is recommended that this be performed
   </data>
   <data name="warningBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
-        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
-        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
-        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
-        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
-        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
-        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
-        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
-        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
-        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
-        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
-        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
-        zJwL4b/EAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="warningBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
-        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
-        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
-        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
-        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
-        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
-        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
-        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
-        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
-        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
-        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
-        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
-        zJwL4b/EAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="swCkObsoleteROData.SuperTooltip" xml:space="preserve">
@@ -324,36 +324,36 @@ This function will remove all of the saved attachment PDFS stored in the databas
   </data>
   <data name="warningBox4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
-        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
-        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
-        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
-        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
-        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
-        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
-        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
-        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
-        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
-        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
-        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
-        zJwL4b/EAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="warningBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
-        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
-        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
-        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
-        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
-        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
-        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
-        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
-        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
-        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
-        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
-        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
-        zJwL4b/EAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="swRmObsoleteROData.SuperTooltip" xml:space="preserve">

PROMS/VEPROMS User Interface/frmSectionProperties.Designer.cs

@@ -88,6 +88,12 @@ namespace VEPROMS
 			this.btnFormat = new DevComponents.DotNetBar.ButtonX();
 			this.btnGeneral = new DevComponents.DotNetBar.ButtonX();
 			this.tcSectionProp = new DevComponents.DotNetBar.TabControl();
+			this.tcpFormat = new DevComponents.DotNetBar.TabControlPanel();
+			this.ppCbShowRplWords = new System.Windows.Forms.CheckBox();
+			this.rbWordSect = new DevComponents.DotNetBar.Controls.CheckBoxX();
+			this.rbStepSect = new DevComponents.DotNetBar.Controls.CheckBoxX();
+			this.ppGpbxSignoffCheckoff = new DevComponents.DotNetBar.Controls.GroupPanel();
+			this.tiFormat = new DevComponents.DotNetBar.TabItem(this.components);
 			this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel();
 			this.ppCbAutoIndent = new System.Windows.Forms.CheckBox();
 			this.ppCbEditableData = new System.Windows.Forms.CheckBox();
@@ -95,11 +101,6 @@ namespace VEPROMS
 			this.ppSectNumberStpRTB = new Volian.Controls.Library.StepRTB(this.components);
 			this.ppSectTitleStpRTB = new Volian.Controls.Library.StepRTB(this.components);
 			this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
-			this.tcpFormat = new DevComponents.DotNetBar.TabControlPanel();
-			this.rbWordSect = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.rbStepSect = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.ppGpbxSignoffCheckoff = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.tiFormat = new DevComponents.DotNetBar.TabItem(this.components);
 			this.tcpAutomation = new DevComponents.DotNetBar.TabControlPanel();
 			this.ppCbNoDuplexFoldout = new System.Windows.Forms.CheckBox();
 			this.gpTOC = new DevComponents.DotNetBar.Controls.GroupPanel();
@@ -120,9 +121,9 @@ namespace VEPROMS
 			this.panSectBtns.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.tcSectionProp)).BeginInit();
 			this.tcSectionProp.SuspendLayout();
-			this.tcpGeneral.SuspendLayout();
 			this.tcpFormat.SuspendLayout();
 			this.ppGpbxSignoffCheckoff.SuspendLayout();
+			this.tcpGeneral.SuspendLayout();
 			this.tcpAutomation.SuspendLayout();
 			this.gpTOC.SuspendLayout();
 			this.grpLnkEnh.SuspendLayout();
@@ -871,8 +872,8 @@ namespace VEPROMS
 			this.tcSectionProp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
 			this.tcSectionProp.BackColor = System.Drawing.Color.Transparent;
 			this.tcSectionProp.CanReorderTabs = true;
-			this.tcSectionProp.Controls.Add(this.tcpGeneral);
 			this.tcSectionProp.Controls.Add(this.tcpFormat);
+			this.tcSectionProp.Controls.Add(this.tcpGeneral);
 			this.tcSectionProp.Controls.Add(this.tcpAutomation);
 			this.tcSectionProp.Controls.Add(this.tcpLibDoc);
 			this.tcSectionProp.Controls.Add(this.tabControlPanel4);
@@ -892,6 +893,151 @@ namespace VEPROMS
 			this.tcSectionProp.TabsVisible = false;
 			this.tcSectionProp.Text = "tabControl2";
 			// 
+			// tcpFormat
+			// 
+			this.tcpFormat.Controls.Add(this.ppCbShowRplWords);
+			this.tcpFormat.Controls.Add(this.cbIsFoldoutSection);
+			this.tcpFormat.Controls.Add(this.ppCbDefaultStepSection);
+			this.tcpFormat.Controls.Add(this.cbKeepWordDocMargins);
+			this.tcpFormat.Controls.Add(this.ppLblDefaultNumColumns);
+			this.tcpFormat.Controls.Add(this.ppLblDefPaginationStyle);
+			this.tcpFormat.Controls.Add(this.ppBtnDefaultNumColumns);
+			this.tcpFormat.Controls.Add(this.ppBtnDefaultPaginationStyle);
+			this.tcpFormat.Controls.Add(this.rbWordSect);
+			this.tcpFormat.Controls.Add(this.rbStepSect);
+			this.tcpFormat.Controls.Add(this.ppGpbxSignoffCheckoff);
+			this.tcpFormat.Controls.Add(this.lblFormat);
+			this.tcpFormat.Controls.Add(this.ppCmbxNumColumns);
+			this.tcpFormat.Controls.Add(this.lblColumns);
+			this.tcpFormat.Controls.Add(this.ppCmbxSectPagination);
+			this.tcpFormat.Controls.Add(this.lblSectType);
+			this.tcpFormat.Controls.Add(this.ppCmbxStyleSectionType);
+			this.tcpFormat.Controls.Add(this.lblPagination);
+			this.tcpFormat.Controls.Add(this.ppBtnDefaultFmt);
+			this.tcpFormat.Controls.Add(this.ppCmbxFormat);
+			this.tcpFormat.Controls.Add(this.ppLblFormatDefault);
+			this.tcpFormat.DisabledBackColor = System.Drawing.Color.Empty;
+			this.tcpFormat.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tcpFormat.Location = new System.Drawing.Point(0, 22);
+			this.tcpFormat.Margin = new System.Windows.Forms.Padding(2);
+			this.tcpFormat.Name = "tcpFormat";
+			this.tcpFormat.Padding = new System.Windows.Forms.Padding(1);
+			this.tcpFormat.Size = new System.Drawing.Size(557, 318);
+			this.tcpFormat.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
+			this.tcpFormat.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
+			this.tcpFormat.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.tcpFormat.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+			this.tcpFormat.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tcpFormat.Style.GradientAngle = 90;
+			this.tcpFormat.TabIndex = 2;
+			this.tcpFormat.TabItem = this.tiFormat;
+			this.tcpFormat.Enter += new System.EventHandler(this.tabpage_Enter);
+			// 
+			// ppCbShowRplWords
+			// 
+			this.ppCbShowRplWords.AutoSize = true;
+			this.ppCbShowRplWords.BackColor = System.Drawing.Color.Transparent;
+			this.ppCbShowRplWords.Location = new System.Drawing.Point(272, 252);
+			this.ppCbShowRplWords.Name = "ppCbShowRplWords";
+			this.ppCbShowRplWords.Size = new System.Drawing.Size(130, 17);
+			this.ppCbShowRplWords.TabIndex = 62;
+			this.ppCbShowRplWords.Text = "Show Replace Words";
+			this.ppCbShowRplWords.UseVisualStyleBackColor = false;
+			this.ppCbShowRplWords.CheckedChanged += new System.EventHandler(this.ppCbShowRplWords_CheckedChanged);
+			// 
+			// rbWordSect
+			// 
+			this.rbWordSect.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.rbWordSect.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.rbWordSect.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
+			this.rbWordSect.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.rbWordSect.Location = new System.Drawing.Point(247, 60);
+			this.rbWordSect.Margin = new System.Windows.Forms.Padding(2);
+			this.rbWordSect.Name = "rbWordSect";
+			this.rbWordSect.Size = new System.Drawing.Size(88, 19);
+			this.rbWordSect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.rbWordSect.TabIndex = 23;
+			this.rbWordSect.TabStop = false;
+			this.rbWordSect.Text = "Word Section";
+			// 
+			// rbStepSect
+			// 
+			this.rbStepSect.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.rbStepSect.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.rbStepSect.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
+			this.rbStepSect.Checked = true;
+			this.rbStepSect.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.rbStepSect.CheckValue = "Y";
+			this.rbStepSect.FocusCuesEnabled = false;
+			this.rbStepSect.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.rbStepSect.Location = new System.Drawing.Point(138, 60);
+			this.rbStepSect.Margin = new System.Windows.Forms.Padding(2);
+			this.rbStepSect.Name = "rbStepSect";
+			this.rbStepSect.Size = new System.Drawing.Size(86, 19);
+			this.rbStepSect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.rbStepSect.TabIndex = 22;
+			this.rbStepSect.TabStop = false;
+			this.rbStepSect.Text = "Step Section";
+			this.rbStepSect.CheckedChanged += new System.EventHandler(this.rbStepSect_CheckedChanged);
+			// 
+			// ppGpbxSignoffCheckoff
+			// 
+			this.ppGpbxSignoffCheckoff.BackColor = System.Drawing.Color.Transparent;
+			this.ppGpbxSignoffCheckoff.CanvasColor = System.Drawing.SystemColors.Control;
+			this.ppGpbxSignoffCheckoff.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+			this.ppGpbxSignoffCheckoff.Controls.Add(this.ppCmbxCheckoffHeading);
+			this.ppGpbxSignoffCheckoff.Controls.Add(this.lblCheckoffType);
+			this.ppGpbxSignoffCheckoff.Controls.Add(this.ppCmbxCheckoffType);
+			this.ppGpbxSignoffCheckoff.Controls.Add(this.lblCheckoffHeading);
+			this.ppGpbxSignoffCheckoff.DisabledBackColor = System.Drawing.Color.Empty;
+			this.ppGpbxSignoffCheckoff.Location = new System.Drawing.Point(272, 123);
+			this.ppGpbxSignoffCheckoff.Margin = new System.Windows.Forms.Padding(2);
+			this.ppGpbxSignoffCheckoff.Name = "ppGpbxSignoffCheckoff";
+			this.ppGpbxSignoffCheckoff.Size = new System.Drawing.Size(206, 117);
+			// 
+			// 
+			// 
+			this.ppGpbxSignoffCheckoff.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+			this.ppGpbxSignoffCheckoff.Style.BackColorGradientAngle = 90;
+			this.ppGpbxSignoffCheckoff.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+			this.ppGpbxSignoffCheckoff.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxSignoffCheckoff.Style.BorderBottomWidth = 1;
+			this.ppGpbxSignoffCheckoff.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.ppGpbxSignoffCheckoff.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxSignoffCheckoff.Style.BorderLeftWidth = 1;
+			this.ppGpbxSignoffCheckoff.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxSignoffCheckoff.Style.BorderRightWidth = 1;
+			this.ppGpbxSignoffCheckoff.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxSignoffCheckoff.Style.BorderTopWidth = 1;
+			this.ppGpbxSignoffCheckoff.Style.CornerDiameter = 4;
+			this.ppGpbxSignoffCheckoff.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+			this.ppGpbxSignoffCheckoff.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+			this.ppGpbxSignoffCheckoff.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+			this.ppGpbxSignoffCheckoff.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+			// 
+			// 
+			// 
+			this.ppGpbxSignoffCheckoff.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			// 
+			// 
+			// 
+			this.ppGpbxSignoffCheckoff.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.ppGpbxSignoffCheckoff.TabIndex = 51;
+			this.ppGpbxSignoffCheckoff.Text = "Signoffs / Checkoffs";
+			// 
+			// tiFormat
+			// 
+			this.tiFormat.AttachedControl = this.tcpFormat;
+			this.tiFormat.Name = "tiFormat";
+			this.tiFormat.Text = "Format";
+			// 
 			// tcpGeneral
 			// 
 			this.tcpGeneral.Controls.Add(this.ppCbAutoIndent);
@@ -1046,138 +1192,6 @@ namespace VEPROMS
 			this.tiGeneral.Name = "tiGeneral";
 			this.tiGeneral.Text = "General";
 			// 
-			// tcpFormat
-			// 
-			this.tcpFormat.Controls.Add(this.cbIsFoldoutSection);
-			this.tcpFormat.Controls.Add(this.ppCbDefaultStepSection);
-			this.tcpFormat.Controls.Add(this.cbKeepWordDocMargins);
-			this.tcpFormat.Controls.Add(this.ppLblDefaultNumColumns);
-			this.tcpFormat.Controls.Add(this.ppLblDefPaginationStyle);
-			this.tcpFormat.Controls.Add(this.ppBtnDefaultNumColumns);
-			this.tcpFormat.Controls.Add(this.ppBtnDefaultPaginationStyle);
-			this.tcpFormat.Controls.Add(this.rbWordSect);
-			this.tcpFormat.Controls.Add(this.rbStepSect);
-			this.tcpFormat.Controls.Add(this.ppGpbxSignoffCheckoff);
-			this.tcpFormat.Controls.Add(this.lblFormat);
-			this.tcpFormat.Controls.Add(this.ppCmbxNumColumns);
-			this.tcpFormat.Controls.Add(this.lblColumns);
-			this.tcpFormat.Controls.Add(this.ppCmbxSectPagination);
-			this.tcpFormat.Controls.Add(this.lblSectType);
-			this.tcpFormat.Controls.Add(this.ppCmbxStyleSectionType);
-			this.tcpFormat.Controls.Add(this.lblPagination);
-			this.tcpFormat.Controls.Add(this.ppBtnDefaultFmt);
-			this.tcpFormat.Controls.Add(this.ppCmbxFormat);
-			this.tcpFormat.Controls.Add(this.ppLblFormatDefault);
-			this.tcpFormat.DisabledBackColor = System.Drawing.Color.Empty;
-			this.tcpFormat.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.tcpFormat.Location = new System.Drawing.Point(0, 22);
-			this.tcpFormat.Margin = new System.Windows.Forms.Padding(2);
-			this.tcpFormat.Name = "tcpFormat";
-			this.tcpFormat.Padding = new System.Windows.Forms.Padding(1);
-			this.tcpFormat.Size = new System.Drawing.Size(557, 318);
-			this.tcpFormat.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
-			this.tcpFormat.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
-			this.tcpFormat.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-			this.tcpFormat.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
-			this.tcpFormat.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
-            | DevComponents.DotNetBar.eBorderSide.Bottom)));
-			this.tcpFormat.Style.GradientAngle = 90;
-			this.tcpFormat.TabIndex = 2;
-			this.tcpFormat.TabItem = this.tiFormat;
-			this.tcpFormat.Enter += new System.EventHandler(this.tabpage_Enter);
-			// 
-			// rbWordSect
-			// 
-			this.rbWordSect.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.rbWordSect.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.rbWordSect.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.rbWordSect.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.rbWordSect.Location = new System.Drawing.Point(247, 60);
-			this.rbWordSect.Margin = new System.Windows.Forms.Padding(2);
-			this.rbWordSect.Name = "rbWordSect";
-			this.rbWordSect.Size = new System.Drawing.Size(88, 19);
-			this.rbWordSect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.rbWordSect.TabIndex = 23;
-			this.rbWordSect.TabStop = false;
-			this.rbWordSect.Text = "Word Section";
-			// 
-			// rbStepSect
-			// 
-			this.rbStepSect.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.rbStepSect.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.rbStepSect.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.rbStepSect.Checked = true;
-			this.rbStepSect.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.rbStepSect.CheckValue = "Y";
-			this.rbStepSect.FocusCuesEnabled = false;
-			this.rbStepSect.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.rbStepSect.Location = new System.Drawing.Point(138, 60);
-			this.rbStepSect.Margin = new System.Windows.Forms.Padding(2);
-			this.rbStepSect.Name = "rbStepSect";
-			this.rbStepSect.Size = new System.Drawing.Size(86, 19);
-			this.rbStepSect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.rbStepSect.TabIndex = 22;
-			this.rbStepSect.TabStop = false;
-			this.rbStepSect.Text = "Step Section";
-			this.rbStepSect.CheckedChanged += new System.EventHandler(this.rbStepSect_CheckedChanged);
-			// 
-			// ppGpbxSignoffCheckoff
-			// 
-			this.ppGpbxSignoffCheckoff.BackColor = System.Drawing.Color.Transparent;
-			this.ppGpbxSignoffCheckoff.CanvasColor = System.Drawing.SystemColors.Control;
-			this.ppGpbxSignoffCheckoff.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.ppGpbxSignoffCheckoff.Controls.Add(this.ppCmbxCheckoffHeading);
-			this.ppGpbxSignoffCheckoff.Controls.Add(this.lblCheckoffType);
-			this.ppGpbxSignoffCheckoff.Controls.Add(this.ppCmbxCheckoffType);
-			this.ppGpbxSignoffCheckoff.Controls.Add(this.lblCheckoffHeading);
-			this.ppGpbxSignoffCheckoff.DisabledBackColor = System.Drawing.Color.Empty;
-			this.ppGpbxSignoffCheckoff.Location = new System.Drawing.Point(272, 123);
-			this.ppGpbxSignoffCheckoff.Margin = new System.Windows.Forms.Padding(2);
-			this.ppGpbxSignoffCheckoff.Name = "ppGpbxSignoffCheckoff";
-			this.ppGpbxSignoffCheckoff.Size = new System.Drawing.Size(206, 117);
-			// 
-			// 
-			// 
-			this.ppGpbxSignoffCheckoff.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.ppGpbxSignoffCheckoff.Style.BackColorGradientAngle = 90;
-			this.ppGpbxSignoffCheckoff.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.ppGpbxSignoffCheckoff.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxSignoffCheckoff.Style.BorderBottomWidth = 1;
-			this.ppGpbxSignoffCheckoff.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.ppGpbxSignoffCheckoff.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxSignoffCheckoff.Style.BorderLeftWidth = 1;
-			this.ppGpbxSignoffCheckoff.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxSignoffCheckoff.Style.BorderRightWidth = 1;
-			this.ppGpbxSignoffCheckoff.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxSignoffCheckoff.Style.BorderTopWidth = 1;
-			this.ppGpbxSignoffCheckoff.Style.CornerDiameter = 4;
-			this.ppGpbxSignoffCheckoff.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.ppGpbxSignoffCheckoff.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.ppGpbxSignoffCheckoff.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.ppGpbxSignoffCheckoff.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.ppGpbxSignoffCheckoff.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.ppGpbxSignoffCheckoff.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.ppGpbxSignoffCheckoff.TabIndex = 51;
-			this.ppGpbxSignoffCheckoff.Text = "Signoffs / Checkoffs";
-			// 
-			// tiFormat
-			// 
-			this.tiFormat.AttachedControl = this.tcpFormat;
-			this.tiFormat.Name = "tiFormat";
-			this.tiFormat.Text = "Format";
-			// 
 			// tcpAutomation
 			// 
 			this.tcpAutomation.Controls.Add(this.ppCbNoDuplexFoldout);
@@ -1465,7 +1479,7 @@ namespace VEPROMS
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.CaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ClientSize = new System.Drawing.Size(730, 398);
+			this.ClientSize = new System.Drawing.Size(722, 390);
 			this.ControlBox = false;
 			this.Controls.Add(this.tcSectionProp);
 			this.Controls.Add(this.panSectBtns);
@@ -1489,12 +1503,12 @@ namespace VEPROMS
 			this.panSectBtns.ResumeLayout(false);
 			((System.ComponentModel.ISupportInitialize)(this.tcSectionProp)).EndInit();
 			this.tcSectionProp.ResumeLayout(false);
-			this.tcpGeneral.ResumeLayout(false);
-			this.tcpGeneral.PerformLayout();
 			this.tcpFormat.ResumeLayout(false);
 			this.tcpFormat.PerformLayout();
 			this.ppGpbxSignoffCheckoff.ResumeLayout(false);
 			this.ppGpbxSignoffCheckoff.PerformLayout();
+			this.tcpGeneral.ResumeLayout(false);
+			this.tcpGeneral.PerformLayout();
 			this.tcpAutomation.ResumeLayout(false);
 			this.tcpAutomation.PerformLayout();
 			this.gpTOC.ResumeLayout(false);
@@ -1598,5 +1612,6 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonX ppBtnConvertToDocX;
 		private System.Windows.Forms.CheckBox cbIsFoldoutSection;
 		private System.Windows.Forms.CheckBox ppCbNoDuplexFoldout;
-  }
+		private System.Windows.Forms.CheckBox ppCbShowRplWords;
+	}
 }

PROMS/VEPROMS User Interface/frmSectionProperties.cs

@@ -523,6 +523,23 @@ namespace VEPROMS
 				else
 					ppCbDefaultStepSection.Text = "Make this the Default Step Section";
 			}
+			// Show Replace Words
+			ppCbShowRplWords.Visible = false;
+			if (_isStepSection && _SectionConfig.MySection.MySectionInfo.MyActiveParent.IsProcedure)
+			{
+				ppCbShowRplWords.Visible = true;
+				ppCbShowRplWords.Checked = _SectionConfig.Section_ShwRplWords == "Y";
+				// Use checkbox text to clarify what is case for this section, i.e. is it already
+				// the default or can it be set.  Note that this is used when printing of page numbers
+				// that use the 'WithSteps' numbering sequence.
+				if (_SectionConfig.Section_OriginalSteps == "Y")
+				{
+					ppCbShowRplWords.Text = "Show Replace Words"; // C2020-021 add the word "the"
+					_isDefaultStepSection = true;
+				}
+				else
+					ppCbShowRplWords.Text = "Show Replace Words";
+			}
 
 			// if the parent has enhanced documents (and is not an enhanced document, i.e. the test
 			// ed.Type != 0 proves that) put up the group panel on the automation tab that allows for setting of 
@@ -1211,6 +1228,7 @@ namespace VEPROMS
 			ppGpbxSignoffCheckoff.Visible = _isStepSection;
 			cbKeepWordDocMargins.Visible = !_isStepSection;
 			ppCbDefaultStepSection.Visible = _isStepSection;
+			ppCbShowRplWords.Visible = _isStepSection;
 		}
 
 		private void rbStepSect_CheckedChanged(object sender, EventArgs e)
@@ -1380,7 +1398,8 @@ namespace VEPROMS
 				_SectionConfig.Section_OriginalSteps = ppCbDefaultStepSection.Checked ? "Y" : "N";
 			}
 		}
-		private void ppBtnConvertToDocX_Click(object sender, EventArgs e)
+	
+			private void ppBtnConvertToDocX_Click(object sender, EventArgs e)
 		{
 			// Get Document as file
 			ItemInfo ii = ItemInfo.Get(_SectionConfig.MySection.ItemID);
@@ -1447,6 +1466,14 @@ namespace VEPROMS
 		{
 			_SectionConfig.Section_DontIncludeDuplexFoldout = ppCbNoDuplexFoldout.Checked;
 		}
+			// C2029-025 Show or hide replace words.  Can highlight replace words in editor.
+		private void ppCbShowRplWords_CheckedChanged(object sender, EventArgs e)
+		{
+			if (!_Initializing)
+			{
+				_SectionConfig.Section_ShwRplWords = ppCbShowRplWords.Checked ? "Y" : "N";
+			}
+		}
 
 		//private void ppBtnDefaultPrintSize_Click(object sender, EventArgs e)
 		//{

PROMS/VEPROMS User Interface/frmSectionProperties.resx

@@ -142,8 +142,11 @@ When a format other than the inherited one is selected, a button labeled "Defaul
 Pressing the "Default" button will revert back to using the inherited format for this section.
 </value>
   </data>
+  <metadata name="sectionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>128, 18</value>
+  </metadata>
   <data name="cbIsFoldoutSection.SuperTooltip" xml:space="preserve">
-     <value>If the format supports duplex Foldouts:
+    <value>If the format supports duplex Foldouts:
 
 - This can be used to turn On duplexing of the Foldout instead
   of using "FOLDOUT" as the section number

PROMS/VEPROMS User Interface/frmSysOptions.cs

@@ -11,6 +11,7 @@ using DevComponents.DotNetBar;
 using VEPROMS.Properties;
 using Volian.Base.Library;
 using DescriptiveEnum;
+using VEPROMS.CSLA.Library;
 
 namespace VEPROMS
 {
@@ -24,6 +25,9 @@ namespace VEPROMS
       get { return _CanChangeSeparateWindowsSetting; }
       set { _CanChangeSeparateWindowsSetting = value; }
     }
+
+		private UserSettings _usersettings;
+
 		public frmSysOptions()
 		{
 			_initializing = true;
@@ -64,6 +68,7 @@ namespace VEPROMS
 			colorPickerButton1.SelectedColor = Settings.Default.TransitionRangeColor;
 			cbAnnotationPopup.Checked = Settings.Default.AutoPopUpAnnotations;
 			cbStepTypeToolTip.Checked = Settings.Default.StepTypeToolTip;
+			cbShwRplWrdsColor.Checked = Settings.Default.cbShwRplWrdsColor;
 			cbTVExpand.Checked = Settings.Default.SaveTreeviewExpanded;
 			cbPasteNoReturns.Checked = Settings.Default.PasteNoReturns;
 			cbPastePlainText.Checked = Settings.Default.PastePlainText;
@@ -89,6 +94,13 @@ namespace VEPROMS
 					break;
 			}
 
+			//CSM - C2024-031 - Getting User Settings
+			//and set checkboxes based on what they are set to
+			_usersettings = new UserSettings(VlnSettings.UserID);
+			cbOTRemember.Checked = _usersettings.UserSetting_OpenTabs_Remember;
+			cbOTAutoOpen.Enabled = cbOTAutoOpen.Visible = cbOTRemember.Checked;
+			cbOTAutoOpen.Checked = _usersettings.UserSetting_OpenTabs_AutoOpen || !cbOTRemember.Checked;
+			
 		}
 		private void cbEnhancedDocumentSync_CheckedChanged(object sender, System.EventArgs e)
 		{
@@ -151,6 +163,15 @@ namespace VEPROMS
 				Settings.Default.PropPageStyle = 3;
 
 			Settings.Default.Save();
+			//CSM - C2024-031 - Save User Settings
+			//based on what checkboxes are set to
+			bool? OTAuto = null;
+			if (cbOTRemember.Checked)
+            {
+                OTAuto = cbOTAutoOpen.Checked;
+            }
+            _usersettings.SetUserSettings(cbOTRemember.Checked, OTAuto);
+
 			this.DialogResult = DialogResult.OK;
 			this.Close();
 		}
@@ -160,6 +181,7 @@ namespace VEPROMS
 		private	Color ss_TransRangeColor;
 		private	bool ss_PopUPAnnotations;
 		private	bool ss_StepTypeToolTip;
+		private bool ss_cbShwRplWrdsColor;
 		private	bool ss_SaveTreeviewExpanded;
 		private	bool ss_PasteNoReturns;
 		private	bool ss_PastePlainText;
@@ -175,6 +197,8 @@ namespace VEPROMS
 			ss_TransRangeColor = Settings.Default.TransitionRangeColor;
 			ss_PopUPAnnotations = Settings.Default.AutoPopUpAnnotations;
 			ss_StepTypeToolTip = Settings.Default.StepTypeToolTip;
+
+			ss_cbShwRplWrdsColor = Settings.Default.cbShwRplWrdsColor;
 			ss_SaveTreeviewExpanded = Settings.Default.SaveTreeviewExpanded;
 			ss_PasteNoReturns = Settings.Default.PasteNoReturns;
 			ss_PastePlainText = Settings.Default.PastePlainText;
@@ -191,6 +215,7 @@ namespace VEPROMS
 			Settings.Default.TransitionRangeColor = ss_TransRangeColor;
 			Settings.Default.AutoPopUpAnnotations = ss_PopUPAnnotations;
 			Settings.Default.StepTypeToolTip = ss_StepTypeToolTip;
+			Settings.Default.cbShwRplWrdsColor = ss_cbShwRplWrdsColor;
 			Settings.Default.SaveTreeviewExpanded = ss_SaveTreeviewExpanded;
 			Settings.Default.PasteNoReturns = ss_PasteNoReturns;
 			Settings.Default.PastePlainText = ss_PastePlainText;
@@ -324,5 +349,16 @@ namespace VEPROMS
 				Settings.Default.UCFImportOpt = 4;
 			}
 		}
-	}
+		private void cbOTRemember_CheckedChanged(object sender, EventArgs e)
+		{
+			cbOTAutoOpen.Enabled = cbOTAutoOpen.Visible = cbShwRplWrdsColor.Checked;
+		}
+		private void cbShwRplWrdsColor_CheckedChanged(object sender, EventArgs e)
+        {
+			Settings.Default.cbShwRplWrdsColor = cbShwRplWrdsColor.Checked;
+			VlnSettings.cbShwRplWrdsColor = cbShwRplWrdsColor.Checked;
+			Properties.Settings.Default.cbShwRplWrdsColor = cbShwRplWrdsColor.Checked; // update setting value
+			Properties.Settings.Default.Save(); // save settings
+		}
+    }
 }

PROMS/VEPROMS User Interface/frmSysOptions.resx

@@ -112,21 +112,20 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="colorPickerButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAACpJREFUOE9j+P//P0UYQgApcjCKASCaFDxqwKgBIDwcDSAHww0gH/9nAACxLJWH1IMf
-        ngAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJxAAAScQHz3HqOAAAAKklE
+        QVQ4T2P4//8/RRhCAClyMIoBIJoUPGrAqAEgPBwNIAfDDSAf/2cAALEslYfUgx+eAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -524,6 +524,7 @@ namespace VEPROMS
 			this.Activated += new EventHandler(frmVEPROMS_Activated);
 
 			VlnSettings.StepTypeToolType = Settings.Default.StepTypeToolTip;
+			VlnSettings.cbShwRplWrdsColor = Settings.Default.cbShwRplWrdsColor;
 			displayLibDocs.PrintRequest += new DisplayLibDocEvent(displayLibDocs_PrintRequest);
 			ContentInfo.InfoChanged += new ContentInfoEvent(RefreshDisplayHistory);
 			AnnotationInfo.InfoChanged += new AnnotationInfoEvent(RefreshDisplayHistory);
@@ -816,6 +817,11 @@ namespace VEPROMS
 			set { frmVEPROMS._ErrorLogFileName = value; }
 		}
 
+		public static bool colorReplaceWords()
+		{
+			return Properties.Settings.Default.cbShwRplWrdsColor;
+		}
+
 		static bool ChangeLogFileName(string AppenderName, string NewFilename)
 		{
 			log4net.Repository.ILoggerRepository RootRep;
@@ -1654,6 +1660,10 @@ namespace VEPROMS
 			// B2017-214 added a null reference check
 			// B2010-071 Since we cannot tell if the user click on the X in Word or the X in PROMS, ask if the current tab
 			//           should be closed or if we should exit PROMS or just Cancel to continue working
+			if (tc._MyDisplayTabItems.Count < 1) // If all thabs are closed in the editor will indicate that in the database.
+			{
+				VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
+			}
 			if (!_WeAreExitingPROMS && !ClosingWithError && tc.SelectedDisplayTabItem != null && tc._MyDisplayTabItems.Count > 0)
 			{
 				// B2019-071 dialog to ask user if we are to close one tab or exit
@@ -1670,16 +1680,38 @@ namespace VEPROMS
 					return;
 				}
 
-				string stk = Volian.Base.Library.vlnStackTrace.StackToString();
+				string stk = Volian.Base.Library.vlnStackTrace.StackToString(); 
 
 				if (!stk.Contains("Exception"))
 				{
 					// B2018-091 Allow PROMS to close if only MSWord sections have been opened.
 					// B2019-071 we will now close one or all of the tabs (even step editor ones)
+					if (_WeAreExitingPROMS)
+					{
+						string DisplayTabID = "";
+						int pos;
+						int TabItemID;
+						string DisplayTabName = "";
+						int cnt = 0;
+						// Deactivate previous procedure tab state by user
+						VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
+						// Save current procedure tab state
+						foreach (KeyValuePair<string, DisplayTabItem> pgTab in tc._MyDisplayTabItems)
+						{
+							cnt++;
+							DisplayTabID = pgTab.Key;
+							TabItemID = Int32.Parse(DisplayTabID.Substring(DisplayTabID.IndexOf("Item - ") + 7));
+							DisplayTabName = pgTab.Value.ToString();
+							//tc.SelectedDisplayTabItem.MyStepTabPanel.ToString()
+							VEPROMS.CSLA.Library.Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt);
+						}
+					}
+
 					int n = tc._MyDisplayTabItems.Count;
 
 					while (n-- > 0 && tc._MyDisplayTabItems.Count > 0)
 					{
+
 						tc.CloseTabItem(tc.SelectedDisplayTabItem);
 
 						// B2019-071 close just the current tab and continue working
@@ -2320,6 +2352,58 @@ namespace VEPROMS
 					CurrentID = txtSearch.Text;
 				}
 			}
+
+			// Add retrieve displaytabs state here.
+			openDisplaytabstate();
+		}
+
+		public void openDisplaytabstate()
+		{
+			// Retrieve edit tab state from database.
+			DataTable DisPlayTabState = VEPROMS.CSLA.Library.Item.GetDisplayTabs(VlnSettings.UserID);
+
+			//CSM - C2024-031 - Getting User Settings
+			//and set checkboxes based on what they are set to
+			UserSettings usersettings = new UserSettings(VlnSettings.UserID);
+
+			if (DisPlayTabState.Rows.Count > 0 && (usersettings.UserSetting_OpenTabs_AutoOpen || !usersettings.UserSetting_OpenTabs_Remember))
+			{
+				//will open tabs by default / ask by default
+				DialogResult result = DialogResult.Yes;
+				if (!usersettings.UserSetting_OpenTabs_Remember)
+				{
+					dlgCheckOpenTabs checkOpenTabs = new dlgCheckOpenTabs();
+					result = checkOpenTabs.ShowDialog();
+
+					//if checkbox was checked in form, then update User Settings in database
+					if (checkOpenTabs.Remember)
+						usersettings.SetUserSettings(true, result == DialogResult.Yes);
+				}
+
+
+				if (result == DialogResult.Yes)
+				{
+					foreach (DataRow TabState in DisPlayTabState.Rows)
+					{
+						int _ItemID = (int)TabState["ItemID"];
+						ItemInfo _Procedure = ItemInfo.Get(_ItemID);
+						// Open procedure in the editor.
+						OpenItem(_Procedure);
+						// SelectedStepTabPanel needs to be set so the print buttons on the ribbon will work.
+						SelectedStepTabPanel = tc.MyEditItem.MyStepPanel.MyStepTabPanel;
+
+						//CSM B2024-090 - if last displaytab item,
+						//select the steptab panel for it
+						//and set the EditItem for Find/Replace
+						//otherwise will cause PROMS to crash if Find clicked before a Tab is given Focus
+						if ((DisPlayTabState.Rows.IndexOf(TabState) == DisPlayTabState.Rows.Count - 1))
+						{
+							SelectedStepTabPanel.Select();
+							dlgFindReplace.MyEditItem = tc.MyEditItem;
+						}
+					}
+				}
+			}
 		}
 
 		void tc_RefreshEnhancedDocument(object sender, ItemSelectedChangedEventArgs args)

PROMS/VEPROMS.CSLA.Library/Config/FormatConfig.cs

@@ -517,6 +517,57 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 		#endregion CheckOff
+		#region ShwRplWds
+		[Serializable]
+		[TypeConverter(typeof(ExpandableObjectConverter))]
+		public class ShwRplWds
+		{
+			private string _MenuItem;
+			[XmlAttribute("MenuItem")]
+			[Browsable(false)]
+			public string MenuItem
+			{
+				get { return _MenuItem; }
+				set { _MenuItem = value; }
+			}
+			private string _Index;
+			[XmlAttribute("Index")]
+			[Browsable(false)]              // Don't show in the property grid
+			public string Index
+			{
+				get { return _Index; }
+				set { _Index = value; }
+			}
+
+			private bool? _Active;
+			[DisplayName("Active ShwRplWds")]
+			[Description("Allow use of this ShwRplWds")]
+			public bool? Active
+			{
+				get { return _Active; }
+				set { _Active = value; }
+			}
+			private bool? _OrigActive;
+			[XmlIgnore]
+			[Browsable(false)]
+			public bool? OrigActive
+			{
+				get { return _OrigActive; }
+				set { _OrigActive = value; }
+			}
+			public ShwRplWds()
+			{
+			}
+			public string ConvertToString()
+			{
+				return GenericSerializer<ShwRplWds>.StringSerialize(this);
+			}
+			public override string ToString()
+			{
+				return MenuItem;
+			}
+		}
+		#endregion ShwRplWds
 		#region StepData (list)
 		[Serializable]
 		[TypeConverter(typeof(ExpandableObjectConverter))]

PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs

@@ -528,6 +528,24 @@ namespace VEPROMS.CSLA.Library
 				OnPropertyChanged("Section_OriginalSteps");
 			}
 		}
+		[Browsable(false)]
+		[DisplayName("Section ShowReplaceWords")]
+		[RefreshProperties(RefreshProperties.All)]
+		[Description("Section ShowReplaceWords")]
+		public string Section_ShwRplWords
+		{
+			get
+			{
+				//return _Xp["Section", "ShwRplWords"];
+				string tmp = _Xp["Section", "ShwRplWords"];
+				return tmp == null || tmp == "" ? "Y" : tmp;
+			}
+			set
+			{
+				_Xp["Section", "ShwRplWords"] = value;
+				OnPropertyChanged("Section_ShwRplWords");
+			}
+		}
 		[Category("Section")]
 		//PROPGRID: Hide Section NumPages
 		[Browsable(false)]

PROMS/VEPROMS.CSLA.Library/Config/StepConfig.cs

@@ -474,6 +474,53 @@ namespace VEPROMS.CSLA.Library
 				OnPropertyChanged("Step_FixedTblForSrch");
 			}
 		}
+		//CSM F2024-080: For South Texas - Ability to toggle off Initial Line
+		public bool Step_DisableInitialLine
+		{
+			get
+			{
+				string s = _Xp["Step", "DisableInitialLine"];
+
+				if (s == string.Empty) return false;
+				if (s == "True") return true;
+				return false;
+			}
+			set
+			{
+				string s = _Xp["Step", "DisableInitialLine"];
+				if (value.ToString() == s) return;
+				_Xp["Step", "DisableInitialLine"] = value.ToString();
+				OnPropertyChanged("Step_DisableInitialLine");
+			}
+		}
+		//C2019-025 Ability to Toggle Replace Words
+		public int Step_ShwRplWdsIndex
+		{
+			get
+			{
+				string s = _Xp["Step", "ShwRplWdsIndex"];
+
+				if (s == string.Empty) return 0;
+
+				if (s == "0") return 0;
+
+				if (s == "1") return 1;
+
+				if (s == "2") return 2;
+
+				if (s == "3") return 3;
+
+				return 0;
+
+			}
+			set
+			{
+				string s = _Xp["Step", ""];
+				if (value.ToString() == s) return;
+				_Xp["Step", "ShwRplWdsIndex"] = value.ToString();
+				OnPropertyChanged("Step_ShwRplWdsIndex");
+			}
+		}
 		#region RO image sizing
 		// if the RO image (figure) is resized, save it in the step config, not in the ROImageConfig.  If stored in ROImageConfig
 		// the size is set for ALL uses.

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

@@ -687,19 +687,46 @@ namespace VEPROMS.CSLA.Library
 								myLength += mg.Groups[3].Length;
 							}
 							string gg = MyGrid.Data.Substring(myIndex, myLength);
+							//CSM B2024-003 Updating RO Values inside a text Grid, adding a karat
+							// and/or dash into the RO value changes to question marks in the UI,
 							if (newvalue.Contains(@"\u8209?"))
 							{
 								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
 								if (m == null)
 									newvalue = newvalue.Replace(@"\u8209?", "-");
+								else if (m.Groups[1].Value == "")
+									newvalue = newvalue.Replace(@"\u8209?", "-");
 								else
 									newvalue = newvalue.Replace(@"\u8209?", m.Groups[1].Value + @"\u8209?" + m.Groups[3].Value);
 							}
+							int indx_to_addfont = -1;
+							if (newvalue.Contains(@"\u916?"))
+							{
+								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
+								if (m == null)
+									newvalue = newvalue.Replace(@"\u916?", "^");
+								else if (m.Groups[1].Value == "" && !ContentItems[0].MyItem.MyItemInfo.MyDocVersion.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
+									newvalue = newvalue.Replace(@"\u916?", "^");
+								else if (m.Groups[1].Value == "")
+                                {
+									//B2024-003, B2023-113, B2024-093 - Updating RO Values inside a text Grid,
+									//  adding a caret and/or dash into the RO value and then updating RO values changed to question marks in the UI.
+									//  This is to handle if ConvertCaretToDelta is true
+									//  since delta is not part of the standard ascii
+									//  may need to add a font to handle it.
+									newvalue = newvalue.Replace(@"\u916?", @"\f9\u916?\f0 ");
+									indx_to_addfont = GetLocationToInsertFontInGrid(myIndex);
+								}
+								else
+									newvalue = newvalue.Replace(@"\u916?", m.Groups[1].Value + @"\u916?" + m.Groups[3].Value);
+							}
 							if (newvalue.Contains(@"\u8593?"))
 							{
 								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
 								if (m == null)
 									newvalue = newvalue.Replace(@"\u8593?", "^");
+								else if (m.Groups[1].Value == "")
+									newvalue = newvalue.Replace(@"\u8593?", "^");
 								else
 									newvalue = newvalue.Replace(@"\u8593?", m.Groups[1].Value + @"\u8593?" + m.Groups[3].Value);
 							}
@@ -708,6 +735,8 @@ namespace VEPROMS.CSLA.Library
 								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
 								if (m == null)
 									newvalue = newvalue.Replace(@"\u9586?", @"\\");
+								else if (m.Groups[1].Value == "")
+									newvalue = newvalue.Replace(@"\u9586?", @"\\");
 								else
 									newvalue = newvalue.Replace(@"\u9586?", m.Groups[1].Value + @"\u9586?" + m.Groups[3].Value);
 							}
@@ -719,7 +748,17 @@ namespace VEPROMS.CSLA.Library
 							if (gg != newvalue)
 							{
 								retval = gg;
-								MyGrid.Data = MyGrid.Data.Substring(0, myIndex) + newvalue + MyGrid.Data.Substring(myIndex + myLength);
+								//B2024-003, B2023-113, B2024-093 - Updating RO Values inside a text Grid,
+								//  adding a caret and/or dash into the RO value and then updating RO values changed to question marks in the UI.
+								//  This is to handle if ConvertCaretToDelta is true
+								//  since delta is not part of the standard ascii
+								//  may need to add a font to handle it.
+								string begin_str = MyGrid.Data.Substring(0, myIndex);
+								if (indx_to_addfont > -1)
+									begin_str = begin_str.Insert(indx_to_addfont, @"{\f9\fnil\fcharset0 FreeMono;}");
+
+								MyGrid.Data = begin_str + newvalue + MyGrid.Data.Substring(myIndex + myLength);
+								MyGrid.Save();
 								break;
 							}
 						}
@@ -729,6 +768,64 @@ namespace VEPROMS.CSLA.Library
 			return retval;
 		}
 
+		//B2024-003, B2023-113, B2024-093 - Updating RO Values inside a text Grid,
+		//  adding a caret and/or dash into the RO value and then updating RO values changed to question marks in the UI.
+		//  This is to handle if ConvertCaretToDelta is true
+		//  since delta is not part of the standard ascii
+		//  may need to add a font to handle it.
+		// startIndex = Index in the Grid at which the text we want to replace is starting
+		//basic Grid data partitioning using the variables in this sub is as follows:
+		//
+		//                                 [indexOfPrefix]               [indx]
+		//                                        |                         |
+		// [text before last occurrence of prefix]  {prefix} [rest of fonts]  [text after fonts]
+		private int GetLocationToInsertFontInGrid(int startIndex)
+        {
+			//searches backwards from the srtIndex for the last previous occurrence of the prefix
+			string prefix = @"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{";
+			int indexOfPrefix = MyGrid.Data.LastIndexOf(prefix, startIndex);
+
+			//find the end of the font section
+			//by passing in the Grid data 
+			//with the following removed:
+			// - Everything before the last occurrence of the prefix
+			// - the prefix itself removed
+			int indx = GetIndexOfCloseBracket(MyGrid.Data.Substring(indexOfPrefix + prefix.Length, startIndex - indexOfPrefix - prefix.Length));
+
+			if (indx > -1)
+			{
+				indx += indexOfPrefix;
+				indx += prefix.Length;
+			}
+
+			//indx will contain last spot inside the font section
+			return indx;
+
+		}
+
+		//B2024-003, B2023-113, B2024-093 - Updating RO Values inside a text Grid,
+		//  this function will find the corresponding occurrence of a closing bracket :
+		// usage is you pass in some text after an opening bracket, and it will tell you what the index is for it closing
+		private int GetIndexOfCloseBracket(string text)
+        {
+			int indx = 0;
+			Stack<char> stk = new System.Collections.Generic.Stack<char>();
+
+			foreach (char c in text)
+			{
+				if (c == '{')
+					stk.Push('{');
+				else if (c == '}' && stk.Count == 0)
+					return indx;
+				else if (c == '}')
+					stk.Pop();
+
+				indx++;
+			}
+
+			return -1;
+        }
+
 		public static string MakeConsistentFormat(string gg)
 		{
 			// replace degree, bullet dash, hardspace
@@ -1255,6 +1352,16 @@ namespace VEPROMS.CSLA.Library
 						{
 							gg = ItemInfo.ConvertToDisplayText(gg);
 							newvalue = ItemInfo.ConvertToDisplayText(newvalue);
+
+							//CSM B2024-094 - Carats (as Deltas) print as question marks in tables when unit <u> is used in RO Definition Value
+							//If there is a grid, need to keep these as the \u code
+							//Otherwise they will not use the correct font and end up as question marks
+							if (MyGrid != null)
+                            {
+								gg = gg.Replace($"{(char)916}", @"\u916?");
+								newvalue = newvalue.Replace($"{(char)916}", @"\u916?");
+							}
+
 							// Debug  - jsj 5-19-2017 - left in for initial check-in
 							//string xx_gg = gg_org.Replace(@"\'b0", @"\'B0").Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
 							//string xx_nv = newval_org.Replace(@"\'b0", @"\'B0").Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
@@ -1307,7 +1414,19 @@ namespace VEPROMS.CSLA.Library
 								else
 									newvalue = newvalue.Replace(@"\u8209?", m.Groups[1].Value + @"\u8209?" + m.Groups[3].Value);
 							}
-
+							//B2024-003, B2023-113, B2024-093 - Updating RO Values inside a text Grid,
+							//  This will handle if there is a delta and the column/row of the grid is removed
+							//then restored from history
+							if (newvalue.Contains(@"\u916?"))
+							{
+								Match m = Regex.Match(gg, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
+								if (m.Groups.Count < 3 && !ContentItems[0].MyDocVersion.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
+									newvalue = newvalue.Replace(@"\u916?", "^");
+								else if (m.Groups.Count < 3)
+									newvalue = newvalue.Replace(@"\u916?", $"{(char)916}");
+								else
+									newvalue = newvalue.Replace(@"\u916?", m.Groups[1].Value + @"\u916?" + m.Groups[3].Value);
+							}
 							if (newvalue.Contains(@"\u8593?"))
 							{
 								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");

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

@@ -6,11 +6,18 @@ using System.Text.RegularExpressions;
 using System.Drawing;
 using Volian.Base.Library;
 using JR.Utils.GUI.Forms;
+//using VEPROMS.colorReplaceWords;
 
 // This was moved from volian.controls.library
 namespace VEPROMS.CSLA.Library
 {
 	public enum E_FieldToEdit { StepText, Text, Number, PSI };
+	public enum ReplaceWords
+	{
+		Inherit = 0,
+		Show = 1,
+		DoNotShow = 2
+	}
 	public class DisplayText
 	{
 		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
@@ -46,6 +53,45 @@ namespace VEPROMS.CSLA.Library
 				return string.Empty;
 			}
 		}
+		private string ShwRplWords(ItemInfo _MyItemInfo)
+		{
+			//if (_Initalizing) return "N";
+			//_MyItemInfo.
+			SectionConfig sc = _MyItemInfo.MyConfig as SectionConfig;
+			if (sc == null) return "N";
+			return sc.Section_ShwRplWords;
+		}
+		// C2019-025 c2025-010 Ability-to-Toggle-Replace-Words
+		private bool ShwRplWdsIndex(ItemInfo _MyItemInfo)
+		{
+			StepConfig sc = _MyItemInfo.MyConfig as StepConfig;
+			int setting = sc.Step_ShwRplWdsIndex;
+			switch (setting)
+			{
+				case (int)ReplaceWords.DoNotShow:
+					return false;
+					break;
+				case (int)ReplaceWords.Show:
+					return true;
+					break;
+				case (int)ReplaceWords.Inherit:
+					//SectionConfig sc2 = _MyItemInfo.ActiveParent.MyConfig as SectionConfig;
+					SectionConfig sc2 = _MyItemInfo.ActiveSection.MyConfig as SectionConfig;
+					if (sc2 == null || sc2.Section_ShwRplWords == "Y")
+					{
+						return true;
+					}
+					else
+					{
+						return false;
+					}
+					break;
+				default:
+					return false;
+					break;
+			}
+		}
+
 		private Item _MyItem;
 		private string EditText
 		{
@@ -357,9 +403,34 @@ namespace VEPROMS.CSLA.Library
 			// But don't do ReplaceWords if the TurnOffReplaceWords format flag is set
 			if (wordsShouldBeReplaced && !_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.TurnOffReplaceWords)
 			{
+
 				int profileDepth1 = ProfileTimer.Push(">>>> DoReplaceWords2");
-				
-				text = DoReplaceWords2(text);
+
+					// C2029-025 Show or hide replace words.  Can highlight replace words in editor.
+				if (_MyItemInfo.IsSection)
+				{
+					string ShwRplWrds = ShwRplWords(_MyItemInfo);
+					if (ShwRplWrds == "Y")
+					{
+						text = DoReplaceWords2(text, epMode);
+					}
+				}
+				if (_MyItemInfo.IsStep)
+				{
+					bool ShwRplWrds = ShwRplWdsIndex(_MyItemInfo);
+					if (ShwRplWrds == true)
+					{
+						text = DoReplaceWords2(text, epMode);
+					}
+				}
+
+
+				if (_MyItemInfo.IsFolder || _MyItemInfo.IsProcedure)
+				{
+					text = DoReplaceWords2(text, epMode);
+				}
+
+
 				ProfileTimer.Pop(profileDepth1);
 			}
 			if (_MyItemInfo != null && ROsShouldBeAdjusted) // B2017-019 - added check for ROsShouldBeAdjusted so that these token are not "cooked" on property pages
@@ -1165,13 +1236,17 @@ namespace VEPROMS.CSLA.Library
 					{
 						int sp = odte.Link.IndexOf(" ") + 1;   // get past tran type
 						string srecid = odte.Link.Substring(sp, odte.Link.IndexOf(" ", sp) - sp);
-						recid = System.Convert.ToInt32(srecid);
-						foreach (ContentTransition ct in itm.MyContent.ContentTransitions)
+
+						//CSM B2024-078 - when a bad transition link / does not contain a number, simply return the text as-is
+						if (int.TryParse(srecid, out recid))
 						{
-							if (ct.TransitionID == recid)
+							foreach (ContentTransition ct in itm.MyContent.ContentTransitions)
 							{
-								itm.MyContent.ContentTransitions.Remove(ct);
-								break;
+								if (ct.TransitionID == recid)
+								{
+									itm.MyContent.ContentTransitions.Remove(ct);
+									break;
+								}
 							}
 						}
 					}
@@ -1656,7 +1731,15 @@ namespace VEPROMS.CSLA.Library
 		private string FixTransition(string link, string text)
 		{
 			if (link.IndexOf("<NewID>") != -1) return text;
-			int transitionID = Convert.ToInt32(link.Split(" ".ToCharArray())[1]);
+
+			//CSM B2024-078 - when a bad transition link / does not contain a number, simply return the text as-is
+			int transitionID;
+			string[] splt_link = link.Split(' ');
+			if (splt_link.Length < 2 || !int.TryParse(splt_link[1], out transitionID))
+			{
+				return text;
+			}
+
 			// Find the transition
 			if (_MyItemInfo.MyContent.ContentTransitionCount <= 0)
 			{
@@ -2089,7 +2172,7 @@ namespace VEPROMS.CSLA.Library
 				return (bool) _ProcessReplaceWords; 
 			}
 		}
-		private string DoReplaceWords2(string Text)
+		private string DoReplaceWords2(string Text, E_EditPrintMode epMode)
 		{
 			if(!ProcessReplaceWords) return Text;
 			// F2021-053: BNPP Alarm - need ability to have super/sub scripts in the text of Alarm Tables (ROs).
@@ -2150,6 +2233,7 @@ namespace VEPROMS.CSLA.Library
 							// CASEINSENS: Do ReplaceWords for all words that match, regardless of case, and replace with the ReplaceWith string as is
 							//RegexOptions myOptions = (rs.Flag & E_ReplaceFlags.CaseInsens) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase & RegexOptions.Singleline : RegexOptions.None & RegexOptions.Singleline;
 							string replaceWord = Regex.Replace(rs.ReplaceWord, @"[[\]\\()]", @"\$0");
+
 							// if first or last character in replaceword is a non-word character, for example, ',', ')', or '.',
 							// don't use the \W, i.e. don't bother to look for a non-word character.
 							string wordMatchBeg = Regex.IsMatch(replaceWord.Substring(0, 1), @"\W") ? "" : @"(?<=\W|^)";
@@ -2176,7 +2260,7 @@ namespace VEPROMS.CSLA.Library
 			}
 			//ProfileTimer.Pop(profileDepth);
 			//int profileDepth5 = ProfileTimer.Push(">>>> DoReplaceWords2.ReplaceMatches");
-			Text = myMatches.ReplaceMatches();
+			Text = myMatches.ReplaceMatches(epMode);
 			//ProfileTimer.Pop(profileDepth5);
 			Text = Text.Replace(@"\xA0", @"\u160?"); //replace hard space
 			return Text;
@@ -2468,7 +2552,8 @@ namespace VEPROMS.CSLA.Library
 				if (str.Length == index && str == text.Substring(0, str.Length)) return true;
 			return false;
 		}
-		public string ReplaceMatches()
+		
+		public string ReplaceMatches(E_EditPrintMode epMode)
 		{
 			int offset = 0;
 			string text = _Text;
@@ -2560,6 +2645,11 @@ namespace VEPROMS.CSLA.Library
 								with = with.Replace(@"\ul ", "");
 								with = with.Replace(@"\ulnone ", "");
 							}
+							//if (Properties.Settings.Default.cbShwRplWrdsColor && !(epMode == E_EditPrintMode.Print))
+							if (Properties.Settings.Default.cbShwRplWrdsColor && !(epMode == E_EditPrintMode.Print))
+							{
+								with = $@"\cf2{with}\cf0 ";
+							}
 
 							text = text.Substring(0, offset + foundMatch.MyMatch.Index) + with + text.Substring(offset + foundMatch.MyMatch.Index + foundMatch.MyMatch.Length);
 							//offset += foundMatch.MyWord.ReplaceWith.Length - foundMatch.MyMatch.Length;

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

@@ -49,29 +49,35 @@ namespace VEPROMS.CSLA.Library
 			{
 				if (DocVersionAssociations == null || DocVersionAssociations.Count == 0) return false;
 
-				ROFstInfo roFstInfo = ROFstInfo.GetJustROFst(DocVersionAssociations[0].ROFstID);
+				using (ROFstInfo roFstInfo = ROFstInfo.GetJustROFst(DocVersionAssociations[0].ROFstID))
+				{
+					using (RODbInfo rdi = RODbInfo.GetJustRODB(roFstInfo.RODbID))
+					{
+						string rofstPath = rdi.FolderPath + @"\ro.fst";
+						if (!File.Exists(rofstPath)) return false;
 
-				RODbInfo rdi = RODbInfo.GetJustRODB(roFstInfo.RODbID);
-				string rofstPath = rdi.FolderPath + @"\ro.fst";
-				if (!File.Exists(rofstPath)) return false;
+						FileInfo fiRofst = new FileInfo(rofstPath);
 
-				FileInfo fiRofst = new FileInfo(rofstPath);
+						// if the database Ro.Fst is newer or if the files have identical DTS, 
+						// assume that they are the same file.
+						if (roFstInfo.DTS >= fiRofst.LastWriteTimeUtc) return false;
 
-				// if the database Ro.Fst is newer or if the files have identical DTS, 
-				// assume that they are the same file.
-				if (roFstInfo.DTS >= fiRofst.LastWriteTimeUtc) return false;
+						// next see if the data is the same size, i.e. byte count of record and byte count
+						// of file.  If different sizes, the date/time stamp check will hold.
+						// B2022-026 RO Memory reduction - new logic
+						var bytes = ROFSTLookup.GetRofstLookupBytes(roFstInfo.ROFstID);
 
-				// next see if the data is the same size, i.e. byte count of record and byte count
-				// of file.  If different sizes, the date/time stamp check will hold.
-				// B2022-026 RO Memory reduction - new logic
-				var bytes = ROFSTLookup.GetRofstLookupBytes(roFstInfo.ROFstID);
+						if (bytes != null && fiRofst.Length != bytes.Length)
+							return fiRofst.LastWriteTimeUtc > roFstInfo.DTS;
+
+						// if we can't tell by the DTS or size, compare the contents.  Get all of the rodb's
+						// rofsts of the size of the file & compare bytes.
+						return ROFstInfoList.ROFstDiffBySize(rofstPath, rdi.RODbID, (int)fiRofst.Length);
+					}
+
+				}
 
-				if (bytes != null && fiRofst.Length != bytes.Length) 
-					return fiRofst.LastWriteTimeUtc > roFstInfo.DTS;
 
-				// if we can't tell by the DTS or size, compare the contents.  Get all of the rodb's
-				// rofsts of the size of the file & compare bytes.
-				return  ROFstInfoList.ROFstDiffBySize(rofstPath, rdi.RODbID, (int)fiRofst.Length);
 			}
 		}
 		public bool ROfstLastCompleted

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

@@ -1876,6 +1876,10 @@ namespace VEPROMS.CSLA.Library
 			if (IsCaution) enhType = 20006;
 			return enhType;
 		}
+
+		// B2024-075: Paste Before/After with Enhanced Documents is creating situation
+		//where Background item is linked to Source but Source is not linked to Background
+		//When Fixing the linking, need to not create a duplicate link if one already exists
 		public void DoCreateLinksEnhancedSingleItem(ItemInfo enhii, int enhtype)
 		{
 			// Link the 2 items, srcII & enhii:
@@ -1893,12 +1897,15 @@ namespace VEPROMS.CSLA.Library
 				using (Item ei = Item.Get(enhii.ItemID))
 				{
 					StepConfig sc = enhii.MyConfig as StepConfig;
-					sc.AddEnhancedDocument(0, this.ItemID);
-					sc.SaveEnhancedDocuments();
-					ei.MyContent.Text = DisplayText;
-					ei.MyContent.Config = sc.ToString();
-					ei.Save();
-					enhii.RefreshConfig();
+					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
+					{
+						sc.AddEnhancedDocument(0, this.ItemID);
+						sc.SaveEnhancedDocuments();
+						ei.MyContent.Text = DisplayText;
+						ei.MyContent.Config = sc.ToString();
+						ei.Save();
+						enhii.RefreshConfig();
+					}
 				}
 			}
 			else if (IsSection)
@@ -1916,12 +1923,15 @@ namespace VEPROMS.CSLA.Library
 				using (Item ei = Item.Get(enhii.ItemID))
 				{
 					SectionConfig sc = enhii.MyConfig as SectionConfig;
-					sc.AddEnhancedDocument(0, this.ItemID);
-					sc.SaveEnhancedDocuments();
-					ei.MyContent.Text = DisplayText;
-					ei.MyContent.Config = sc.ToString();
-					ei.Save();
-					enhii.RefreshConfig();
+					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
+					{
+						sc.AddEnhancedDocument(0, this.ItemID);
+						sc.SaveEnhancedDocuments();
+						ei.MyContent.Text = DisplayText;
+						ei.MyContent.Config = sc.ToString();
+						ei.Save();
+						enhii.RefreshConfig();
+					}
 				}
 			}
 			else if (IsProcedure)
@@ -1942,16 +1952,66 @@ namespace VEPROMS.CSLA.Library
                 using (Item ii = this.Get())
                 {
                     ProcedureConfig sc = this.MyConfig as ProcedureConfig;
-                    sc.AddEnhancedDocument(enhtype, enhii.ItemID);
-                    sc.SaveEnhancedDocuments();
-                    ii.MyContent.Config = sc.ToString();
-                    ii.Save();
-                    RefreshConfig();
+					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
+					{
+						sc.AddEnhancedDocument(enhtype, enhii.ItemID);
+						sc.SaveEnhancedDocuments();
+						ii.MyContent.Config = sc.ToString();
+						ii.Save();
+						RefreshConfig();
+					}
                 }
 			}
 		}
 		#endregion
 		#region DataPortal
+		// C2017-031:  Support for paste/replace an enhanced step
+		private void DataPortal_Fetch(PastingPartEnhancedCriteria criteria)
+		{
+			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
+			try
+			{
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				{
+					Csla.ApplicationContext.LocalContext["cn"] = cn;
+					using (SqlCommand cm = cn.CreateCommand())
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.Parameters.AddWithValue("@StartItemID", criteria.StartItemID);  // copy children
+						cm.Parameters.AddWithValue("@ItemID", criteria.ItemID);            //copy to
+						cm.Parameters.AddWithValue("@Type", criteria.Type);
+						cm.Parameters.AddWithValue("@DTS", criteria.DTS);
+						cm.Parameters.AddWithValue("@UserID", criteria.UserID);
+						SqlParameter param_ContentID = new SqlParameter("@NewItemID", SqlDbType.Int);
+						param_ContentID.Direction = ParameterDirection.Output;
+						cm.Parameters.Add(param_ContentID);
+						cm.CommandText = "PasteItemEnhancedReplace";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+						{
+							if (!dr.Read())
+							{
+								_ErrorMessage = "No Record Found";
+								return;
+							}
+							ReadData(dr);
+						}
+					}
+					// removing of item only needed for local data portal
+					if (Csla.ApplicationContext.ExecutionLocation == Csla.ApplicationContext.ExecutionLocations.Client)
+						Csla.ApplicationContext.LocalContext.Remove("cn");
+				}
+			}
+			catch (Exception ex)
+			{
+				if (!ex.Message.Contains("This step has been deleted") && !ex.Message.Contains("This current step has been deleted in another session"))
+				{
+					if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemInfo.DataPortal_Fetch", ex);
+				}
+				_ErrorMessage = ex.Message;
+				throw new DbCslaException("ItemInfo.DataPortal_Fetch", ex);
+			}
+		}
 		private void DataPortal_Fetch(PastingPartCriteria criteria)
 		{
 			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
@@ -2073,9 +2133,72 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("ItemInfo.DataPortal_Fetch", ex);
 			}
 		}
+	#endregion
+	#region PastingPartEnhancedCriteria
+	// C2017-031:  Support for paste/replace an enhanced step
+	[Serializable()]
+	public class PastingPartEnhancedCriteria
+	{
+		#region Properties
+		private int _StartItemID;
+		public int StartItemID
+		{
+			get { return _StartItemID; }
+			set { _StartItemID = value; }
+		}
+		private int _ItemID;            // paste relative to this itemid
+		public int ItemID
+		{
+			get { return _ItemID; }
+			set { _ItemID = value; }
+		}
+		private EAddpingPart _AddType;
+		public EAddpingPart AddType
+		{
+			get { return _AddType; }
+			set { _AddType = value; }
+		}
+		private int? _FromType = null;
+		public int? FromType
+		{
+			get { return _FromType; }
+			set { _FromType = value; }
+		}
+		private int? _Type = null;
+		public int? Type
+		{
+			get { return _Type; }
+			set { _Type = value; }
+		}
+		private DateTime _DTS;
+		public DateTime DTS
+		{
+			get { return _DTS; }
+			set { _DTS = value; }
+		}
+		private string _UserID;
+		public string UserID
+		{
+			get { return _UserID; }
+			set { _UserID = value; }
+		}
+			#endregion
+			#region Constructor
+			public PastingPartEnhancedCriteria(int startItemid, int itemID, EAddpingPart addType, int? type, int? fromType, DateTime dts, string userID)
+			{
+				_StartItemID = startItemid;
+				_ItemID = itemID;
+				_AddType = addType;
+				_Type = type;
+				_FromType = fromType;
+				_DTS = dts;
+				_UserID = userID;
+			}
 		#endregion
-		#region PastingPartCriteria
-		[Serializable()]
+	}
+	#endregion
+	#region PastingPartCriteria
+	[Serializable()]
 		public class PastingPartCriteria
 		{
 			#region Properties
@@ -2364,6 +2487,14 @@ namespace VEPROMS.CSLA.Library
 			_MyPrevious = null; // Reset list so that the next line gets a new list
 			if (MyPrevious != null) MyPrevious.RefreshNextItems(); // Update List for new value
 		}
+		// C2017-031:  Support for paste/replace an enhanced step
+		internal static ItemInfo CopyPasteReplaceEnhancedItemInfoFetch(int copyStartID, ItemInfo itemInfo)
+		{
+			ItemInfo tmp = null;
+			tmp = DataPortal.Fetch<StepInfo>(new ItemInfo.PastingPartEnhancedCriteria(copyStartID, itemInfo.ItemID, ItemInfo.EAddpingPart.Replace, itemInfo.MyContent.Type, itemInfo.MyContent.Type, DateTime.Now, Volian.Base.Library.VlnSettings.UserID));
+			AddToCache(tmp);
+			return tmp;
+		}
 		internal static ItemInfo CopyPasteReplaceItemInfoFetch(int copyStartID, ItemInfo itemInfo) // int itemID, int? type, int? fromType)
 		{
 			ItemInfo tmp = null;
@@ -2519,89 +2650,174 @@ namespace VEPROMS.CSLA.Library
 			firstTrans = false;
 			if (!CanDeleteObject())
 				throw new System.Security.SecurityException("User not authorized to remove a Item");
-			// B2016-009 check source and desintation types and display message box if needed
+			// B2016-009 check source and destination types and display message box if needed
 			// C2022-017 moved the CheckSourceDestinationType call to  btnPasteReplace_Click in StepTabRibbon
 			// B2023-101 Handle Paste Replace when procedure to be replaced has Incoming Transitions, i.e. do a separate try/catch for this case
 			ItemInfo newItemInfo = null;
-			try
+			using (ItemInfo copyItemInfo = ItemInfo.Get(copyStartID))
 			{
-				newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); //itemInfo.ItemID, itemInfo.MyContent.Type, itemInfo.MyContent.Type);
-				if (newItemInfo == null) return null;
-			}
-			catch (Exception ex1)
-			{
-				if (ex1.Message.Contains("has External Transitions and has no next step")
+				try
+				{
+					// C2017-031:  Support for paste/replace an enhanced step, if this is replacing enhanced, do a specific query
+					if (itemInfo.IsEnhancedStep)
+					{
+						newItemInfo = ItemInfo.CopyPasteReplaceEnhancedItemInfoFetch(copyStartID, itemInfo);
+						if (newItemInfo == null) return null;
+					}
+					//C2025-003 Enhanced Copy/Paste Upgrade - Added support for paste/replace on a master step
+					else if (itemInfo.HasEnhancedLinkedStep || copyItemInfo.HasEnhancedLinkedStep)
+					{
+						DialogResult rslt = DialogResult.No;
+
+						SectionConfig secCfg = itemInfo.ActiveSection.MyConfig as SectionConfig;
+						if (copyItemInfo.HasEnhancedLinkedStep && secCfg.MyEnhancedDocuments.Count > 0)
+							rslt = FlexibleMessageBox.Show("The step you are copying contains linked background documents." +
+									"\r\n\r\nDo you also wish to make a copy of the background documents?",
+									"Paste background documents", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+
+						//unlink and remove any background documents attached to where you are copying to
+						//and then delete them
+						//if selected want to replace BG step (DialogResult.Yes)
+						if (itemInfo.HasEnhancedLinkedStep && rslt == DialogResult.Yes)
+						{
+							foreach (EnhancedDocument ed in itemInfo.GetMyEnhancedDocuments())
+							{
+								using (ItemInfo exEnh = ItemInfo.Get(ed.ItemID))
+								{
+									exEnh.DoUnlinkEnhanced(exEnh, 0, false);
+									DeleteItemAndChildren(exEnh);
+								}
+
+							}
+						}
+
+						//do copy/paste replace of the master step
+						newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo);
+						if (newItemInfo == null) return null;
+
+						//copy any background documents
+						//if selected want to replace BG step (DialogResult.Yes)
+						if (copyItemInfo.HasEnhancedLinkedStep && rslt == DialogResult.Yes)
+						{
+							foreach (EnhancedDocument ed in copyItemInfo.GetMyEnhancedDocuments())
+							{
+								using (ItemInfo exEnh = newItemInfo.DoAddMissingEnhancedItems(ed.Type))
+								{
+									PasteReplace(exEnh, ed.ItemID, chgid, ref firstTrans);
+								}
+
+							}
+						}
+						else if (rslt == DialogResult.No)
+						{
+							//if selected didn't want to copy BG documents (DialogResult.No)
+							//need to unlink BG doc from old removed content (what was pasted over top of)
+							//re-link BG document to new paste replace master doc
+							//this should also auto update the text of the main linked item
+							//to match the new master doc wording
+
+							//get original BG documents
+							EnhancedDocuments orig_eds = itemInfo.GetMyEnhancedDocuments();
+
+							//remove link from pre-existing BG docs
+							foreach (EnhancedDocument ed in orig_eds)
+							{
+								using (ItemInfo exEnh = ItemInfo.Get(ed.ItemID))
+									{ exEnh.DoUnlinkEnhanced(exEnh, 0, false); }
+							}
+
+							//remove link from steps just copied
+							ItemInfo.PasteClearEnhanced(newItemInfo);
+
+							//re-link pre-existing BG docs to newly replaced master step
+							foreach (EnhancedDocument ed in orig_eds)
+							{
+								using (ItemInfo orig_ed_item = ItemInfo.Get(ed.ItemID))
+									{ newItemInfo.DoCreateLinksEnhancedSingleItem(orig_ed_item, ed.Type); }
+							}
+
+						}
+					}
+					else
+					{
+						newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); if (newItemInfo == null) return null;
+					}
+				}
+				catch (Exception ex1)
+				{
+					if (ex1.Message.Contains("has External Transitions and has no next step")
 						|| ex1.Message.Contains("has External Transitions to Procedure")
 						|| ex1.Message.Contains("has External Transitions to it's children"))
 
-				{
-					FlexibleMessageBox.Show("This procedure has external transition references to it that must be resolved before doing the Paste/Replace.\r\nRight Click on the procedure and select the Incoming Transitions menu option to find these references and resolve them.", "Paste Replace Failed", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
-					return null;
+					{
+						FlexibleMessageBox.Show("This procedure has external transition references to it that must be resolved before doing the Paste/Replace.\r\nRight Click on the procedure and select the Incoming Transitions menu option to find these references and resolve them.", "Paste Replace Failed", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
+						return null;
+					}
 				}
-			}
-			try
-			{
-				// Delete business objects, including remove from tree
-				ItemInfo.DeleteItemInfoAndChildren(itemInfo.ItemID); // Dispose ItemInfo and Children
-				using (Item item = Get(newItemInfo.ItemID)) ItemInfo.Refresh(item);
-				ItemInfo.PasteSetChangeId(newItemInfo, chgid);
-				ItemInfo.PasteClearEnhanced(newItemInfo);
-				if (newItemInfo.NextItem != null) using (Item item = newItemInfo.NextItem.Get()) ItemInfo.Refresh(item);
-				newItemInfo.RefreshNextItems();
-				// if inserting after a caution or note, refreshes tabs.  This will adjust bullets
-				// of any previous cautions or notes.
-				if (newItemInfo.IsCaution || newItemInfo.IsNote) newItemInfo.ResetOrdinal();
-				newItemInfo.UpdateTransitionText();
-				newItemInfo.UpdateROText();
-				newItemInfo.UpdatePastedStepTransitionText();
+				try
+				{
+					// Delete business objects, including remove from tree
+					ItemInfo.DeleteItemInfoAndChildren(itemInfo.ItemID); // Dispose ItemInfo and Children
+					using (Item item = Get(newItemInfo.ItemID)) ItemInfo.Refresh(item);
+					ItemInfo.PasteSetChangeId(newItemInfo, chgid);
+					if (!copyItemInfo.HasEnhancedLinkedStep && !itemInfo.HasEnhancedLinkedStep) ItemInfo.PasteClearEnhanced(newItemInfo);
+					if (newItemInfo.NextItem != null) using (Item item = newItemInfo.NextItem.Get()) ItemInfo.Refresh(item);
+					newItemInfo.RefreshNextItems();
+					// if inserting after a caution or note, refreshes tabs.  This will adjust bullets
+					// of any previous cautions or notes.
+					if (newItemInfo.IsCaution || newItemInfo.IsNote) newItemInfo.ResetOrdinal();
+					newItemInfo.UpdateTransitionText();
+					newItemInfo.UpdateROText();
+					newItemInfo.UpdatePastedStepTransitionText();
 
-				// Add to tree
-				if (newItemInfo.NextItem != null)
-				{
-					using (ItemInfo itm = ItemInfo.GetNonCached(newItemInfo.NextItem.ItemID))
+					// Add to tree
+					if (newItemInfo.NextItem != null)
 					{
-						itm.OnNewSiblingBefore(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.Before));
+						using (ItemInfo itm = ItemInfo.GetNonCached(newItemInfo.NextItem.ItemID))
+						{
+							itm.OnNewSiblingBefore(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.Before));
+						}
 					}
-				}
-				else if (newItemInfo.PreviousID != null)
-				{
-					using (ItemInfo itm2 = ItemInfo.GetNonCached((int)newItemInfo.PreviousID))
+					else if (newItemInfo.PreviousID != null)
 					{
-						itm2.OnNewSiblingAfter(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.After));
+						using (ItemInfo itm2 = ItemInfo.GetNonCached((int)newItemInfo.PreviousID))
+						{
+							itm2.OnNewSiblingAfter(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.After));
+						}
 					}
+					else
+					{
+						// B2024-045, 049 and 050: if not a single procedure replace, update user interface by using the 'OnNewChild'. Single 
+						//	procedure's MyParent is null because its parent is a working draft (docversion) since MyParent's type is iteminfo.
+						//	For the single procedure case, the user interface code in vlntreeview will update the tree.
+						if (newItemInfo.MyParent != null)
+							newItemInfo.MyParent.OnNewChild(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.Child));
+					}
+					return newItemInfo;
 				}
-				else
+				catch (Exception ex)
 				{
-					// B2024-045, 049 and 050: if not a single procedure replace, update user interface by using the 'OnNewChild'. Single 
-					//	procedure's MyParent is null because its parent is a working draft (docversion) since MyParent's type is iteminfo.
-					//	For the single procedure case, the user interface code in vlntreeview will update the tree.
-					if (newItemInfo.MyParent != null)
-						newItemInfo.MyParent.OnNewChild(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.Child));
+					ItemInfo iii = itemInfo.HandleSqlExceptionOnDelete(ex);
+					if (iii == itemInfo) return null;// If self returned then return null
+					if (iii != null)
+					{
+						firstTrans = true; // B2017-179 set the firstTrans to true and return the itminfo of the first transition location that needs resolved
+						return iii;
+					}
+					if (!HandleSqlExceptionOnCopy(ex))
+					{
+						if (ex.Message.Contains("has External Transitions and has no next step")
+							|| ex.Message.Contains("has External Transitions to Procedure")
+							|| ex.Message.Contains("has External Transitions to it's children")
+							|| ex.Message.Contains("This step has been deleted"))
+								throw ex;
+
+						FlexibleMessageBox.Show("Details were written to the Error Log.", "Paste Replace Failed", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
+						return itemInfo;
+					}
+					else
+					  return itemInfo;
 				}
-				return newItemInfo;
-			}
-			catch (Exception ex)
-			{
-				ItemInfo iii = itemInfo.HandleSqlExceptionOnDelete(ex);
-				if (iii == itemInfo) return null;// If self returned then return null
-				if (iii != null)
-				{
-					firstTrans = true; // B2017-179 set the firstTrans to true and return the itminfo of the first transition location that needs resolved
-					return iii;
-				}
-        if (!HandleSqlExceptionOnCopy(ex))
-        {
-          if (ex.Message.Contains("has External Transitions and has no next step")
-						|| ex.Message.Contains("has External Transitions to Procedure")
-						|| ex.Message.Contains("has External Transitions to it's children")
-            || ex.Message.Contains("This step has been deleted")
-            )
-            throw ex;
-					FlexibleMessageBox.Show("Details were written to the Error Log.", "Paste Replace Failed", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
-          return itemInfo;
-        }
-        else
-          return itemInfo;
 			}
 		}
 		#endregion

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

@@ -84,7 +84,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("LastChanged", true);
 				return _LastChanged;
 			}
 			set { _LastChanged = value; }

PROMS/VEPROMS.CSLA.Library/Extension/MultiUserExt.cs.org

@@ -80,7 +80,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("LastChanged", true);
 				return _LastChanged;
 			}
 			set { _LastChanged = value; }

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

@@ -676,37 +676,47 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void AppendPrefix()
 		{
-			if (HasText && Prefix != null)
+			if (Prefix == null) return; // no Prefix text to add
+			if (HasText)
 			{
-				if (!_Results.ToString().EndsWith(_Prefix))
+				if (!_Results.ToString().EndsWith(_Prefix)) //existing transition text does not end with Prefix text, OK to append
 					_Results.Append(Prefix);
 				_Prefix = null;
 			}
 			else if (_TranType == 4 && _ToItem.MoreThanOneStepSection())
 			{
-				if (!HasText && Prefix != null && Prefix.ToUpper().StartsWith(", STEP")
-					&& _FromItem.ActiveFormat.Name.StartsWith("WEP"))
-				{
-					Console.WriteLine("Format,'{0}'", _FromItem.ActiveFormat.Name);
-					_Prefix = null;
-					return;
-				}
+				// WEP (Point Beach) is no longer a customer - commented out
+				//if (!HasText && Prefix.ToUpper().StartsWith(", STEP")
+				//	&& _FromItem.ActiveFormat.Name.StartsWith("WEP")) 
+				//{
+				//	Console.WriteLine("Format,'{0}'", _FromItem.ActiveFormat.Name);
+				//	_Prefix = null;
+				//	return;
+				//}
 				_Results.Append(Prefix);
 				_Prefix = null;
 			}
-			else if (_TranType == 5 && Prefix != null)
-			{
-				if (!HasText && Prefix.StartsWith(", "))
-					_Results.Append(Prefix.TrimStart(", ".ToCharArray()));
-				else
-					_Results.Append(Prefix);
-				_Prefix = null;
-			}
 			// If the prefix contains an open paren, we want to add the open paren regardless
 			// of whether there already is text in the resulting string.
-			else if (!HasText && Prefix != null && Prefix.Contains("("))
+			else if (!HasText && Prefix.Contains("("))
 			{
 				_Results.Append(Prefix.TrimStart(" ".ToCharArray()));   // since no text in result, trim starting space.
+				_Prefix = null;
+			}
+			else if (!HasText && Prefix.StartsWith(", "))
+			{
+				_Results.Append(Prefix.TrimStart(", ".ToCharArray()));// no preceeding text, remove comma and space
+				_Prefix = null;
+			}
+			else if (!HasText && Prefix.StartsWith(","))
+			{
+				_Results.Append(Prefix.TrimStart(",".ToCharArray())); // no preceeding text, remove comma
+				_Prefix = null;
+			}
+			else
+			{
+				_Results.Append(Prefix); // append prefix as is
+				_Prefix = null;
 			}
 		}
 		public string OverridePrefix

PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs

@@ -2173,6 +2173,7 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 	}
+
 	#endregion
 	#region CheckOff
 	[TypeConverter(typeof(ExpandableObjectConverter))]
@@ -2284,6 +2285,49 @@ namespace VEPROMS.CSLA.Library
 		}
 	}
 	#endregion
+	#region ShwRplWds
+	// C2029-025 Show or hide replace words.  Can highlight replace words in editor.
+	public class ShwRplWds : vlnFormatItem, IVlnIndexedFormatItem
+	{
+		public ShwRplWds(XmlNode xmlNode) : base(xmlNode) { }
+		public ShwRplWds() : base() { }
+		private LazyLoad<int?> _Index;
+		public int? Index
+		{
+			get
+			{
+				return LazyLoad(ref _Index, "@Index");
+			}
+		}
+
+		// User Interface Mark (UIMark) is the deimal number of an ASCII character that is desplayed in the step editor
+		// to indicate the selected checkoff
+		private LazyLoad<int?> _UIMark;
+		public int? UIMark
+		{
+			get
+			{
+				return LazyLoad(ref _UIMark, "@UIMark");
+			}
+		}
+
+
+		//Descriptive text shown in the checkoff selection list
+		private LazyLoad<string> _MenuItem;
+		public string MenuItem
+		{
+			get
+			{
+				return LazyLoad(ref _MenuItem, "@MenuItem");
+			}
+		}
+
+		public override string ToString()
+		{
+			return MenuItem;
+		}
+	}
+#endregion
 	#region CheckOffList
 	[TypeConverter(typeof(vlnIndexedListConverter<CheckOffList, CheckOff>))]
 	public class CheckOffList : vlnIndexedFormatList<CheckOff>
@@ -3175,6 +3219,17 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _ChangeFontUpperCaseIinArial, "@ChangeFontUpperCaseIinArial");
 			}
 		}
+
+		// F2024-080 South Texas
+		// Used to show if "Initial Line Disable" checkbox should show in the DisplayTab
+		private LazyLoad<bool> _ShowInitialLineDisable;
+		public bool ShowInitialLineDisable
+		{
+			get
+			{
+				return LazyLoad(ref _ShowInitialLineDisable, "@ShowInitialLineDisable");
+			}
+		}
 	}
 	#endregion - StepSectionData
 	#region TextTypeValue
@@ -6202,6 +6257,36 @@ public StepData Equation		// equation has a parent of embedded object.
 			}
 		}
 
+		// F2024-078 adjusts the the spacing before the Note/Caution tab - the space betwee the top of the box and the tab text
+		private LazyLoad<float?> _AdjSpB4Tab;
+		public float? AdjSpB4Tab
+		{
+			get
+			{
+				return LazyLoad(ref _AdjSpB4Tab, "@AdjSpB4Tab");
+			}
+		}
+
+		// F2024-078 adjusts the the spacing after the Note/Caution tab - the space betwee the tab text and the first line of of Note/Caution text
+		private LazyLoad<float?> _AdjSpAftTab;
+		public float? AdjSpAftTab
+		{
+			get
+			{
+				return LazyLoad(ref _AdjSpAftTab, "@AdjSpAftTab");
+			}
+		}
+
+		// F2024-078 adjusts the the spacing after the last line of Note/Caution text - between the last line of text and the bottom of the box
+		private LazyLoad<float?> _AdjLastBlnkLn;
+		public float? AdjLastBlnkLn
+		{
+			get
+			{
+				return LazyLoad(ref _AdjLastBlnkLn, "@AdjLastBlnkLn");
+			}
+		}
+
 		// this will adjust the line spacing when an extra thick line is used for a box, so that the text below the box doesn't hit up against the bottom of the box
 		private LazyLoad<bool> _ThickDouble;    // F2021-026: Barakah single column 2 thick double lines around Warnings
 		public bool ThickDouble
@@ -6396,7 +6481,7 @@ public StepData Equation		// equation has a parent of embedded object.
 		}
 		public TransData(XmlNode xmlNode) : base(xmlNode) { }
 
-		// a character that is placed before and after the title that's in the transition text
+		// a character that is placed before and after the procedure title that's in the transition text
 		private LazyLoad<string> _DelimiterForTransitionTitle;
 		public string DelimiterForTransitionTitle
 		{
@@ -6673,7 +6758,9 @@ public StepData Equation		// equation has a parent of embedded object.
 			}
 		}
 
-		// holdover from 16bit, used to define whether transitions are range (types 2 & 3). this is used in the logic for transitions with page numbers
+		// Holdover from 16bit, used to define whether transitions are range (types 2 & 3).
+		// This is used in the logic for transitions with page numbers. This gets defined as "Type" in the code for the transition class.
+		// NOTE: the TransType you see in the code is actually the index into the list of transition definitions for given format. 
 		private LazyLoad<int?> _Type;
 		public int? Type
 		{

PROMS/VEPROMS.CSLA.Library/Generated/Annotation.cs

@@ -108,7 +108,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("AnnotationID", true);
 				return _AnnotationID;
 			}
 		}
@@ -118,7 +117,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("ItemID", true);
 				if (_MyItem != null) _ItemID = _MyItem.ItemID;
 				return _ItemID;
 			}
@@ -129,14 +127,12 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("MyItem", true);
 				if (_MyItem == null && _ItemID != 0) _MyItem = Item.Get(_ItemID);
 				return _MyItem;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("MyItem", true);
 				if (_MyItem != value)
 				{
 					_MyItem = value;
@@ -151,7 +147,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("TypeID", true);
 				if (_MyAnnotationType != null) _TypeID = _MyAnnotationType.TypeID;
 				return _TypeID;
 			}
@@ -162,14 +157,12 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("MyAnnotationType", true);
 				if (_MyAnnotationType == null && _TypeID != 0) _MyAnnotationType = AnnotationType.Get(_TypeID);
 				return _MyAnnotationType;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("MyAnnotationType", true);
 				if (_MyAnnotationType != value)
 				{
 					_MyAnnotationType = value;
@@ -184,13 +177,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("RtfText", true);
 				return _RtfText;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("RtfText", true);
 				if (value == null) value = string.Empty;
 				if (_RtfText != value)
 				{
@@ -205,13 +196,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("SearchText", true);
 				return _SearchText;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("SearchText", true);
 				if (value == null) value = string.Empty;
 				if (_SearchText != value)
 				{
@@ -226,13 +215,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("Config", true);
 				return _Config;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("Config", true);
 				if (value == null) value = string.Empty;
 				if (_Config != value)
 				{
@@ -247,13 +234,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("DTS", true);
 				return _DTS;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("DTS", true);
 				if (_DTS != value)
 				{
 					_DTS = value;
@@ -267,13 +252,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("UserID", true);
 				return _UserID;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("UserID", true);
 				if (value == null) value = string.Empty;
 				if (_UserID != value)
 				{

PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAudit.cs

@@ -106,7 +106,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("AuditID", true);
 				return _AuditID;
 			}
 		}
@@ -116,13 +115,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("AnnotationID", true);
 				return _AnnotationID;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("AnnotationID", true);
 				if (_AnnotationID != value)
 				{
 					_AnnotationID = value;
@@ -136,13 +133,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("ItemID", true);
 				return _ItemID;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("ItemID", true);
 				if (_ItemID != value)
 				{
 					_ItemID = value;
@@ -156,13 +151,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("TypeID", true);
 				return _TypeID;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("TypeID", true);
 				if (_TypeID != value)
 				{
 					_TypeID = value;
@@ -176,13 +169,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("RtfText", true);
 				return _RtfText;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("RtfText", true);
 				if (value == null) value = string.Empty;
 				if (_RtfText != value)
 				{
@@ -197,13 +188,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("SearchText", true);
 				return _SearchText;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("SearchText", true);
 				if (value == null) value = string.Empty;
 				if (_SearchText != value)
 				{
@@ -218,13 +207,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("Config", true);
 				return _Config;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("Config", true);
 				if (value == null) value = string.Empty;
 				if (_Config != value)
 				{
@@ -239,13 +226,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("DTS", true);
 				return _DTS;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("DTS", true);
 				if (_DTS != value)
 				{
 					_DTS = value;
@@ -259,13 +244,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("UserID", true);
 				return _UserID;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("UserID", true);
 				if (value == null) value = string.Empty;
 				if (_UserID != value)
 				{
@@ -280,13 +263,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("DeleteStatus", true);
 				return _DeleteStatus;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("DeleteStatus", true);
 				if (_DeleteStatus != value)
 				{
 					_DeleteStatus = value;

PROMS/VEPROMS.CSLA.Library/Generated/AnnotationAuditInfo.cs

@@ -96,7 +96,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("AuditID", true);
 				return _AuditID;
 			}
 		}
@@ -106,7 +105,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("AnnotationID", true);
 				return _AnnotationID;
 			}
 		}
@@ -116,7 +114,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("ItemID", true);
 				return _ItemID;
 			}
 		}
@@ -126,7 +123,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("TypeID", true);
 				return _TypeID;
 			}
 		}
@@ -136,7 +132,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("RtfText", true);
 				return _RtfText;
 			}
 		}
@@ -146,7 +141,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("SearchText", true);
 				return _SearchText;
 			}
 		}
@@ -156,7 +150,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("Config", true);
 				return _Config;
 			}
 		}
@@ -166,7 +159,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("DTS", true);
 				return _DTS;
 			}
 		}
@@ -176,7 +168,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("UserID", true);
 				return _UserID;
 			}
 		}
@@ -186,7 +177,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("DeleteStatus", true);
 				return _DeleteStatus;
 			}
 		}

PROMS/VEPROMS.CSLA.Library/Generated/AnnotationInfo.cs

@@ -109,7 +109,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("AnnotationID", true);
 				return _AnnotationID;
 			}
 		}
@@ -119,7 +118,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("ItemID", true);
 				if (_MyItem != null) _ItemID = _MyItem.ItemID;
 				return _ItemID;
 			}
@@ -130,7 +128,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("MyItem", true);
 				if (_MyItem == null && _ItemID != 0) _MyItem = ItemInfo.Get(_ItemID);
 				return _MyItem;
 			}
@@ -141,7 +138,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("TypeID", true);
 				if (_MyAnnotationType != null) _TypeID = _MyAnnotationType.TypeID;
 				return _TypeID;
 			}
@@ -152,7 +148,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("MyAnnotationType", true);
 				if (_MyAnnotationType == null && _TypeID != 0) _MyAnnotationType = AnnotationTypeInfo.Get(_TypeID);
 				return _MyAnnotationType;
 			}
@@ -163,7 +158,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("RtfText", true);
 				return _RtfText;
 			}
 		}
@@ -173,7 +167,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("SearchText", true);
 				return _SearchText;
 			}
 		}
@@ -183,7 +176,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("Config", true);
 				return _Config;
 			}
 		}
@@ -193,7 +185,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("DTS", true);
 				return _DTS;
 			}
 		}
@@ -203,7 +194,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("UserID", true);
 				return _UserID;
 			}
 		}

PROMS/VEPROMS.CSLA.Library/Generated/AnnotationType.cs

@@ -129,7 +129,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("TypeID", true);
 				return _TypeID;
 			}
 		}
@@ -139,13 +138,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("Name", true);
 				return _Name;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("Name", true);
 				if (value == null) value = string.Empty;
 				if (_Name != value)
 				{
@@ -160,13 +157,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("Config", true);
 				return _Config;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("Config", true);
 				if (value == null) value = string.Empty;
 				if (_Config != value)
 				{
@@ -181,13 +176,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("DTS", true);
 				return _DTS;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("DTS", true);
 				if (_DTS != value)
 				{
 					_DTS = value;
@@ -201,13 +194,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("UserID", true);
 				return _UserID;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("UserID", true);
 				if (value == null) value = string.Empty;
 				if (_UserID != value)
 				{
@@ -226,7 +217,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("AnnotationTypeAnnotationCount", true);
 				return _AnnotationTypeAnnotationCount;
 			}
 		}
@@ -240,7 +230,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("AnnotationTypeAnnotations", true);
 				if (_AnnotationTypeAnnotationCount < 0 || (_AnnotationTypeAnnotationCount > 0 && _AnnotationTypeAnnotations == null))
 					_AnnotationTypeAnnotations = AnnotationTypeAnnotations.GetByTypeID(TypeID);
 				if (_AnnotationTypeAnnotationCount < 0 )

PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeAnnotation.cs

@@ -43,7 +43,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("AnnotationID", true);
 				if (_MyAnnotation != null) _AnnotationID = _MyAnnotation.AnnotationID;
 				return _AnnotationID;
 			}
@@ -55,7 +54,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("MyAnnotation", true);
 				if (_MyAnnotation == null && _AnnotationID != 0) _MyAnnotation = Annotation.Get(_AnnotationID);
 				return _MyAnnotation;
 			}
@@ -66,7 +64,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("ItemID", true);
 				if (_MyItem != null) _ItemID = _MyItem.ItemID;
 				return _ItemID;
 			}
@@ -77,14 +74,12 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("MyItem", true);
 				if (_MyItem == null && _ItemID != 0) _MyItem = Item.Get(_ItemID);
 				return _MyItem;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("MyItem", true);
 				if (_MyItem != value)
 				{
 					_MyItem = value;
@@ -99,13 +94,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("RtfText", true);
 				return _RtfText;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("RtfText", true);
 				if (value == null) value = string.Empty;
 				if (_RtfText != value)
 				{
@@ -120,13 +113,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("SearchText", true);
 				return _SearchText;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("SearchText", true);
 				if (value == null) value = string.Empty;
 				if (_SearchText != value)
 				{
@@ -141,13 +132,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("Config", true);
 				return _Config;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("Config", true);
 				if (value == null) value = string.Empty;
 				if (_Config != value)
 				{
@@ -162,13 +151,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("DTS", true);
 				return _DTS;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("DTS", true);
 				if (_DTS != value)
 				{
 					_DTS = value;
@@ -182,13 +169,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("UserID", true);
 				return _UserID;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("UserID", true);
 				if (value == null) value = string.Empty;
 				if (_UserID != value)
 				{
@@ -204,7 +189,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("Item_PreviousID", true);
 				return _Item_PreviousID;
 			}
 		}
@@ -214,7 +198,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("Item_ContentID", true);
 				return _Item_ContentID;
 			}
 		}
@@ -224,7 +207,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("Item_DTS", true);
 				return _Item_DTS;
 			}
 		}
@@ -234,7 +216,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("Item_UserID", true);
 				return _Item_UserID;
 			}
 		}

PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeInfo.cs

@@ -96,7 +96,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("TypeID", true);
 				return _TypeID;
 			}
 		}
@@ -106,7 +105,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("Name", true);
 				return _Name;
 			}
 		}
@@ -116,7 +114,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("Config", true);
 				return _Config;
 			}
 		}
@@ -126,7 +123,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("DTS", true);
 				return _DTS;
 			}
 		}
@@ -136,7 +132,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("UserID", true);
 				return _UserID;
 			}
 		}
@@ -149,7 +144,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("AnnotationTypeAnnotationCount", true);
 				if (_AnnotationTypeAnnotationCount < 0)
 					_AnnotationTypeAnnotationCount = AnnotationTypeAnnotations.Count;
 				return _AnnotationTypeAnnotationCount;
@@ -162,7 +156,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("AnnotationTypeAnnotations", true);
 				if (_AnnotationTypeAnnotationCount < 0 || (_AnnotationTypeAnnotationCount > 0 && _AnnotationTypeAnnotations == null))
 					_AnnotationTypeAnnotations = AnnotationInfoList.GetByTypeID(_TypeID);
 				if (_AnnotationTypeAnnotationCount < 0)

PROMS/VEPROMS.CSLA.Library/Generated/Assignment.cs

@@ -109,7 +109,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("AID", true);
 				return _AID;
 			}
 		}
@@ -119,7 +118,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("GID", true);
 				if (_MyGroup != null) _GID = _MyGroup.GID;
 				return _GID;
 			}
@@ -130,14 +128,12 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("MyGroup", true);
 				if (_MyGroup == null && _GID != 0) _MyGroup = Group.Get(_GID);
 				return _MyGroup;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("MyGroup", true);
 				if (_MyGroup != value)
 				{
 					_MyGroup = value;
@@ -152,7 +148,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("RID", true);
 				if (_MyRole != null) _RID = _MyRole.RID;
 				return _RID;
 			}
@@ -163,14 +158,12 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("MyRole", true);
 				if (_MyRole == null && _RID != 0) _MyRole = Role.Get(_RID);
 				return _MyRole;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("MyRole", true);
 				if (_MyRole != value)
 				{
 					_MyRole = value;
@@ -185,7 +178,6 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("FolderID", true);
 				if (_MyFolder != null) _FolderID = _MyFolder.FolderID;
 				return _FolderID;
 			}
@@ -196,14 +188,12 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("MyFolder", true);
 				if (_MyFolder == null && _FolderID != 0) _MyFolder = Folder.Get(_FolderID);
 				return _MyFolder;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("MyFolder", true);
 				if (_MyFolder != value)
 				{
 					_MyFolder = value;
@@ -218,13 +208,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("StartDate", true);
 				return _StartDate;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("StartDate", true);
 				if (value == null) value = string.Empty;
 				_StartDate = value;
 				try
@@ -248,13 +236,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("EndDate", true);
 				return _EndDate;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("EndDate", true);
 				if (value == null) value = string.Empty;
 				_EndDate = value;
 				try
@@ -278,13 +264,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("DTS", true);
 				return _DTS;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("DTS", true);
 				if (_DTS != value)
 				{
 					_DTS = value;
@@ -298,13 +282,11 @@ namespace VEPROMS.CSLA.Library
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			get
 			{
-				CanReadProperty("UsrID", true);
 				return _UsrID;
 			}
 			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
 			set
 			{
-				CanWriteProperty("UsrID", true);
 				if (value == null) value = string.Empty;
 				if (_UsrID != value)
 				{

PROMS/VEPROMS.CSLA.Library/Generated/AssociationInfo.cs

@@ -19,432 +19,424 @@ using System.ComponentModel;
 using System.Collections.Generic;
 namespace VEPROMS.CSLA.Library
 {
-	public delegate void AssociationInfoEvent(object sender);
-	/// <summary>
-	///	AssociationInfo Generated by MyGeneration using the CSLA Object Mapping template
-	/// </summary>
-	[Serializable()]
-	[TypeConverter(typeof(AssociationInfoConverter))]
-	public partial class AssociationInfo : ReadOnlyBase<AssociationInfo>, IDisposable
-	{
-		public event AssociationInfoEvent Changed;
-		private void OnChange()
-		{
-			if (Changed != null) Changed(this);
-		}
-		#region Log4Net
-		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-		#endregion
-		#region Collection
-		private static List<AssociationInfo> _CacheList = new List<AssociationInfo>();
-		protected static void AddToCache(AssociationInfo associationInfo)
-		{
-			if (!_CacheList.Contains(associationInfo)) _CacheList.Add(associationInfo); // In AddToCache
-		}
-		protected static void RemoveFromCache(AssociationInfo associationInfo)
-		{
-			while (_CacheList.Contains(associationInfo)) _CacheList.Remove(associationInfo); // In RemoveFromCache
-		}
-		private static Dictionary<string, List<AssociationInfo>> _CacheByPrimaryKey = new Dictionary<string, List<AssociationInfo>>();
-		private static void ConvertListToDictionary()
-		{
-			while (_CacheList.Count > 0) // Move AssociationInfo(s) from temporary _CacheList to _CacheByPrimaryKey
-			{
-				AssociationInfo tmp = _CacheList[0]; // Get the first AssociationInfo
-				string pKey = tmp.AssociationID.ToString();
-				if (!_CacheByPrimaryKey.ContainsKey(pKey))
-				{
-					_CacheByPrimaryKey[pKey] = new List<AssociationInfo>(); // Add new list for PrimaryKey
-				}
-				_CacheByPrimaryKey[pKey].Add(tmp); // Add to Primary Key list
-				_CacheList.RemoveAt(0); // Remove the first AssociationInfo
-			}
-		}
-		internal static void AddList(AssociationInfoList lst)
-		{
-			foreach (AssociationInfo item in lst) AddToCache(item);
-		}
-		protected static AssociationInfo GetCachedByPrimaryKey(int associationID)
-		{
-			ConvertListToDictionary();
-			string key = associationID.ToString();
-			if (_CacheByPrimaryKey.ContainsKey(key)) return _CacheByPrimaryKey[key][0];
-			return null;
-		}
-		#endregion
-		#region Business Methods
-		private string _ErrorMessage = string.Empty;
-		public string ErrorMessage
-		{
-			get { return _ErrorMessage; }
-		}
-		protected Association _Editable;
-		private IVEHasBrokenRules HasBrokenRules
-		{
-			get
-			{
-				IVEHasBrokenRules hasBrokenRules = null;
-				if (_Editable != null)
-					hasBrokenRules = _Editable.HasBrokenRules;
-				return hasBrokenRules;
-			}
-		}
-		private int _AssociationID;
-		[System.ComponentModel.DataObjectField(true, true)]
-		public int AssociationID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("AssociationID", true);
-				return _AssociationID;
-			}
-		}
-		private int _VersionID;
-		public int VersionID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("VersionID", true);
-				if (_MyDocVersion != null) _VersionID = _MyDocVersion.VersionID;
-				return _VersionID;
-			}
-		}
-		private DocVersionInfo _MyDocVersion;
-		public DocVersionInfo MyDocVersion
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("MyDocVersion", true);
-				if (_MyDocVersion == null && _VersionID != 0) _MyDocVersion = DocVersionInfo.Get(_VersionID);
-				return _MyDocVersion;
-			}
-		}
-		private int _ROFstID;
-		public int ROFstID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("ROFstID", true);
-				if (_MyROFst != null) _ROFstID = _MyROFst.ROFstID;
-				return _ROFstID;
-			}
-		}
-		private ROFstInfo _MyROFst;
-		public ROFstInfo MyROFst
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("MyROFst", true);
-				//if (_MyROFst == null && _ROFstID != 0) _MyROFst = ROFstInfo.Get(_ROFstID);
-				if (_MyROFst == null && _ROFstID != 0) _MyROFst = ROFstInfo.GetJustROFst(_ROFstID);// Improve performance by not loading all ROImages
-				return _MyROFst;
-			}
-		}
-		private string _Config = string.Empty;
-		public string Config
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("Config", true);
-				return _Config;
-			}
-		}
-		private DateTime _DTS = new DateTime();
-		public DateTime DTS
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("DTS", true);
-				return _DTS;
-			}
-		}
-		private string _UserID = string.Empty;
-		public string UserID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("UserID", true);
-				return _UserID;
-			}
-		}
-		// CSLATODO: Replace base AssociationInfo.ToString function as necessary
-		/// <summary>
-		/// Overrides Base ToString
-		/// </summary>
-		/// <returns>A string representation of current AssociationInfo</returns>
-		//public override string ToString()
-		//{
-		//  return base.ToString();
-		//}
-		// CSLATODO: Check AssociationInfo.GetIdValue to assure that the ID returned is unique
-		/// <summary>
-		/// Overrides Base GetIdValue - Used internally by CSLA to determine equality
-		/// </summary>
-		/// <returns>A Unique ID for the current AssociationInfo</returns>
-		protected override object GetIdValue()
-		{
-			return MyAssociationInfoUnique; // Absolutely Unique ID
-		}
-		#endregion
-		#region Factory Methods
-		private static int _AssociationInfoUnique = 0;
-		private static int AssociationInfoUnique
-		{ get { return ++_AssociationInfoUnique; } }
-		private int _MyAssociationInfoUnique = AssociationInfoUnique;
-		public int MyAssociationInfoUnique // Absolutely Unique ID - Info
-		{ get { return _MyAssociationInfoUnique; } }
-		protected AssociationInfo()
-		{/* require use of factory methods */
-			AddToCache(this);
-		}
-		private bool _Disposed = false;
-		private static int _CountCreated = 0;
-		private static int _CountDisposed = 0;
-		private static int _CountFinalized = 0;
-		private static int IncrementCountCreated
-		{ get { return ++_CountCreated; } }
-		private int _CountWhenCreated = IncrementCountCreated;
-		public static int CountCreated
-		{ get { return _CountCreated; } }
-		public static int CountNotDisposed
-		{ get { return _CountCreated - _CountDisposed; } }
-		public static int CountNotFinalized
-		{ get { return _CountCreated - _CountFinalized; } }
-		~AssociationInfo()
-		{
-			_CountFinalized++;
-		}
-		public void Dispose()
-		{
-			if (_Disposed) return;
-			_CountDisposed++;
-			_Disposed = true;
-			RemoveFromCache(this);
-			if (!_CacheByPrimaryKey.ContainsKey(AssociationID.ToString())) return;
-			List<AssociationInfo> listAssociationInfo = _CacheByPrimaryKey[AssociationID.ToString()]; // Get the list of items
-			while (listAssociationInfo.Contains(this)) listAssociationInfo.Remove(this); // Remove the item from the list
-			if (listAssociationInfo.Count == 0) // If there are no items left in the list
-				_CacheByPrimaryKey.Remove(AssociationID.ToString()); // remove the list
-		}
-		public virtual Association Get()
-		{
-			return _Editable = Association.Get(_AssociationID);
-		}
-		public static void Refresh(Association tmp)
-		{
-			string key = tmp.AssociationID.ToString();
-			ConvertListToDictionary();
-			if (_CacheByPrimaryKey.ContainsKey(key))
-				foreach (AssociationInfo tmpInfo in _CacheByPrimaryKey[key])
-					tmpInfo.RefreshFields(tmp);
-		}
-		protected virtual void RefreshFields(Association tmp)
-		{
-			if (_VersionID != tmp.VersionID)
-			{
-				if (MyDocVersion != null) MyDocVersion.RefreshDocVersionAssociations(); // Update List for old value
-				_VersionID = tmp.VersionID; // Update the value
-			}
-			_MyDocVersion = null; // Reset list so that the next line gets a new list
-			if (MyDocVersion != null) MyDocVersion.RefreshDocVersionAssociations(); // Update List for new value
-			if (_ROFstID != tmp.ROFstID)
-			{
-				if (MyROFst != null) MyROFst.RefreshROFstAssociations(); // Update List for old value
-				_ROFstID = tmp.ROFstID; // Update the value
-			}
-			_MyROFst = null; // Reset list so that the next line gets a new list
-			if (MyROFst != null) MyROFst.RefreshROFstAssociations(); // Update List for new value
-			_Config = tmp.Config;
-			_DTS = tmp.DTS;
-			_UserID = tmp.UserID;
-			_AssociationInfoExtension.Refresh(this);
-			OnChange();// raise an event
-		}
-		public static void Refresh(DocVersionAssociation tmp)
-		{
-			string key = tmp.AssociationID.ToString();
-			ConvertListToDictionary();
-			if (_CacheByPrimaryKey.ContainsKey(key))
-				foreach (AssociationInfo tmpInfo in _CacheByPrimaryKey[key])
-					tmpInfo.RefreshFields(tmp);
-		}
-		protected virtual void RefreshFields(DocVersionAssociation tmp)
-		{
-			if (_ROFstID != tmp.ROFstID)
-			{
-				if (MyROFst != null) MyROFst.RefreshROFstAssociations(); // Update List for old value
-				_ROFstID = tmp.ROFstID; // Update the value
-			}
-			_MyROFst = null; // Reset list so that the next line gets a new list
-			if (MyROFst != null) MyROFst.RefreshROFstAssociations(); // Update List for new value
-			_Config = tmp.Config;
-			_DTS = tmp.DTS;
-			_UserID = tmp.UserID;
-			_AssociationInfoExtension.Refresh(this);
-			OnChange();// raise an event
-		}
-		public static void Refresh(ROFstAssociation tmp)
-		{
-			string key = tmp.AssociationID.ToString();
-			ConvertListToDictionary();
-			if (_CacheByPrimaryKey.ContainsKey(key))
-				foreach (AssociationInfo tmpInfo in _CacheByPrimaryKey[key])
-					tmpInfo.RefreshFields(tmp);
-		}
-		protected virtual void RefreshFields(ROFstAssociation tmp)
-		{
-			if (_VersionID != tmp.VersionID)
-			{
-				if (MyDocVersion != null) MyDocVersion.RefreshDocVersionAssociations(); // Update List for old value
-				_VersionID = tmp.VersionID; // Update the value
-			}
-			_MyDocVersion = null; // Reset list so that the next line gets a new list
-			if (MyDocVersion != null) MyDocVersion.RefreshDocVersionAssociations(); // Update List for new value
-			_Config = tmp.Config;
-			_DTS = tmp.DTS;
-			_UserID = tmp.UserID;
-			_AssociationInfoExtension.Refresh(this);
-			OnChange();// raise an event
-		}
-		public static AssociationInfo Get(int associationID)
-		{
-			//if (!CanGetObject())
-			//  throw new System.Security.SecurityException("User not authorized to view a Association");
-			try
-			{
-				AssociationInfo tmp = GetCachedByPrimaryKey(associationID);
-				if (tmp == null)
-				{
-					tmp = DataPortal.Fetch<AssociationInfo>(new PKCriteria(associationID));
-					AddToCache(tmp);
-				}
-				if (tmp.ErrorMessage == "No Record Found")
-				{
-					tmp.Dispose(); // Clean-up AssociationInfo
-					tmp = null;
-				}
-				return tmp;
-			}
-			catch (Exception ex)
-			{
-				throw new DbCslaException("Error on AssociationInfo.Get", ex);
-			}
-		}
-		#endregion
-		#region Data Access Portal
-		internal AssociationInfo(SafeDataReader dr)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AssociationInfo.Constructor", GetHashCode());
-			try
-			{
-				ReadData(dr);
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("AssociationInfo.Constructor", ex);
-				throw new DbCslaException("AssociationInfo.Constructor", ex);
-			}
-		}
-		[Serializable()]
-		protected class PKCriteria
-		{
-			private int _AssociationID;
-			public int AssociationID
-			{ get { return _AssociationID; } }
-			public PKCriteria(int associationID)
-			{
-				_AssociationID = associationID;
-			}
-		}
-		private void ReadData(SafeDataReader dr)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AssociationInfo.ReadData", GetHashCode());
-			try
-			{
-				_AssociationID = dr.GetInt32("AssociationID");
-				_VersionID = dr.GetInt32("VersionID");
-				_ROFstID = dr.GetInt32("ROFstID");
-				_Config = dr.GetString("Config");
-				_DTS = dr.GetDateTime("DTS");
-				_UserID = dr.GetString("UserID");
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("AssociationInfo.ReadData", ex);
-				_ErrorMessage = ex.Message;
-				throw new DbCslaException("AssociationInfo.ReadData", ex);
-			}
-		}
-		private void DataPortal_Fetch(PKCriteria criteria)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AssociationInfo.DataPortal_Fetch", GetHashCode());
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					ApplicationContext.LocalContext["cn"] = cn;
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "getAssociation";
-						cm.Parameters.AddWithValue("@AssociationID", criteria.AssociationID);
-						cm.CommandTimeout = Database.DefaultTimeout;
-						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-						{
-							if (!dr.Read())
-							{
-								_ErrorMessage = "No Record Found";
-								return;
-							}
-							ReadData(dr);
-						}
-					}
-					// removing of item only needed for local data portal
-					if (ApplicationContext.ExecutionLocation == ApplicationContext.ExecutionLocations.Client)
-						ApplicationContext.LocalContext.Remove("cn");
-				}
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("AssociationInfo.DataPortal_Fetch", ex);
-				_ErrorMessage = ex.Message;
-				throw new DbCslaException("AssociationInfo.DataPortal_Fetch", ex);
-			}
-		}
-		#endregion
-		// Standard Refresh
-		#region extension
-		AssociationInfoExtension _AssociationInfoExtension = new AssociationInfoExtension();
-		[Serializable()]
-		partial class AssociationInfoExtension : extensionBase { }
-		[Serializable()]
-		class extensionBase
-		{
-			// Default Refresh
-			public virtual void Refresh(AssociationInfo tmp) { }
-		}
-		#endregion
-	} // Class
-	#region Converter
-	internal class AssociationInfoConverter : ExpandableObjectConverter
-	{
-		public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
-		{
-			if (destType == typeof(string) && value is AssociationInfo)
-			{
-				// Return the ToString value
-				return ((AssociationInfo)value).ToString();
-			}
-			return base.ConvertTo(context, culture, value, destType);
-		}
-	}
-	#endregion
+    public delegate void AssociationInfoEvent(object sender);
+    /// <summary>
+    ///	AssociationInfo Generated by MyGeneration using the CSLA Object Mapping template
+    /// </summary>
+    [Serializable()]
+    [TypeConverter(typeof(AssociationInfoConverter))]
+    public partial class AssociationInfo : ReadOnlyBase<AssociationInfo>, IDisposable
+    {
+        public event AssociationInfoEvent Changed;
+        private void OnChange()
+        {
+            if (Changed != null) Changed(this);
+        }
+        #region Log4Net
+        private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+        #region Collection
+        private static List<AssociationInfo> _CacheList = new List<AssociationInfo>();
+        protected static void AddToCache(AssociationInfo associationInfo)
+        {
+            if (!_CacheList.Contains(associationInfo)) _CacheList.Add(associationInfo); // In AddToCache
+        }
+        protected static void RemoveFromCache(AssociationInfo associationInfo)
+        {
+            while (_CacheList.Contains(associationInfo)) _CacheList.Remove(associationInfo); // In RemoveFromCache
+        }
+        private static Dictionary<string, List<AssociationInfo>> _CacheByPrimaryKey = new Dictionary<string, List<AssociationInfo>>();
+        private static void ConvertListToDictionary()
+        {
+            while (_CacheList.Count > 0) // Move AssociationInfo(s) from temporary _CacheList to _CacheByPrimaryKey
+            {
+                AssociationInfo tmp = _CacheList[0]; // Get the first AssociationInfo
+                string pKey = tmp.AssociationID.ToString();
+                if (!_CacheByPrimaryKey.ContainsKey(pKey))
+                {
+                    _CacheByPrimaryKey[pKey] = new List<AssociationInfo>(); // Add new list for PrimaryKey
+                }
+                _CacheByPrimaryKey[pKey].Add(tmp); // Add to Primary Key list
+                _CacheList.RemoveAt(0); // Remove the first AssociationInfo
+            }
+        }
+        internal static void AddList(AssociationInfoList lst)
+        {
+            foreach (AssociationInfo item in lst) AddToCache(item);
+        }
+        protected static AssociationInfo GetCachedByPrimaryKey(int associationID)
+        {
+            ConvertListToDictionary();
+            string key = associationID.ToString();
+            if (_CacheByPrimaryKey.ContainsKey(key)) return _CacheByPrimaryKey[key][0];
+            return null;
+        }
+        #endregion
+        #region Business Methods
+        private string _ErrorMessage = string.Empty;
+        public string ErrorMessage
+        {
+            get { return _ErrorMessage; }
+        }
+        protected Association _Editable;
+        private IVEHasBrokenRules HasBrokenRules
+        {
+            get
+            {
+                IVEHasBrokenRules hasBrokenRules = null;
+                if (_Editable != null)
+                    hasBrokenRules = _Editable.HasBrokenRules;
+                return hasBrokenRules;
+            }
+        }
+        private int _AssociationID;
+        [System.ComponentModel.DataObjectField(true, true)]
+        public int AssociationID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _AssociationID;
+            }
+        }
+        private int _VersionID;
+        public int VersionID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_MyDocVersion != null) _VersionID = _MyDocVersion.VersionID;
+                return _VersionID;
+            }
+        }
+        private DocVersionInfo _MyDocVersion;
+        public DocVersionInfo MyDocVersion
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_MyDocVersion == null && _VersionID != 0) _MyDocVersion = DocVersionInfo.Get(_VersionID);
+                return _MyDocVersion;
+            }
+        }
+        private int _ROFstID;
+        public int ROFstID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_MyROFst != null) _ROFstID = _MyROFst.ROFstID;
+                return _ROFstID;
+            }
+        }
+        private ROFstInfo _MyROFst;
+        public ROFstInfo MyROFst
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                //if (_MyROFst == null && _ROFstID != 0) _MyROFst = ROFstInfo.Get(_ROFstID);
+                if (_MyROFst == null && _ROFstID != 0) _MyROFst = ROFstInfo.GetJustROFst(_ROFstID);// Improve performance by not loading all ROImages
+                return _MyROFst;
+            }
+        }
+        private string _Config = string.Empty;
+        public string Config
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _Config;
+            }
+        }
+        private DateTime _DTS = new DateTime();
+        public DateTime DTS
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _DTS;
+            }
+        }
+        private string _UserID = string.Empty;
+        public string UserID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _UserID;
+            }
+        }
+        // CSLATODO: Replace base AssociationInfo.ToString function as necessary
+        /// <summary>
+        /// Overrides Base ToString
+        /// </summary>
+        /// <returns>A string representation of current AssociationInfo</returns>
+        //public override string ToString()
+        //{
+        //  return base.ToString();
+        //}
+        // CSLATODO: Check AssociationInfo.GetIdValue to assure that the ID returned is unique
+        /// <summary>
+        /// Overrides Base GetIdValue - Used internally by CSLA to determine equality
+        /// </summary>
+        /// <returns>A Unique ID for the current AssociationInfo</returns>
+        protected override object GetIdValue()
+        {
+            return MyAssociationInfoUnique; // Absolutely Unique ID
+        }
+        #endregion
+        #region Factory Methods
+        private static int _AssociationInfoUnique = 0;
+        private static int AssociationInfoUnique
+        { get { return ++_AssociationInfoUnique; } }
+        private int _MyAssociationInfoUnique = AssociationInfoUnique;
+        public int MyAssociationInfoUnique // Absolutely Unique ID - Info
+        { get { return _MyAssociationInfoUnique; } }
+        protected AssociationInfo()
+        {/* require use of factory methods */
+            AddToCache(this);
+        }
+        private bool _Disposed = false;
+        private static int _CountCreated = 0;
+        private static int _CountDisposed = 0;
+        private static int _CountFinalized = 0;
+        private static int IncrementCountCreated
+        { get { return ++_CountCreated; } }
+        private int _CountWhenCreated = IncrementCountCreated;
+        public static int CountCreated
+        { get { return _CountCreated; } }
+        public static int CountNotDisposed
+        { get { return _CountCreated - _CountDisposed; } }
+        public static int CountNotFinalized
+        { get { return _CountCreated - _CountFinalized; } }
+        ~AssociationInfo()
+        {
+            _CountFinalized++;
+        }
+        public void Dispose()
+        {
+            if (_Disposed) return;
+            _CountDisposed++;
+            _Disposed = true;
+            RemoveFromCache(this);
+            if (!_CacheByPrimaryKey.ContainsKey(AssociationID.ToString())) return;
+            List<AssociationInfo> listAssociationInfo = _CacheByPrimaryKey[AssociationID.ToString()]; // Get the list of items
+            while (listAssociationInfo.Contains(this)) listAssociationInfo.Remove(this); // Remove the item from the list
+            if (listAssociationInfo.Count == 0) // If there are no items left in the list
+                _CacheByPrimaryKey.Remove(AssociationID.ToString()); // remove the list
+        }
+        public virtual Association Get()
+        {
+            return _Editable = Association.Get(_AssociationID);
+        }
+        public static void Refresh(Association tmp)
+        {
+            string key = tmp.AssociationID.ToString();
+            ConvertListToDictionary();
+            if (_CacheByPrimaryKey.ContainsKey(key))
+                foreach (AssociationInfo tmpInfo in _CacheByPrimaryKey[key])
+                    tmpInfo.RefreshFields(tmp);
+        }
+        protected virtual void RefreshFields(Association tmp)
+        {
+            if (_VersionID != tmp.VersionID)
+            {
+                if (MyDocVersion != null) MyDocVersion.RefreshDocVersionAssociations(); // Update List for old value
+                _VersionID = tmp.VersionID; // Update the value
+            }
+            _MyDocVersion = null; // Reset list so that the next line gets a new list
+            if (MyDocVersion != null) MyDocVersion.RefreshDocVersionAssociations(); // Update List for new value
+            if (_ROFstID != tmp.ROFstID)
+            {
+                if (MyROFst != null) MyROFst.RefreshROFstAssociations(); // Update List for old value
+                _ROFstID = tmp.ROFstID; // Update the value
+            }
+            _MyROFst = null; // Reset list so that the next line gets a new list
+            if (MyROFst != null) MyROFst.RefreshROFstAssociations(); // Update List for new value
+            _Config = tmp.Config;
+            _DTS = tmp.DTS;
+            _UserID = tmp.UserID;
+            _AssociationInfoExtension.Refresh(this);
+            OnChange();// raise an event
+        }
+        public static void Refresh(DocVersionAssociation tmp)
+        {
+            string key = tmp.AssociationID.ToString();
+            ConvertListToDictionary();
+            if (_CacheByPrimaryKey.ContainsKey(key))
+                foreach (AssociationInfo tmpInfo in _CacheByPrimaryKey[key])
+                    tmpInfo.RefreshFields(tmp);
+        }
+        protected virtual void RefreshFields(DocVersionAssociation tmp)
+        {
+            if (_ROFstID != tmp.ROFstID)
+            {
+                if (MyROFst != null) MyROFst.RefreshROFstAssociations(); // Update List for old value
+                _ROFstID = tmp.ROFstID; // Update the value
+            }
+            _MyROFst = null; // Reset list so that the next line gets a new list
+            if (MyROFst != null) MyROFst.RefreshROFstAssociations(); // Update List for new value
+            _Config = tmp.Config;
+            _DTS = tmp.DTS;
+            _UserID = tmp.UserID;
+            _AssociationInfoExtension.Refresh(this);
+            OnChange();// raise an event
+        }
+        public static void Refresh(ROFstAssociation tmp)
+        {
+            string key = tmp.AssociationID.ToString();
+            ConvertListToDictionary();
+            if (_CacheByPrimaryKey.ContainsKey(key))
+                foreach (AssociationInfo tmpInfo in _CacheByPrimaryKey[key])
+                    tmpInfo.RefreshFields(tmp);
+        }
+        protected virtual void RefreshFields(ROFstAssociation tmp)
+        {
+            if (_VersionID != tmp.VersionID)
+            {
+                if (MyDocVersion != null) MyDocVersion.RefreshDocVersionAssociations(); // Update List for old value
+                _VersionID = tmp.VersionID; // Update the value
+            }
+            _MyDocVersion = null; // Reset list so that the next line gets a new list
+            if (MyDocVersion != null) MyDocVersion.RefreshDocVersionAssociations(); // Update List for new value
+            _Config = tmp.Config;
+            _DTS = tmp.DTS;
+            _UserID = tmp.UserID;
+            _AssociationInfoExtension.Refresh(this);
+            OnChange();// raise an event
+        }
+        public static AssociationInfo Get(int associationID)
+        {
+            //if (!CanGetObject())
+            //  throw new System.Security.SecurityException("User not authorized to view a Association");
+            try
+            {
+                AssociationInfo tmp = GetCachedByPrimaryKey(associationID);
+                if (tmp == null)
+                {
+                    tmp = DataPortal.Fetch<AssociationInfo>(new PKCriteria(associationID));
+                    AddToCache(tmp);
+                }
+                if (tmp.ErrorMessage == "No Record Found")
+                {
+                    tmp.Dispose(); // Clean-up AssociationInfo
+                    tmp = null;
+                }
+                return tmp;
+            }
+            catch (Exception ex)
+            {
+                throw new DbCslaException("Error on AssociationInfo.Get", ex);
+            }
+        }
+        #endregion
+        #region Data Access Portal
+        internal AssociationInfo(SafeDataReader dr)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AssociationInfo.Constructor", GetHashCode());
+            try
+            {
+                ReadData(dr);
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("AssociationInfo.Constructor", ex);
+                throw new DbCslaException("AssociationInfo.Constructor", ex);
+            }
+        }
+        [Serializable()]
+        protected class PKCriteria
+        {
+            private int _AssociationID;
+            public int AssociationID
+            { get { return _AssociationID; } }
+            public PKCriteria(int associationID)
+            {
+                _AssociationID = associationID;
+            }
+        }
+        private void ReadData(SafeDataReader dr)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AssociationInfo.ReadData", GetHashCode());
+            try
+            {
+                _AssociationID = dr.GetInt32("AssociationID");
+                _VersionID = dr.GetInt32("VersionID");
+                _ROFstID = dr.GetInt32("ROFstID");
+                _Config = dr.GetString("Config");
+                _DTS = dr.GetDateTime("DTS");
+                _UserID = dr.GetString("UserID");
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("AssociationInfo.ReadData", ex);
+                _ErrorMessage = ex.Message;
+                throw new DbCslaException("AssociationInfo.ReadData", ex);
+            }
+        }
+        private void DataPortal_Fetch(PKCriteria criteria)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AssociationInfo.DataPortal_Fetch", GetHashCode());
+            try
+            {
+                using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+                {
+                    ApplicationContext.LocalContext["cn"] = cn;
+                    using (SqlCommand cm = cn.CreateCommand())
+                    {
+                        cm.CommandType = CommandType.StoredProcedure;
+                        cm.CommandText = "getAssociation";
+                        cm.Parameters.AddWithValue("@AssociationID", criteria.AssociationID);
+                        cm.CommandTimeout = Database.DefaultTimeout;
+                        using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+                        {
+                            if (!dr.Read())
+                            {
+                                _ErrorMessage = "No Record Found";
+                                return;
+                            }
+                            ReadData(dr);
+                        }
+                    }
+                    // removing of item only needed for local data portal
+                    if (ApplicationContext.ExecutionLocation == ApplicationContext.ExecutionLocations.Client)
+                        ApplicationContext.LocalContext.Remove("cn");
+                }
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("AssociationInfo.DataPortal_Fetch", ex);
+                _ErrorMessage = ex.Message;
+                throw new DbCslaException("AssociationInfo.DataPortal_Fetch", ex);
+            }
+        }
+        #endregion
+        // Standard Refresh
+        #region extension
+        AssociationInfoExtension _AssociationInfoExtension = new AssociationInfoExtension();
+        [Serializable()]
+        partial class AssociationInfoExtension : extensionBase { }
+        [Serializable()]
+        class extensionBase
+        {
+            // Default Refresh
+            public virtual void Refresh(AssociationInfo tmp) { }
+        }
+        #endregion
+    } // Class
+    #region Converter
+    internal class AssociationInfoConverter : ExpandableObjectConverter
+    {
+        public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
+        {
+            if (destType == typeof(string) && value is AssociationInfo)
+            {
+                // Return the ToString value
+                return ((AssociationInfo)value).ToString();
+            }
+            return base.ConvertTo(context, culture, value, destType);
+        }
+    }
+    #endregion
 } // Namespace

PROMS/VEPROMS.CSLA.Library/Generated/CheckInfo.cs

@@ -19,431 +19,423 @@ using System.ComponentModel;
 using System.Collections.Generic;
 namespace VEPROMS.CSLA.Library
 {
-	public delegate void CheckInfoEvent(object sender);
-	/// <summary>
-	///	CheckInfo Generated by MyGeneration using the CSLA Object Mapping template
-	/// </summary>
-	[Serializable()]
-	[TypeConverter(typeof(CheckInfoConverter))]
-	public partial class CheckInfo : ReadOnlyBase<CheckInfo>, IDisposable
-	{
-		public event CheckInfoEvent Changed;
-		private void OnChange()
-		{
-			if (Changed != null) Changed(this);
-		}
-		#region Log4Net
-		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-		#endregion
-		#region Collection
-		private static List<CheckInfo> _CacheList = new List<CheckInfo>();
-		protected static void AddToCache(CheckInfo checkInfo)
-		{
-			if (!_CacheList.Contains(checkInfo)) _CacheList.Add(checkInfo); // In AddToCache
-		}
-		protected static void RemoveFromCache(CheckInfo checkInfo)
-		{
-			while (_CacheList.Contains(checkInfo)) _CacheList.Remove(checkInfo); // In RemoveFromCache
-		}
-		private static Dictionary<string, List<CheckInfo>> _CacheByPrimaryKey = new Dictionary<string, List<CheckInfo>>();
-		private static void ConvertListToDictionary()
-		{
-			while (_CacheList.Count > 0) // Move CheckInfo(s) from temporary _CacheList to _CacheByPrimaryKey
-			{
-				CheckInfo tmp = _CacheList[0]; // Get the first CheckInfo
-				string pKey = tmp.CheckID.ToString();
-				if (!_CacheByPrimaryKey.ContainsKey(pKey))
-				{
-					_CacheByPrimaryKey[pKey] = new List<CheckInfo>(); // Add new list for PrimaryKey
-				}
-				_CacheByPrimaryKey[pKey].Add(tmp); // Add to Primary Key list
-				_CacheList.RemoveAt(0); // Remove the first CheckInfo
-			}
-		}
-		internal static void AddList(CheckInfoList lst)
-		{
-			foreach (CheckInfo item in lst) AddToCache(item);
-		}
-		protected static CheckInfo GetCachedByPrimaryKey(int checkID)
-		{
-			ConvertListToDictionary();
-			string key = checkID.ToString();
-			if (_CacheByPrimaryKey.ContainsKey(key)) return _CacheByPrimaryKey[key][0];
-			return null;
-		}
-		#endregion
-		#region Business Methods
-		private string _ErrorMessage = string.Empty;
-		public string ErrorMessage
-		{
-			get { return _ErrorMessage; }
-		}
-		protected Check _Editable;
-		private IVEHasBrokenRules HasBrokenRules
-		{
-			get
-			{
-				IVEHasBrokenRules hasBrokenRules = null;
-				if (_Editable != null)
-					hasBrokenRules = _Editable.HasBrokenRules;
-				return hasBrokenRules;
-			}
-		}
-		private int _CheckID;
-		[System.ComponentModel.DataObjectField(true, true)]
-		public int CheckID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("CheckID", true);
-				return _CheckID;
-			}
-		}
-		private int _RevisionID;
-		public int RevisionID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("RevisionID", true);
-				if (_MyRevision != null) _RevisionID = _MyRevision.RevisionID;
-				return _RevisionID;
-			}
-		}
-		private RevisionInfo _MyRevision;
-		public RevisionInfo MyRevision
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("MyRevision", true);
-				if (_MyRevision == null && _RevisionID != 0) _MyRevision = RevisionInfo.Get(_RevisionID);
-				return _MyRevision;
-			}
-		}
-		private int _StageID;
-		public int StageID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("StageID", true);
-				if (_MyStage != null) _StageID = _MyStage.StageID;
-				return _StageID;
-			}
-		}
-		private StageInfo _MyStage;
-		public StageInfo MyStage
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("MyStage", true);
-				if (_MyStage == null && _StageID != 0) _MyStage = StageInfo.GetJustStage(_StageID);
-				return _MyStage;
-			}
-		}
-		private string _ConsistencyChecks = string.Empty;
-		public string ConsistencyChecks
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("ConsistencyChecks", true);
-				return _ConsistencyChecks;
-			}
-		}
-		private DateTime _DTS = new DateTime();
-		public DateTime DTS
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("DTS", true);
-				return _DTS;
-			}
-		}
-		private string _UserID = string.Empty;
-		public string UserID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("UserID", true);
-				return _UserID;
-			}
-		}
-		// CSLATODO: Replace base CheckInfo.ToString function as necessary
-		/// <summary>
-		/// Overrides Base ToString
-		/// </summary>
-		/// <returns>A string representation of current CheckInfo</returns>
-		//public override string ToString()
-		//{
-		//  return base.ToString();
-		//}
-		// CSLATODO: Check CheckInfo.GetIdValue to assure that the ID returned is unique
-		/// <summary>
-		/// Overrides Base GetIdValue - Used internally by CSLA to determine equality
-		/// </summary>
-		/// <returns>A Unique ID for the current CheckInfo</returns>
-		protected override object GetIdValue()
-		{
-			return MyCheckInfoUnique; // Absolutely Unique ID
-		}
-		#endregion
-		#region Factory Methods
-		private static int _CheckInfoUnique = 0;
-		private static int CheckInfoUnique
-		{ get { return ++_CheckInfoUnique; } }
-		private int _MyCheckInfoUnique = CheckInfoUnique;
-		public int MyCheckInfoUnique // Absolutely Unique ID - Info
-		{ get { return _MyCheckInfoUnique; } }
-		protected CheckInfo()
-		{/* require use of factory methods */
-			AddToCache(this);
-		}
-		private bool _Disposed = false;
-		private static int _CountCreated = 0;
-		private static int _CountDisposed = 0;
-		private static int _CountFinalized = 0;
-		private static int IncrementCountCreated
-		{ get { return ++_CountCreated; } }
-		private int _CountWhenCreated = IncrementCountCreated;
-		public static int CountCreated
-		{ get { return _CountCreated; } }
-		public static int CountNotDisposed
-		{ get { return _CountCreated - _CountDisposed; } }
-		public static int CountNotFinalized
-		{ get { return _CountCreated - _CountFinalized; } }
-		~CheckInfo()
-		{
-			_CountFinalized++;
-		}
-		public void Dispose()
-		{
-			if (_Disposed) return;
-			_CountDisposed++;
-			_Disposed = true;
-			RemoveFromCache(this);
-			if (!_CacheByPrimaryKey.ContainsKey(CheckID.ToString())) return;
-			List<CheckInfo> listCheckInfo = _CacheByPrimaryKey[CheckID.ToString()]; // Get the list of items
-			while (listCheckInfo.Contains(this)) listCheckInfo.Remove(this); // Remove the item from the list
-			if (listCheckInfo.Count == 0) // If there are no items left in the list
-				_CacheByPrimaryKey.Remove(CheckID.ToString()); // remove the list
-		}
-		public virtual Check Get()
-		{
-			return _Editable = Check.Get(_CheckID);
-		}
-		public static void Refresh(Check tmp)
-		{
-			string key = tmp.CheckID.ToString();
-			ConvertListToDictionary();
-			if (_CacheByPrimaryKey.ContainsKey(key))
-				foreach (CheckInfo tmpInfo in _CacheByPrimaryKey[key])
-					tmpInfo.RefreshFields(tmp);
-		}
-		protected virtual void RefreshFields(Check tmp)
-		{
-			if (_RevisionID != tmp.RevisionID)
-			{
-				if (MyRevision != null) MyRevision.RefreshRevisionChecks(); // Update List for old value
-				_RevisionID = tmp.RevisionID; // Update the value
-			}
-			_MyRevision = null; // Reset list so that the next line gets a new list
-			if (MyRevision != null) MyRevision.RefreshRevisionChecks(); // Update List for new value
-			if (_StageID != tmp.StageID)
-			{
-				if (MyStage != null) MyStage.RefreshStageChecks(); // Update List for old value
-				_StageID = tmp.StageID; // Update the value
-			}
-			_MyStage = null; // Reset list so that the next line gets a new list
-			if (MyStage != null) MyStage.RefreshStageChecks(); // Update List for new value
-			_ConsistencyChecks = tmp.ConsistencyChecks;
-			_DTS = tmp.DTS;
-			_UserID = tmp.UserID;
-			_CheckInfoExtension.Refresh(this);
-			OnChange();// raise an event
-		}
-		public static void Refresh(RevisionCheck tmp)
-		{
-			string key = tmp.CheckID.ToString();
-			ConvertListToDictionary();
-			if (_CacheByPrimaryKey.ContainsKey(key))
-				foreach (CheckInfo tmpInfo in _CacheByPrimaryKey[key])
-					tmpInfo.RefreshFields(tmp);
-		}
-		protected virtual void RefreshFields(RevisionCheck tmp)
-		{
-			if (_StageID != tmp.StageID)
-			{
-				if (MyStage != null) MyStage.RefreshStageChecks(); // Update List for old value
-				_StageID = tmp.StageID; // Update the value
-			}
-			_MyStage = null; // Reset list so that the next line gets a new list
-			if (MyStage != null) MyStage.RefreshStageChecks(); // Update List for new value
-			_ConsistencyChecks = tmp.ConsistencyChecks;
-			_DTS = tmp.DTS;
-			_UserID = tmp.UserID;
-			_CheckInfoExtension.Refresh(this);
-			OnChange();// raise an event
-		}
-		public static void Refresh(StageCheck tmp)
-		{
-			string key = tmp.CheckID.ToString();
-			ConvertListToDictionary();
-			if (_CacheByPrimaryKey.ContainsKey(key))
-				foreach (CheckInfo tmpInfo in _CacheByPrimaryKey[key])
-					tmpInfo.RefreshFields(tmp);
-		}
-		protected virtual void RefreshFields(StageCheck tmp)
-		{
-			if (_RevisionID != tmp.RevisionID)
-			{
-				if (MyRevision != null) MyRevision.RefreshRevisionChecks(); // Update List for old value
-				_RevisionID = tmp.RevisionID; // Update the value
-			}
-			_MyRevision = null; // Reset list so that the next line gets a new list
-			if (MyRevision != null) MyRevision.RefreshRevisionChecks(); // Update List for new value
-			_ConsistencyChecks = tmp.ConsistencyChecks;
-			_DTS = tmp.DTS;
-			_UserID = tmp.UserID;
-			_CheckInfoExtension.Refresh(this);
-			OnChange();// raise an event
-		}
-		public static CheckInfo Get(int checkID)
-		{
-			//if (!CanGetObject())
-			//  throw new System.Security.SecurityException("User not authorized to view a Check");
-			try
-			{
-				CheckInfo tmp = GetCachedByPrimaryKey(checkID);
-				if (tmp == null)
-				{
-					tmp = DataPortal.Fetch<CheckInfo>(new PKCriteria(checkID));
-					AddToCache(tmp);
-				}
-				if (tmp.ErrorMessage == "No Record Found")
-				{
-					tmp.Dispose(); // Clean-up CheckInfo
-					tmp = null;
-				}
-				return tmp;
-			}
-			catch (Exception ex)
-			{
-				throw new DbCslaException("Error on CheckInfo.Get", ex);
-			}
-		}
-		#endregion
-		#region Data Access Portal
-		internal CheckInfo(SafeDataReader dr)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] CheckInfo.Constructor", GetHashCode());
-			try
-			{
-				ReadData(dr);
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("CheckInfo.Constructor", ex);
-				throw new DbCslaException("CheckInfo.Constructor", ex);
-			}
-		}
-		[Serializable()]
-		protected class PKCriteria
-		{
-			private int _CheckID;
-			public int CheckID
-			{ get { return _CheckID; } }
-			public PKCriteria(int checkID)
-			{
-				_CheckID = checkID;
-			}
-		}
-		private void ReadData(SafeDataReader dr)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] CheckInfo.ReadData", GetHashCode());
-			try
-			{
-				_CheckID = dr.GetInt32("CheckID");
-				_RevisionID = dr.GetInt32("RevisionID");
-				_StageID = dr.GetInt32("StageID");
-				_ConsistencyChecks = dr.GetString("ConsistencyChecks");
-				_DTS = dr.GetDateTime("DTS");
-				_UserID = dr.GetString("UserID");
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("CheckInfo.ReadData", ex);
-				_ErrorMessage = ex.Message;
-				throw new DbCslaException("CheckInfo.ReadData", ex);
-			}
-		}
-		private void DataPortal_Fetch(PKCriteria criteria)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] CheckInfo.DataPortal_Fetch", GetHashCode());
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					ApplicationContext.LocalContext["cn"] = cn;
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "getCheck";
-						cm.Parameters.AddWithValue("@CheckID", criteria.CheckID);
-						cm.CommandTimeout = Database.DefaultTimeout;
-						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-						{
-							if (!dr.Read())
-							{
-								_ErrorMessage = "No Record Found";
-								return;
-							}
-							ReadData(dr);
-						}
-					}
-					// removing of item only needed for local data portal
-					if (ApplicationContext.ExecutionLocation == ApplicationContext.ExecutionLocations.Client)
-						ApplicationContext.LocalContext.Remove("cn");
-				}
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("CheckInfo.DataPortal_Fetch", ex);
-				_ErrorMessage = ex.Message;
-				throw new DbCslaException("CheckInfo.DataPortal_Fetch", ex);
-			}
-		}
-		#endregion
-		// Standard Refresh
-		#region extension
-		CheckInfoExtension _CheckInfoExtension = new CheckInfoExtension();
-		[Serializable()]
-		partial class CheckInfoExtension : extensionBase { }
-		[Serializable()]
-		class extensionBase
-		{
-			// Default Refresh
-			public virtual void Refresh(CheckInfo tmp) { }
-		}
-		#endregion
-	} // Class
-	#region Converter
-	internal class CheckInfoConverter : ExpandableObjectConverter
-	{
-		public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
-		{
-			if (destType == typeof(string) && value is CheckInfo)
-			{
-				// Return the ToString value
-				return ((CheckInfo)value).ToString();
-			}
-			return base.ConvertTo(context, culture, value, destType);
-		}
-	}
-	#endregion
+    public delegate void CheckInfoEvent(object sender);
+    /// <summary>
+    ///	CheckInfo Generated by MyGeneration using the CSLA Object Mapping template
+    /// </summary>
+    [Serializable()]
+    [TypeConverter(typeof(CheckInfoConverter))]
+    public partial class CheckInfo : ReadOnlyBase<CheckInfo>, IDisposable
+    {
+        public event CheckInfoEvent Changed;
+        private void OnChange()
+        {
+            if (Changed != null) Changed(this);
+        }
+        #region Log4Net
+        private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+        #region Collection
+        private static List<CheckInfo> _CacheList = new List<CheckInfo>();
+        protected static void AddToCache(CheckInfo checkInfo)
+        {
+            if (!_CacheList.Contains(checkInfo)) _CacheList.Add(checkInfo); // In AddToCache
+        }
+        protected static void RemoveFromCache(CheckInfo checkInfo)
+        {
+            while (_CacheList.Contains(checkInfo)) _CacheList.Remove(checkInfo); // In RemoveFromCache
+        }
+        private static Dictionary<string, List<CheckInfo>> _CacheByPrimaryKey = new Dictionary<string, List<CheckInfo>>();
+        private static void ConvertListToDictionary()
+        {
+            while (_CacheList.Count > 0) // Move CheckInfo(s) from temporary _CacheList to _CacheByPrimaryKey
+            {
+                CheckInfo tmp = _CacheList[0]; // Get the first CheckInfo
+                string pKey = tmp.CheckID.ToString();
+                if (!_CacheByPrimaryKey.ContainsKey(pKey))
+                {
+                    _CacheByPrimaryKey[pKey] = new List<CheckInfo>(); // Add new list for PrimaryKey
+                }
+                _CacheByPrimaryKey[pKey].Add(tmp); // Add to Primary Key list
+                _CacheList.RemoveAt(0); // Remove the first CheckInfo
+            }
+        }
+        internal static void AddList(CheckInfoList lst)
+        {
+            foreach (CheckInfo item in lst) AddToCache(item);
+        }
+        protected static CheckInfo GetCachedByPrimaryKey(int checkID)
+        {
+            ConvertListToDictionary();
+            string key = checkID.ToString();
+            if (_CacheByPrimaryKey.ContainsKey(key)) return _CacheByPrimaryKey[key][0];
+            return null;
+        }
+        #endregion
+        #region Business Methods
+        private string _ErrorMessage = string.Empty;
+        public string ErrorMessage
+        {
+            get { return _ErrorMessage; }
+        }
+        protected Check _Editable;
+        private IVEHasBrokenRules HasBrokenRules
+        {
+            get
+            {
+                IVEHasBrokenRules hasBrokenRules = null;
+                if (_Editable != null)
+                    hasBrokenRules = _Editable.HasBrokenRules;
+                return hasBrokenRules;
+            }
+        }
+        private int _CheckID;
+        [System.ComponentModel.DataObjectField(true, true)]
+        public int CheckID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _CheckID;
+            }
+        }
+        private int _RevisionID;
+        public int RevisionID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_MyRevision != null) _RevisionID = _MyRevision.RevisionID;
+                return _RevisionID;
+            }
+        }
+        private RevisionInfo _MyRevision;
+        public RevisionInfo MyRevision
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_MyRevision == null && _RevisionID != 0) _MyRevision = RevisionInfo.Get(_RevisionID);
+                return _MyRevision;
+            }
+        }
+        private int _StageID;
+        public int StageID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_MyStage != null) _StageID = _MyStage.StageID;
+                return _StageID;
+            }
+        }
+        private StageInfo _MyStage;
+        public StageInfo MyStage
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_MyStage == null && _StageID != 0) _MyStage = StageInfo.GetJustStage(_StageID);
+                return _MyStage;
+            }
+        }
+        private string _ConsistencyChecks = string.Empty;
+        public string ConsistencyChecks
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _ConsistencyChecks;
+            }
+        }
+        private DateTime _DTS = new DateTime();
+        public DateTime DTS
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _DTS;
+            }
+        }
+        private string _UserID = string.Empty;
+        public string UserID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _UserID;
+            }
+        }
+        // CSLATODO: Replace base CheckInfo.ToString function as necessary
+        /// <summary>
+        /// Overrides Base ToString
+        /// </summary>
+        /// <returns>A string representation of current CheckInfo</returns>
+        //public override string ToString()
+        //{
+        //  return base.ToString();
+        //}
+        // CSLATODO: Check CheckInfo.GetIdValue to assure that the ID returned is unique
+        /// <summary>
+        /// Overrides Base GetIdValue - Used internally by CSLA to determine equality
+        /// </summary>
+        /// <returns>A Unique ID for the current CheckInfo</returns>
+        protected override object GetIdValue()
+        {
+            return MyCheckInfoUnique; // Absolutely Unique ID
+        }
+        #endregion
+        #region Factory Methods
+        private static int _CheckInfoUnique = 0;
+        private static int CheckInfoUnique
+        { get { return ++_CheckInfoUnique; } }
+        private int _MyCheckInfoUnique = CheckInfoUnique;
+        public int MyCheckInfoUnique // Absolutely Unique ID - Info
+        { get { return _MyCheckInfoUnique; } }
+        protected CheckInfo()
+        {/* require use of factory methods */
+            AddToCache(this);
+        }
+        private bool _Disposed = false;
+        private static int _CountCreated = 0;
+        private static int _CountDisposed = 0;
+        private static int _CountFinalized = 0;
+        private static int IncrementCountCreated
+        { get { return ++_CountCreated; } }
+        private int _CountWhenCreated = IncrementCountCreated;
+        public static int CountCreated
+        { get { return _CountCreated; } }
+        public static int CountNotDisposed
+        { get { return _CountCreated - _CountDisposed; } }
+        public static int CountNotFinalized
+        { get { return _CountCreated - _CountFinalized; } }
+        ~CheckInfo()
+        {
+            _CountFinalized++;
+        }
+        public void Dispose()
+        {
+            if (_Disposed) return;
+            _CountDisposed++;
+            _Disposed = true;
+            RemoveFromCache(this);
+            if (!_CacheByPrimaryKey.ContainsKey(CheckID.ToString())) return;
+            List<CheckInfo> listCheckInfo = _CacheByPrimaryKey[CheckID.ToString()]; // Get the list of items
+            while (listCheckInfo.Contains(this)) listCheckInfo.Remove(this); // Remove the item from the list
+            if (listCheckInfo.Count == 0) // If there are no items left in the list
+                _CacheByPrimaryKey.Remove(CheckID.ToString()); // remove the list
+        }
+        public virtual Check Get()
+        {
+            return _Editable = Check.Get(_CheckID);
+        }
+        public static void Refresh(Check tmp)
+        {
+            string key = tmp.CheckID.ToString();
+            ConvertListToDictionary();
+            if (_CacheByPrimaryKey.ContainsKey(key))
+                foreach (CheckInfo tmpInfo in _CacheByPrimaryKey[key])
+                    tmpInfo.RefreshFields(tmp);
+        }
+        protected virtual void RefreshFields(Check tmp)
+        {
+            if (_RevisionID != tmp.RevisionID)
+            {
+                if (MyRevision != null) MyRevision.RefreshRevisionChecks(); // Update List for old value
+                _RevisionID = tmp.RevisionID; // Update the value
+            }
+            _MyRevision = null; // Reset list so that the next line gets a new list
+            if (MyRevision != null) MyRevision.RefreshRevisionChecks(); // Update List for new value
+            if (_StageID != tmp.StageID)
+            {
+                if (MyStage != null) MyStage.RefreshStageChecks(); // Update List for old value
+                _StageID = tmp.StageID; // Update the value
+            }
+            _MyStage = null; // Reset list so that the next line gets a new list
+            if (MyStage != null) MyStage.RefreshStageChecks(); // Update List for new value
+            _ConsistencyChecks = tmp.ConsistencyChecks;
+            _DTS = tmp.DTS;
+            _UserID = tmp.UserID;
+            _CheckInfoExtension.Refresh(this);
+            OnChange();// raise an event
+        }
+        public static void Refresh(RevisionCheck tmp)
+        {
+            string key = tmp.CheckID.ToString();
+            ConvertListToDictionary();
+            if (_CacheByPrimaryKey.ContainsKey(key))
+                foreach (CheckInfo tmpInfo in _CacheByPrimaryKey[key])
+                    tmpInfo.RefreshFields(tmp);
+        }
+        protected virtual void RefreshFields(RevisionCheck tmp)
+        {
+            if (_StageID != tmp.StageID)
+            {
+                if (MyStage != null) MyStage.RefreshStageChecks(); // Update List for old value
+                _StageID = tmp.StageID; // Update the value
+            }
+            _MyStage = null; // Reset list so that the next line gets a new list
+            if (MyStage != null) MyStage.RefreshStageChecks(); // Update List for new value
+            _ConsistencyChecks = tmp.ConsistencyChecks;
+            _DTS = tmp.DTS;
+            _UserID = tmp.UserID;
+            _CheckInfoExtension.Refresh(this);
+            OnChange();// raise an event
+        }
+        public static void Refresh(StageCheck tmp)
+        {
+            string key = tmp.CheckID.ToString();
+            ConvertListToDictionary();
+            if (_CacheByPrimaryKey.ContainsKey(key))
+                foreach (CheckInfo tmpInfo in _CacheByPrimaryKey[key])
+                    tmpInfo.RefreshFields(tmp);
+        }
+        protected virtual void RefreshFields(StageCheck tmp)
+        {
+            if (_RevisionID != tmp.RevisionID)
+            {
+                if (MyRevision != null) MyRevision.RefreshRevisionChecks(); // Update List for old value
+                _RevisionID = tmp.RevisionID; // Update the value
+            }
+            _MyRevision = null; // Reset list so that the next line gets a new list
+            if (MyRevision != null) MyRevision.RefreshRevisionChecks(); // Update List for new value
+            _ConsistencyChecks = tmp.ConsistencyChecks;
+            _DTS = tmp.DTS;
+            _UserID = tmp.UserID;
+            _CheckInfoExtension.Refresh(this);
+            OnChange();// raise an event
+        }
+        public static CheckInfo Get(int checkID)
+        {
+            //if (!CanGetObject())
+            //  throw new System.Security.SecurityException("User not authorized to view a Check");
+            try
+            {
+                CheckInfo tmp = GetCachedByPrimaryKey(checkID);
+                if (tmp == null)
+                {
+                    tmp = DataPortal.Fetch<CheckInfo>(new PKCriteria(checkID));
+                    AddToCache(tmp);
+                }
+                if (tmp.ErrorMessage == "No Record Found")
+                {
+                    tmp.Dispose(); // Clean-up CheckInfo
+                    tmp = null;
+                }
+                return tmp;
+            }
+            catch (Exception ex)
+            {
+                throw new DbCslaException("Error on CheckInfo.Get", ex);
+            }
+        }
+        #endregion
+        #region Data Access Portal
+        internal CheckInfo(SafeDataReader dr)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] CheckInfo.Constructor", GetHashCode());
+            try
+            {
+                ReadData(dr);
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("CheckInfo.Constructor", ex);
+                throw new DbCslaException("CheckInfo.Constructor", ex);
+            }
+        }
+        [Serializable()]
+        protected class PKCriteria
+        {
+            private int _CheckID;
+            public int CheckID
+            { get { return _CheckID; } }
+            public PKCriteria(int checkID)
+            {
+                _CheckID = checkID;
+            }
+        }
+        private void ReadData(SafeDataReader dr)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] CheckInfo.ReadData", GetHashCode());
+            try
+            {
+                _CheckID = dr.GetInt32("CheckID");
+                _RevisionID = dr.GetInt32("RevisionID");
+                _StageID = dr.GetInt32("StageID");
+                _ConsistencyChecks = dr.GetString("ConsistencyChecks");
+                _DTS = dr.GetDateTime("DTS");
+                _UserID = dr.GetString("UserID");
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("CheckInfo.ReadData", ex);
+                _ErrorMessage = ex.Message;
+                throw new DbCslaException("CheckInfo.ReadData", ex);
+            }
+        }
+        private void DataPortal_Fetch(PKCriteria criteria)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] CheckInfo.DataPortal_Fetch", GetHashCode());
+            try
+            {
+                using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+                {
+                    ApplicationContext.LocalContext["cn"] = cn;
+                    using (SqlCommand cm = cn.CreateCommand())
+                    {
+                        cm.CommandType = CommandType.StoredProcedure;
+                        cm.CommandText = "getCheck";
+                        cm.Parameters.AddWithValue("@CheckID", criteria.CheckID);
+                        cm.CommandTimeout = Database.DefaultTimeout;
+                        using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+                        {
+                            if (!dr.Read())
+                            {
+                                _ErrorMessage = "No Record Found";
+                                return;
+                            }
+                            ReadData(dr);
+                        }
+                    }
+                    // removing of item only needed for local data portal
+                    if (ApplicationContext.ExecutionLocation == ApplicationContext.ExecutionLocations.Client)
+                        ApplicationContext.LocalContext.Remove("cn");
+                }
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("CheckInfo.DataPortal_Fetch", ex);
+                _ErrorMessage = ex.Message;
+                throw new DbCslaException("CheckInfo.DataPortal_Fetch", ex);
+            }
+        }
+        #endregion
+        // Standard Refresh
+        #region extension
+        CheckInfoExtension _CheckInfoExtension = new CheckInfoExtension();
+        [Serializable()]
+        partial class CheckInfoExtension : extensionBase { }
+        [Serializable()]
+        class extensionBase
+        {
+            // Default Refresh
+            public virtual void Refresh(CheckInfo tmp) { }
+        }
+        #endregion
+    } // Class
+    #region Converter
+    internal class CheckInfoConverter : ExpandableObjectConverter
+    {
+        public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
+        {
+            if (destType == typeof(string) && value is CheckInfo)
+            {
+                // Return the ToString value
+                return ((CheckInfo)value).ToString();
+            }
+            return base.ConvertTo(context, culture, value, destType);
+        }
+    }
+    #endregion
 } // Namespace

PROMS/VEPROMS.CSLA.Library/Generated/ConnectionInfo.cs

@@ -19,415 +19,405 @@ using System.ComponentModel;
 using System.Collections.Generic;
 namespace VEPROMS.CSLA.Library
 {
-	public delegate void ConnectionInfoEvent(object sender);
-	/// <summary>
-	///	ConnectionInfo Generated by MyGeneration using the CSLA Object Mapping template
-	/// </summary>
-	[Serializable()]
-	[TypeConverter(typeof(ConnectionInfoConverter))]
-	public partial class ConnectionInfo : ReadOnlyBase<ConnectionInfo>, IDisposable
-	{
-		public event ConnectionInfoEvent Changed;
-		private void OnChange()
-		{
-			if (Changed != null) Changed(this);
-		}
-		#region Log4Net
-		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-		#endregion
-		#region Collection
-		private static List<ConnectionInfo> _CacheList = new List<ConnectionInfo>();
-		protected static void AddToCache(ConnectionInfo connectionInfo)
-		{
-			if (!_CacheList.Contains(connectionInfo)) _CacheList.Add(connectionInfo); // In AddToCache
-		}
-		protected static void RemoveFromCache(ConnectionInfo connectionInfo)
-		{
-			while (_CacheList.Contains(connectionInfo)) _CacheList.Remove(connectionInfo); // In RemoveFromCache
-		}
-		private static Dictionary<string, List<ConnectionInfo>> _CacheByPrimaryKey = new Dictionary<string, List<ConnectionInfo>>();
-		private static void ConvertListToDictionary()
-		{
-			while (_CacheList.Count > 0) // Move ConnectionInfo(s) from temporary _CacheList to _CacheByPrimaryKey
-			{
-				ConnectionInfo tmp = _CacheList[0]; // Get the first ConnectionInfo
-				string pKey = tmp.DBID.ToString();
-				if (!_CacheByPrimaryKey.ContainsKey(pKey))
-				{
-					_CacheByPrimaryKey[pKey] = new List<ConnectionInfo>(); // Add new list for PrimaryKey
-				}
-				_CacheByPrimaryKey[pKey].Add(tmp); // Add to Primary Key list
-				_CacheList.RemoveAt(0); // Remove the first ConnectionInfo
-			}
-		}
-		internal static void AddList(ConnectionInfoList lst)
-		{
-			foreach (ConnectionInfo item in lst) AddToCache(item);
-		}
-		protected static ConnectionInfo GetCachedByPrimaryKey(int dbid)
-		{
-			ConvertListToDictionary();
-			string key = dbid.ToString();
-			if (_CacheByPrimaryKey.ContainsKey(key)) return _CacheByPrimaryKey[key][0];
-			return null;
-		}
-		#endregion
-		#region Business Methods
-		private string _ErrorMessage = string.Empty;
-		public string ErrorMessage
-		{
-			get { return _ErrorMessage; }
-		}
-		protected Connection _Editable;
-		private IVEHasBrokenRules HasBrokenRules
-		{
-			get
-			{
-				IVEHasBrokenRules hasBrokenRules = null;
-				if (_Editable != null)
-					hasBrokenRules = _Editable.HasBrokenRules;
-				return hasBrokenRules;
-			}
-		}
-		private int _DBID;
-		[System.ComponentModel.DataObjectField(true, true)]
-		public int DBID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("DBID", true);
-				return _DBID;
-			}
-		}
-		private string _Name = string.Empty;
-		public string Name
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("Name", true);
-				return _Name;
-			}
-		}
-		private string _Title = string.Empty;
-		public string Title
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("Title", true);
-				return _Title;
-			}
-		}
-		private string _ConnectionString = string.Empty;
-		public string ConnectionString
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("ConnectionString", true);
-				return _ConnectionString;
-			}
-		}
-		private int _ServerType;
-		/// <summary>
-		/// 0 SQL Server
-		/// </summary>
-		public int ServerType
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("ServerType", true);
-				return _ServerType;
-			}
-		}
-		private string _Config = string.Empty;
-		public string Config
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("Config", true);
-				return _Config;
-			}
-		}
-		private DateTime _DTS = new DateTime();
-		public DateTime DTS
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("DTS", true);
-				return _DTS;
-			}
-		}
-		private string _UsrID = string.Empty;
-		public string UsrID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("UsrID", true);
-				return _UsrID;
-			}
-		}
-		private int _ConnectionFolderCount = 0;
-		/// <summary>
-		/// Count of ConnectionFolders for this Connection
-		/// </summary>
-		public int ConnectionFolderCount
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("ConnectionFolderCount", true);
-				if (_ConnectionFolderCount < 0)
-					_ConnectionFolderCount = ConnectionFolders.Count;
-				return _ConnectionFolderCount;
-			}
-		}
-		private FolderInfoList _ConnectionFolders = null;
-		[TypeConverter(typeof(FolderInfoListConverter))]
-		public FolderInfoList ConnectionFolders
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("ConnectionFolders", true);
-				if (_ConnectionFolderCount < 0 || (_ConnectionFolderCount > 0 && _ConnectionFolders == null))
-					_ConnectionFolders = FolderInfoList.GetByDBID(_DBID);
-				if (_ConnectionFolderCount < 0)
-					_ConnectionFolderCount = _ConnectionFolders.Count;
-				return _ConnectionFolders;
-			}
-		}
-		public void RefreshConnectionFolders()
-		{
-			_ConnectionFolderCount = -1;
-			ConvertListToDictionary();
-			if (_CacheByPrimaryKey.ContainsKey(_DBID.ToString()))
-				foreach (ConnectionInfo tmp in _CacheByPrimaryKey[_DBID.ToString()])
-					tmp._ConnectionFolderCount = -1; // This will cause the data to be requeried
-		}
-		// CSLATODO: Replace base ConnectionInfo.ToString function as necessary
-		/// <summary>
-		/// Overrides Base ToString
-		/// </summary>
-		/// <returns>A string representation of current ConnectionInfo</returns>
-		//public override string ToString()
-		//{
-		//  return base.ToString();
-		//}
-		// CSLATODO: Check ConnectionInfo.GetIdValue to assure that the ID returned is unique
-		/// <summary>
-		/// Overrides Base GetIdValue - Used internally by CSLA to determine equality
-		/// </summary>
-		/// <returns>A Unique ID for the current ConnectionInfo</returns>
-		protected override object GetIdValue()
-		{
-			return MyConnectionInfoUnique; // Absolutely Unique ID
-		}
-		#endregion
-		#region Factory Methods
-		private static int _ConnectionInfoUnique = 0;
-		private static int ConnectionInfoUnique
-		{ get { return ++_ConnectionInfoUnique; } }
-		private int _MyConnectionInfoUnique = ConnectionInfoUnique;
-		public int MyConnectionInfoUnique // Absolutely Unique ID - Info
-		{ get { return _MyConnectionInfoUnique; } }
-		protected ConnectionInfo()
-		{/* require use of factory methods */
-			AddToCache(this);
-		}
-		private bool _Disposed = false;
-		private static int _CountCreated = 0;
-		private static int _CountDisposed = 0;
-		private static int _CountFinalized = 0;
-		private static int IncrementCountCreated
-		{ get { return ++_CountCreated; } }
-		private int _CountWhenCreated = IncrementCountCreated;
-		public static int CountCreated
-		{ get { return _CountCreated; } }
-		public static int CountNotDisposed
-		{ get { return _CountCreated - _CountDisposed; } }
-		public static int CountNotFinalized
-		{ get { return _CountCreated - _CountFinalized; } }
-		~ConnectionInfo()
-		{
-			_CountFinalized++;
-		}
-		public void Dispose()
-		{
-			if (_Disposed) return;
-			_CountDisposed++;
-			_Disposed = true;
-			RemoveFromCache(this);
-			if (!_CacheByPrimaryKey.ContainsKey(DBID.ToString())) return;
-			List<ConnectionInfo> listConnectionInfo = _CacheByPrimaryKey[DBID.ToString()]; // Get the list of items
-			while (listConnectionInfo.Contains(this)) listConnectionInfo.Remove(this); // Remove the item from the list
-			if (listConnectionInfo.Count == 0) // If there are no items left in the list
-				_CacheByPrimaryKey.Remove(DBID.ToString()); // remove the list
-		}
-		public virtual Connection Get()
-		{
-			return _Editable = Connection.Get(_DBID);
-		}
-		public static void Refresh(Connection tmp)
-		{
-			string key = tmp.DBID.ToString();
-			ConvertListToDictionary();
-			if (_CacheByPrimaryKey.ContainsKey(key))
-				foreach (ConnectionInfo tmpInfo in _CacheByPrimaryKey[key])
-					tmpInfo.RefreshFields(tmp);
-		}
-		protected virtual void RefreshFields(Connection tmp)
-		{
-			_Name = tmp.Name;
-			_Title = tmp.Title;
-			_ConnectionString = tmp.ConnectionString;
-			_ServerType = tmp.ServerType;
-			_Config = tmp.Config;
-			_DTS = tmp.DTS;
-			_UsrID = tmp.UsrID;
-			_ConnectionInfoExtension.Refresh(this);
-			OnChange();// raise an event
-		}
-		public static ConnectionInfo Get(int dbid)
-		{
-			//if (!CanGetObject())
-			//  throw new System.Security.SecurityException("User not authorized to view a Connection");
-			try
-			{
-				ConnectionInfo tmp = GetCachedByPrimaryKey(dbid);
-				if (tmp == null)
-				{
-					tmp = DataPortal.Fetch<ConnectionInfo>(new PKCriteria(dbid));
-					AddToCache(tmp);
-				}
-				if (tmp.ErrorMessage == "No Record Found")
-				{
-					tmp.Dispose(); // Clean-up ConnectionInfo
-					tmp = null;
-				}
-				return tmp;
-			}
-			catch (Exception ex)
-			{
-				throw new DbCslaException("Error on ConnectionInfo.Get", ex);
-			}
-		}
-		#endregion
-		#region Data Access Portal
-		internal ConnectionInfo(SafeDataReader dr)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ConnectionInfo.Constructor", GetHashCode());
-			try
-			{
-				ReadData(dr);
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("ConnectionInfo.Constructor", ex);
-				throw new DbCslaException("ConnectionInfo.Constructor", ex);
-			}
-		}
-		[Serializable()]
-		protected class PKCriteria
-		{
-			private int _DBID;
-			public int DBID
-			{ get { return _DBID; } }
-			public PKCriteria(int dbid)
-			{
-				_DBID = dbid;
-			}
-		}
-		private void ReadData(SafeDataReader dr)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ConnectionInfo.ReadData", GetHashCode());
-			try
-			{
-				_DBID = dr.GetInt32("DBID");
-				_Name = dr.GetString("Name");
-				_Title = dr.GetString("Title");
-				_ConnectionString = dr.GetString("ConnectionString");
-				_ServerType = dr.GetInt32("ServerType");
-				_Config = dr.GetString("Config");
-				_DTS = dr.GetDateTime("DTS");
-				_UsrID = dr.GetString("UsrID");
-				_ConnectionFolderCount = dr.GetInt32("FolderCount");
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("ConnectionInfo.ReadData", ex);
-				_ErrorMessage = ex.Message;
-				throw new DbCslaException("ConnectionInfo.ReadData", ex);
-			}
-		}
-		private void DataPortal_Fetch(PKCriteria criteria)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ConnectionInfo.DataPortal_Fetch", GetHashCode());
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					ApplicationContext.LocalContext["cn"] = cn;
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "getConnection";
-						cm.Parameters.AddWithValue("@DBID", criteria.DBID);
-						cm.CommandTimeout = Database.DefaultTimeout;
-						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-						{
-							if (!dr.Read())
-							{
-								_ErrorMessage = "No Record Found";
-								return;
-							}
-							ReadData(dr);
-						}
-					}
-					// removing of item only needed for local data portal
-					if (ApplicationContext.ExecutionLocation == ApplicationContext.ExecutionLocations.Client)
-						ApplicationContext.LocalContext.Remove("cn");
-				}
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("ConnectionInfo.DataPortal_Fetch", ex);
-				_ErrorMessage = ex.Message;
-				throw new DbCslaException("ConnectionInfo.DataPortal_Fetch", ex);
-			}
-		}
-		#endregion
-		// Standard Refresh
-		#region extension
-		ConnectionInfoExtension _ConnectionInfoExtension = new ConnectionInfoExtension();
-		[Serializable()]
-		partial class ConnectionInfoExtension : extensionBase { }
-		[Serializable()]
-		class extensionBase
-		{
-			// Default Refresh
-			public virtual void Refresh(ConnectionInfo tmp) { }
-		}
-		#endregion
-	} // Class
-	#region Converter
-	internal class ConnectionInfoConverter : ExpandableObjectConverter
-	{
-		public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
-		{
-			if (destType == typeof(string) && value is ConnectionInfo)
-			{
-				// Return the ToString value
-				return ((ConnectionInfo)value).ToString();
-			}
-			return base.ConvertTo(context, culture, value, destType);
-		}
-	}
-	#endregion
+    public delegate void ConnectionInfoEvent(object sender);
+    /// <summary>
+    ///	ConnectionInfo Generated by MyGeneration using the CSLA Object Mapping template
+    /// </summary>
+    [Serializable()]
+    [TypeConverter(typeof(ConnectionInfoConverter))]
+    public partial class ConnectionInfo : ReadOnlyBase<ConnectionInfo>, IDisposable
+    {
+        public event ConnectionInfoEvent Changed;
+        private void OnChange()
+        {
+            if (Changed != null) Changed(this);
+        }
+        #region Log4Net
+        private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+        #region Collection
+        private static List<ConnectionInfo> _CacheList = new List<ConnectionInfo>();
+        protected static void AddToCache(ConnectionInfo connectionInfo)
+        {
+            if (!_CacheList.Contains(connectionInfo)) _CacheList.Add(connectionInfo); // In AddToCache
+        }
+        protected static void RemoveFromCache(ConnectionInfo connectionInfo)
+        {
+            while (_CacheList.Contains(connectionInfo)) _CacheList.Remove(connectionInfo); // In RemoveFromCache
+        }
+        private static Dictionary<string, List<ConnectionInfo>> _CacheByPrimaryKey = new Dictionary<string, List<ConnectionInfo>>();
+        private static void ConvertListToDictionary()
+        {
+            while (_CacheList.Count > 0) // Move ConnectionInfo(s) from temporary _CacheList to _CacheByPrimaryKey
+            {
+                ConnectionInfo tmp = _CacheList[0]; // Get the first ConnectionInfo
+                string pKey = tmp.DBID.ToString();
+                if (!_CacheByPrimaryKey.ContainsKey(pKey))
+                {
+                    _CacheByPrimaryKey[pKey] = new List<ConnectionInfo>(); // Add new list for PrimaryKey
+                }
+                _CacheByPrimaryKey[pKey].Add(tmp); // Add to Primary Key list
+                _CacheList.RemoveAt(0); // Remove the first ConnectionInfo
+            }
+        }
+        internal static void AddList(ConnectionInfoList lst)
+        {
+            foreach (ConnectionInfo item in lst) AddToCache(item);
+        }
+        protected static ConnectionInfo GetCachedByPrimaryKey(int dbid)
+        {
+            ConvertListToDictionary();
+            string key = dbid.ToString();
+            if (_CacheByPrimaryKey.ContainsKey(key)) return _CacheByPrimaryKey[key][0];
+            return null;
+        }
+        #endregion
+        #region Business Methods
+        private string _ErrorMessage = string.Empty;
+        public string ErrorMessage
+        {
+            get { return _ErrorMessage; }
+        }
+        protected Connection _Editable;
+        private IVEHasBrokenRules HasBrokenRules
+        {
+            get
+            {
+                IVEHasBrokenRules hasBrokenRules = null;
+                if (_Editable != null)
+                    hasBrokenRules = _Editable.HasBrokenRules;
+                return hasBrokenRules;
+            }
+        }
+        private int _DBID;
+        [System.ComponentModel.DataObjectField(true, true)]
+        public int DBID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _DBID;
+            }
+        }
+        private string _Name = string.Empty;
+        public string Name
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _Name;
+            }
+        }
+        private string _Title = string.Empty;
+        public string Title
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _Title;
+            }
+        }
+        private string _ConnectionString = string.Empty;
+        public string ConnectionString
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _ConnectionString;
+            }
+        }
+        private int _ServerType;
+        /// <summary>
+        /// 0 SQL Server
+        /// </summary>
+        public int ServerType
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _ServerType;
+            }
+        }
+        private string _Config = string.Empty;
+        public string Config
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _Config;
+            }
+        }
+        private DateTime _DTS = new DateTime();
+        public DateTime DTS
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _DTS;
+            }
+        }
+        private string _UsrID = string.Empty;
+        public string UsrID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _UsrID;
+            }
+        }
+        private int _ConnectionFolderCount = 0;
+        /// <summary>
+        /// Count of ConnectionFolders for this Connection
+        /// </summary>
+        public int ConnectionFolderCount
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_ConnectionFolderCount < 0)
+                    _ConnectionFolderCount = ConnectionFolders.Count;
+                return _ConnectionFolderCount;
+            }
+        }
+        private FolderInfoList _ConnectionFolders = null;
+        [TypeConverter(typeof(FolderInfoListConverter))]
+        public FolderInfoList ConnectionFolders
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_ConnectionFolderCount < 0 || (_ConnectionFolderCount > 0 && _ConnectionFolders == null))
+                    _ConnectionFolders = FolderInfoList.GetByDBID(_DBID);
+                if (_ConnectionFolderCount < 0)
+                    _ConnectionFolderCount = _ConnectionFolders.Count;
+                return _ConnectionFolders;
+            }
+        }
+        public void RefreshConnectionFolders()
+        {
+            _ConnectionFolderCount = -1;
+            ConvertListToDictionary();
+            if (_CacheByPrimaryKey.ContainsKey(_DBID.ToString()))
+                foreach (ConnectionInfo tmp in _CacheByPrimaryKey[_DBID.ToString()])
+                    tmp._ConnectionFolderCount = -1; // This will cause the data to be requeried
+        }
+        // CSLATODO: Replace base ConnectionInfo.ToString function as necessary
+        /// <summary>
+        /// Overrides Base ToString
+        /// </summary>
+        /// <returns>A string representation of current ConnectionInfo</returns>
+        //public override string ToString()
+        //{
+        //  return base.ToString();
+        //}
+        // CSLATODO: Check ConnectionInfo.GetIdValue to assure that the ID returned is unique
+        /// <summary>
+        /// Overrides Base GetIdValue - Used internally by CSLA to determine equality
+        /// </summary>
+        /// <returns>A Unique ID for the current ConnectionInfo</returns>
+        protected override object GetIdValue()
+        {
+            return MyConnectionInfoUnique; // Absolutely Unique ID
+        }
+        #endregion
+        #region Factory Methods
+        private static int _ConnectionInfoUnique = 0;
+        private static int ConnectionInfoUnique
+        { get { return ++_ConnectionInfoUnique; } }
+        private int _MyConnectionInfoUnique = ConnectionInfoUnique;
+        public int MyConnectionInfoUnique // Absolutely Unique ID - Info
+        { get { return _MyConnectionInfoUnique; } }
+        protected ConnectionInfo()
+        {/* require use of factory methods */
+            AddToCache(this);
+        }
+        private bool _Disposed = false;
+        private static int _CountCreated = 0;
+        private static int _CountDisposed = 0;
+        private static int _CountFinalized = 0;
+        private static int IncrementCountCreated
+        { get { return ++_CountCreated; } }
+        private int _CountWhenCreated = IncrementCountCreated;
+        public static int CountCreated
+        { get { return _CountCreated; } }
+        public static int CountNotDisposed
+        { get { return _CountCreated - _CountDisposed; } }
+        public static int CountNotFinalized
+        { get { return _CountCreated - _CountFinalized; } }
+        ~ConnectionInfo()
+        {
+            _CountFinalized++;
+        }
+        public void Dispose()
+        {
+            if (_Disposed) return;
+            _CountDisposed++;
+            _Disposed = true;
+            RemoveFromCache(this);
+            if (!_CacheByPrimaryKey.ContainsKey(DBID.ToString())) return;
+            List<ConnectionInfo> listConnectionInfo = _CacheByPrimaryKey[DBID.ToString()]; // Get the list of items
+            while (listConnectionInfo.Contains(this)) listConnectionInfo.Remove(this); // Remove the item from the list
+            if (listConnectionInfo.Count == 0) // If there are no items left in the list
+                _CacheByPrimaryKey.Remove(DBID.ToString()); // remove the list
+        }
+        public virtual Connection Get()
+        {
+            return _Editable = Connection.Get(_DBID);
+        }
+        public static void Refresh(Connection tmp)
+        {
+            string key = tmp.DBID.ToString();
+            ConvertListToDictionary();
+            if (_CacheByPrimaryKey.ContainsKey(key))
+                foreach (ConnectionInfo tmpInfo in _CacheByPrimaryKey[key])
+                    tmpInfo.RefreshFields(tmp);
+        }
+        protected virtual void RefreshFields(Connection tmp)
+        {
+            _Name = tmp.Name;
+            _Title = tmp.Title;
+            _ConnectionString = tmp.ConnectionString;
+            _ServerType = tmp.ServerType;
+            _Config = tmp.Config;
+            _DTS = tmp.DTS;
+            _UsrID = tmp.UsrID;
+            _ConnectionInfoExtension.Refresh(this);
+            OnChange();// raise an event
+        }
+        public static ConnectionInfo Get(int dbid)
+        {
+            //if (!CanGetObject())
+            //  throw new System.Security.SecurityException("User not authorized to view a Connection");
+            try
+            {
+                ConnectionInfo tmp = GetCachedByPrimaryKey(dbid);
+                if (tmp == null)
+                {
+                    tmp = DataPortal.Fetch<ConnectionInfo>(new PKCriteria(dbid));
+                    AddToCache(tmp);
+                }
+                if (tmp.ErrorMessage == "No Record Found")
+                {
+                    tmp.Dispose(); // Clean-up ConnectionInfo
+                    tmp = null;
+                }
+                return tmp;
+            }
+            catch (Exception ex)
+            {
+                throw new DbCslaException("Error on ConnectionInfo.Get", ex);
+            }
+        }
+        #endregion
+        #region Data Access Portal
+        internal ConnectionInfo(SafeDataReader dr)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ConnectionInfo.Constructor", GetHashCode());
+            try
+            {
+                ReadData(dr);
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("ConnectionInfo.Constructor", ex);
+                throw new DbCslaException("ConnectionInfo.Constructor", ex);
+            }
+        }
+        [Serializable()]
+        protected class PKCriteria
+        {
+            private int _DBID;
+            public int DBID
+            { get { return _DBID; } }
+            public PKCriteria(int dbid)
+            {
+                _DBID = dbid;
+            }
+        }
+        private void ReadData(SafeDataReader dr)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ConnectionInfo.ReadData", GetHashCode());
+            try
+            {
+                _DBID = dr.GetInt32("DBID");
+                _Name = dr.GetString("Name");
+                _Title = dr.GetString("Title");
+                _ConnectionString = dr.GetString("ConnectionString");
+                _ServerType = dr.GetInt32("ServerType");
+                _Config = dr.GetString("Config");
+                _DTS = dr.GetDateTime("DTS");
+                _UsrID = dr.GetString("UsrID");
+                _ConnectionFolderCount = dr.GetInt32("FolderCount");
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("ConnectionInfo.ReadData", ex);
+                _ErrorMessage = ex.Message;
+                throw new DbCslaException("ConnectionInfo.ReadData", ex);
+            }
+        }
+        private void DataPortal_Fetch(PKCriteria criteria)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ConnectionInfo.DataPortal_Fetch", GetHashCode());
+            try
+            {
+                using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+                {
+                    ApplicationContext.LocalContext["cn"] = cn;
+                    using (SqlCommand cm = cn.CreateCommand())
+                    {
+                        cm.CommandType = CommandType.StoredProcedure;
+                        cm.CommandText = "getConnection";
+                        cm.Parameters.AddWithValue("@DBID", criteria.DBID);
+                        cm.CommandTimeout = Database.DefaultTimeout;
+                        using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+                        {
+                            if (!dr.Read())
+                            {
+                                _ErrorMessage = "No Record Found";
+                                return;
+                            }
+                            ReadData(dr);
+                        }
+                    }
+                    // removing of item only needed for local data portal
+                    if (ApplicationContext.ExecutionLocation == ApplicationContext.ExecutionLocations.Client)
+                        ApplicationContext.LocalContext.Remove("cn");
+                }
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("ConnectionInfo.DataPortal_Fetch", ex);
+                _ErrorMessage = ex.Message;
+                throw new DbCslaException("ConnectionInfo.DataPortal_Fetch", ex);
+            }
+        }
+        #endregion
+        // Standard Refresh
+        #region extension
+        ConnectionInfoExtension _ConnectionInfoExtension = new ConnectionInfoExtension();
+        [Serializable()]
+        partial class ConnectionInfoExtension : extensionBase { }
+        [Serializable()]
+        class extensionBase
+        {
+            // Default Refresh
+            public virtual void Refresh(ConnectionInfo tmp) { }
+        }
+        #endregion
+    } // Class
+    #region Converter
+    internal class ConnectionInfoConverter : ExpandableObjectConverter
+    {
+        public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
+        {
+            if (destType == typeof(string) && value is ConnectionInfo)
+            {
+                // Return the ToString value
+                return ((ConnectionInfo)value).ToString();
+            }
+            return base.ConvertTo(context, culture, value, destType);
+        }
+    }
+    #endregion
 } // Namespace

PROMS/VEPROMS.CSLA.Library/Generated/ContentAuditInfo.cs

@@ -19,397 +19,387 @@ using System.ComponentModel;
 using System.Collections.Generic;
 namespace VEPROMS.CSLA.Library
 {
-	public delegate void ContentAuditInfoEvent(object sender);
-	/// <summary>
-	///	ContentAuditInfo Generated by MyGeneration using the CSLA Object Mapping template
-	/// </summary>
-	[Serializable()]
-	[TypeConverter(typeof(ContentAuditInfoConverter))]
-	public partial class ContentAuditInfo : ReadOnlyBase<ContentAuditInfo>, IDisposable
-	{
-		public event ContentAuditInfoEvent Changed;
-		private void OnChange()
-		{
-			if (Changed != null) Changed(this);
-		}
-		#region Log4Net
-		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-		#endregion
-		#region Collection
-		private static List<ContentAuditInfo> _CacheList = new List<ContentAuditInfo>();
-		protected static void AddToCache(ContentAuditInfo contentAuditInfo)
-		{
-			if (!_CacheList.Contains(contentAuditInfo)) _CacheList.Add(contentAuditInfo); // In AddToCache
-		}
-		protected static void RemoveFromCache(ContentAuditInfo contentAuditInfo)
-		{
-			while (_CacheList.Contains(contentAuditInfo)) _CacheList.Remove(contentAuditInfo); // In RemoveFromCache
-		}
-		private static Dictionary<string, List<ContentAuditInfo>> _CacheByPrimaryKey = new Dictionary<string, List<ContentAuditInfo>>();
-		private static void ConvertListToDictionary()
-		{
-			while (_CacheList.Count > 0) // Move ContentAuditInfo(s) from temporary _CacheList to _CacheByPrimaryKey
-			{
-				ContentAuditInfo tmp = _CacheList[0]; // Get the first ContentAuditInfo
-				string pKey = tmp.AuditID.ToString();
-				if (!_CacheByPrimaryKey.ContainsKey(pKey))
-				{
-					_CacheByPrimaryKey[pKey] = new List<ContentAuditInfo>(); // Add new list for PrimaryKey
-				}
-				_CacheByPrimaryKey[pKey].Add(tmp); // Add to Primary Key list
-				_CacheList.RemoveAt(0); // Remove the first ContentAuditInfo
-			}
-		}
-		internal static void AddList(ContentAuditInfoList lst)
-		{
-			foreach (ContentAuditInfo item in lst) AddToCache(item);
-		}
-		protected static ContentAuditInfo GetCachedByPrimaryKey(long auditID)
-		{
-			ConvertListToDictionary();
-			string key = auditID.ToString();
-			if (_CacheByPrimaryKey.ContainsKey(key)) return _CacheByPrimaryKey[key][0];
-			return null;
-		}
-		#endregion
-		#region Business Methods
-		private string _ErrorMessage = string.Empty;
-		public string ErrorMessage
-		{
-			get { return _ErrorMessage; }
-		}
-		protected ContentAudit _Editable;
-		private IVEHasBrokenRules HasBrokenRules
-		{
-			get
-			{
-				IVEHasBrokenRules hasBrokenRules = null;
-				if (_Editable != null)
-					hasBrokenRules = _Editable.HasBrokenRules;
-				return hasBrokenRules;
-			}
-		}
-		private long _AuditID;
-		[System.ComponentModel.DataObjectField(true, true)]
-		public long AuditID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("AuditID", true);
-				return _AuditID;
-			}
-		}
-		private int _ContentID;
-		public int ContentID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("ContentID", true);
-				return _ContentID;
-			}
-		}
-		private string _Number = string.Empty;
-		public string Number
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("Number", true);
-				return _Number;
-			}
-		}
-		private string _Text = string.Empty;
-		public string Text
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("Text", true);
-				return _Text;
-			}
-		}
-		private int? _Type;
-		public int? Type
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("Type", true);
-				return _Type;
-			}
-		}
-		private int? _FormatID;
-		public int? FormatID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("FormatID", true);
-				return _FormatID;
-			}
-		}
-		private string _Config = string.Empty;
-		public string Config
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("Config", true);
-				return _Config;
-			}
-		}
-		private DateTime _DTS = new DateTime();
-		public DateTime DTS
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("DTS", true);
-				return _DTS;
-			}
-		}
-		private string _UserID = string.Empty;
-		public string UserID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("UserID", true);
-				return _UserID;
-			}
-		}
-		private int _DeleteStatus;
-		public int DeleteStatus
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("DeleteStatus", true);
-				return _DeleteStatus;
-			}
-		}
-		// CSLATODO: Replace base ContentAuditInfo.ToString function as necessary
-		/// <summary>
-		/// Overrides Base ToString
-		/// </summary>
-		/// <returns>A string representation of current ContentAuditInfo</returns>
-		//public override string ToString()
-		//{
-		//  return base.ToString();
-		//}
-		// CSLATODO: Check ContentAuditInfo.GetIdValue to assure that the ID returned is unique
-		/// <summary>
-		/// Overrides Base GetIdValue - Used internally by CSLA to determine equality
-		/// </summary>
-		/// <returns>A Unique ID for the current ContentAuditInfo</returns>
-		protected override object GetIdValue()
-		{
-			return MyContentAuditInfoUnique; // Absolutely Unique ID
-		}
-		#endregion
-		#region Factory Methods
-		private static int _ContentAuditInfoUnique = 0;
-		private static int ContentAuditInfoUnique
-		{ get { return ++_ContentAuditInfoUnique; } }
-		private int _MyContentAuditInfoUnique = ContentAuditInfoUnique;
-		public int MyContentAuditInfoUnique // Absolutely Unique ID - Info
-		{ get { return _MyContentAuditInfoUnique; } }
-		protected ContentAuditInfo()
-		{/* require use of factory methods */
-			AddToCache(this);
-		}
-		private bool _Disposed = false;
-		private static int _CountCreated = 0;
-		private static int _CountDisposed = 0;
-		private static int _CountFinalized = 0;
-		private static int IncrementCountCreated
-		{ get { return ++_CountCreated; } }
-		private int _CountWhenCreated = IncrementCountCreated;
-		public static int CountCreated
-		{ get { return _CountCreated; } }
-		public static int CountNotDisposed
-		{ get { return _CountCreated - _CountDisposed; } }
-		public static int CountNotFinalized
-		{ get { return _CountCreated - _CountFinalized; } }
-		~ContentAuditInfo()
-		{
-			_CountFinalized++;
-		}
-		public void Dispose()
-		{
-			if (_Disposed) return;
-			_CountDisposed++;
-			_Disposed = true;
-			RemoveFromCache(this);
-			if (!_CacheByPrimaryKey.ContainsKey(AuditID.ToString())) return;
-			List<ContentAuditInfo> listContentAuditInfo = _CacheByPrimaryKey[AuditID.ToString()]; // Get the list of items
-			while (listContentAuditInfo.Contains(this)) listContentAuditInfo.Remove(this); // Remove the item from the list
-			if (listContentAuditInfo.Count == 0) // If there are no items left in the list
-				_CacheByPrimaryKey.Remove(AuditID.ToString()); // remove the list
-		}
-		public virtual ContentAudit Get()
-		{
-			return _Editable = ContentAudit.Get(_AuditID);
-		}
-		public static void Refresh(ContentAudit tmp)
-		{
-			string key = tmp.AuditID.ToString();
-			ConvertListToDictionary();
-			if (_CacheByPrimaryKey.ContainsKey(key))
-				foreach (ContentAuditInfo tmpInfo in _CacheByPrimaryKey[key])
-					tmpInfo.RefreshFields(tmp);
-		}
-		protected virtual void RefreshFields(ContentAudit tmp)
-		{
-			_ContentID = tmp.ContentID;
-			_Number = tmp.Number;
-			_Text = tmp.Text;
-			_Type = tmp.Type;
-			_FormatID = tmp.FormatID;
-			_Config = tmp.Config;
-			_DTS = tmp.DTS;
-			_UserID = tmp.UserID;
-			_DeleteStatus = tmp.DeleteStatus;
-			_ContentAuditInfoExtension.Refresh(this);
-			OnChange();// raise an event
-		}
-		public static ContentAuditInfo Get(long auditID)
-		{
-			//if (!CanGetObject())
-			//  throw new System.Security.SecurityException("User not authorized to view a ContentAudit");
-			try
-			{
-				ContentAuditInfo tmp = GetCachedByPrimaryKey(auditID);
-				if (tmp == null)
-				{
-					tmp = DataPortal.Fetch<ContentAuditInfo>(new PKCriteria(auditID));
-					AddToCache(tmp);
-				}
-				if (tmp.ErrorMessage == "No Record Found")
-				{
-					tmp.Dispose(); // Clean-up ContentAuditInfo
-					tmp = null;
-				}
-				return tmp;
-			}
-			catch (Exception ex)
-			{
-				throw new DbCslaException("Error on ContentAuditInfo.Get", ex);
-			}
-		}
-		#endregion
-		#region Data Access Portal
-		internal ContentAuditInfo(SafeDataReader dr)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ContentAuditInfo.Constructor", GetHashCode());
-			try
-			{
-				ReadData(dr);
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("ContentAuditInfo.Constructor", ex);
-				throw new DbCslaException("ContentAuditInfo.Constructor", ex);
-			}
-		}
-		[Serializable()]
-		protected class PKCriteria
-		{
-			private long _AuditID;
-			public long AuditID
-			{ get { return _AuditID; } }
-			public PKCriteria(long auditID)
-			{
-				_AuditID = auditID;
-			}
-		}
-		private void ReadData(SafeDataReader dr)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ContentAuditInfo.ReadData", GetHashCode());
-			try
-			{
-				_AuditID = dr.GetInt64("AuditID");
-				_ContentID = dr.GetInt32("ContentID");
-				_Number = dr.GetString("Number");
-				_Text = dr.GetString("Text");
-				_Type = (int?)dr.GetValue("Type");
-				_FormatID = (int?)dr.GetValue("FormatID");
-				_Config = dr.GetString("Config");
-				_DTS = dr.GetDateTime("DTS");
-				_UserID = dr.GetString("UserID");
-				_DeleteStatus = dr.GetInt32("DeleteStatus");
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("ContentAuditInfo.ReadData", ex);
-				_ErrorMessage = ex.Message;
-				throw new DbCslaException("ContentAuditInfo.ReadData", ex);
-			}
-		}
-		private void DataPortal_Fetch(PKCriteria criteria)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ContentAuditInfo.DataPortal_Fetch", GetHashCode());
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					ApplicationContext.LocalContext["cn"] = cn;
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "getContentAudit";
-						cm.Parameters.AddWithValue("@AuditID", criteria.AuditID);
-						cm.CommandTimeout = Database.DefaultTimeout;
-						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-						{
-							if (!dr.Read())
-							{
-								_ErrorMessage = "No Record Found";
-								return;
-							}
-							ReadData(dr);
-						}
-					}
-					// removing of item only needed for local data portal
-					if (ApplicationContext.ExecutionLocation == ApplicationContext.ExecutionLocations.Client)
-						ApplicationContext.LocalContext.Remove("cn");
-				}
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("ContentAuditInfo.DataPortal_Fetch", ex);
-				_ErrorMessage = ex.Message;
-				throw new DbCslaException("ContentAuditInfo.DataPortal_Fetch", ex);
-			}
-		}
-		#endregion
-		// Standard Refresh
-		#region extension
-		ContentAuditInfoExtension _ContentAuditInfoExtension = new ContentAuditInfoExtension();
-		[Serializable()]
-		partial class ContentAuditInfoExtension : extensionBase { }
-		[Serializable()]
-		class extensionBase
-		{
-			// Default Refresh
-			public virtual void Refresh(ContentAuditInfo tmp) { }
-		}
-		#endregion
-	} // Class
-	#region Converter
-	internal class ContentAuditInfoConverter : ExpandableObjectConverter
-	{
-		public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
-		{
-			if (destType == typeof(string) && value is ContentAuditInfo)
-			{
-				// Return the ToString value
-				return ((ContentAuditInfo)value).ToString();
-			}
-			return base.ConvertTo(context, culture, value, destType);
-		}
-	}
-	#endregion
+    public delegate void ContentAuditInfoEvent(object sender);
+    /// <summary>
+    ///	ContentAuditInfo Generated by MyGeneration using the CSLA Object Mapping template
+    /// </summary>
+    [Serializable()]
+    [TypeConverter(typeof(ContentAuditInfoConverter))]
+    public partial class ContentAuditInfo : ReadOnlyBase<ContentAuditInfo>, IDisposable
+    {
+        public event ContentAuditInfoEvent Changed;
+        private void OnChange()
+        {
+            if (Changed != null) Changed(this);
+        }
+        #region Log4Net
+        private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+        #region Collection
+        private static List<ContentAuditInfo> _CacheList = new List<ContentAuditInfo>();
+        protected static void AddToCache(ContentAuditInfo contentAuditInfo)
+        {
+            if (!_CacheList.Contains(contentAuditInfo)) _CacheList.Add(contentAuditInfo); // In AddToCache
+        }
+        protected static void RemoveFromCache(ContentAuditInfo contentAuditInfo)
+        {
+            while (_CacheList.Contains(contentAuditInfo)) _CacheList.Remove(contentAuditInfo); // In RemoveFromCache
+        }
+        private static Dictionary<string, List<ContentAuditInfo>> _CacheByPrimaryKey = new Dictionary<string, List<ContentAuditInfo>>();
+        private static void ConvertListToDictionary()
+        {
+            while (_CacheList.Count > 0) // Move ContentAuditInfo(s) from temporary _CacheList to _CacheByPrimaryKey
+            {
+                ContentAuditInfo tmp = _CacheList[0]; // Get the first ContentAuditInfo
+                string pKey = tmp.AuditID.ToString();
+                if (!_CacheByPrimaryKey.ContainsKey(pKey))
+                {
+                    _CacheByPrimaryKey[pKey] = new List<ContentAuditInfo>(); // Add new list for PrimaryKey
+                }
+                _CacheByPrimaryKey[pKey].Add(tmp); // Add to Primary Key list
+                _CacheList.RemoveAt(0); // Remove the first ContentAuditInfo
+            }
+        }
+        internal static void AddList(ContentAuditInfoList lst)
+        {
+            foreach (ContentAuditInfo item in lst) AddToCache(item);
+        }
+        protected static ContentAuditInfo GetCachedByPrimaryKey(long auditID)
+        {
+            ConvertListToDictionary();
+            string key = auditID.ToString();
+            if (_CacheByPrimaryKey.ContainsKey(key)) return _CacheByPrimaryKey[key][0];
+            return null;
+        }
+        #endregion
+        #region Business Methods
+        private string _ErrorMessage = string.Empty;
+        public string ErrorMessage
+        {
+            get { return _ErrorMessage; }
+        }
+        protected ContentAudit _Editable;
+        private IVEHasBrokenRules HasBrokenRules
+        {
+            get
+            {
+                IVEHasBrokenRules hasBrokenRules = null;
+                if (_Editable != null)
+                    hasBrokenRules = _Editable.HasBrokenRules;
+                return hasBrokenRules;
+            }
+        }
+        private long _AuditID;
+        [System.ComponentModel.DataObjectField(true, true)]
+        public long AuditID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _AuditID;
+            }
+        }
+        private int _ContentID;
+        public int ContentID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _ContentID;
+            }
+        }
+        private string _Number = string.Empty;
+        public string Number
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _Number;
+            }
+        }
+        private string _Text = string.Empty;
+        public string Text
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _Text;
+            }
+        }
+        private int? _Type;
+        public int? Type
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _Type;
+            }
+        }
+        private int? _FormatID;
+        public int? FormatID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _FormatID;
+            }
+        }
+        private string _Config = string.Empty;
+        public string Config
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _Config;
+            }
+        }
+        private DateTime _DTS = new DateTime();
+        public DateTime DTS
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _DTS;
+            }
+        }
+        private string _UserID = string.Empty;
+        public string UserID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _UserID;
+            }
+        }
+        private int _DeleteStatus;
+        public int DeleteStatus
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _DeleteStatus;
+            }
+        }
+        // CSLATODO: Replace base ContentAuditInfo.ToString function as necessary
+        /// <summary>
+        /// Overrides Base ToString
+        /// </summary>
+        /// <returns>A string representation of current ContentAuditInfo</returns>
+        //public override string ToString()
+        //{
+        //  return base.ToString();
+        //}
+        // CSLATODO: Check ContentAuditInfo.GetIdValue to assure that the ID returned is unique
+        /// <summary>
+        /// Overrides Base GetIdValue - Used internally by CSLA to determine equality
+        /// </summary>
+        /// <returns>A Unique ID for the current ContentAuditInfo</returns>
+        protected override object GetIdValue()
+        {
+            return MyContentAuditInfoUnique; // Absolutely Unique ID
+        }
+        #endregion
+        #region Factory Methods
+        private static int _ContentAuditInfoUnique = 0;
+        private static int ContentAuditInfoUnique
+        { get { return ++_ContentAuditInfoUnique; } }
+        private int _MyContentAuditInfoUnique = ContentAuditInfoUnique;
+        public int MyContentAuditInfoUnique // Absolutely Unique ID - Info
+        { get { return _MyContentAuditInfoUnique; } }
+        protected ContentAuditInfo()
+        {/* require use of factory methods */
+            AddToCache(this);
+        }
+        private bool _Disposed = false;
+        private static int _CountCreated = 0;
+        private static int _CountDisposed = 0;
+        private static int _CountFinalized = 0;
+        private static int IncrementCountCreated
+        { get { return ++_CountCreated; } }
+        private int _CountWhenCreated = IncrementCountCreated;
+        public static int CountCreated
+        { get { return _CountCreated; } }
+        public static int CountNotDisposed
+        { get { return _CountCreated - _CountDisposed; } }
+        public static int CountNotFinalized
+        { get { return _CountCreated - _CountFinalized; } }
+        ~ContentAuditInfo()
+        {
+            _CountFinalized++;
+        }
+        public void Dispose()
+        {
+            if (_Disposed) return;
+            _CountDisposed++;
+            _Disposed = true;
+            RemoveFromCache(this);
+            if (!_CacheByPrimaryKey.ContainsKey(AuditID.ToString())) return;
+            List<ContentAuditInfo> listContentAuditInfo = _CacheByPrimaryKey[AuditID.ToString()]; // Get the list of items
+            while (listContentAuditInfo.Contains(this)) listContentAuditInfo.Remove(this); // Remove the item from the list
+            if (listContentAuditInfo.Count == 0) // If there are no items left in the list
+                _CacheByPrimaryKey.Remove(AuditID.ToString()); // remove the list
+        }
+        public virtual ContentAudit Get()
+        {
+            return _Editable = ContentAudit.Get(_AuditID);
+        }
+        public static void Refresh(ContentAudit tmp)
+        {
+            string key = tmp.AuditID.ToString();
+            ConvertListToDictionary();
+            if (_CacheByPrimaryKey.ContainsKey(key))
+                foreach (ContentAuditInfo tmpInfo in _CacheByPrimaryKey[key])
+                    tmpInfo.RefreshFields(tmp);
+        }
+        protected virtual void RefreshFields(ContentAudit tmp)
+        {
+            _ContentID = tmp.ContentID;
+            _Number = tmp.Number;
+            _Text = tmp.Text;
+            _Type = tmp.Type;
+            _FormatID = tmp.FormatID;
+            _Config = tmp.Config;
+            _DTS = tmp.DTS;
+            _UserID = tmp.UserID;
+            _DeleteStatus = tmp.DeleteStatus;
+            _ContentAuditInfoExtension.Refresh(this);
+            OnChange();// raise an event
+        }
+        public static ContentAuditInfo Get(long auditID)
+        {
+            //if (!CanGetObject())
+            //  throw new System.Security.SecurityException("User not authorized to view a ContentAudit");
+            try
+            {
+                ContentAuditInfo tmp = GetCachedByPrimaryKey(auditID);
+                if (tmp == null)
+                {
+                    tmp = DataPortal.Fetch<ContentAuditInfo>(new PKCriteria(auditID));
+                    AddToCache(tmp);
+                }
+                if (tmp.ErrorMessage == "No Record Found")
+                {
+                    tmp.Dispose(); // Clean-up ContentAuditInfo
+                    tmp = null;
+                }
+                return tmp;
+            }
+            catch (Exception ex)
+            {
+                throw new DbCslaException("Error on ContentAuditInfo.Get", ex);
+            }
+        }
+        #endregion
+        #region Data Access Portal
+        internal ContentAuditInfo(SafeDataReader dr)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ContentAuditInfo.Constructor", GetHashCode());
+            try
+            {
+                ReadData(dr);
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("ContentAuditInfo.Constructor", ex);
+                throw new DbCslaException("ContentAuditInfo.Constructor", ex);
+            }
+        }
+        [Serializable()]
+        protected class PKCriteria
+        {
+            private long _AuditID;
+            public long AuditID
+            { get { return _AuditID; } }
+            public PKCriteria(long auditID)
+            {
+                _AuditID = auditID;
+            }
+        }
+        private void ReadData(SafeDataReader dr)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ContentAuditInfo.ReadData", GetHashCode());
+            try
+            {
+                _AuditID = dr.GetInt64("AuditID");
+                _ContentID = dr.GetInt32("ContentID");
+                _Number = dr.GetString("Number");
+                _Text = dr.GetString("Text");
+                _Type = (int?)dr.GetValue("Type");
+                _FormatID = (int?)dr.GetValue("FormatID");
+                _Config = dr.GetString("Config");
+                _DTS = dr.GetDateTime("DTS");
+                _UserID = dr.GetString("UserID");
+                _DeleteStatus = dr.GetInt32("DeleteStatus");
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("ContentAuditInfo.ReadData", ex);
+                _ErrorMessage = ex.Message;
+                throw new DbCslaException("ContentAuditInfo.ReadData", ex);
+            }
+        }
+        private void DataPortal_Fetch(PKCriteria criteria)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ContentAuditInfo.DataPortal_Fetch", GetHashCode());
+            try
+            {
+                using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+                {
+                    ApplicationContext.LocalContext["cn"] = cn;
+                    using (SqlCommand cm = cn.CreateCommand())
+                    {
+                        cm.CommandType = CommandType.StoredProcedure;
+                        cm.CommandText = "getContentAudit";
+                        cm.Parameters.AddWithValue("@AuditID", criteria.AuditID);
+                        cm.CommandTimeout = Database.DefaultTimeout;
+                        using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+                        {
+                            if (!dr.Read())
+                            {
+                                _ErrorMessage = "No Record Found";
+                                return;
+                            }
+                            ReadData(dr);
+                        }
+                    }
+                    // removing of item only needed for local data portal
+                    if (ApplicationContext.ExecutionLocation == ApplicationContext.ExecutionLocations.Client)
+                        ApplicationContext.LocalContext.Remove("cn");
+                }
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("ContentAuditInfo.DataPortal_Fetch", ex);
+                _ErrorMessage = ex.Message;
+                throw new DbCslaException("ContentAuditInfo.DataPortal_Fetch", ex);
+            }
+        }
+        #endregion
+        // Standard Refresh
+        #region extension
+        ContentAuditInfoExtension _ContentAuditInfoExtension = new ContentAuditInfoExtension();
+        [Serializable()]
+        partial class ContentAuditInfoExtension : extensionBase { }
+        [Serializable()]
+        class extensionBase
+        {
+            // Default Refresh
+            public virtual void Refresh(ContentAuditInfo tmp) { }
+        }
+        #endregion
+    } // Class
+    #region Converter
+    internal class ContentAuditInfoConverter : ExpandableObjectConverter
+    {
+        public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
+        {
+            if (destType == typeof(string) && value is ContentAuditInfo)
+            {
+                // Return the ToString value
+                return ((ContentAuditInfo)value).ToString();
+            }
+            return base.ConvertTo(context, culture, value, destType);
+        }
+    }
+    #endregion
 } // Namespace

PROMS/VEPROMS.CSLA.Library/Generated/ContentDetail.cs

@@ -20,456 +20,444 @@ using System.Collections.Generic;
 using Csla.Validation;
 namespace VEPROMS.CSLA.Library
 {
-	/// <summary>
-	///	ContentDetail Generated by MyGeneration using the CSLA Object Mapping template
-	/// </summary>
-	[Serializable()]
-	[TypeConverter(typeof(ContentDetailConverter))]
-	public partial class ContentDetail : BusinessBase<ContentDetail>, IVEHasBrokenRules, IDisposable
-	{
-		#region Log4Net
-		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-		#endregion
-		#region Business Methods
-		private string _ErrorMessage = string.Empty;
-		public string ErrorMessage
-		{
-			get { return _ErrorMessage; }
-		}
-		private int _DetailID;
-		[System.ComponentModel.DataObjectField(true, true)]
-		public int DetailID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("DetailID", true);
-				if (_MyDetail != null) _DetailID = _MyDetail.DetailID;
-				return _DetailID;
-			}
-		}
-		private Detail _MyDetail;
-		[System.ComponentModel.DataObjectField(true, true)]
-		public Detail MyDetail
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("MyDetail", true);
-				if (_MyDetail == null && _DetailID != 0) _MyDetail = Detail.Get(_DetailID);
-				return _MyDetail;
-			}
-		}
-		private int _ItemType;
-		public int ItemType
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("ItemType", true);
-				return _ItemType;
-			}
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			set
-			{
-				CanWriteProperty("ItemType", true);
-				if (_ItemType != value)
-				{
-					_ItemType = value;
-					PropertyHasChanged();
-				}
-			}
-		}
-		private string _Text = string.Empty;
-		public string Text
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("Text", true);
-				return _Text;
-			}
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			set
-			{
-				CanWriteProperty("Text", true);
-				if (value == null) value = string.Empty;
-				if (_Text != value)
-				{
-					_Text = value;
-					PropertyHasChanged();
-				}
-			}
-		}
-		private string _Config = string.Empty;
-		public string Config
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("Config", true);
-				return _Config;
-			}
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			set
-			{
-				CanWriteProperty("Config", true);
-				if (value == null) value = string.Empty;
-				if (_Config != value)
-				{
-					_Config = value;
-					PropertyHasChanged();
-				}
-			}
-		}
-		private DateTime _DTS = new DateTime();
-		public DateTime DTS
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("DTS", true);
-				return _DTS;
-			}
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			set
-			{
-				CanWriteProperty("DTS", true);
-				if (_DTS != value)
-				{
-					_DTS = value;
-					PropertyHasChanged();
-				}
-			}
-		}
-		private string _UserID = string.Empty;
-		public string UserID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("UserID", true);
-				return _UserID;
-			}
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			set
-			{
-				CanWriteProperty("UserID", true);
-				if (value == null) value = string.Empty;
-				if (_UserID != value)
-				{
-					_UserID = value;
-					PropertyHasChanged();
-				}
-			}
-		}
-		private byte[] _LastChanged = new byte[8];//timestamp
-		// CSLATODO: Check ContentDetail.GetIdValue to assure that the ID returned is unique
-		/// <summary>
-		/// Overrides Base GetIdValue - Used internally by CSLA to determine equality
-		/// </summary>
-		/// <returns>A Unique ID for the current ContentDetail</returns>
-		protected override object GetIdValue()
-		{
-			return MyContentDetailUnique; // Absolutely Unique ID
-		}
-		// CSLATODO: Replace base ContentDetail.ToString function as necessary
-		/// <summary>
-		/// Overrides Base ToString
-		/// </summary>
-		/// <returns>A string representation of current ContentDetail</returns>
-		//public override string ToString()
-		//{
-		//  return base.ToString();
-		//}
-		public override bool IsDirty
-		{
-			get { return base.IsDirty; }
-		}
-		public bool IsDirtyList(List<object> list)
-		{
-			return base.IsDirty;
-		}
-		public override bool IsValid
-		{
-			get { return (IsNew && !IsDirty) ? true : base.IsValid; }
-		}
-		public bool IsValidList(List<object> list)
-		{
-			return (IsNew && !IsDirty) ? true : base.IsValid;
-		}
-		#endregion
-		#region ValidationRules
-		[NonSerialized]
-		private bool _CheckingBrokenRules = false;
-		public IVEHasBrokenRules HasBrokenRules
-		{
-			get
-			{
-				if (_CheckingBrokenRules) return null;
-				if (BrokenRulesCollection.Count > 0) return this;
-				try
-				{
-					_CheckingBrokenRules = true;
-					IVEHasBrokenRules hasBrokenRules = null;
-					return hasBrokenRules;
-				}
-				finally
-				{
-					_CheckingBrokenRules = false;
-				}
-			}
-		}
-		public BrokenRulesCollection BrokenRules
-		{
-			get
-			{
-				IVEHasBrokenRules hasBrokenRules = HasBrokenRules;
-				if (this.Equals(hasBrokenRules)) return BrokenRulesCollection;
-				return (hasBrokenRules != null ? hasBrokenRules.BrokenRules : null);
-			}
-		}
-		protected override void AddBusinessRules()
-		{
-			ValidationRules.AddRule(
-				Csla.Validation.CommonRules.StringRequired, "Text");
-			ValidationRules.AddRule(
-				Csla.Validation.CommonRules.StringMaxLength,
-				new Csla.Validation.CommonRules.MaxLengthRuleArgs("Text", 1073741823));
-			ValidationRules.AddRule(
-				Csla.Validation.CommonRules.StringMaxLength,
-				new Csla.Validation.CommonRules.MaxLengthRuleArgs("Config", 1073741823));
-			ValidationRules.AddRule(
-				Csla.Validation.CommonRules.StringRequired, "UserID");
-			ValidationRules.AddRule(
-				Csla.Validation.CommonRules.StringMaxLength,
-				new Csla.Validation.CommonRules.MaxLengthRuleArgs("UserID", 100));
-			// CSLATODO:  Add other validation rules
-		}
-		// Sample data comparison validation rule
-		//private bool StartDateGTEndDate(object target, Csla.Validation.RuleArgs e)
-		//{
-		//	if (_started > _ended)
-		//	{
-		//		e.Description = "Start date can't be after end date";
-		//		return false;
-		//	}
-		//	else
-		//		return true;
-		//}
-		#endregion
-		#region Authorization Rules
-		protected override void AddAuthorizationRules()
-		{
-			//CSLATODO: Who can read/write which fields
-			//AuthorizationRules.AllowRead(DetailID, "<Role(s)>");
-			//AuthorizationRules.AllowRead(ItemType, "<Role(s)>");
-			//AuthorizationRules.AllowWrite(ItemType, "<Role(s)>");
-			//AuthorizationRules.AllowRead(Text, "<Role(s)>");
-			//AuthorizationRules.AllowWrite(Text, "<Role(s)>");
-			//AuthorizationRules.AllowRead(Config, "<Role(s)>");
-			//AuthorizationRules.AllowWrite(Config, "<Role(s)>");
-			//AuthorizationRules.AllowRead(DTS, "<Role(s)>");
-			//AuthorizationRules.AllowWrite(DTS, "<Role(s)>");
-			//AuthorizationRules.AllowRead(UserID, "<Role(s)>");
-			//AuthorizationRules.AllowWrite(UserID, "<Role(s)>");
-		}
-		public static bool CanAddObject()
-		{
-			// CSLATODO: Can Add Authorization
-			//return Csla.ApplicationContext.User.IsInRole("ProjectManager");
-			return true;
-		}
-		public static bool CanGetObject()
-		{
-			// CSLATODO: CanGet Authorization
-			return true;
-		}
-		public static bool CanDeleteObject()
-		{
-			// CSLATODO: CanDelete Authorization
-			//bool result = false;
-			//if (Csla.ApplicationContext.User.IsInRole("ProjectManager"))result = true;
-			//if (Csla.ApplicationContext.User.IsInRole("Administrator"))result = true;
-			//return result;
-			return true;
-		}
-		public static bool CanEditObject()
-		{
-			// CSLATODO: CanEdit Authorization
-			//return Csla.ApplicationContext.User.IsInRole("ProjectManager");
-			return true;
-		}
-		#endregion
-		#region Factory Methods
-		public int CurrentEditLevel
-		{ get { return EditLevel; } }
-		private static int _ContentDetailUnique = 0;
-		private static int ContentDetailUnique
-		{ get { return ++_ContentDetailUnique; } }
-		private int _MyContentDetailUnique = ContentDetailUnique;
-		public int MyContentDetailUnique // Absolutely Unique ID - Editable FK
-		{ get { return _MyContentDetailUnique; } }
-		internal static ContentDetail New(int itemType, string text)
-		{
-			return new ContentDetail(itemType, text);
-		}
-		internal static ContentDetail Get(SafeDataReader dr)
-		{
-			return new ContentDetail(dr);
-		}
-		public ContentDetail()
-		{
-			MarkAsChild();
-			_DetailID = Detail.NextDetailID;
-			_DTS = _ContentDetailExtension.DefaultDTS;
-			_UserID = _ContentDetailExtension.DefaultUserID;
-			ValidationRules.CheckRules();
-		}
-		private ContentDetail(int itemType, string text)
-		{
-			MarkAsChild();
-			// CSLATODO: Add any initialization & defaults
-			_DetailID = Detail.NextDetailID;
-			_DTS = _ContentDetailExtension.DefaultDTS;
-			_UserID = _ContentDetailExtension.DefaultUserID;
-			_ItemType = itemType;
-			_Text = text;
-			ValidationRules.CheckRules();
-		}
-		internal ContentDetail(SafeDataReader dr)
-		{
-			MarkAsChild();
-			Fetch(dr);
-		}
-		private bool _Disposed = false;
-		private static int _CountCreated = 0;
-		private static int _CountDisposed = 0;
-		private static int _CountFinalized = 0;
-		private static int IncrementCountCreated
-		{ get { return ++_CountCreated; } }
-		private int _CountWhenCreated = IncrementCountCreated;
-		public static int CountCreated
-		{ get { return _CountCreated; } }
-		public static int CountNotDisposed
-		{ get { return _CountCreated - _CountDisposed; } }
-		public static int CountNotFinalized
-		{ get { return _CountCreated - _CountFinalized; } }
-		~ContentDetail()
-		{
-			_CountFinalized++;
-		}
-		public void Dispose()
-		{
-			if (_Disposed) return;
-			_CountDisposed++;
-			_Disposed = true;
-		}
-		#endregion
-		#region Data Access Portal
-		private void Fetch(SafeDataReader dr)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ContentDetail.FetchDR", GetHashCode());
-			try
-			{
-				_DetailID = dr.GetInt32("DetailID");
-				_ItemType = dr.GetInt32("ItemType");
-				_Text = dr.GetString("Text");
-				_Config = dr.GetString("Config");
-				_DTS = dr.GetDateTime("DTS");
-				_UserID = dr.GetString("UserID");
-				dr.GetBytes("LastChanged", 0, _LastChanged, 0, 8);
-			}
-			catch (Exception ex) // FKItem Fetch
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("ContentDetail.FetchDR", ex);
-				throw new DbCslaException("ContentDetail.Fetch", ex);
-			}
-			MarkOld();
-		}
-		internal void Insert(Content myContent)
-		{
-			// if we're not dirty then don't update the database
-			if (!this.IsDirty) return;
-			SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
-			_LastChanged = Detail.Add(cn, ref _DetailID, myContent, _ItemType, _Text, _Config, _DTS, _UserID);
-			MarkOld();
-		}
-		internal void Update(Content myContent)
-		{
-			// if we're not dirty then don't update the database
-			if (!this.IsDirty) return;
-			SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
-			_LastChanged = Detail.Update(cn, ref _DetailID, myContent.ContentID, _ItemType, _Text, _Config, _DTS, _UserID, ref _LastChanged);
-			MarkOld();
-		}
-		internal void DeleteSelf(Content myContent)
-		{
-			// if we're not dirty then don't update the database
-			if (!this.IsDirty) return;
-			// if we're new then don't update the database
-			if (this.IsNew) return;
-			SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
-			Detail.Remove(cn, _DetailID);
-			MarkNew();
-		}
-		#endregion
-		// Standard Default Code
-		#region extension
-		ContentDetailExtension _ContentDetailExtension = new ContentDetailExtension();
-		[Serializable()]
-		partial class ContentDetailExtension : extensionBase
-		{
-		}
-		[Serializable()]
-		class extensionBase
-		{
-			// Default Values
-			public virtual DateTime DefaultDTS
-			{
-				get { return DateTime.Now; }
-			}
-			public virtual string DefaultUserID
-			{
-				get { return Volian.Base.Library.VlnSettings.UserID; }
-			}
-			// Authorization Rules
-			public virtual void AddAuthorizationRules(Csla.Security.AuthorizationRules rules)
-			{
-				// Needs to be overriden to add new authorization rules
-			}
-			// Instance Authorization Rules
-			public virtual void AddInstanceAuthorizationRules(Csla.Security.AuthorizationRules rules)
-			{
-				// Needs to be overriden to add new authorization rules
-			}
-			// Validation Rules
-			public virtual void AddValidationRules(Csla.Validation.ValidationRules rules)
-			{
-				// Needs to be overriden to add new validation rules
-			}
-			// InstanceValidation Rules
-			public virtual void AddInstanceValidationRules(Csla.Validation.ValidationRules rules)
-			{
-				// Needs to be overriden to add new validation rules
-			}
-		}
-		#endregion
-	} // Class
-	#region Converter
-	internal class ContentDetailConverter : ExpandableObjectConverter
-	{
-		public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
-		{
-			if (destType == typeof(string) && value is ContentDetail)
-			{
-				// Return the ToString value
-				return ((ContentDetail)value).ToString();
-			}
-			return base.ConvertTo(context, culture, value, destType);
-		}
-	}
-	#endregion
+    /// <summary>
+    ///	ContentDetail Generated by MyGeneration using the CSLA Object Mapping template
+    /// </summary>
+    [Serializable()]
+    [TypeConverter(typeof(ContentDetailConverter))]
+    public partial class ContentDetail : BusinessBase<ContentDetail>, IVEHasBrokenRules, IDisposable
+    {
+        #region Log4Net
+        private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+        #region Business Methods
+        private string _ErrorMessage = string.Empty;
+        public string ErrorMessage
+        {
+            get { return _ErrorMessage; }
+        }
+        private int _DetailID;
+        [System.ComponentModel.DataObjectField(true, true)]
+        public int DetailID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_MyDetail != null) _DetailID = _MyDetail.DetailID;
+                return _DetailID;
+            }
+        }
+        private Detail _MyDetail;
+        [System.ComponentModel.DataObjectField(true, true)]
+        public Detail MyDetail
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_MyDetail == null && _DetailID != 0) _MyDetail = Detail.Get(_DetailID);
+                return _MyDetail;
+            }
+        }
+        private int _ItemType;
+        public int ItemType
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _ItemType;
+            }
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            set
+            {
+                if (_ItemType != value)
+                {
+                    _ItemType = value;
+                    PropertyHasChanged();
+                }
+            }
+        }
+        private string _Text = string.Empty;
+        public string Text
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _Text;
+            }
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            set
+            {
+                if (value == null) value = string.Empty;
+                if (_Text != value)
+                {
+                    _Text = value;
+                    PropertyHasChanged();
+                }
+            }
+        }
+        private string _Config = string.Empty;
+        public string Config
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _Config;
+            }
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            set
+            {
+                if (value == null) value = string.Empty;
+                if (_Config != value)
+                {
+                    _Config = value;
+                    PropertyHasChanged();
+                }
+            }
+        }
+        private DateTime _DTS = new DateTime();
+        public DateTime DTS
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _DTS;
+            }
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            set
+            {
+                if (_DTS != value)
+                {
+                    _DTS = value;
+                    PropertyHasChanged();
+                }
+            }
+        }
+        private string _UserID = string.Empty;
+        public string UserID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _UserID;
+            }
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            set
+            {
+                if (value == null) value = string.Empty;
+                if (_UserID != value)
+                {
+                    _UserID = value;
+                    PropertyHasChanged();
+                }
+            }
+        }
+        private byte[] _LastChanged = new byte[8];//timestamp
+                                                  // CSLATODO: Check ContentDetail.GetIdValue to assure that the ID returned is unique
+        /// <summary>
+        /// Overrides Base GetIdValue - Used internally by CSLA to determine equality
+        /// </summary>
+        /// <returns>A Unique ID for the current ContentDetail</returns>
+        protected override object GetIdValue()
+        {
+            return MyContentDetailUnique; // Absolutely Unique ID
+        }
+        // CSLATODO: Replace base ContentDetail.ToString function as necessary
+        /// <summary>
+        /// Overrides Base ToString
+        /// </summary>
+        /// <returns>A string representation of current ContentDetail</returns>
+        //public override string ToString()
+        //{
+        //  return base.ToString();
+        //}
+        public override bool IsDirty
+        {
+            get { return base.IsDirty; }
+        }
+        public bool IsDirtyList(List<object> list)
+        {
+            return base.IsDirty;
+        }
+        public override bool IsValid
+        {
+            get { return (IsNew && !IsDirty) ? true : base.IsValid; }
+        }
+        public bool IsValidList(List<object> list)
+        {
+            return (IsNew && !IsDirty) ? true : base.IsValid;
+        }
+        #endregion
+        #region ValidationRules
+        [NonSerialized]
+        private bool _CheckingBrokenRules = false;
+        public IVEHasBrokenRules HasBrokenRules
+        {
+            get
+            {
+                if (_CheckingBrokenRules) return null;
+                if (BrokenRulesCollection.Count > 0) return this;
+                try
+                {
+                    _CheckingBrokenRules = true;
+                    IVEHasBrokenRules hasBrokenRules = null;
+                    return hasBrokenRules;
+                }
+                finally
+                {
+                    _CheckingBrokenRules = false;
+                }
+            }
+        }
+        public BrokenRulesCollection BrokenRules
+        {
+            get
+            {
+                IVEHasBrokenRules hasBrokenRules = HasBrokenRules;
+                if (this.Equals(hasBrokenRules)) return BrokenRulesCollection;
+                return (hasBrokenRules != null ? hasBrokenRules.BrokenRules : null);
+            }
+        }
+        protected override void AddBusinessRules()
+        {
+            ValidationRules.AddRule(
+                Csla.Validation.CommonRules.StringRequired, "Text");
+            ValidationRules.AddRule(
+                Csla.Validation.CommonRules.StringMaxLength,
+                new Csla.Validation.CommonRules.MaxLengthRuleArgs("Text", 1073741823));
+            ValidationRules.AddRule(
+                Csla.Validation.CommonRules.StringMaxLength,
+                new Csla.Validation.CommonRules.MaxLengthRuleArgs("Config", 1073741823));
+            ValidationRules.AddRule(
+                Csla.Validation.CommonRules.StringRequired, "UserID");
+            ValidationRules.AddRule(
+                Csla.Validation.CommonRules.StringMaxLength,
+                new Csla.Validation.CommonRules.MaxLengthRuleArgs("UserID", 100));
+            // CSLATODO:  Add other validation rules
+        }
+        // Sample data comparison validation rule
+        //private bool StartDateGTEndDate(object target, Csla.Validation.RuleArgs e)
+        //{
+        //	if (_started > _ended)
+        //	{
+        //		e.Description = "Start date can't be after end date";
+        //		return false;
+        //	}
+        //	else
+        //		return true;
+        //}
+        #endregion
+        #region Authorization Rules
+        protected override void AddAuthorizationRules()
+        {
+            //CSLATODO: Who can read/write which fields
+            //AuthorizationRules.AllowRead(DetailID, "<Role(s)>");
+            //AuthorizationRules.AllowRead(ItemType, "<Role(s)>");
+            //AuthorizationRules.AllowWrite(ItemType, "<Role(s)>");
+            //AuthorizationRules.AllowRead(Text, "<Role(s)>");
+            //AuthorizationRules.AllowWrite(Text, "<Role(s)>");
+            //AuthorizationRules.AllowRead(Config, "<Role(s)>");
+            //AuthorizationRules.AllowWrite(Config, "<Role(s)>");
+            //AuthorizationRules.AllowRead(DTS, "<Role(s)>");
+            //AuthorizationRules.AllowWrite(DTS, "<Role(s)>");
+            //AuthorizationRules.AllowRead(UserID, "<Role(s)>");
+            //AuthorizationRules.AllowWrite(UserID, "<Role(s)>");
+        }
+        public static bool CanAddObject()
+        {
+            // CSLATODO: Can Add Authorization
+            //return Csla.ApplicationContext.User.IsInRole("ProjectManager");
+            return true;
+        }
+        public static bool CanGetObject()
+        {
+            // CSLATODO: CanGet Authorization
+            return true;
+        }
+        public static bool CanDeleteObject()
+        {
+            // CSLATODO: CanDelete Authorization
+            //bool result = false;
+            //if (Csla.ApplicationContext.User.IsInRole("ProjectManager"))result = true;
+            //if (Csla.ApplicationContext.User.IsInRole("Administrator"))result = true;
+            //return result;
+            return true;
+        }
+        public static bool CanEditObject()
+        {
+            // CSLATODO: CanEdit Authorization
+            //return Csla.ApplicationContext.User.IsInRole("ProjectManager");
+            return true;
+        }
+        #endregion
+        #region Factory Methods
+        public int CurrentEditLevel
+        { get { return EditLevel; } }
+        private static int _ContentDetailUnique = 0;
+        private static int ContentDetailUnique
+        { get { return ++_ContentDetailUnique; } }
+        private int _MyContentDetailUnique = ContentDetailUnique;
+        public int MyContentDetailUnique // Absolutely Unique ID - Editable FK
+        { get { return _MyContentDetailUnique; } }
+        internal static ContentDetail New(int itemType, string text)
+        {
+            return new ContentDetail(itemType, text);
+        }
+        internal static ContentDetail Get(SafeDataReader dr)
+        {
+            return new ContentDetail(dr);
+        }
+        public ContentDetail()
+        {
+            MarkAsChild();
+            _DetailID = Detail.NextDetailID;
+            _DTS = _ContentDetailExtension.DefaultDTS;
+            _UserID = _ContentDetailExtension.DefaultUserID;
+            ValidationRules.CheckRules();
+        }
+        private ContentDetail(int itemType, string text)
+        {
+            MarkAsChild();
+            // CSLATODO: Add any initialization & defaults
+            _DetailID = Detail.NextDetailID;
+            _DTS = _ContentDetailExtension.DefaultDTS;
+            _UserID = _ContentDetailExtension.DefaultUserID;
+            _ItemType = itemType;
+            _Text = text;
+            ValidationRules.CheckRules();
+        }
+        internal ContentDetail(SafeDataReader dr)
+        {
+            MarkAsChild();
+            Fetch(dr);
+        }
+        private bool _Disposed = false;
+        private static int _CountCreated = 0;
+        private static int _CountDisposed = 0;
+        private static int _CountFinalized = 0;
+        private static int IncrementCountCreated
+        { get { return ++_CountCreated; } }
+        private int _CountWhenCreated = IncrementCountCreated;
+        public static int CountCreated
+        { get { return _CountCreated; } }
+        public static int CountNotDisposed
+        { get { return _CountCreated - _CountDisposed; } }
+        public static int CountNotFinalized
+        { get { return _CountCreated - _CountFinalized; } }
+        ~ContentDetail()
+        {
+            _CountFinalized++;
+        }
+        public void Dispose()
+        {
+            if (_Disposed) return;
+            _CountDisposed++;
+            _Disposed = true;
+        }
+        #endregion
+        #region Data Access Portal
+        private void Fetch(SafeDataReader dr)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ContentDetail.FetchDR", GetHashCode());
+            try
+            {
+                _DetailID = dr.GetInt32("DetailID");
+                _ItemType = dr.GetInt32("ItemType");
+                _Text = dr.GetString("Text");
+                _Config = dr.GetString("Config");
+                _DTS = dr.GetDateTime("DTS");
+                _UserID = dr.GetString("UserID");
+                dr.GetBytes("LastChanged", 0, _LastChanged, 0, 8);
+            }
+            catch (Exception ex) // FKItem Fetch
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("ContentDetail.FetchDR", ex);
+                throw new DbCslaException("ContentDetail.Fetch", ex);
+            }
+            MarkOld();
+        }
+        internal void Insert(Content myContent)
+        {
+            // if we're not dirty then don't update the database
+            if (!this.IsDirty) return;
+            SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
+            _LastChanged = Detail.Add(cn, ref _DetailID, myContent, _ItemType, _Text, _Config, _DTS, _UserID);
+            MarkOld();
+        }
+        internal void Update(Content myContent)
+        {
+            // if we're not dirty then don't update the database
+            if (!this.IsDirty) return;
+            SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
+            _LastChanged = Detail.Update(cn, ref _DetailID, myContent.ContentID, _ItemType, _Text, _Config, _DTS, _UserID, ref _LastChanged);
+            MarkOld();
+        }
+        internal void DeleteSelf(Content myContent)
+        {
+            // if we're not dirty then don't update the database
+            if (!this.IsDirty) return;
+            // if we're new then don't update the database
+            if (this.IsNew) return;
+            SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
+            Detail.Remove(cn, _DetailID);
+            MarkNew();
+        }
+        #endregion
+        // Standard Default Code
+        #region extension
+        ContentDetailExtension _ContentDetailExtension = new ContentDetailExtension();
+        [Serializable()]
+        partial class ContentDetailExtension : extensionBase
+        {
+        }
+        [Serializable()]
+        class extensionBase
+        {
+            // Default Values
+            public virtual DateTime DefaultDTS
+            {
+                get { return DateTime.Now; }
+            }
+            public virtual string DefaultUserID
+            {
+                get { return Volian.Base.Library.VlnSettings.UserID; }
+            }
+            // Authorization Rules
+            public virtual void AddAuthorizationRules(Csla.Security.AuthorizationRules rules)
+            {
+                // Needs to be overriden to add new authorization rules
+            }
+            // Instance Authorization Rules
+            public virtual void AddInstanceAuthorizationRules(Csla.Security.AuthorizationRules rules)
+            {
+                // Needs to be overriden to add new authorization rules
+            }
+            // Validation Rules
+            public virtual void AddValidationRules(Csla.Validation.ValidationRules rules)
+            {
+                // Needs to be overriden to add new validation rules
+            }
+            // InstanceValidation Rules
+            public virtual void AddInstanceValidationRules(Csla.Validation.ValidationRules rules)
+            {
+                // Needs to be overriden to add new validation rules
+            }
+        }
+        #endregion
+    } // Class
+    #region Converter
+    internal class ContentDetailConverter : ExpandableObjectConverter
+    {
+        public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
+        {
+            if (destType == typeof(string) && value is ContentDetail)
+            {
+                // Return the ToString value
+                return ((ContentDetail)value).ToString();
+            }
+            return base.ConvertTo(context, culture, value, destType);
+        }
+    }
+    #endregion
 } // Namespace
 
 

PROMS/VEPROMS.CSLA.Library/Generated/ContentItem.cs

@@ -20,403 +20,394 @@ using System.Collections.Generic;
 using Csla.Validation;
 namespace VEPROMS.CSLA.Library
 {
-	/// <summary>
-	///	ContentItem Generated by MyGeneration using the CSLA Object Mapping template
-	/// </summary>
-	[Serializable()]
-	[TypeConverter(typeof(ContentItemConverter))]
-	public partial class ContentItem : BusinessBase<ContentItem>, IVEHasBrokenRules, IDisposable
-	{
-		#region Log4Net
-		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-		#endregion
-		#region Business Methods
-		private string _ErrorMessage = string.Empty;
-		public string ErrorMessage
-		{
-			get { return _ErrorMessage; }
-		}
-		private int _ItemID;
-		[System.ComponentModel.DataObjectField(true, true)]
-		public int ItemID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("ItemID", true);
-				if (_MyItem != null) _ItemID = _MyItem.ItemID;
-				return _ItemID;
-			}
-		}
-		private Item _MyItem;
-		[System.ComponentModel.DataObjectField(true, true)]
-		public Item MyItem
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("MyItem", true);
-				if (_MyItem == null && _ItemID != 0) _MyItem = Item.Get(_ItemID);
-				return _MyItem;
-			}
-		}
-		private int? _PreviousID;
-		public int? PreviousID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("PreviousID", true);
-				if (_MyPrevious != null) _PreviousID = _MyPrevious.ItemID;
-				return _PreviousID;
-			}
-		}
-		private Item _MyPrevious;
-		public Item MyPrevious
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("MyPrevious", true);
-				if (_MyPrevious == null && _PreviousID != null) _MyPrevious = Item.Get((int)_PreviousID);
-				return _MyPrevious;
-			}
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			set
-			{
-				CanWriteProperty("MyPrevious", true);
-				if ((_MyPrevious == null ? _PreviousID : (int?)_MyPrevious.ItemID) != (value == null ? null : (int?)value.ItemID))
-				{
-					_MyPrevious = value;
-					_PreviousID = (value == null ? null : (int?)value.ItemID);
-					PropertyHasChanged();
-				}
-			}
-		}
-		private DateTime _DTS = new DateTime();
-		public DateTime DTS
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("DTS", true);
-				return _DTS;
-			}
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			set
-			{
-				CanWriteProperty("DTS", true);
-				if (_DTS != value)
-				{
-					_DTS = value;
-					PropertyHasChanged();
-				}
-			}
-		}
-		private string _UserID = string.Empty;
-		public string UserID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("UserID", true);
-				return _UserID;
-			}
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			set
-			{
-				CanWriteProperty("UserID", true);
-				if (value == null) value = string.Empty;
-				if (_UserID != value)
-				{
-					_UserID = value;
-					PropertyHasChanged();
-				}
-			}
-		}
-		private byte[] _LastChanged = new byte[8];//timestamp
-		// CSLATODO: Check ContentItem.GetIdValue to assure that the ID returned is unique
-		/// <summary>
-		/// Overrides Base GetIdValue - Used internally by CSLA to determine equality
-		/// </summary>
-		/// <returns>A Unique ID for the current ContentItem</returns>
-		protected override object GetIdValue()
-		{
-			return MyContentItemUnique; // Absolutely Unique ID
-		}
-		// CSLATODO: Replace base ContentItem.ToString function as necessary
-		/// <summary>
-		/// Overrides Base ToString
-		/// </summary>
-		/// <returns>A string representation of current ContentItem</returns>
-		//public override string ToString()
-		//{
-		//  return base.ToString();
-		//}
-		public override bool IsDirty
-		{
-			get { return base.IsDirty; }
-		}
-		public bool IsDirtyList(List<object> list)
-		{
-			return base.IsDirty;
-		}
-		public override bool IsValid
-		{
-			get { return (IsNew && !IsDirty) ? true : base.IsValid; }
-		}
-		public bool IsValidList(List<object> list)
-		{
-			return (IsNew && !IsDirty) ? true : base.IsValid;
-		}
-		#endregion
-		#region ValidationRules
-		[NonSerialized]
-		private bool _CheckingBrokenRules = false;
-		public IVEHasBrokenRules HasBrokenRules
-		{
-			get
-			{
-				if (_CheckingBrokenRules) return null;
-				if (BrokenRulesCollection.Count > 0) return this;
-				try
-				{
-					_CheckingBrokenRules = true;
-					IVEHasBrokenRules hasBrokenRules = null;
-					if (_MyItem != null && (hasBrokenRules = _MyItem.HasBrokenRules) != null) return hasBrokenRules;
-					return hasBrokenRules;
-				}
-				finally
-				{
-					_CheckingBrokenRules = false;
-				}
-			}
-		}
-		public BrokenRulesCollection BrokenRules
-		{
-			get
-			{
-				IVEHasBrokenRules hasBrokenRules = HasBrokenRules;
-				if (this.Equals(hasBrokenRules)) return BrokenRulesCollection;
-				return (hasBrokenRules != null ? hasBrokenRules.BrokenRules : null);
-			}
-		}
-		protected override void AddBusinessRules()
-		{
-			ValidationRules.AddRule(
-				Csla.Validation.CommonRules.StringRequired, "UserID");
-			ValidationRules.AddRule(
-				Csla.Validation.CommonRules.StringMaxLength,
-				new Csla.Validation.CommonRules.MaxLengthRuleArgs("UserID", 100));
-			// CSLATODO:  Add other validation rules
-		}
-		// Sample data comparison validation rule
-		//private bool StartDateGTEndDate(object target, Csla.Validation.RuleArgs e)
-		//{
-		//	if (_started > _ended)
-		//	{
-		//		e.Description = "Start date can't be after end date";
-		//		return false;
-		//	}
-		//	else
-		//		return true;
-		//}
-		#endregion
-		#region Authorization Rules
-		protected override void AddAuthorizationRules()
-		{
-			//CSLATODO: Who can read/write which fields
-			//AuthorizationRules.AllowRead(ItemID, "<Role(s)>");
-			//AuthorizationRules.AllowRead(PreviousID, "<Role(s)>");
-			//AuthorizationRules.AllowWrite(PreviousID, "<Role(s)>");
-			//AuthorizationRules.AllowRead(DTS, "<Role(s)>");
-			//AuthorizationRules.AllowWrite(DTS, "<Role(s)>");
-			//AuthorizationRules.AllowRead(UserID, "<Role(s)>");
-			//AuthorizationRules.AllowWrite(UserID, "<Role(s)>");
-		}
-		public static bool CanAddObject()
-		{
-			// CSLATODO: Can Add Authorization
-			//return Csla.ApplicationContext.User.IsInRole("ProjectManager");
-			return true;
-		}
-		public static bool CanGetObject()
-		{
-			// CSLATODO: CanGet Authorization
-			return true;
-		}
-		public static bool CanDeleteObject()
-		{
-			// CSLATODO: CanDelete Authorization
-			//bool result = false;
-			//if (Csla.ApplicationContext.User.IsInRole("ProjectManager"))result = true;
-			//if (Csla.ApplicationContext.User.IsInRole("Administrator"))result = true;
-			//return result;
-			return true;
-		}
-		public static bool CanEditObject()
-		{
-			// CSLATODO: CanEdit Authorization
-			//return Csla.ApplicationContext.User.IsInRole("ProjectManager");
-			return true;
-		}
-		#endregion
-		#region Factory Methods
-		public int CurrentEditLevel
-		{ get { return EditLevel; } }
-		private static int _ContentItemUnique = 0;
-		private static int ContentItemUnique
-		{ get { return ++_ContentItemUnique; } }
-		private int _MyContentItemUnique = ContentItemUnique;
-		public int MyContentItemUnique // Absolutely Unique ID - Editable FK
-		{ get { return _MyContentItemUnique; } }
-		internal static ContentItem New()
-		{
-			return new ContentItem();
-		}
-		internal static ContentItem Get(SafeDataReader dr)
-		{
-			return new ContentItem(dr);
-		}
-		public ContentItem()
-		{
-			MarkAsChild();
-			_ItemID = Item.NextItemID;
-			_DTS = _ContentItemExtension.DefaultDTS;
-			_UserID = _ContentItemExtension.DefaultUserID;
-			ValidationRules.CheckRules();
-		}
-		internal ContentItem(SafeDataReader dr)
-		{
-			MarkAsChild();
-			Fetch(dr);
-		}
-		private bool _Disposed = false;
-		private static int _CountCreated = 0;
-		private static int _CountDisposed = 0;
-		private static int _CountFinalized = 0;
-		private static int IncrementCountCreated
-		{ get { return ++_CountCreated; } }
-		private int _CountWhenCreated = IncrementCountCreated;
-		public static int CountCreated
-		{ get { return _CountCreated; } }
-		public static int CountNotDisposed
-		{ get { return _CountCreated - _CountDisposed; } }
-		public static int CountNotFinalized
-		{ get { return _CountCreated - _CountFinalized; } }
-		~ContentItem()
-		{
-			_CountFinalized++;
-		}
-		public void Dispose()
-		{
-			if (_Disposed) return;
-			_CountDisposed++;
-			_Disposed = true;
-		}
-		#endregion
-		#region Data Access Portal
-		private void Fetch(SafeDataReader dr)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ContentItem.FetchDR", GetHashCode());
-			try
-			{
-				_ItemID = dr.GetInt32("ItemID");
-				_PreviousID = (int?)dr.GetValue("PreviousID");
-				_DTS = dr.GetDateTime("DTS");
-				_UserID = dr.GetString("UserID");
-				dr.GetBytes("LastChanged", 0, _LastChanged, 0, 8);
-			}
-			catch (Exception ex) // FKItem Fetch
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("ContentItem.FetchDR", ex);
-				throw new DbCslaException("ContentItem.Fetch", ex);
-			}
-			MarkOld();
-		}
-		internal void Insert(Content myContent)
-		{
-			// if we're not dirty then don't update the database
-			if (!this.IsDirty) return;
-			SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
-			_LastChanged = Item.Add(cn, ref _ItemID, Item.Get((int)_PreviousID), myContent, _DTS, _UserID);
-			MarkOld();
-		}
-		internal void Update(Content myContent)
-		{
-			// if we're not dirty then don't update the database
-			if (!this.IsDirty) return;
-			SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
-			_LastChanged = Item.Update(cn, ref _ItemID, _PreviousID, myContent.ContentID, _DTS, _UserID, ref _LastChanged);
-			MarkOld();
-		}
-		internal void DeleteSelf(Content myContent)
-		{
-			// if we're not dirty then don't update the database
-			if (!this.IsDirty) return;
-			// if we're new then don't update the database
-			if (this.IsNew) return;
-			SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
-			Item.Remove(cn, _ItemID);
-			MarkNew();
-		}
-		#endregion
-		// Standard Default Code
-		#region extension
-		ContentItemExtension _ContentItemExtension = new ContentItemExtension();
-		[Serializable()]
-		partial class ContentItemExtension : extensionBase
-		{
-		}
-		[Serializable()]
-		class extensionBase
-		{
-			// Default Values
-			public virtual DateTime DefaultDTS
-			{
-				get { return DateTime.Now; }
-			}
-			public virtual string DefaultUserID
-			{
-				get { return Volian.Base.Library.VlnSettings.UserID; }
-			}
-			// Authorization Rules
-			public virtual void AddAuthorizationRules(Csla.Security.AuthorizationRules rules)
-			{
-				// Needs to be overriden to add new authorization rules
-			}
-			// Instance Authorization Rules
-			public virtual void AddInstanceAuthorizationRules(Csla.Security.AuthorizationRules rules)
-			{
-				// Needs to be overriden to add new authorization rules
-			}
-			// Validation Rules
-			public virtual void AddValidationRules(Csla.Validation.ValidationRules rules)
-			{
-				// Needs to be overriden to add new validation rules
-			}
-			// InstanceValidation Rules
-			public virtual void AddInstanceValidationRules(Csla.Validation.ValidationRules rules)
-			{
-				// Needs to be overriden to add new validation rules
-			}
-		}
-		#endregion
-	} // Class
-	#region Converter
-	internal class ContentItemConverter : ExpandableObjectConverter
-	{
-		public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
-		{
-			if (destType == typeof(string) && value is ContentItem)
-			{
-				// Return the ToString value
-				return ((ContentItem)value).ToString();
-			}
-			return base.ConvertTo(context, culture, value, destType);
-		}
-	}
-	#endregion
+    /// <summary>
+    ///	ContentItem Generated by MyGeneration using the CSLA Object Mapping template
+    /// </summary>
+    [Serializable()]
+    [TypeConverter(typeof(ContentItemConverter))]
+    public partial class ContentItem : BusinessBase<ContentItem>, IVEHasBrokenRules, IDisposable
+    {
+        #region Log4Net
+        private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+        #region Business Methods
+        private string _ErrorMessage = string.Empty;
+        public string ErrorMessage
+        {
+            get { return _ErrorMessage; }
+        }
+        private int _ItemID;
+        [System.ComponentModel.DataObjectField(true, true)]
+        public int ItemID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_MyItem != null) _ItemID = _MyItem.ItemID;
+                return _ItemID;
+            }
+        }
+        private Item _MyItem;
+        [System.ComponentModel.DataObjectField(true, true)]
+        public Item MyItem
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_MyItem == null && _ItemID != 0) _MyItem = Item.Get(_ItemID);
+                return _MyItem;
+            }
+        }
+        private int? _PreviousID;
+        public int? PreviousID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_MyPrevious != null) _PreviousID = _MyPrevious.ItemID;
+                return _PreviousID;
+            }
+        }
+        private Item _MyPrevious;
+        public Item MyPrevious
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_MyPrevious == null && _PreviousID != null) _MyPrevious = Item.Get((int)_PreviousID);
+                return _MyPrevious;
+            }
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            set
+            {
+                if ((_MyPrevious == null ? _PreviousID : (int?)_MyPrevious.ItemID) != (value == null ? null : (int?)value.ItemID))
+                {
+                    _MyPrevious = value;
+                    _PreviousID = (value == null ? null : (int?)value.ItemID);
+                    PropertyHasChanged();
+                }
+            }
+        }
+        private DateTime _DTS = new DateTime();
+        public DateTime DTS
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _DTS;
+            }
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            set
+            {
+                if (_DTS != value)
+                {
+                    _DTS = value;
+                    PropertyHasChanged();
+                }
+            }
+        }
+        private string _UserID = string.Empty;
+        public string UserID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _UserID;
+            }
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            set
+            {
+                if (value == null) value = string.Empty;
+                if (_UserID != value)
+                {
+                    _UserID = value;
+                    PropertyHasChanged();
+                }
+            }
+        }
+        private byte[] _LastChanged = new byte[8];//timestamp
+                                                  // CSLATODO: Check ContentItem.GetIdValue to assure that the ID returned is unique
+        /// <summary>
+        /// Overrides Base GetIdValue - Used internally by CSLA to determine equality
+        /// </summary>
+        /// <returns>A Unique ID for the current ContentItem</returns>
+        protected override object GetIdValue()
+        {
+            return MyContentItemUnique; // Absolutely Unique ID
+        }
+        // CSLATODO: Replace base ContentItem.ToString function as necessary
+        /// <summary>
+        /// Overrides Base ToString
+        /// </summary>
+        /// <returns>A string representation of current ContentItem</returns>
+        //public override string ToString()
+        //{
+        //  return base.ToString();
+        //}
+        public override bool IsDirty
+        {
+            get { return base.IsDirty; }
+        }
+        public bool IsDirtyList(List<object> list)
+        {
+            return base.IsDirty;
+        }
+        public override bool IsValid
+        {
+            get { return (IsNew && !IsDirty) ? true : base.IsValid; }
+        }
+        public bool IsValidList(List<object> list)
+        {
+            return (IsNew && !IsDirty) ? true : base.IsValid;
+        }
+        #endregion
+        #region ValidationRules
+        [NonSerialized]
+        private bool _CheckingBrokenRules = false;
+        public IVEHasBrokenRules HasBrokenRules
+        {
+            get
+            {
+                if (_CheckingBrokenRules) return null;
+                if (BrokenRulesCollection.Count > 0) return this;
+                try
+                {
+                    _CheckingBrokenRules = true;
+                    IVEHasBrokenRules hasBrokenRules = null;
+                    if (_MyItem != null && (hasBrokenRules = _MyItem.HasBrokenRules) != null) return hasBrokenRules;
+                    return hasBrokenRules;
+                }
+                finally
+                {
+                    _CheckingBrokenRules = false;
+                }
+            }
+        }
+        public BrokenRulesCollection BrokenRules
+        {
+            get
+            {
+                IVEHasBrokenRules hasBrokenRules = HasBrokenRules;
+                if (this.Equals(hasBrokenRules)) return BrokenRulesCollection;
+                return (hasBrokenRules != null ? hasBrokenRules.BrokenRules : null);
+            }
+        }
+        protected override void AddBusinessRules()
+        {
+            ValidationRules.AddRule(
+                Csla.Validation.CommonRules.StringRequired, "UserID");
+            ValidationRules.AddRule(
+                Csla.Validation.CommonRules.StringMaxLength,
+                new Csla.Validation.CommonRules.MaxLengthRuleArgs("UserID", 100));
+            // CSLATODO:  Add other validation rules
+        }
+        // Sample data comparison validation rule
+        //private bool StartDateGTEndDate(object target, Csla.Validation.RuleArgs e)
+        //{
+        //	if (_started > _ended)
+        //	{
+        //		e.Description = "Start date can't be after end date";
+        //		return false;
+        //	}
+        //	else
+        //		return true;
+        //}
+        #endregion
+        #region Authorization Rules
+        protected override void AddAuthorizationRules()
+        {
+            //CSLATODO: Who can read/write which fields
+            //AuthorizationRules.AllowRead(ItemID, "<Role(s)>");
+            //AuthorizationRules.AllowRead(PreviousID, "<Role(s)>");
+            //AuthorizationRules.AllowWrite(PreviousID, "<Role(s)>");
+            //AuthorizationRules.AllowRead(DTS, "<Role(s)>");
+            //AuthorizationRules.AllowWrite(DTS, "<Role(s)>");
+            //AuthorizationRules.AllowRead(UserID, "<Role(s)>");
+            //AuthorizationRules.AllowWrite(UserID, "<Role(s)>");
+        }
+        public static bool CanAddObject()
+        {
+            // CSLATODO: Can Add Authorization
+            //return Csla.ApplicationContext.User.IsInRole("ProjectManager");
+            return true;
+        }
+        public static bool CanGetObject()
+        {
+            // CSLATODO: CanGet Authorization
+            return true;
+        }
+        public static bool CanDeleteObject()
+        {
+            // CSLATODO: CanDelete Authorization
+            //bool result = false;
+            //if (Csla.ApplicationContext.User.IsInRole("ProjectManager"))result = true;
+            //if (Csla.ApplicationContext.User.IsInRole("Administrator"))result = true;
+            //return result;
+            return true;
+        }
+        public static bool CanEditObject()
+        {
+            // CSLATODO: CanEdit Authorization
+            //return Csla.ApplicationContext.User.IsInRole("ProjectManager");
+            return true;
+        }
+        #endregion
+        #region Factory Methods
+        public int CurrentEditLevel
+        { get { return EditLevel; } }
+        private static int _ContentItemUnique = 0;
+        private static int ContentItemUnique
+        { get { return ++_ContentItemUnique; } }
+        private int _MyContentItemUnique = ContentItemUnique;
+        public int MyContentItemUnique // Absolutely Unique ID - Editable FK
+        { get { return _MyContentItemUnique; } }
+        internal static ContentItem New()
+        {
+            return new ContentItem();
+        }
+        internal static ContentItem Get(SafeDataReader dr)
+        {
+            return new ContentItem(dr);
+        }
+        public ContentItem()
+        {
+            MarkAsChild();
+            _ItemID = Item.NextItemID;
+            _DTS = _ContentItemExtension.DefaultDTS;
+            _UserID = _ContentItemExtension.DefaultUserID;
+            ValidationRules.CheckRules();
+        }
+        internal ContentItem(SafeDataReader dr)
+        {
+            MarkAsChild();
+            Fetch(dr);
+        }
+        private bool _Disposed = false;
+        private static int _CountCreated = 0;
+        private static int _CountDisposed = 0;
+        private static int _CountFinalized = 0;
+        private static int IncrementCountCreated
+        { get { return ++_CountCreated; } }
+        private int _CountWhenCreated = IncrementCountCreated;
+        public static int CountCreated
+        { get { return _CountCreated; } }
+        public static int CountNotDisposed
+        { get { return _CountCreated - _CountDisposed; } }
+        public static int CountNotFinalized
+        { get { return _CountCreated - _CountFinalized; } }
+        ~ContentItem()
+        {
+            _CountFinalized++;
+        }
+        public void Dispose()
+        {
+            if (_Disposed) return;
+            _CountDisposed++;
+            _Disposed = true;
+        }
+        #endregion
+        #region Data Access Portal
+        private void Fetch(SafeDataReader dr)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ContentItem.FetchDR", GetHashCode());
+            try
+            {
+                _ItemID = dr.GetInt32("ItemID");
+                _PreviousID = (int?)dr.GetValue("PreviousID");
+                _DTS = dr.GetDateTime("DTS");
+                _UserID = dr.GetString("UserID");
+                dr.GetBytes("LastChanged", 0, _LastChanged, 0, 8);
+            }
+            catch (Exception ex) // FKItem Fetch
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("ContentItem.FetchDR", ex);
+                throw new DbCslaException("ContentItem.Fetch", ex);
+            }
+            MarkOld();
+        }
+        internal void Insert(Content myContent)
+        {
+            // if we're not dirty then don't update the database
+            if (!this.IsDirty) return;
+            SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
+            _LastChanged = Item.Add(cn, ref _ItemID, Item.Get((int)_PreviousID), myContent, _DTS, _UserID);
+            MarkOld();
+        }
+        internal void Update(Content myContent)
+        {
+            // if we're not dirty then don't update the database
+            if (!this.IsDirty) return;
+            SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
+            _LastChanged = Item.Update(cn, ref _ItemID, _PreviousID, myContent.ContentID, _DTS, _UserID, ref _LastChanged);
+            MarkOld();
+        }
+        internal void DeleteSelf(Content myContent)
+        {
+            // if we're not dirty then don't update the database
+            if (!this.IsDirty) return;
+            // if we're new then don't update the database
+            if (this.IsNew) return;
+            SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
+            Item.Remove(cn, _ItemID);
+            MarkNew();
+        }
+        #endregion
+        // Standard Default Code
+        #region extension
+        ContentItemExtension _ContentItemExtension = new ContentItemExtension();
+        [Serializable()]
+        partial class ContentItemExtension : extensionBase
+        {
+        }
+        [Serializable()]
+        class extensionBase
+        {
+            // Default Values
+            public virtual DateTime DefaultDTS
+            {
+                get { return DateTime.Now; }
+            }
+            public virtual string DefaultUserID
+            {
+                get { return Volian.Base.Library.VlnSettings.UserID; }
+            }
+            // Authorization Rules
+            public virtual void AddAuthorizationRules(Csla.Security.AuthorizationRules rules)
+            {
+                // Needs to be overriden to add new authorization rules
+            }
+            // Instance Authorization Rules
+            public virtual void AddInstanceAuthorizationRules(Csla.Security.AuthorizationRules rules)
+            {
+                // Needs to be overriden to add new authorization rules
+            }
+            // Validation Rules
+            public virtual void AddValidationRules(Csla.Validation.ValidationRules rules)
+            {
+                // Needs to be overriden to add new validation rules
+            }
+            // InstanceValidation Rules
+            public virtual void AddInstanceValidationRules(Csla.Validation.ValidationRules rules)
+            {
+                // Needs to be overriden to add new validation rules
+            }
+        }
+        #endregion
+    } // Class
+    #region Converter
+    internal class ContentItemConverter : ExpandableObjectConverter
+    {
+        public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
+        {
+            if (destType == typeof(string) && value is ContentItem)
+            {
+                // Return the ToString value
+                return ((ContentItem)value).ToString();
+            }
+            return base.ConvertTo(context, culture, value, destType);
+        }
+    }
+    #endregion
 } // Namespace
 
 

PROMS/VEPROMS.CSLA.Library/Generated/ContentPart.cs

@@ -20,470 +20,458 @@ using System.Collections.Generic;
 using Csla.Validation;
 namespace VEPROMS.CSLA.Library
 {
-	/// <summary>
-	///	ContentPart Generated by MyGeneration using the CSLA Object Mapping template
-	/// </summary>
-	[Serializable()]
-	[TypeConverter(typeof(ContentPartConverter))]
-	public partial class ContentPart : BusinessBase<ContentPart>, IVEHasBrokenRules, IDisposable
-	{
-		#region Log4Net
-		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-		#endregion
-		#region Business Methods
-		private string _ErrorMessage = string.Empty;
-		public string ErrorMessage
-		{
-			get { return _ErrorMessage; }
-		}
-		private int _FromType;
-		[System.ComponentModel.DataObjectField(true, true)]
-		public int FromType
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("FromType", true);
-				return _FromType;
-			}
-		}
-		private int _ItemID;
-		public int ItemID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("ItemID", true);
-				if (_MyItem != null) _ItemID = _MyItem.ItemID;
-				return _ItemID;
-			}
-		}
-		private Item _MyItem;
-		public Item MyItem
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("MyItem", true);
-				if (_MyItem == null && _ItemID != 0) _MyItem = Item.Get(_ItemID);
-				return _MyItem;
-			}
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			set
-			{
-				CanWriteProperty("MyItem", true);
-				if (_MyItem != value)
-				{
-					_MyItem = value;
-					_ItemID = value.ItemID;// Update underlying data field
-					PropertyHasChanged();
-				}
-			}
-		}
-		private DateTime _DTS = new DateTime();
-		public DateTime DTS
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("DTS", true);
-				return _DTS;
-			}
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			set
-			{
-				CanWriteProperty("DTS", true);
-				if (_DTS != value)
-				{
-					_DTS = value;
-					PropertyHasChanged();
-				}
-			}
-		}
-		private string _UserID = string.Empty;
-		public string UserID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("UserID", true);
-				return _UserID;
-			}
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			set
-			{
-				CanWriteProperty("UserID", true);
-				if (value == null) value = string.Empty;
-				if (_UserID != value)
-				{
-					_UserID = value;
-					PropertyHasChanged();
-				}
-			}
-		}
-		private byte[] _LastChanged = new byte[8];//timestamp
-		private int? _Item_PreviousID;
-		public int? Item_PreviousID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("Item_PreviousID", true);
-				return _Item_PreviousID;
-			}
-		}
-		private int _Item_ContentID;
-		public int Item_ContentID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("Item_ContentID", true);
-				return _Item_ContentID;
-			}
-		}
-		private DateTime _Item_DTS = new DateTime();
-		public DateTime Item_DTS
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("Item_DTS", true);
-				return _Item_DTS;
-			}
-		}
-		private string _Item_UserID = string.Empty;
-		public string Item_UserID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("Item_UserID", true);
-				return _Item_UserID;
-			}
-		}
-		// CSLATODO: Check ContentPart.GetIdValue to assure that the ID returned is unique
-		/// <summary>
-		/// Overrides Base GetIdValue - Used internally by CSLA to determine equality
-		/// </summary>
-		/// <returns>A Unique ID for the current ContentPart</returns>
-		protected override object GetIdValue()
-		{
-			return MyContentPartUnique; // Absolutely Unique ID
-		}
-		// CSLATODO: Replace base ContentPart.ToString function as necessary
-		/// <summary>
-		/// Overrides Base ToString
-		/// </summary>
-		/// <returns>A string representation of current ContentPart</returns>
-		//public override string ToString()
-		//{
-		//  return base.ToString();
-		//}
-		public override bool IsDirty
-		{
-			get 
-			{
-				if ( base.IsDirty ) 
-					return true;
-				return IsDirtyList(new List<object>());
-			}
-		}
-		public bool IsDirtyList(List<object> list)
-		{
-			if (base.IsDirty || list.Contains(this))
-				return base.IsDirty;
-			list.Add(this);
-			return base.IsDirty || (_MyItem == null ? false : _MyItem.IsDirtyList(list));
-		}
-		public override bool IsValid
-		{
-			get { return IsValidList(new List<object>()); }
-		}
-		public bool IsValidList(List<object> list)
-		{
-			if(list.Contains(this))
-				return (IsNew && !IsDirty) ? true : base.IsValid;
-			list.Add(this);
-			return ((IsNew && !IsDirty) ? true : base.IsValid) && (_MyItem == null ? true : _MyItem.IsValidList(list));
-		}
-		#endregion
-		#region ValidationRules
-		[NonSerialized]
-		private bool _CheckingBrokenRules = false;
-		public IVEHasBrokenRules HasBrokenRules
-		{
-			get
-			{
-				if (_CheckingBrokenRules) return null;
-				if (BrokenRulesCollection.Count > 0) return this;
-				try
-				{
-					_CheckingBrokenRules = true;
-					IVEHasBrokenRules hasBrokenRules = null;
-					if (_MyItem != null && (hasBrokenRules = _MyItem.HasBrokenRules) != null) return hasBrokenRules;
-					return hasBrokenRules;
-				}
-				finally
-				{
-					_CheckingBrokenRules = false;
-				}
-			}
-		}
-		public BrokenRulesCollection BrokenRules
-		{
-			get
-			{
-				IVEHasBrokenRules hasBrokenRules = HasBrokenRules;
-				if (this.Equals(hasBrokenRules)) return BrokenRulesCollection;
-				return (hasBrokenRules != null ? hasBrokenRules.BrokenRules : null);
-			}
-		}
-		protected override void AddBusinessRules()
-		{
-			ValidationRules.AddRule<ContentPart>(MyItemRequired, "MyItem");
-			ValidationRules.AddRule(
-				Csla.Validation.CommonRules.StringRequired, "UserID");
-			ValidationRules.AddRule(
-				Csla.Validation.CommonRules.StringMaxLength,
-				new Csla.Validation.CommonRules.MaxLengthRuleArgs("UserID", 100));
-			// CSLATODO:  Add other validation rules
-		}
-		private static bool MyItemRequired(ContentPart target, Csla.Validation.RuleArgs e)
-		{
-			if (target._ItemID == 0 && target._MyItem == null) // Required field missing
-			{
-				e.Description = "Required";
-				return false;
-			}
-			return true;
-		}
-		// Sample data comparison validation rule
-		//private bool StartDateGTEndDate(object target, Csla.Validation.RuleArgs e)
-		//{
-		//	if (_started > _ended)
-		//	{
-		//		e.Description = "Start date can't be after end date";
-		//		return false;
-		//	}
-		//	else
-		//		return true;
-		//}
-		#endregion
-		#region Authorization Rules
-		protected override void AddAuthorizationRules()
-		{
-			//CSLATODO: Who can read/write which fields
-			//AuthorizationRules.AllowRead(FromType, "<Role(s)>");
-			//AuthorizationRules.AllowRead(ItemID, "<Role(s)>");
-			//AuthorizationRules.AllowWrite(ItemID, "<Role(s)>");
-			//AuthorizationRules.AllowRead(DTS, "<Role(s)>");
-			//AuthorizationRules.AllowWrite(DTS, "<Role(s)>");
-			//AuthorizationRules.AllowRead(UserID, "<Role(s)>");
-			//AuthorizationRules.AllowWrite(UserID, "<Role(s)>");
-		}
-		public static bool CanAddObject()
-		{
-			// CSLATODO: Can Add Authorization
-			//return Csla.ApplicationContext.User.IsInRole("ProjectManager");
-			return true;
-		}
-		public static bool CanGetObject()
-		{
-			// CSLATODO: CanGet Authorization
-			return true;
-		}
-		public static bool CanDeleteObject()
-		{
-			// CSLATODO: CanDelete Authorization
-			//bool result = false;
-			//if (Csla.ApplicationContext.User.IsInRole("ProjectManager"))result = true;
-			//if (Csla.ApplicationContext.User.IsInRole("Administrator"))result = true;
-			//return result;
-			return true;
-		}
-		public static bool CanEditObject()
-		{
-			// CSLATODO: CanEdit Authorization
-			//return Csla.ApplicationContext.User.IsInRole("ProjectManager");
-			return true;
-		}
-		#endregion
-		#region Factory Methods
-		public int CurrentEditLevel
-		{ get { return EditLevel; } }
-		private static int _ContentPartUnique = 0;
-		private static int ContentPartUnique
-		{ get { return ++_ContentPartUnique; } }
-		private int _MyContentPartUnique = ContentPartUnique;
-		public int MyContentPartUnique // Absolutely Unique ID - Editable FK
-		{ get { return _MyContentPartUnique; } }
-		internal static ContentPart New(int fromType, Item myItem)
-		{
-			return new ContentPart(fromType, myItem);
-		}
-		internal static ContentPart Get(SafeDataReader dr)
-		{
-			return new ContentPart(dr);
-		}
-		public ContentPart()
-		{
-			MarkAsChild();
+    /// <summary>
+    ///	ContentPart Generated by MyGeneration using the CSLA Object Mapping template
+    /// </summary>
+    [Serializable()]
+    [TypeConverter(typeof(ContentPartConverter))]
+    public partial class ContentPart : BusinessBase<ContentPart>, IVEHasBrokenRules, IDisposable
+    {
+        #region Log4Net
+        private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+        #region Business Methods
+        private string _ErrorMessage = string.Empty;
+        public string ErrorMessage
+        {
+            get { return _ErrorMessage; }
+        }
+        private int _FromType;
+        [System.ComponentModel.DataObjectField(true, true)]
+        public int FromType
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _FromType;
+            }
+        }
+        private int _ItemID;
+        public int ItemID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_MyItem != null) _ItemID = _MyItem.ItemID;
+                return _ItemID;
+            }
+        }
+        private Item _MyItem;
+        public Item MyItem
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                if (_MyItem == null && _ItemID != 0) _MyItem = Item.Get(_ItemID);
+                return _MyItem;
+            }
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            set
+            {
+                if (_MyItem != value)
+                {
+                    _MyItem = value;
+                    _ItemID = value.ItemID;// Update underlying data field
+                    PropertyHasChanged();
+                }
+            }
+        }
+        private DateTime _DTS = new DateTime();
+        public DateTime DTS
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _DTS;
+            }
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            set
+            {
+                if (_DTS != value)
+                {
+                    _DTS = value;
+                    PropertyHasChanged();
+                }
+            }
+        }
+        private string _UserID = string.Empty;
+        public string UserID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _UserID;
+            }
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            set
+            {
+                if (value == null) value = string.Empty;
+                if (_UserID != value)
+                {
+                    _UserID = value;
+                    PropertyHasChanged();
+                }
+            }
+        }
+        private byte[] _LastChanged = new byte[8];//timestamp
+        private int? _Item_PreviousID;
+        public int? Item_PreviousID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _Item_PreviousID;
+            }
+        }
+        private int _Item_ContentID;
+        public int Item_ContentID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _Item_ContentID;
+            }
+        }
+        private DateTime _Item_DTS = new DateTime();
+        public DateTime Item_DTS
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _Item_DTS;
+            }
+        }
+        private string _Item_UserID = string.Empty;
+        public string Item_UserID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _Item_UserID;
+            }
+        }
+        // CSLATODO: Check ContentPart.GetIdValue to assure that the ID returned is unique
+        /// <summary>
+        /// Overrides Base GetIdValue - Used internally by CSLA to determine equality
+        /// </summary>
+        /// <returns>A Unique ID for the current ContentPart</returns>
+        protected override object GetIdValue()
+        {
+            return MyContentPartUnique; // Absolutely Unique ID
+        }
+        // CSLATODO: Replace base ContentPart.ToString function as necessary
+        /// <summary>
+        /// Overrides Base ToString
+        /// </summary>
+        /// <returns>A string representation of current ContentPart</returns>
+        //public override string ToString()
+        //{
+        //  return base.ToString();
+        //}
+        public override bool IsDirty
+        {
+            get
+            {
+                if (base.IsDirty)
+                    return true;
+                return IsDirtyList(new List<object>());
+            }
+        }
+        public bool IsDirtyList(List<object> list)
+        {
+            if (base.IsDirty || list.Contains(this))
+                return base.IsDirty;
+            list.Add(this);
+            return base.IsDirty || (_MyItem == null ? false : _MyItem.IsDirtyList(list));
+        }
+        public override bool IsValid
+        {
+            get { return IsValidList(new List<object>()); }
+        }
+        public bool IsValidList(List<object> list)
+        {
+            if (list.Contains(this))
+                return (IsNew && !IsDirty) ? true : base.IsValid;
+            list.Add(this);
+            return ((IsNew && !IsDirty) ? true : base.IsValid) && (_MyItem == null ? true : _MyItem.IsValidList(list));
+        }
+        #endregion
+        #region ValidationRules
+        [NonSerialized]
+        private bool _CheckingBrokenRules = false;
+        public IVEHasBrokenRules HasBrokenRules
+        {
+            get
+            {
+                if (_CheckingBrokenRules) return null;
+                if (BrokenRulesCollection.Count > 0) return this;
+                try
+                {
+                    _CheckingBrokenRules = true;
+                    IVEHasBrokenRules hasBrokenRules = null;
+                    if (_MyItem != null && (hasBrokenRules = _MyItem.HasBrokenRules) != null) return hasBrokenRules;
+                    return hasBrokenRules;
+                }
+                finally
+                {
+                    _CheckingBrokenRules = false;
+                }
+            }
+        }
+        public BrokenRulesCollection BrokenRules
+        {
+            get
+            {
+                IVEHasBrokenRules hasBrokenRules = HasBrokenRules;
+                if (this.Equals(hasBrokenRules)) return BrokenRulesCollection;
+                return (hasBrokenRules != null ? hasBrokenRules.BrokenRules : null);
+            }
+        }
+        protected override void AddBusinessRules()
+        {
+            ValidationRules.AddRule<ContentPart>(MyItemRequired, "MyItem");
+            ValidationRules.AddRule(
+                Csla.Validation.CommonRules.StringRequired, "UserID");
+            ValidationRules.AddRule(
+                Csla.Validation.CommonRules.StringMaxLength,
+                new Csla.Validation.CommonRules.MaxLengthRuleArgs("UserID", 100));
+            // CSLATODO:  Add other validation rules
+        }
+        private static bool MyItemRequired(ContentPart target, Csla.Validation.RuleArgs e)
+        {
+            if (target._ItemID == 0 && target._MyItem == null) // Required field missing
+            {
+                e.Description = "Required";
+                return false;
+            }
+            return true;
+        }
+        // Sample data comparison validation rule
+        //private bool StartDateGTEndDate(object target, Csla.Validation.RuleArgs e)
+        //{
+        //	if (_started > _ended)
+        //	{
+        //		e.Description = "Start date can't be after end date";
+        //		return false;
+        //	}
+        //	else
+        //		return true;
+        //}
+        #endregion
+        #region Authorization Rules
+        protected override void AddAuthorizationRules()
+        {
+            //CSLATODO: Who can read/write which fields
+            //AuthorizationRules.AllowRead(FromType, "<Role(s)>");
+            //AuthorizationRules.AllowRead(ItemID, "<Role(s)>");
+            //AuthorizationRules.AllowWrite(ItemID, "<Role(s)>");
+            //AuthorizationRules.AllowRead(DTS, "<Role(s)>");
+            //AuthorizationRules.AllowWrite(DTS, "<Role(s)>");
+            //AuthorizationRules.AllowRead(UserID, "<Role(s)>");
+            //AuthorizationRules.AllowWrite(UserID, "<Role(s)>");
+        }
+        public static bool CanAddObject()
+        {
+            // CSLATODO: Can Add Authorization
+            //return Csla.ApplicationContext.User.IsInRole("ProjectManager");
+            return true;
+        }
+        public static bool CanGetObject()
+        {
+            // CSLATODO: CanGet Authorization
+            return true;
+        }
+        public static bool CanDeleteObject()
+        {
+            // CSLATODO: CanDelete Authorization
+            //bool result = false;
+            //if (Csla.ApplicationContext.User.IsInRole("ProjectManager"))result = true;
+            //if (Csla.ApplicationContext.User.IsInRole("Administrator"))result = true;
+            //return result;
+            return true;
+        }
+        public static bool CanEditObject()
+        {
+            // CSLATODO: CanEdit Authorization
+            //return Csla.ApplicationContext.User.IsInRole("ProjectManager");
+            return true;
+        }
+        #endregion
+        #region Factory Methods
+        public int CurrentEditLevel
+        { get { return EditLevel; } }
+        private static int _ContentPartUnique = 0;
+        private static int ContentPartUnique
+        { get { return ++_ContentPartUnique; } }
+        private int _MyContentPartUnique = ContentPartUnique;
+        public int MyContentPartUnique // Absolutely Unique ID - Editable FK
+        { get { return _MyContentPartUnique; } }
+        internal static ContentPart New(int fromType, Item myItem)
+        {
+            return new ContentPart(fromType, myItem);
+        }
+        internal static ContentPart Get(SafeDataReader dr)
+        {
+            return new ContentPart(dr);
+        }
+        public ContentPart()
+        {
+            MarkAsChild();
 
-			_DTS = _ContentPartExtension.DefaultDTS;
-			_UserID = _ContentPartExtension.DefaultUserID;
-			ValidationRules.CheckRules();
-		}
-		private ContentPart(int fromType, Item myItem)
-		{
-			MarkAsChild();
-			// CSLATODO: Add any initialization & defaults
-			_DTS = _ContentPartExtension.DefaultDTS;
-			_UserID = _ContentPartExtension.DefaultUserID;
-			_FromType = fromType;
-			_MyItem = myItem;
-			ValidationRules.CheckRules();
-		}
-		internal ContentPart(SafeDataReader dr)
-		{
-			MarkAsChild();
-			Fetch(dr);
-		}
-		private bool _Disposed = false;
-		private static int _CountCreated = 0;
-		private static int _CountDisposed = 0;
-		private static int _CountFinalized = 0;
-		private static int IncrementCountCreated
-		{ get { return ++_CountCreated; } }
-		private int _CountWhenCreated = IncrementCountCreated;
-		public static int CountCreated
-		{ get { return _CountCreated; } }
-		public static int CountNotDisposed
-		{ get { return _CountCreated - _CountDisposed; } }
-		public static int CountNotFinalized
-		{ get { return _CountCreated - _CountFinalized; } }
-		~ContentPart()
-		{
-			_CountFinalized++;
-		}
-		public void Dispose()
-		{
-			if (_Disposed) return;
-			_CountDisposed++;
-			_Disposed = true;
-			if (_MyItem != null)
-			{
-				_MyItem.Dispose();
-				_MyItem = null;
-			}
-		}
-		#endregion
-		#region Data Access Portal
-		private void Fetch(SafeDataReader dr)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ContentPart.FetchDR", GetHashCode());
-			try
-			{
-				_FromType = dr.GetInt32("FromType");
-				_ItemID = dr.GetInt32("ItemID");
-				_DTS = dr.GetDateTime("DTS");
-				_UserID = dr.GetString("UserID");
-				dr.GetBytes("LastChanged", 0, _LastChanged, 0, 8);
-				_Item_PreviousID = (int?)dr.GetValue("Item_PreviousID");
-				_Item_ContentID = dr.GetInt32("Item_ContentID");
-				_Item_DTS = dr.GetDateTime("Item_DTS");
-				_Item_UserID = dr.GetString("Item_UserID");
-			}
-			catch (Exception ex) // FKItem Fetch
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("ContentPart.FetchDR", ex);
-				throw new DbCslaException("ContentPart.Fetch", ex);
-			}
-			MarkOld();
-		}
-		internal void Insert(Content myContent)
-		{
-			// if we're not dirty then don't update the database
-			if (!this.IsDirty) return;
-			SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
-			_LastChanged = Part.Add(cn, myContent, _FromType, _MyItem, _DTS, _UserID);
-			MarkOld();
-		}
-		internal void Update(Content myContent)
-		{
-			// if we're not dirty then don't update the database
-			if (!this.IsDirty) return;
-			SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
-			_LastChanged = Part.Update(cn, myContent.ContentID, _FromType, _ItemID, _DTS, _UserID, ref _LastChanged);
-			MarkOld();
-		}
-		internal void DeleteSelf(Content myContent)
-		{
-			// if we're not dirty then don't update the database
-			if (!this.IsDirty) return;
-			// if we're new then don't update the database
-			if (this.IsNew) return;
-			SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
-			Part.Remove(cn, myContent.ContentID, _FromType);
-			MarkNew();
-		}
-		#endregion
-		// Standard Default Code
-		#region extension
-		ContentPartExtension _ContentPartExtension = new ContentPartExtension();
-		[Serializable()]
-		partial class ContentPartExtension : extensionBase
-		{
-		}
-		[Serializable()]
-		class extensionBase
-		{
-			// Default Values
-			public virtual DateTime DefaultDTS
-			{
-				get { return DateTime.Now; }
-			}
-			public virtual string DefaultUserID
-			{
-				get { return Volian.Base.Library.VlnSettings.UserID; }
-			}
-			// Authorization Rules
-			public virtual void AddAuthorizationRules(Csla.Security.AuthorizationRules rules)
-			{
-				// Needs to be overriden to add new authorization rules
-			}
-			// Instance Authorization Rules
-			public virtual void AddInstanceAuthorizationRules(Csla.Security.AuthorizationRules rules)
-			{
-				// Needs to be overriden to add new authorization rules
-			}
-			// Validation Rules
-			public virtual void AddValidationRules(Csla.Validation.ValidationRules rules)
-			{
-				// Needs to be overriden to add new validation rules
-			}
-			// InstanceValidation Rules
-			public virtual void AddInstanceValidationRules(Csla.Validation.ValidationRules rules)
-			{
-				// Needs to be overriden to add new validation rules
-			}
-		}
-		#endregion
-	} // Class
-	#region Converter
-	internal class ContentPartConverter : ExpandableObjectConverter
-	{
-		public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
-		{
-			if (destType == typeof(string) && value is ContentPart)
-			{
-				// Return the ToString value
-				return ((ContentPart)value).ToString();
-			}
-			return base.ConvertTo(context, culture, value, destType);
-		}
-	}
-	#endregion
+            _DTS = _ContentPartExtension.DefaultDTS;
+            _UserID = _ContentPartExtension.DefaultUserID;
+            ValidationRules.CheckRules();
+        }
+        private ContentPart(int fromType, Item myItem)
+        {
+            MarkAsChild();
+            // CSLATODO: Add any initialization & defaults
+            _DTS = _ContentPartExtension.DefaultDTS;
+            _UserID = _ContentPartExtension.DefaultUserID;
+            _FromType = fromType;
+            _MyItem = myItem;
+            ValidationRules.CheckRules();
+        }
+        internal ContentPart(SafeDataReader dr)
+        {
+            MarkAsChild();
+            Fetch(dr);
+        }
+        private bool _Disposed = false;
+        private static int _CountCreated = 0;
+        private static int _CountDisposed = 0;
+        private static int _CountFinalized = 0;
+        private static int IncrementCountCreated
+        { get { return ++_CountCreated; } }
+        private int _CountWhenCreated = IncrementCountCreated;
+        public static int CountCreated
+        { get { return _CountCreated; } }
+        public static int CountNotDisposed
+        { get { return _CountCreated - _CountDisposed; } }
+        public static int CountNotFinalized
+        { get { return _CountCreated - _CountFinalized; } }
+        ~ContentPart()
+        {
+            _CountFinalized++;
+        }
+        public void Dispose()
+        {
+            if (_Disposed) return;
+            _CountDisposed++;
+            _Disposed = true;
+            if (_MyItem != null)
+            {
+                _MyItem.Dispose();
+                _MyItem = null;
+            }
+        }
+        #endregion
+        #region Data Access Portal
+        private void Fetch(SafeDataReader dr)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ContentPart.FetchDR", GetHashCode());
+            try
+            {
+                _FromType = dr.GetInt32("FromType");
+                _ItemID = dr.GetInt32("ItemID");
+                _DTS = dr.GetDateTime("DTS");
+                _UserID = dr.GetString("UserID");
+                dr.GetBytes("LastChanged", 0, _LastChanged, 0, 8);
+                _Item_PreviousID = (int?)dr.GetValue("Item_PreviousID");
+                _Item_ContentID = dr.GetInt32("Item_ContentID");
+                _Item_DTS = dr.GetDateTime("Item_DTS");
+                _Item_UserID = dr.GetString("Item_UserID");
+            }
+            catch (Exception ex) // FKItem Fetch
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("ContentPart.FetchDR", ex);
+                throw new DbCslaException("ContentPart.Fetch", ex);
+            }
+            MarkOld();
+        }
+        internal void Insert(Content myContent)
+        {
+            // if we're not dirty then don't update the database
+            if (!this.IsDirty) return;
+            SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
+            _LastChanged = Part.Add(cn, myContent, _FromType, _MyItem, _DTS, _UserID);
+            MarkOld();
+        }
+        internal void Update(Content myContent)
+        {
+            // if we're not dirty then don't update the database
+            if (!this.IsDirty) return;
+            SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
+            _LastChanged = Part.Update(cn, myContent.ContentID, _FromType, _ItemID, _DTS, _UserID, ref _LastChanged);
+            MarkOld();
+        }
+        internal void DeleteSelf(Content myContent)
+        {
+            // if we're not dirty then don't update the database
+            if (!this.IsDirty) return;
+            // if we're new then don't update the database
+            if (this.IsNew) return;
+            SqlConnection cn = (SqlConnection)ApplicationContext.LocalContext["cn"];
+            Part.Remove(cn, myContent.ContentID, _FromType);
+            MarkNew();
+        }
+        #endregion
+        // Standard Default Code
+        #region extension
+        ContentPartExtension _ContentPartExtension = new ContentPartExtension();
+        [Serializable()]
+        partial class ContentPartExtension : extensionBase
+        {
+        }
+        [Serializable()]
+        class extensionBase
+        {
+            // Default Values
+            public virtual DateTime DefaultDTS
+            {
+                get { return DateTime.Now; }
+            }
+            public virtual string DefaultUserID
+            {
+                get { return Volian.Base.Library.VlnSettings.UserID; }
+            }
+            // Authorization Rules
+            public virtual void AddAuthorizationRules(Csla.Security.AuthorizationRules rules)
+            {
+                // Needs to be overriden to add new authorization rules
+            }
+            // Instance Authorization Rules
+            public virtual void AddInstanceAuthorizationRules(Csla.Security.AuthorizationRules rules)
+            {
+                // Needs to be overriden to add new authorization rules
+            }
+            // Validation Rules
+            public virtual void AddValidationRules(Csla.Validation.ValidationRules rules)
+            {
+                // Needs to be overriden to add new validation rules
+            }
+            // InstanceValidation Rules
+            public virtual void AddInstanceValidationRules(Csla.Validation.ValidationRules rules)
+            {
+                // Needs to be overriden to add new validation rules
+            }
+        }
+        #endregion
+    } // Class
+    #region Converter
+    internal class ContentPartConverter : ExpandableObjectConverter
+    {
+        public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
+        {
+            if (destType == typeof(string) && value is ContentPart)
+            {
+                // Return the ToString value
+                return ((ContentPart)value).ToString();
+            }
+            return base.ConvertTo(context, culture, value, destType);
+        }
+    }
+    #endregion
 } // Namespace
 
 

PROMS/VEPROMS.CSLA.Library/Generated/Copy of AnnotationAuditInfo.cs

@@ -19,376 +19,366 @@ using System.ComponentModel;
 using System.Collections.Generic;
 namespace VEPROMS.CSLA.Library
 {
-	public delegate void AnnotationAuditInfoEvent(object sender);
-	/// <summary>
-	///	AnnotationAuditInfo Generated by MyGeneration using the CSLA Object Mapping template
-	/// </summary>
-	[Serializable()]
-	[TypeConverter(typeof(AnnotationAuditInfoConverter))]
-	public partial class AnnotationAuditInfo : ReadOnlyBase<AnnotationAuditInfo>, IDisposable
-	{
-		public event AnnotationAuditInfoEvent Changed;
-		private void OnChange()
-		{
-			if (Changed != null) Changed(this);
-		}
-		#region Log4Net
-		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-		#endregion
-		#region Collection
-		private static List<AnnotationAuditInfo> _CacheList = new List<AnnotationAuditInfo>();
-		protected static void AddToCache(AnnotationAuditInfo annotationAuditInfo)
-		{
-			if (!_CacheList.Contains(annotationAuditInfo)) _CacheList.Add(annotationAuditInfo); // In AddToCache
-		}
-		protected static void RemoveFromCache(AnnotationAuditInfo annotationAuditInfo)
-		{
-			while (_CacheList.Contains(annotationAuditInfo)) _CacheList.Remove(annotationAuditInfo); // In RemoveFromCache
-		}
-		private static Dictionary<string, List<AnnotationAuditInfo>> _CacheByPrimaryKey = new Dictionary<string, List<AnnotationAuditInfo>>();
-		private static void ConvertListToDictionary()
-		{
-			while (_CacheList.Count > 0) // Move AnnotationAuditInfo(s) from temporary _CacheList to _CacheByPrimaryKey
-			{
-				AnnotationAuditInfo tmp = _CacheList[0]; // Get the first AnnotationAuditInfo
-				string pKey = tmp.AuditID.ToString();
-				if (!_CacheByPrimaryKey.ContainsKey(pKey))
-				{
-					_CacheByPrimaryKey[pKey] = new List<AnnotationAuditInfo>(); // Add new list for PrimaryKey
-				}
-				_CacheByPrimaryKey[pKey].Add(tmp); // Add to Primary Key list
-				_CacheList.RemoveAt(0); // Remove the first AnnotationAuditInfo
-			}
-		}
-		internal static void AddList(AnnotationAuditInfoList lst)
-		{
-			foreach (AnnotationAuditInfo item in lst) AddToCache(item);
-		}
-		protected static AnnotationAuditInfo GetCachedByPrimaryKey(long auditID)
-		{
-			ConvertListToDictionary();
-			string key = auditID.ToString();
-			if (_CacheByPrimaryKey.ContainsKey(key)) return _CacheByPrimaryKey[key][0];
-			return null;
-		}
-		#endregion
-		#region Business Methods
-		private string _ErrorMessage = string.Empty;
-		public string ErrorMessage
-		{
-			get { return _ErrorMessage; }
-		}
-		protected AnnotationAudit _Editable;
-		private IVEHasBrokenRules HasBrokenRules
-		{
-			get
-			{
-				IVEHasBrokenRules hasBrokenRules = null;
-				if (_Editable != null)
-					hasBrokenRules = _Editable.HasBrokenRules;
-				return hasBrokenRules;
-			}
-		}
-		private long _AuditID;
-		[System.ComponentModel.DataObjectField(true, true)]
-		public long AuditID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("AuditID", true);
-				return _AuditID;
-			}
-		}
-		private int _AnnotationID;
-		public int AnnotationID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("AnnotationID", true);
-				return _AnnotationID;
-			}
-		}
-		private int _ItemID;
-		public int ItemID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("ItemID", true);
-				return _ItemID;
-			}
-		}
-		private int _TypeID;
-		public int TypeID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("TypeID", true);
-				return _TypeID;
-			}
-		}
-		private string _RtfText = string.Empty;
-		public string RtfText
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("RtfText", true);
-				return _RtfText;
-			}
-		}
-		private string _SearchText = string.Empty;
-		public string SearchText
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("SearchText", true);
-				return _SearchText;
-			}
-		}
-		private string _Config = string.Empty;
-		public string Config
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("Config", true);
-				return _Config;
-			}
-		}
-		private DateTime _DTS = new DateTime();
-		public DateTime DTS
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("DTS", true);
-				return _DTS;
-			}
-		}
-		private string _UserID = string.Empty;
-		public string UserID
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("UserID", true);
-				return _UserID;
-			}
-		}
-		private int _DeleteStatus;
-		public int DeleteStatus
-		{
-			[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-			get
-			{
-				CanReadProperty("DeleteStatus", true);
-				return _DeleteStatus;
-			}
-		}
-		// CSLATODO: Replace base AnnotationAuditInfo.ToString function as necessary
-		/// <summary>
-		/// Overrides Base ToString
-		/// </summary>
-		/// <returns>A string representation of current AnnotationAuditInfo</returns>
-		//public override string ToString()
-		//{
-		//  return base.ToString();
-		//}
-		// CSLATODO: Check AnnotationAuditInfo.GetIdValue to assure that the ID returned is unique
-		/// <summary>
-		/// Overrides Base GetIdValue - Used internally by CSLA to determine equality
-		/// </summary>
-		/// <returns>A Unique ID for the current AnnotationAuditInfo</returns>
-		protected override object GetIdValue()
-		{
-			return MyAnnotationAuditInfoUnique; // Absolutely Unique ID
-		}
-		#endregion
-		#region Factory Methods
-		private static int _AnnotationAuditInfoUnique = 0;
-		private static int AnnotationAuditInfoUnique
-		{ get { return ++_AnnotationAuditInfoUnique; } }
-		private int _MyAnnotationAuditInfoUnique = AnnotationAuditInfoUnique;
-		public int MyAnnotationAuditInfoUnique // Absolutely Unique ID - Info
-		{ get { return _MyAnnotationAuditInfoUnique; } }
-		protected AnnotationAuditInfo()
-		{/* require use of factory methods */
-			AddToCache(this);
-		}
-		public void Dispose()
-		{
-			RemoveFromCache(this);
-			if (!_CacheByPrimaryKey.ContainsKey(AuditID.ToString())) return;
-			List<AnnotationAuditInfo> listAnnotationAuditInfo = _CacheByPrimaryKey[AuditID.ToString()]; // Get the list of items
-			while (listAnnotationAuditInfo.Contains(this)) listAnnotationAuditInfo.Remove(this); // Remove the item from the list
-			if (listAnnotationAuditInfo.Count == 0) // If there are no items left in the list
-				_CacheByPrimaryKey.Remove(AuditID.ToString()); // remove the list
-		}
-		public virtual AnnotationAudit Get()
-		{
-			return _Editable = AnnotationAudit.Get(_AuditID);
-		}
-		public static void Refresh(AnnotationAudit tmp)
-		{
-			string key = tmp.AuditID.ToString();
-			ConvertListToDictionary();
-			if (_CacheByPrimaryKey.ContainsKey(key))
-				foreach (AnnotationAuditInfo tmpInfo in _CacheByPrimaryKey[key])
-					tmpInfo.RefreshFields(tmp);
-		}
-		protected virtual void RefreshFields(AnnotationAudit tmp)
-		{
-			_AnnotationID = tmp.AnnotationID;
-			_ItemID = tmp.ItemID;
-			_TypeID = tmp.TypeID;
-			_RtfText = tmp.RtfText;
-			_SearchText = tmp.SearchText;
-			_Config = tmp.Config;
-			_DTS = tmp.DTS;
-			_UserID = tmp.UserID;
-			_DeleteStatus = tmp.DeleteStatus;
-			_AnnotationAuditInfoExtension.Refresh(this);
-			OnChange();// raise an event
-		}
-		public static AnnotationAuditInfo Get(long auditID)
-		{
-			//if (!CanGetObject())
-			//  throw new System.Security.SecurityException("User not authorized to view a AnnotationAudit");
-			try
-			{
-				AnnotationAuditInfo tmp = GetCachedByPrimaryKey(auditID);
-				if (tmp == null)
-				{
-					tmp = DataPortal.Fetch<AnnotationAuditInfo>(new PKCriteria(auditID));
-					AddToCache(tmp);
-				}
-				if (tmp.ErrorMessage == "No Record Found")
-				{
-					tmp.Dispose(); // Clean-up AnnotationAuditInfo
-					tmp = null;
-				}
-				return tmp;
-			}
-			catch (Exception ex)
-			{
-				throw new DbCslaException("Error on AnnotationAuditInfo.Get", ex);
-			}
-		}
-		#endregion
-		#region Data Access Portal
-		internal AnnotationAuditInfo(SafeDataReader dr)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AnnotationAuditInfo.Constructor", GetHashCode());
-			try
-			{
-				ReadData(dr);
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("AnnotationAuditInfo.Constructor", ex);
-				throw new DbCslaException("AnnotationAuditInfo.Constructor", ex);
-			}
-		}
-		[Serializable()]
-		protected class PKCriteria
-		{
-			private long _AuditID;
-			public long AuditID
-			{ get { return _AuditID; } }
-			public PKCriteria(long auditID)
-			{
-				_AuditID = auditID;
-			}
-		}
-		private void ReadData(SafeDataReader dr)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AnnotationAuditInfo.ReadData", GetHashCode());
-			try
-			{
-				_AuditID = dr.GetInt64("AuditID");
-				_AnnotationID = dr.GetInt32("AnnotationID");
-				_ItemID = dr.GetInt32("ItemID");
-				_TypeID = dr.GetInt32("TypeID");
-				_RtfText = dr.GetString("RtfText");
-				_SearchText = dr.GetString("SearchText");
-				_Config = dr.GetString("Config");
-				_DTS = dr.GetDateTime("DTS");
-				_UserID = dr.GetString("UserID");
-				_DeleteStatus = dr.GetInt32("DeleteStatus");
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("AnnotationAuditInfo.ReadData", ex);
-				_ErrorMessage = ex.Message;
-				throw new DbCslaException("AnnotationAuditInfo.ReadData", ex);
-			}
-		}
-		private void DataPortal_Fetch(PKCriteria criteria)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AnnotationAuditInfo.DataPortal_Fetch", GetHashCode());
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					ApplicationContext.LocalContext["cn"] = cn;
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "getAnnotationAudit";
-						cm.Parameters.AddWithValue("@AuditID", criteria.AuditID);
-						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-						{
-							if (!dr.Read())
-							{
-								_ErrorMessage = "No Record Found";
-								return;
-							}
-							ReadData(dr);
-						}
-					}
-					// removing of item only needed for local data portal
-					if (ApplicationContext.ExecutionLocation == ApplicationContext.ExecutionLocations.Client)
-						ApplicationContext.LocalContext.Remove("cn");
-				}
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("AnnotationAuditInfo.DataPortal_Fetch", ex);
-				_ErrorMessage = ex.Message;
-				throw new DbCslaException("AnnotationAuditInfo.DataPortal_Fetch", ex);
-			}
-		}
-		#endregion
-		// Standard Refresh
-		#region extension
-		AnnotationAuditInfoExtension _AnnotationAuditInfoExtension = new AnnotationAuditInfoExtension();
-		[Serializable()]
-		partial class AnnotationAuditInfoExtension : extensionBase { }
-		[Serializable()]
-		class extensionBase
-		{
-			// Default Refresh
-			public virtual void Refresh(AnnotationAuditInfo tmp) { }
-		}
-		#endregion
-	} // Class
-	#region Converter
-	internal class AnnotationAuditInfoConverter : ExpandableObjectConverter
-	{
-		public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
-		{
-			if (destType == typeof(string) && value is AnnotationAuditInfo)
-			{
-				// Return the ToString value
-				return ((AnnotationAuditInfo)value).ToString();
-			}
-			return base.ConvertTo(context, culture, value, destType);
-		}
-	}
-	#endregion
+    public delegate void AnnotationAuditInfoEvent(object sender);
+    /// <summary>
+    ///	AnnotationAuditInfo Generated by MyGeneration using the CSLA Object Mapping template
+    /// </summary>
+    [Serializable()]
+    [TypeConverter(typeof(AnnotationAuditInfoConverter))]
+    public partial class AnnotationAuditInfo : ReadOnlyBase<AnnotationAuditInfo>, IDisposable
+    {
+        public event AnnotationAuditInfoEvent Changed;
+        private void OnChange()
+        {
+            if (Changed != null) Changed(this);
+        }
+        #region Log4Net
+        private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        #endregion
+        #region Collection
+        private static List<AnnotationAuditInfo> _CacheList = new List<AnnotationAuditInfo>();
+        protected static void AddToCache(AnnotationAuditInfo annotationAuditInfo)
+        {
+            if (!_CacheList.Contains(annotationAuditInfo)) _CacheList.Add(annotationAuditInfo); // In AddToCache
+        }
+        protected static void RemoveFromCache(AnnotationAuditInfo annotationAuditInfo)
+        {
+            while (_CacheList.Contains(annotationAuditInfo)) _CacheList.Remove(annotationAuditInfo); // In RemoveFromCache
+        }
+        private static Dictionary<string, List<AnnotationAuditInfo>> _CacheByPrimaryKey = new Dictionary<string, List<AnnotationAuditInfo>>();
+        private static void ConvertListToDictionary()
+        {
+            while (_CacheList.Count > 0) // Move AnnotationAuditInfo(s) from temporary _CacheList to _CacheByPrimaryKey
+            {
+                AnnotationAuditInfo tmp = _CacheList[0]; // Get the first AnnotationAuditInfo
+                string pKey = tmp.AuditID.ToString();
+                if (!_CacheByPrimaryKey.ContainsKey(pKey))
+                {
+                    _CacheByPrimaryKey[pKey] = new List<AnnotationAuditInfo>(); // Add new list for PrimaryKey
+                }
+                _CacheByPrimaryKey[pKey].Add(tmp); // Add to Primary Key list
+                _CacheList.RemoveAt(0); // Remove the first AnnotationAuditInfo
+            }
+        }
+        internal static void AddList(AnnotationAuditInfoList lst)
+        {
+            foreach (AnnotationAuditInfo item in lst) AddToCache(item);
+        }
+        protected static AnnotationAuditInfo GetCachedByPrimaryKey(long auditID)
+        {
+            ConvertListToDictionary();
+            string key = auditID.ToString();
+            if (_CacheByPrimaryKey.ContainsKey(key)) return _CacheByPrimaryKey[key][0];
+            return null;
+        }
+        #endregion
+        #region Business Methods
+        private string _ErrorMessage = string.Empty;
+        public string ErrorMessage
+        {
+            get { return _ErrorMessage; }
+        }
+        protected AnnotationAudit _Editable;
+        private IVEHasBrokenRules HasBrokenRules
+        {
+            get
+            {
+                IVEHasBrokenRules hasBrokenRules = null;
+                if (_Editable != null)
+                    hasBrokenRules = _Editable.HasBrokenRules;
+                return hasBrokenRules;
+            }
+        }
+        private long _AuditID;
+        [System.ComponentModel.DataObjectField(true, true)]
+        public long AuditID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _AuditID;
+            }
+        }
+        private int _AnnotationID;
+        public int AnnotationID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _AnnotationID;
+            }
+        }
+        private int _ItemID;
+        public int ItemID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _ItemID;
+            }
+        }
+        private int _TypeID;
+        public int TypeID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _TypeID;
+            }
+        }
+        private string _RtfText = string.Empty;
+        public string RtfText
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _RtfText;
+            }
+        }
+        private string _SearchText = string.Empty;
+        public string SearchText
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _SearchText;
+            }
+        }
+        private string _Config = string.Empty;
+        public string Config
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _Config;
+            }
+        }
+        private DateTime _DTS = new DateTime();
+        public DateTime DTS
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _DTS;
+            }
+        }
+        private string _UserID = string.Empty;
+        public string UserID
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _UserID;
+            }
+        }
+        private int _DeleteStatus;
+        public int DeleteStatus
+        {
+            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+            get
+            {
+                return _DeleteStatus;
+            }
+        }
+        // CSLATODO: Replace base AnnotationAuditInfo.ToString function as necessary
+        /// <summary>
+        /// Overrides Base ToString
+        /// </summary>
+        /// <returns>A string representation of current AnnotationAuditInfo</returns>
+        //public override string ToString()
+        //{
+        //  return base.ToString();
+        //}
+        // CSLATODO: Check AnnotationAuditInfo.GetIdValue to assure that the ID returned is unique
+        /// <summary>
+        /// Overrides Base GetIdValue - Used internally by CSLA to determine equality
+        /// </summary>
+        /// <returns>A Unique ID for the current AnnotationAuditInfo</returns>
+        protected override object GetIdValue()
+        {
+            return MyAnnotationAuditInfoUnique; // Absolutely Unique ID
+        }
+        #endregion
+        #region Factory Methods
+        private static int _AnnotationAuditInfoUnique = 0;
+        private static int AnnotationAuditInfoUnique
+        { get { return ++_AnnotationAuditInfoUnique; } }
+        private int _MyAnnotationAuditInfoUnique = AnnotationAuditInfoUnique;
+        public int MyAnnotationAuditInfoUnique // Absolutely Unique ID - Info
+        { get { return _MyAnnotationAuditInfoUnique; } }
+        protected AnnotationAuditInfo()
+        {/* require use of factory methods */
+            AddToCache(this);
+        }
+        public void Dispose()
+        {
+            RemoveFromCache(this);
+            if (!_CacheByPrimaryKey.ContainsKey(AuditID.ToString())) return;
+            List<AnnotationAuditInfo> listAnnotationAuditInfo = _CacheByPrimaryKey[AuditID.ToString()]; // Get the list of items
+            while (listAnnotationAuditInfo.Contains(this)) listAnnotationAuditInfo.Remove(this); // Remove the item from the list
+            if (listAnnotationAuditInfo.Count == 0) // If there are no items left in the list
+                _CacheByPrimaryKey.Remove(AuditID.ToString()); // remove the list
+        }
+        public virtual AnnotationAudit Get()
+        {
+            return _Editable = AnnotationAudit.Get(_AuditID);
+        }
+        public static void Refresh(AnnotationAudit tmp)
+        {
+            string key = tmp.AuditID.ToString();
+            ConvertListToDictionary();
+            if (_CacheByPrimaryKey.ContainsKey(key))
+                foreach (AnnotationAuditInfo tmpInfo in _CacheByPrimaryKey[key])
+                    tmpInfo.RefreshFields(tmp);
+        }
+        protected virtual void RefreshFields(AnnotationAudit tmp)
+        {
+            _AnnotationID = tmp.AnnotationID;
+            _ItemID = tmp.ItemID;
+            _TypeID = tmp.TypeID;
+            _RtfText = tmp.RtfText;
+            _SearchText = tmp.SearchText;
+            _Config = tmp.Config;
+            _DTS = tmp.DTS;
+            _UserID = tmp.UserID;
+            _DeleteStatus = tmp.DeleteStatus;
+            _AnnotationAuditInfoExtension.Refresh(this);
+            OnChange();// raise an event
+        }
+        public static AnnotationAuditInfo Get(long auditID)
+        {
+            //if (!CanGetObject())
+            //  throw new System.Security.SecurityException("User not authorized to view a AnnotationAudit");
+            try
+            {
+                AnnotationAuditInfo tmp = GetCachedByPrimaryKey(auditID);
+                if (tmp == null)
+                {
+                    tmp = DataPortal.Fetch<AnnotationAuditInfo>(new PKCriteria(auditID));
+                    AddToCache(tmp);
+                }
+                if (tmp.ErrorMessage == "No Record Found")
+                {
+                    tmp.Dispose(); // Clean-up AnnotationAuditInfo
+                    tmp = null;
+                }
+                return tmp;
+            }
+            catch (Exception ex)
+            {
+                throw new DbCslaException("Error on AnnotationAuditInfo.Get", ex);
+            }
+        }
+        #endregion
+        #region Data Access Portal
+        internal AnnotationAuditInfo(SafeDataReader dr)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AnnotationAuditInfo.Constructor", GetHashCode());
+            try
+            {
+                ReadData(dr);
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("AnnotationAuditInfo.Constructor", ex);
+                throw new DbCslaException("AnnotationAuditInfo.Constructor", ex);
+            }
+        }
+        [Serializable()]
+        protected class PKCriteria
+        {
+            private long _AuditID;
+            public long AuditID
+            { get { return _AuditID; } }
+            public PKCriteria(long auditID)
+            {
+                _AuditID = auditID;
+            }
+        }
+        private void ReadData(SafeDataReader dr)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AnnotationAuditInfo.ReadData", GetHashCode());
+            try
+            {
+                _AuditID = dr.GetInt64("AuditID");
+                _AnnotationID = dr.GetInt32("AnnotationID");
+                _ItemID = dr.GetInt32("ItemID");
+                _TypeID = dr.GetInt32("TypeID");
+                _RtfText = dr.GetString("RtfText");
+                _SearchText = dr.GetString("SearchText");
+                _Config = dr.GetString("Config");
+                _DTS = dr.GetDateTime("DTS");
+                _UserID = dr.GetString("UserID");
+                _DeleteStatus = dr.GetInt32("DeleteStatus");
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("AnnotationAuditInfo.ReadData", ex);
+                _ErrorMessage = ex.Message;
+                throw new DbCslaException("AnnotationAuditInfo.ReadData", ex);
+            }
+        }
+        private void DataPortal_Fetch(PKCriteria criteria)
+        {
+            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] AnnotationAuditInfo.DataPortal_Fetch", GetHashCode());
+            try
+            {
+                using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+                {
+                    ApplicationContext.LocalContext["cn"] = cn;
+                    using (SqlCommand cm = cn.CreateCommand())
+                    {
+                        cm.CommandType = CommandType.StoredProcedure;
+                        cm.CommandText = "getAnnotationAudit";
+                        cm.Parameters.AddWithValue("@AuditID", criteria.AuditID);
+                        using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+                        {
+                            if (!dr.Read())
+                            {
+                                _ErrorMessage = "No Record Found";
+                                return;
+                            }
+                            ReadData(dr);
+                        }
+                    }
+                    // removing of item only needed for local data portal
+                    if (ApplicationContext.ExecutionLocation == ApplicationContext.ExecutionLocations.Client)
+                        ApplicationContext.LocalContext.Remove("cn");
+                }
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("AnnotationAuditInfo.DataPortal_Fetch", ex);
+                _ErrorMessage = ex.Message;
+                throw new DbCslaException("AnnotationAuditInfo.DataPortal_Fetch", ex);
+            }
+        }
+        #endregion
+        // Standard Refresh
+        #region extension
+        AnnotationAuditInfoExtension _AnnotationAuditInfoExtension = new AnnotationAuditInfoExtension();
+        [Serializable()]
+        partial class AnnotationAuditInfoExtension : extensionBase { }
+        [Serializable()]
+        class extensionBase
+        {
+            // Default Refresh
+            public virtual void Refresh(AnnotationAuditInfo tmp) { }
+        }
+        #endregion
+    } // Class
+    #region Converter
+    internal class AnnotationAuditInfoConverter : ExpandableObjectConverter
+    {
+        public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
+        {
+            if (destType == typeof(string) && value is AnnotationAuditInfo)
+            {
+                // Return the ToString value
+                return ((AnnotationAuditInfo)value).ToString();
+            }
+            return base.ConvertTo(context, culture, value, destType);
+        }
+    }
+    #endregion
 } // Namespace