Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 3 Projects Releases Wiki Activity

use revision config data when making a new revision

Browse Source
This commit is contained in:
Rich 2012-02-15 20:39:49 +00:00
parent f46022bf8c
commit 435606b403
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PROMS/VEPROMS User Interface/dlgApproveProcedure.cs
View File

@ -908,11 +908,11 @@ namespace VEPROMS
ProcedureInfo pi = ap.ProcInfo; ProcedureInfo pi = ap.ProcInfo;
OnStatusUpdated(this, new ApprovalMessageArgs(string.Format("Processing {0}", pi.DisplayNumber))); OnStatusUpdated(this, new ApprovalMessageArgs(string.Format("Processing {0}", pi.DisplayNumber)));
RevisionInfo ric = RevisionInfo.GetCurrentByItemID(pi.ItemID); RevisionInfo ric = RevisionInfo.GetCurrentByItemID(pi.ItemID);
RevisionInfo rip = RevisionInfo.GetPreviousByItemID(pi.ItemID); // RevisionInfo rip = RevisionInfo.GetPreviousByItemID(pi.ItemID);
DateTime myDTS = pi.DTS; DateTime myDTS = pi.DTS;
if (ric != null && ap.RevNumber == ric.RevisionNumber && ric.LatestVersion.MyStage.IsApproved == 1) if (ric != null && ap.RevNumber == ric.RevisionNumber && ric.LatestVersion.MyStage.IsApproved == 1)
{ {
myDTS = rip.DTS; myDTS = ric.MyConfig.History_StartDate;
UpdateProcedureDTS(pi, myDTS); UpdateProcedureDTS(pi, myDTS);
} }
string summaryPDF = VlnSettings.TemporaryFolder + @"\MySummary.pdf"; string summaryPDF = VlnSettings.TemporaryFolder + @"\MySummary.pdf";
@ -927,7 +927,15 @@ namespace VEPROMS
fs.Close(); fs.Close();
Revision revision = Revision.GetByItemIDAndRevisionNumber(pi.ItemID, ap.RevNumber); Revision revision = Revision.GetByItemIDAndRevisionNumber(pi.ItemID, ap.RevNumber);
if (revision == null) if (revision == null)
revision = Revision.MakeRevision(pi.ItemID, RevType, ap.RevNumber, ap.RevDate, RevNote, "", DateTime.Now, Volian.Base.Library.VlnSettings.UserID); {
RevisionConfig cfg = new RevisionConfig();
cfg.History_StartDate = pi.DTS;
//cfg.Save();
revision = Revision.MakeRevision(pi.ItemID, RevType, ap.RevNumber, ap.RevDate, RevNote, cfg.ToString(), DateTime.Now, Volian.Base.Library.VlnSettings.UserID);
// revision.MyConfig.History_StartDate = pi.DTS;
// revision.MyConfig.Save();
// revision = revision.Save();
}
else if (revision.Notes != RevNote || revision.RevisionDate != ap.RevDate) else if (revision.Notes != RevNote || revision.RevisionDate != ap.RevDate)
{ {
revision.Notes = RevNote; revision.Notes = RevNote;