Modified to use newly created ProcedureInfo property PDFNumber
Fixed how new folder was created to assure ManualOrder value is not overwritten with null value and UserID column is populated with user id instead of “test”
This commit is contained in:
parent
493faf5f09
commit
1ad17cb080
@ -739,7 +739,7 @@ namespace Volian.Controls.Library
|
||||
if (ri.RevisionID < int.Parse(mip.Parent.Tag.ToString()))
|
||||
superceded = true;
|
||||
}
|
||||
vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ItemInfo.Get(ri.ItemID).DisplayNumber), ri.LatestVersion.PDF, superceded ? "Superceded" : "");
|
||||
vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName((ItemInfo.Get(ri.ItemID) as ProcedureInfo).PDFNumber), ri.LatestVersion.PDF, superceded ? "Superceded" : "");
|
||||
OnViewPDF(sender, args);
|
||||
// System.Diagnostics.Process pp = System.Diagnostics.Process.Start(GetDocPdf(ri, superceded));
|
||||
}
|
||||
@ -756,7 +756,7 @@ namespace Volian.Controls.Library
|
||||
}
|
||||
ItemInfo ii = ItemInfo.Get(ri.ItemID);
|
||||
ii.MyDocVersion.DocVersionConfig.SelectedSlave = ri.MyConfig.Applicability_Index;
|
||||
vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ii.DisplayNumber), ri.LatestVersion.PDF, superceded ? "Superceded" : "");
|
||||
vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName((ii as ProcedureInfo).PDFNumber), ri.LatestVersion.PDF, superceded ? "Superceded" : "");
|
||||
OnViewPDF(sender, args);
|
||||
// System.Diagnostics.Process pp = System.Diagnostics.Process.Start(GetDocPdf(ri, superceded));
|
||||
}
|
||||
@ -765,7 +765,7 @@ namespace Volian.Controls.Library
|
||||
MenuItem mi = sender as MenuItem;
|
||||
if (mi == null) return;
|
||||
RevisionInfo ri = mi.Tag as RevisionInfo;
|
||||
vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ItemInfo.Get(ri.ItemID).DisplayNumber + " Summary of Changes"), ri.LatestVersion.SummaryPDF, "");
|
||||
vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName((ItemInfo.Get(ri.ItemID) as ProcedureInfo).PDFNumber + " Summary of Changes"), ri.LatestVersion.SummaryPDF, "");
|
||||
OnViewPDF(sender, args);
|
||||
// System.Diagnostics.Process pps = System.Diagnostics.Process.Start(GetDocSummaryPdf(ri));
|
||||
}
|
||||
@ -776,7 +776,7 @@ namespace Volian.Controls.Library
|
||||
RevisionInfo ri = mi.Tag as RevisionInfo;
|
||||
ItemInfo ii = ItemInfo.Get(ri.ItemID);
|
||||
ii.MyDocVersion.DocVersionConfig.SelectedSlave = ri.MyConfig.Applicability_Index;
|
||||
vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ii.DisplayNumber + " Summary of Changes"), ri.LatestVersion.SummaryPDF, "");
|
||||
vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName((ii as ProcedureInfo).PDFNumber + " Summary of Changes"), ri.LatestVersion.SummaryPDF, "");
|
||||
OnViewPDF(sender, args);
|
||||
// System.Diagnostics.Process pps = System.Diagnostics.Process.Start(GetDocSummaryPdf(ri));
|
||||
}
|
||||
@ -1229,10 +1229,12 @@ namespace Volian.Controls.Library
|
||||
{
|
||||
int f1 = -1; // flag to allow user to cancel from dialog & then we remove it.
|
||||
string uniquename = _LastFolderInfo.UniqueChildName("New Folder");
|
||||
using (Folder folder = Folder.MakeFolder(parentfolder, parentfolder.MyConnection, uniquename, string.Empty, "Short Name", null, string.Empty, DateTime.Now, "Test"))
|
||||
using (Folder folder = Folder.MakeFolder(parentfolder, parentfolder.MyConnection, uniquename, string.Empty, "Short Name", null, string.Empty, DateTime.Now, VlnSettings.UserID))
|
||||
{
|
||||
ShowBrokenRules(folder.BrokenRulesCollection);
|
||||
SetLastValues(FolderInfo.Get(folder.FolderID));
|
||||
FolderInfo fi = FolderInfo.Get(folder.FolderID);
|
||||
folder.ManualOrder = fi.ManualOrder;
|
||||
SetLastValues(fi);
|
||||
if (OnNodeOpenProperty(this, new vlnTreePropertyEventArgs(uniquename, folder.FolderConfig)) == DialogResult.OK)
|
||||
{
|
||||
folder.Save();
|
||||
@ -1251,7 +1253,7 @@ namespace Volian.Controls.Library
|
||||
int myindex = SelectedNode.Index + ((newtype == MenuSelections.FolderAfter) ? 1 : 0);
|
||||
FolderInfo parfolderinfo = FolderInfo.Get(parentfolder.FolderID);
|
||||
double? myorder = parfolderinfo.NewManualOrder(myindex);
|
||||
using (Folder folder = Folder.MakeFolder(parentfolder.MyParent, parentfolder.MyConnection, uniquename, string.Empty, "Short Name", null, myorder, string.Empty, DateTime.Now, "Test"))
|
||||
using (Folder folder = Folder.MakeFolder(parentfolder.MyParent, parentfolder.MyConnection, uniquename, string.Empty, "Short Name", null, myorder, string.Empty, DateTime.Now, VlnSettings.UserID))
|
||||
{
|
||||
ShowBrokenRules(folder.BrokenRulesCollection);
|
||||
SetLastValues(FolderInfo.Get(folder.FolderID));
|
||||
|
Loading…
x
Reference in New Issue
Block a user