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

Browse Source
This commit is contained in:
Kathy Ruffing
2012-10-26 10:18:28 +00:00
parent 690ca80ee8
commit 1966e05e01
3 changed files with 184 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -639,13 +639,14 @@ namespace VEPROMS
{
ProcInfo = proc;
RevNumber = proc.ProcedureConfig.Print_Rev == string.Empty ? "0" : proc.ProcedureConfig.Print_Rev;
DateTime revdate;
string print_revdate = proc.ProcedureConfig.Print_RevDate;
if (print_revdate == string.Empty && DateTime.TryParse(RevNumber, out revdate))
;
else
revdate = DateTime.TryParse(proc.ProcedureConfig.Print_RevDate.Replace("-","/").Replace("00/","01/"), out revdate) ? revdate : DateTime.Now;
RevDate = revdate;
//AppRevDate Change
//DateTime revdate;
//string print_revdate = proc.ProcedureConfig.Print_RevDate;
//if (print_revdate == string.Empty && DateTime.TryParse(RevNumber, out revdate))
// ;
//else
// revdate = DateTime.TryParse(proc.ProcedureConfig.Print_RevDate.Replace("-","/").Replace("00/","01/"), out revdate) ? revdate : DateTime.Now;
//RevDate = revdate;
}
}
public class ApprovalMessageArgs : EventArgs
@@ -988,7 +989,7 @@ namespace VEPROMS
// Moved to end so that Item and Content are saved at the same time
//UpdateProcedureConfig(pi, ap.RevNumber, ap.RevDate, myDTS);
string waterMark = Stage.Get(RevStage).IsApproved > 0 ? null : Stage.Get(RevStage).Name;
frmPDFStatusForm frm = new frmPDFStatusForm(pi, ap.RevNumber, ap.RevDate.ToString("MM/dd/yyyy"), waterMark, false, false, ViewPDF, true, VlnSettings.TemporaryFolder, new ChangeBarDefinition(pi.MyDocVersion.MyConfig as DocVersionConfig, pi.ActiveFormat), pdfTmp, location);
frmPDFStatusForm frm = new frmPDFStatusForm(pi, ap.RevNumber, /* revdate change: ap.RevDate.ToString("MM/dd/yyyy") ,*/ waterMark, false, false, ViewPDF, true, VlnSettings.TemporaryFolder, new ChangeBarDefinition(pi.MyDocVersion.MyConfig as DocVersionConfig, pi.ActiveFormat), pdfTmp, location);
frm.AllowAllWatermarks = true;
frm.CloseWhenDone = !ViewPDF;
frm.ShowDialog();
@@ -1124,7 +1125,8 @@ namespace VEPROMS
ProcedureConfig pc = procedureInfo.MyConfig as ProcedureConfig;
if (pc == null) return;
pc.Print_Rev = revNumber;
pc.Print_RevDate = revDate.ToString();
//AppRevDate Change
//pc.Print_RevDate = revDate.ToString();
using (Item itm = Item.Get(procedureInfo.ItemID))
{
itm.MyContent.Config = pc.ToString();