From 61fcf176248584e3414b864e7749e8b93647a24b Mon Sep 17 00:00:00 2001 From: John Date: Tue, 20 Nov 2012 16:07:56 +0000 Subject: [PATCH] =?UTF-8?q?B2012-315=20=E2=80=93=20fixed=20problem=20appro?= =?UTF-8?q?ving=20a=20new=20procedure=20added=20a=20null=20reference=20che?= =?UTF-8?q?ck?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/VEPROMS User Interface/dlgApproveProcedure.cs | 6 +++++- PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs index c43c734d..a047597c 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs @@ -641,7 +641,11 @@ namespace VEPROMS RevNumber = proc.ProcedureConfig.Print_Rev == string.Empty ? "0" : proc.ProcedureConfig.Print_Rev; //AppRevDate Change //DateTime revdate; - RevDate = DateTime.Parse(proc.ProcedureConfig.Print_RevDate); + string sRevDate = proc.ProcedureConfig.Print_RevDate; + if (sRevDate == string.Empty) + sRevDate = DateTime.Now.ToString("M/d/y"); + RevDate = DateTime.Parse(sRevDate); + //RevDate = DateTime.Parse(proc.ProcedureConfig.Print_RevDate); //if (print_revdate == string.Empty && DateTime.TryParse(RevNumber, out revdate)) // ; //else diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs index 72678e87..ac0c5988 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs @@ -658,7 +658,7 @@ namespace VEPROMS.CSLA.Library { get { - if (this.RevisionVersions.Count == 0) return null; + if (this.RevisionVersions == null || this.RevisionVersions.Count == 0) return null; VersionInfo latest = this.RevisionVersions[0]; foreach (VersionInfo vi in this.RevisionVersions) {