Compare commits
No commits in common. "8883ac6358b01e4c7f07d69124d98b87d61365ed" and "85f683371ca9dc17b467c4bad016b771c73cff91" have entirely different histories.
8883ac6358
...
85f683371c
@ -597,13 +597,6 @@ namespace VEPROMS.CSLA.Library
|
|||||||
//if (_RevisionInfoList != null)
|
//if (_RevisionInfoList != null)
|
||||||
// return _RevisionInfoList;
|
// return _RevisionInfoList;
|
||||||
RevisionInfoList tmp = DataPortal.Fetch<RevisionInfoList>(new ItemUnitCriteria(itemID, unitID));
|
RevisionInfoList tmp = DataPortal.Fetch<RevisionInfoList>(new ItemUnitCriteria(itemID, unitID));
|
||||||
|
|
||||||
foreach (var x in tmp)
|
|
||||||
{
|
|
||||||
x.LatestVersion.ApprovedXML = x.RevisionID.ToString();
|
|
||||||
x.LatestVersion.PDF = Encoding.ASCII.GetBytes(x.RevisionID.ToString());
|
|
||||||
x.LatestVersion.SummaryPDF = Encoding.ASCII.GetBytes(x.RevisionID.ToString());
|
|
||||||
}
|
|
||||||
RevisionInfo.AddList(tmp);
|
RevisionInfo.AddList(tmp);
|
||||||
tmp.AddEvents();
|
tmp.AddEvents();
|
||||||
//_RevisionInfoList = tmp;
|
//_RevisionInfoList = tmp;
|
||||||
|
@ -153,10 +153,6 @@ namespace VEPROMS.CSLA.Library
|
|||||||
CanReadProperty("PDF", true);
|
CanReadProperty("PDF", true);
|
||||||
return _PDF;
|
return _PDF;
|
||||||
}
|
}
|
||||||
set
|
|
||||||
{
|
|
||||||
_PDF = value;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
private byte[] _SummaryPDF;
|
private byte[] _SummaryPDF;
|
||||||
public byte[] SummaryPDF
|
public byte[] SummaryPDF
|
||||||
@ -167,10 +163,6 @@ namespace VEPROMS.CSLA.Library
|
|||||||
CanReadProperty("SummaryPDF", true);
|
CanReadProperty("SummaryPDF", true);
|
||||||
return _SummaryPDF;
|
return _SummaryPDF;
|
||||||
}
|
}
|
||||||
set
|
|
||||||
{
|
|
||||||
_SummaryPDF = value;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
private string _ApprovedXML;
|
private string _ApprovedXML;
|
||||||
public string ApprovedXML
|
public string ApprovedXML
|
||||||
@ -181,10 +173,6 @@ namespace VEPROMS.CSLA.Library
|
|||||||
CanReadProperty("ApprovedXML", true);
|
CanReadProperty("ApprovedXML", true);
|
||||||
return _ApprovedXML;
|
return _ApprovedXML;
|
||||||
}
|
}
|
||||||
set
|
|
||||||
{
|
|
||||||
_ApprovedXML = value;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
private DateTime _DTS = new DateTime();
|
private DateTime _DTS = new DateTime();
|
||||||
public DateTime DTS
|
public DateTime DTS
|
||||||
|
@ -1309,26 +1309,25 @@ namespace Volian.Controls.Library
|
|||||||
if (ri.LatestVersion.PDF != null)
|
if (ri.LatestVersion.PDF != null)
|
||||||
{
|
{
|
||||||
MenuItem mirp = mir.MenuItems.Add("View Procedure");
|
MenuItem mirp = mir.MenuItems.Add("View Procedure");
|
||||||
mirp.Tag = ri.RevisionID;
|
mirp.Tag = ri;
|
||||||
mirp.Click += new EventHandler(MultiUnitApprovedRevision_Click);
|
mirp.Click += new EventHandler(MultiUnitApprovedRevision_Click);
|
||||||
}
|
}
|
||||||
if (ri.LatestVersion.SummaryPDF != null)
|
if (ri.LatestVersion.SummaryPDF != null)
|
||||||
{
|
{
|
||||||
MenuItem mirs = mir.MenuItems.Add("View Summary of Changes");
|
MenuItem mirs = mir.MenuItems.Add("View Summary of Changes");
|
||||||
mirs.Tag = ri.RevisionID;
|
mirs.Tag = ri;
|
||||||
mirs.Click += new EventHandler(MultiUnitSummaryOfChanges_Click);
|
mirs.Click += new EventHandler(MultiUnitSummaryOfChanges_Click);
|
||||||
}
|
}
|
||||||
if (ri.LatestVersion.ApprovedXML != null && ri.LatestVersion.ApprovedXML != "")
|
if (ri.LatestVersion.ApprovedXML != null && ri.LatestVersion.ApprovedXML != "")
|
||||||
{
|
{
|
||||||
MenuItem miri = mir.MenuItems.Add("Create Procedure to Import");
|
MenuItem miri = mir.MenuItems.Add("Create Procedure to Import");
|
||||||
miri.Tag = ri.RevisionID;
|
miri.Tag = ri;
|
||||||
miri.Click += new EventHandler(ImportProcedure_Click);
|
miri.Click += new EventHandler(ImportProcedure_Click);
|
||||||
}
|
}
|
||||||
|
|
||||||
//end added jcb 20111031
|
//end added jcb 20111031
|
||||||
mv.Tag = lastApprovedRevisionID;
|
mv.Tag = lastApprovedRevisionID;
|
||||||
}
|
}
|
||||||
ril = null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public void AddNewNode(IVEDrillDownReadOnly o)
|
public void AddNewNode(IVEDrillDownReadOnly o)
|
||||||
@ -1420,8 +1419,7 @@ namespace Volian.Controls.Library
|
|||||||
|
|
||||||
void ImportProcedure_Click(object sender, EventArgs e)
|
void ImportProcedure_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
//RevisionInfo ri = (sender as MenuItem).Tag as RevisionInfo;
|
RevisionInfo ri = (sender as MenuItem).Tag as RevisionInfo;
|
||||||
RevisionInfo ri = RevisionInfo.Get(int.Parse((sender as MenuItem).Tag.ToString()));
|
|
||||||
RevisionConfig rc = ri.MyConfig as RevisionConfig;
|
RevisionConfig rc = ri.MyConfig as RevisionConfig;
|
||||||
// bug fix: B2016-183 - add the child's name (ex Unit 1) to the export file name for Parent/Child procedures.
|
// bug fix: B2016-183 - add the child's name (ex Unit 1) to the export file name for Parent/Child procedures.
|
||||||
int applIdx = rc.Applicability_Index;
|
int applIdx = rc.Applicability_Index;
|
||||||
@ -1461,8 +1459,7 @@ namespace Volian.Controls.Library
|
|||||||
bool superceded = false;
|
bool superceded = false;
|
||||||
MenuItem mi = sender as MenuItem;
|
MenuItem mi = sender as MenuItem;
|
||||||
if (mi == null) return;
|
if (mi == null) return;
|
||||||
//RevisionInfo ri = mi.Tag as RevisionInfo;
|
RevisionInfo ri = mi.Tag as RevisionInfo;
|
||||||
RevisionInfo ri = RevisionInfo.Get(int.Parse(mi.Tag.ToString()));
|
|
||||||
{
|
{
|
||||||
MenuItem mip = mi.Parent as MenuItem;
|
MenuItem mip = mi.Parent as MenuItem;
|
||||||
//B2021-086 Added the check for the last revision stage is an Approved stage
|
//B2021-086 Added the check for the last revision stage is an Approved stage
|
||||||
@ -1488,8 +1485,7 @@ namespace Volian.Controls.Library
|
|||||||
{
|
{
|
||||||
MenuItem mi = sender as MenuItem;
|
MenuItem mi = sender as MenuItem;
|
||||||
if (mi == null) return;
|
if (mi == null) return;
|
||||||
//RevisionInfo ri = mi.Tag as RevisionInfo;
|
RevisionInfo ri = mi.Tag as RevisionInfo;
|
||||||
RevisionInfo ri = RevisionInfo.Get(int.Parse(mi.Tag.ToString()));
|
|
||||||
ItemInfo ii = ItemInfo.Get(ri.ItemID);
|
ItemInfo ii = ItemInfo.Get(ri.ItemID);
|
||||||
ii.MyDocVersion.DocVersionConfig.SelectedSlave = ri.MyConfig.Applicability_Index;
|
ii.MyDocVersion.DocVersionConfig.SelectedSlave = ri.MyConfig.Applicability_Index;
|
||||||
vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ProcedureInfo.Get(ri.ItemID).PDFNumber + " Summary of Changes"), ri.LatestVersion.SummaryPDF, "");
|
vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ProcedureInfo.Get(ri.ItemID).PDFNumber + " Summary of Changes"), ri.LatestVersion.SummaryPDF, "");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user