diff --git a/PROMS/MyGeneration/csla_21/CSLA_Objects.csgen b/PROMS/MyGeneration/csla_21/CSLA_Objects.csgen
index 61305b52..56e40e50 100644
--- a/PROMS/MyGeneration/csla_21/CSLA_Objects.csgen
+++ b/PROMS/MyGeneration/csla_21/CSLA_Objects.csgen
@@ -4449,6 +4449,11 @@ private void vlnDataPortalFetch(string sPrefix,IColumns cols,string sql,bool get
sCheck2=FormatColumn("\r\n\t\t\t\t\t{member} = (value == null ? null : ({ctype})value.{!column});",column);
sCheck3=FormatColumn("({!member} == null ? {member} : ({ctype}){!member}.{!column}) != (value == null ? null : ({ctype})value.{!column})",column);
}
+ else
+ {
+ sCheck2=FormatColumn("\r\n\t\t\t\t\t{member} = value.{!column};// Update underlying data field",column);
+ sCheck3=FormatColumn("{!member} != value",column);
+ }
vlnProperty(RelObjType( column ) + (bInfo?"Info":"") ,sMember
,sProp,";"+DebugLine("20070501.4"),"",bReadOnly,column.IsInPrimaryKey,false,null,sCheck,sCheck2,sCheck3);
//if (sProp.StartsWith("My"))_refreshMine += string.Format("\t\t\t{0} = null;\r\n",sMember);
diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.cs b/PROMS/VEPROMS User Interface/frmSectionProperties.cs
index 7cd2929d..d17f1c3a 100644
--- a/PROMS/VEPROMS User Interface/frmSectionProperties.cs
+++ b/PROMS/VEPROMS User Interface/frmSectionProperties.cs
@@ -445,40 +445,40 @@ namespace VEPROMS
{
ProcessButtonClick(tiLibDoc, btnLibDocs);
}
- private void ppBtnCvrtToLibDoc_Click(object sender, EventArgs e)
- {
+ private void ppBtnCvrtToLibDoc_Click(object sender, EventArgs e)
+ {
// Double Check that this is not a step section, if so just return.
if (_isStepSection) return;
- // If current section is library document, user selected to convert to non-library document. If
- // this is the case, data from lib doc must be copied to new document and the section must point
- // to id.
- if (ppBtnCvrtToLibDoc.Text.IndexOf("Non") > 0) // convert to a 'non' library.
- {
- ItemInfo ii = ItemInfo.Get(_SectionConfig.MySection.ItemID);
- DocumentInfo doclibinfo = ii.MyContent.MyEntry.MyDocument;
+ // If current section is library document, user selected to convert to non-library document. If
+ // this is the case, data from lib doc must be copied to new document and the section must point
+ // to id.
+ if (ppBtnCvrtToLibDoc.Text.IndexOf("Non") > 0) // convert to a 'non' library.
+ {
+ ItemInfo ii = ItemInfo.Get(_SectionConfig.MySection.ItemID);
+ DocumentInfo doclibinfo = ii.MyContent.MyEntry.MyDocument;
- // if just one usage (this one), then just convert this to a non-library document. If there are more
- // than one usage, make a copy so that the rest of the usages still point to the library document.
- if (doclibinfo.DocumentEntryCount == 1)
- _SectionConfig.MySection.MyContent.MyEntry.MyDocument.LibTitle = null;
- else
- {
- // make new document with 'no' libtitle - use libtitle for the doc title. Then link this
- // to the item...
- Document doc = Document.MakeDocument(null, doclibinfo.DocContent,doclibinfo.DocAscii,doclibinfo.Config,doclibinfo.DocPdf);
- _SectionConfig.MySection.MyContent.MyEntry.MyDocument = doc;
- }
- ppCmbxLibDoc.Items.Clear();
- ppCmbxLibDoc.WatermarkEnabled = true;
- ppBtnCvrtToLibDoc.Text = "Convert this to a Library Document";
- superTooltip1.SetSuperTooltip(this.ppBtnCvrtToLibDoc, new DevComponents.DotNetBar.SuperTooltipInfo("Convert To Library Document button", "", "This button will convert the current section to a library document, allowing it t" +
- "o be shared with other procedures.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(250, 76)));
+ // if just one usage (this one), then just convert this to a non-library document. If there are more
+ // than one usage, make a copy so that the rest of the usages still point to the library document.
+ if (doclibinfo.DocumentEntryCount == 1)
+ _SectionConfig.MySection.MyContent.MyEntry.MyDocument.LibTitle = null;
+ else
+ {
+ // make new document with 'no' libtitle - use libtitle for the doc title. Then link this
+ // to the item...
+ Document doc = Document.MakeDocument(null, doclibinfo.DocContent, doclibinfo.DocAscii, doclibinfo.Config, doclibinfo.DocPdf);
+ _SectionConfig.MySection.MyContent.MyEntry.MyDocument = doc;
+ }
+ ppCmbxLibDoc.Items.Clear();
+ ppCmbxLibDoc.WatermarkEnabled = true;
+ ppBtnCvrtToLibDoc.Text = "Convert this to a Library Document";
+ superTooltip1.SetSuperTooltip(this.ppBtnCvrtToLibDoc, new DevComponents.DotNetBar.SuperTooltipInfo("Convert To Library Document button", "", "This button will convert the current section to a library document, allowing it t" +
+ "o be shared with other procedures.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(250, 76)));
return;
- }
- // If current section is not a library document, it is either a new section or the user selected the
+ }
+ // If current section is not a library document, it is either a new section or the user selected the
// button to convert it to a library document. Check for this, if new, just attach to document.
- else if (_SectionConfig.MySection.MyContent.MyEntry.MyDocument == null)
- {
+ else if (_SectionConfig.MySection.MyContent.MyEntry.MyDocument == null)
+ {
// if nothing was selected, give message & return
if (ppCmbxLibDoc.SelectedIndex == -1)
{
@@ -495,57 +495,57 @@ namespace VEPROMS
break;
}
}
- if (docid==-1)return;
+ if (docid == -1) return;
using (Document dc = Document.Get(docid))
{
_SectionConfig.MySection.MyContent.MyEntry.MyDocument = dc;
}
}
- else
+ else
// if converting to library document, just put 'text' into the 'LibTitle' property (that's what flags
- // it to be a library document.
+ // it to be a library document.
{
- _SectionConfig.MySection.MyContent.MyEntry.MyDocument.LibTitle = _SectionConfig.MySection.MyContent.Text;
- // Save now so that it shows up in the library document list in the ppcmbxlibdoc (combo box
+ _SectionConfig.MySection.MyContent.MyEntry.MyDocument.LibTitle = _SectionConfig.MySection.MyContent.Text;
+ // Save now so that it shows up in the library document list in the ppcmbxlibdoc (combo box
// listing lib docs that is regenerated in ppCmbxLibDocFill)
- _SectionConfig.MySection.MyContent.MyEntry.MyDocument.Save();
+ _SectionConfig.MySection.MyContent.MyEntry.MyDocument.Save();
ppCmbxLibDocFill();
- ppCmbxLibDoc.Enabled = false;
- }
+ ppCmbxLibDoc.Enabled = false;
+ }
ppBtnCvrtToLibDoc.Text = "Convert this Section To A Non-Library Document";
lblLibraryDocument.Text = "Library Document";
superTooltip1.SetSuperTooltip(this.ppBtnCvrtToLibDoc, new DevComponents.DotNetBar.SuperTooltipInfo("Convert To Non-Library Document", "", "This button will convert the current section from a library document to a non-library document",
null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(250, 76)));
- }
+ }
- private void ppCmbxLibDoc_SelectedIndexChanged(object sender, EventArgs e)
- {
- if (_Initializing) return;
+ private void ppCmbxLibDoc_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (_Initializing) return;
// first check if this is a 'new' section - if so, then just return.
if (_SectionConfig.MySection.MyContent.MyEntry == null) return;
- // see if this was NOT a library document. If it is not a library document, ask the user if
- // it should be linked, thus losing the original text/data.
- if (_SectionConfig.MySection.MyContent.MyEntry.MyDocument != null && !(_SectionConfig.MySection.MyContent.MyEntry.MyDocument.LibTitle != ""))
- {
+ // see if this was NOT a library document. If it is not a library document, ask the user if
+ // it should be linked, thus losing the original text/data.
+ if (_SectionConfig.MySection.MyContent.MyEntry.MyDocument != null && !(_SectionConfig.MySection.MyContent.MyEntry.MyDocument.LibTitle != ""))
+ {
_SectionConfig.MySection.MyContent.MyEntry.MyDocument = Document.New();
- if (ppCmbxLibDoc.SelectedIndex > -1)
- {
- if (MessageBox.Show("Linking to this library document will cause loss of data to this section. Do you want to continue?", "Link", MessageBoxButtons.YesNo) == DialogResult.Yes)
- {
- _DocumentToDelete = _SectionConfig.MySection.MyContent.MyEntry.MyDocument;
- DocumentInfoList LibDocList = DocumentInfoList.GetLibraries(true);
- _SectionConfig.MySection.MyContent.MyEntry.MyDocument = Document.Get(LibDocList[ppCmbxLibDoc.SelectedIndex].DocID);
+ if (ppCmbxLibDoc.SelectedIndex > -1)
+ {
+ if (MessageBox.Show("Linking to this library document will cause loss of data to this section. Do you want to continue?", "Link", MessageBoxButtons.YesNo) == DialogResult.Yes)
+ {
+ _DocumentToDelete = _SectionConfig.MySection.MyContent.MyEntry.MyDocument;
+ DocumentInfoList LibDocList = DocumentInfoList.GetLibraries(true);
+ _SectionConfig.MySection.MyContent.MyEntry.MyDocument = Document.Get(LibDocList[ppCmbxLibDoc.SelectedIndex].DocID);
ppBtnCvrtToLibDoc.Enabled = true;
- }
- else
- {
- ppCmbxLibDoc.SelectedIndex = -1;
+ }
+ else
+ {
+ ppCmbxLibDoc.SelectedIndex = -1;
ppBtnCvrtToLibDoc.Enabled = false;
- }
- }
-
- }
+ }
+ }
+
+ }
//else if (_SectionConfig.MySection.MyContent.MyEntry.MyDocument == null)
//{
// // was creating a new document & selected to connect it to a libdoc
@@ -553,12 +553,19 @@ namespace VEPROMS
//}
else
{
- // it already is a library document, just change usages...
- DocumentInfoList LibDocList = DocumentInfoList.GetLibraries(true);
- _SectionConfig.MySection.MyContent.MyEntry.MyDocument = Document.Get(LibDocList[ppCmbxLibDoc.SelectedIndex].DocID);
- ppBtnCvrtToLibDoc.Enabled = true;
- }
- }
+ // it already is a library document, just change usages...
+ DocumentInfoList LibDocList = DocumentInfoList.GetLibraries(true);
+ if (ppCmbxLibDoc.SelectedIndex >= 0 && ppCmbxLibDoc.SelectedIndex < LibDocList.Count)
+ {
+ _SectionConfig.MySection.MyContent.MyEntry.MyDocument = Document.Get(LibDocList[ppCmbxLibDoc.SelectedIndex].DocID);
+ ppBtnCvrtToLibDoc.Enabled = true;
+ }
+ else
+ {
+ throw new Exception(string.Format("Index Out Of Range Index = {0}, Count = {1}", ppCmbxLibDoc.SelectedIndex, LibDocList.Count));
+ }
+ }
+ }
#endregion
#region View Settings tab
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Annotation.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Annotation.cs
index 84e41aea..9f8118d7 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Annotation.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Annotation.cs
@@ -135,6 +135,7 @@ namespace VEPROMS.CSLA.Library
if (_MyItem != value)
{
_MyItem = value;
+ _ItemID = value.ItemID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -167,6 +168,7 @@ namespace VEPROMS.CSLA.Library
if (_MyAnnotationType != value)
{
_MyAnnotationType = value;
+ _TypeID = value.TypeID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeAnnotation.cs b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeAnnotation.cs
index ea0b6b88..6ac53f33 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeAnnotation.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeAnnotation.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyItem != value)
{
_MyItem = value;
+ _ItemID = value.ItemID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Assignment.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Assignment.cs
index 867bfa4f..55d14b1d 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Assignment.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Assignment.cs
@@ -136,6 +136,7 @@ namespace VEPROMS.CSLA.Library
if (_MyGroup != value)
{
_MyGroup = value;
+ _GID = value.GID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -168,6 +169,7 @@ namespace VEPROMS.CSLA.Library
if (_MyRole != value)
{
_MyRole = value;
+ _RID = value.RID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -200,6 +202,7 @@ namespace VEPROMS.CSLA.Library
if (_MyFolder != value)
{
_MyFolder = value;
+ _FolderID = value.FolderID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Association.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Association.cs
index 9214082e..e09ae16b 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Association.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Association.cs
@@ -145,6 +145,7 @@ namespace VEPROMS.CSLA.Library
if (_MyDocVersion != value)
{
_MyDocVersion = value;
+ _VersionID = value.VersionID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -177,6 +178,7 @@ namespace VEPROMS.CSLA.Library
if (_MyROFst != value)
{
_MyROFst = value;
+ _ROFstID = value.ROFstID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ConnectionFolder.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ConnectionFolder.cs
index b7a586f2..2f246e6b 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ConnectionFolder.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ConnectionFolder.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyParent != value)
{
_MyParent = value;
+ _ParentID = value.FolderID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ContentPart.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ContentPart.cs
index 43352eaa..ce9a2040 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ContentPart.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ContentPart.cs
@@ -75,6 +75,7 @@ namespace VEPROMS.CSLA.Library
if (_MyItem != value)
{
_MyItem = value;
+ _ItemID = value.ItemID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ContentRoUsage.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ContentRoUsage.cs
index f117f706..4ec818b0 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ContentRoUsage.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ContentRoUsage.cs
@@ -172,6 +172,7 @@ namespace VEPROMS.CSLA.Library
if (_MyRODb != value)
{
_MyRODb = value;
+ _RODbID = value.RODbID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ContentTransition.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ContentTransition.cs
index c63efaed..39f25ac6 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ContentTransition.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ContentTransition.cs
@@ -91,6 +91,7 @@ namespace VEPROMS.CSLA.Library
if (_MyItemToID != value)
{
_MyItemToID = value;
+ _ToID = value.ItemID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -123,6 +124,7 @@ namespace VEPROMS.CSLA.Library
if (_MyItemRangeID != value)
{
_MyItemRangeID = value;
+ _RangeID = value.ItemID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Detail.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Detail.cs
index 9b532b6d..753b530e 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Detail.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Detail.cs
@@ -134,6 +134,7 @@ namespace VEPROMS.CSLA.Library
if (_MyContent != value)
{
_MyContent = value;
+ _ContentID = value.ContentID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/DocVersion.cs b/PROMS/VEPROMS.CSLA.Library/Generated/DocVersion.cs
index d90eb617..250fcb67 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/DocVersion.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/DocVersion.cs
@@ -149,6 +149,7 @@ namespace VEPROMS.CSLA.Library
if (_MyFolder != value)
{
_MyFolder = value;
+ _FolderID = value.FolderID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionAssociation.cs b/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionAssociation.cs
index bc257811..523c265d 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionAssociation.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionAssociation.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyROFst != value)
{
_MyROFst = value;
+ _ROFstID = value.ROFstID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Entry.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Entry.cs
index def95910..572434da 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Entry.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Entry.cs
@@ -142,6 +142,7 @@ namespace VEPROMS.CSLA.Library
if (_MyDocument != value)
{
_MyDocument = value;
+ _DocID = value.DocID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Figure.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Figure.cs
index 85aa46d0..cb98761b 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Figure.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Figure.cs
@@ -145,6 +145,7 @@ namespace VEPROMS.CSLA.Library
if (_MyROFst != value)
{
_MyROFst = value;
+ _ROFstID = value.ROFstID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -177,6 +178,7 @@ namespace VEPROMS.CSLA.Library
if (_MyROImage != value)
{
_MyROImage = value;
+ _ImageID = value.ImageID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Folder.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Folder.cs
index e825ac5d..b5895d66 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Folder.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Folder.cs
@@ -178,6 +178,7 @@ namespace VEPROMS.CSLA.Library
if (_MyParent != value)
{
_MyParent = value;
+ _ParentID = value.FolderID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -210,6 +211,7 @@ namespace VEPROMS.CSLA.Library
if (_MyConnection != value)
{
_MyConnection = value;
+ _DBID = value.DBID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/FolderAssignment.cs b/PROMS/VEPROMS.CSLA.Library/Generated/FolderAssignment.cs
index 815d67c7..113def44 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/FolderAssignment.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/FolderAssignment.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyGroup != value)
{
_MyGroup = value;
+ _GID = value.GID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -120,6 +121,7 @@ namespace VEPROMS.CSLA.Library
if (_MyRole != value)
{
_MyRole = value;
+ _RID = value.RID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Format.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Format.cs
index 1e32482c..9cb8eb26 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Format.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Format.cs
@@ -189,6 +189,7 @@ namespace VEPROMS.CSLA.Library
if (_MyParent != value)
{
_MyParent = value;
+ _ParentID = value.FormatID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/FormatDocVersion.cs b/PROMS/VEPROMS.CSLA.Library/Generated/FormatDocVersion.cs
index be9a2964..52008687 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/FormatDocVersion.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/FormatDocVersion.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyFolder != value)
{
_MyFolder = value;
+ _FolderID = value.FolderID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/FormatFolder.cs b/PROMS/VEPROMS.CSLA.Library/Generated/FormatFolder.cs
index 6afe58b2..c9ffe9d8 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/FormatFolder.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/FormatFolder.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyParent != value)
{
_MyParent = value;
+ _ParentID = value.FolderID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -120,6 +121,7 @@ namespace VEPROMS.CSLA.Library
if (_MyConnection != value)
{
_MyConnection = value;
+ _DBID = value.DBID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/GroupAssignment.cs b/PROMS/VEPROMS.CSLA.Library/Generated/GroupAssignment.cs
index 1cb1cbd2..a881cfce 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/GroupAssignment.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/GroupAssignment.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyRole != value)
{
_MyRole = value;
+ _RID = value.RID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -120,6 +121,7 @@ namespace VEPROMS.CSLA.Library
if (_MyFolder != value)
{
_MyFolder = value;
+ _FolderID = value.FolderID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/GroupMembership.cs b/PROMS/VEPROMS.CSLA.Library/Generated/GroupMembership.cs
index 4d1444db..2ce6dfef 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/GroupMembership.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/GroupMembership.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyUser != value)
{
_MyUser = value;
+ _UID = value.UID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs
index 3d56b735..ad500eaf 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs
@@ -239,6 +239,7 @@ namespace VEPROMS.CSLA.Library
if (_MyContent != value)
{
_MyContent = value;
+ _ContentID = value.ContentID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ItemAnnotation.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ItemAnnotation.cs
index 147e9387..1b574d39 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ItemAnnotation.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ItemAnnotation.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyAnnotationType != value)
{
_MyAnnotationType = value;
+ _TypeID = value.TypeID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ItemDocVersion.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ItemDocVersion.cs
index fde9e370..cd3ef85b 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ItemDocVersion.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ItemDocVersion.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyFolder != value)
{
_MyFolder = value;
+ _FolderID = value.FolderID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_RangeID.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_RangeID.cs
index aa0bdb74..f71c3cc9 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_RangeID.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_RangeID.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyContent != value)
{
_MyContent = value;
+ _FromID = value.ContentID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -123,6 +124,7 @@ namespace VEPROMS.CSLA.Library
if (_MyItemToID != value)
{
_MyItemToID = value;
+ _ToID = value.ItemID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_ToID.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_ToID.cs
index 6102281e..768764e7 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_ToID.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_ToID.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyContent != value)
{
_MyContent = value;
+ _FromID = value.ContentID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -120,6 +121,7 @@ namespace VEPROMS.CSLA.Library
if (_MyItemRangeID != value)
{
_MyItemRangeID = value;
+ _RangeID = value.ItemID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Membership.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Membership.cs
index 2988e2f9..283abe40 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Membership.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Membership.cs
@@ -135,6 +135,7 @@ namespace VEPROMS.CSLA.Library
if (_MyUser != value)
{
_MyUser = value;
+ _UID = value.UID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -167,6 +168,7 @@ namespace VEPROMS.CSLA.Library
if (_MyGroup != value)
{
_MyGroup = value;
+ _GID = value.GID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Part.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Part.cs
index 34997d24..8ac6e454 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Part.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Part.cs
@@ -154,6 +154,7 @@ namespace VEPROMS.CSLA.Library
if (_MyItem != value)
{
_MyItem = value;
+ _ItemID = value.ItemID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Permission.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Permission.cs
index b8980ca4..0c81503b 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Permission.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Permission.cs
@@ -134,6 +134,7 @@ namespace VEPROMS.CSLA.Library
if (_MyRole != value)
{
_MyRole = value;
+ _RID = value.RID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/RODbRoUsage.cs b/PROMS/VEPROMS.CSLA.Library/Generated/RODbRoUsage.cs
index 7cb95493..ee4242af 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/RODbRoUsage.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/RODbRoUsage.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyContent != value)
{
_MyContent = value;
+ _ContentID = value.ContentID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ROFst.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ROFst.cs
index 51879066..4adf618f 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ROFst.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ROFst.cs
@@ -170,6 +170,7 @@ namespace VEPROMS.CSLA.Library
if (_MyRODb != value)
{
_MyRODb = value;
+ _RODbID = value.RODbID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ROFstAssociation.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ROFstAssociation.cs
index 98e759ba..92eece82 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ROFstAssociation.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ROFstAssociation.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyDocVersion != value)
{
_MyDocVersion = value;
+ _VersionID = value.VersionID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ROFstFigure.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ROFstFigure.cs
index d915d72f..1e101d73 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ROFstFigure.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ROFstFigure.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyROImage != value)
{
_MyROImage = value;
+ _ImageID = value.ImageID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ROImage.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ROImage.cs
index 4e9ace9c..d5ff7174 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ROImage.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ROImage.cs
@@ -157,6 +157,7 @@ namespace VEPROMS.CSLA.Library
if (_MyRODb != value)
{
_MyRODb = value;
+ _RODbID = value.RODbID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ROImageFigure.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ROImageFigure.cs
index 2c10c46d..577fb779 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ROImageFigure.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ROImageFigure.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyROFst != value)
{
_MyROFst = value;
+ _ROFstID = value.ROFstID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/RoUsage.cs b/PROMS/VEPROMS.CSLA.Library/Generated/RoUsage.cs
index 78cd4a02..60dad22b 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/RoUsage.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/RoUsage.cs
@@ -135,6 +135,7 @@ namespace VEPROMS.CSLA.Library
if (_MyContent != value)
{
_MyContent = value;
+ _ContentID = value.ContentID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -251,6 +252,7 @@ namespace VEPROMS.CSLA.Library
if (_MyRODb != value)
{
_MyRODb = value;
+ _RODbID = value.RODbID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/RoleAssignment.cs b/PROMS/VEPROMS.CSLA.Library/Generated/RoleAssignment.cs
index 80f06fe7..71ede263 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/RoleAssignment.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/RoleAssignment.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyGroup != value)
{
_MyGroup = value;
+ _GID = value.GID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -120,6 +121,7 @@ namespace VEPROMS.CSLA.Library
if (_MyFolder != value)
{
_MyFolder = value;
+ _FolderID = value.FolderID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Transition.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Transition.cs
index fd34d15c..bae56bfc 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Transition.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Transition.cs
@@ -136,6 +136,7 @@ namespace VEPROMS.CSLA.Library
if (_MyContent != value)
{
_MyContent = value;
+ _FromID = value.ContentID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -171,6 +172,7 @@ namespace VEPROMS.CSLA.Library
if (_MyItemToID != value)
{
_MyItemToID = value;
+ _ToID = value.ItemID;// Update underlying data field
PropertyHasChanged();
}
}
@@ -203,6 +205,7 @@ namespace VEPROMS.CSLA.Library
if (_MyItemRangeID != value)
{
_MyItemRangeID = value;
+ _RangeID = value.ItemID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/UserMembership.cs b/PROMS/VEPROMS.CSLA.Library/Generated/UserMembership.cs
index 0ce83778..e4146195 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/UserMembership.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/UserMembership.cs
@@ -88,6 +88,7 @@ namespace VEPROMS.CSLA.Library
if (_MyGroup != value)
{
_MyGroup = value;
+ _GID = value.GID;// Update underlying data field
PropertyHasChanged();
}
}
diff --git a/PROMS/Volian.Controls.Library/DisplayBookMarks.cs b/PROMS/Volian.Controls.Library/DisplayBookMarks.cs
index b8e67154..a6faaaa9 100644
--- a/PROMS/Volian.Controls.Library/DisplayBookMarks.cs
+++ b/PROMS/Volian.Controls.Library/DisplayBookMarks.cs
@@ -113,7 +113,8 @@ namespace Volian.Controls.Library
private void lbxBookMarks_Click(object sender, EventArgs e)
{
MostRecentItem itm = lbxBookMarks.SelectedValue as MostRecentItem;
- MyDisplayTabControl.OpenItem(itm.MyItemInfo);
+ if(itm != null)
+ MyDisplayTabControl.OpenItem(itm.MyItemInfo);
}
#endregion
}
diff --git a/PROMS/Volian.Controls.Library/StepItem.cs b/PROMS/Volian.Controls.Library/StepItem.cs
index 24f19c5a..2391e87b 100644
--- a/PROMS/Volian.Controls.Library/StepItem.cs
+++ b/PROMS/Volian.Controls.Library/StepItem.cs
@@ -372,6 +372,16 @@ namespace Volian.Controls.Library
get { return new Point(Location.X + lblTab.Left, Location.Y); }
set { Location = new Point(value.X - lblTab.Left, value.Y); }
}
+ private int _RTBMargin = 3;
+ ///
+ /// Margin between the StepItem and the StepRTB. Appears on the Right.
+ /// Will allow space to draw a Change Bar on the right side of the StepItem.
+ ///
+ public int RTBMargin
+ {
+ get { return _RTBMargin; }
+ set { _RTBMargin = value; }
+ }
///
/// Width of the Tab and RTB
///
@@ -380,7 +390,7 @@ namespace Volian.Controls.Library
get { return Width - lblTab.Left; }
set
{
- Width = value + lblTab.Left;
+ Width = RTBMargin + value + lblTab.Left;
}
}
///
@@ -430,7 +440,7 @@ namespace Volian.Controls.Library
lblTab.Width = tabString.Length * 8 * MyStepPanel.DPI / 96;// Adjust width for DPI
Invalidate();
_MyStepRTB.Left = lblTab.Left + lblTab.Width;// +2;
- _MyStepRTB.Width = Width - _MyStepRTB.Left;
+ _MyStepRTB.Width = Width - _MyStepRTB.Left - RTBMargin;
_TabFormat = value; // tabString;
}
}