From 25db26519e51a55e40067d5df8fa291c3ddb2dea Mon Sep 17 00:00:00 2001
From: Rich <rmark@volian.com>
Date: Fri, 15 Jun 2012 16:41:39 +0000
Subject: [PATCH] Allow approval to work if no existing approved versions Try
 too set margins if bottom margin is undefined for MSWord section Corrected
 comment

---
 .../VEPROMS User Interface/dlgApproveProcedure.cs  |  9 ++++++---
 .../VEPROMS.CSLA.Library/Extension/DocumentExt.cs  | 14 ++++++++++++++
 PROMS/VEPROMS.CSLA.Library/Generated/Database.cs   |  4 ++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs
index 62daed4c..841d0a6c 100644
--- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs	
+++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs	
@@ -925,9 +925,12 @@ namespace VEPROMS
 			foreach (ApprovalProcedure ap in MyProcedures) //spin thru looking for updating current revision
 			{
 				RevisionInfo ric = RevisionInfo.GetCurrentByItemID(ap.ProcInfo.ItemID);
-				VersionInfo vi = ric.LatestVersion;
-				if (ap.RevNumber == ric.RevisionNumber && nsi.IsApproved == 0 && vi.MyStage.IsApproved == 1)
-					sb.AppendLine(string.Format("{0} - '{1}'", ap.ProcInfo.DisplayNumber, vi.MyStage.Name));
+				if (ric != null)
+				{
+					VersionInfo vi = ric.LatestVersion;
+					if (ap.RevNumber == ric.RevisionNumber && nsi.IsApproved == 0 && vi.MyStage.IsApproved == 1)
+						sb.AppendLine(string.Format("{0} - '{1}'", ap.ProcInfo.DisplayNumber, vi.MyStage.Name));
+				}
 			}
 			if (sb.Length > 0)
 			{
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
index f155ddb5..9dee1419 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
@@ -784,6 +784,20 @@ namespace VEPROMS.CSLA.Library
 					myDoc.PageSetup.LeftMargin = newLeft;
 					myDoc.PageSetup.TopMargin = newTop;
 				}
+				else
+				{
+					try
+					{
+						myDoc.PageSetup.BottomMargin = 0; // 11 * 72 - (newTop + newLength);
+						myDoc.PageSetup.RightMargin = newRight;
+						myDoc.PageSetup.LeftMargin = newLeft;
+						myDoc.PageSetup.TopMargin = newTop;
+					}
+					catch (Exception ex)
+					{
+						_MyLog.Error("Could not set margins", ex);
+					}
+				}
 			}
 			else
 			{
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs
index 312ad15c..06481f6b 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs
@@ -133,11 +133,11 @@ namespace VEPROMS.CSLA.Library
 			//			SqlDataAdapter da = new SqlDataAdapter("select name from sysdatabases where name like 'VEP%' order by name", cn);
 			//SqlDataAdapter da = new SqlDataAdapter("select name, case when object_id('[' + name + ']..Items') is null then 'Not PROMS' when object_id('[' + name + ']..Revisions') is not null then 'Approval' when object_id('[' + name + ']..ContentAudits') is not null then 'Change Manager' else 'Original' end functionality from sysdatabases where name not in ('master','model','msdb','tempdb') order by name", cn);
 			SqlDataAdapter da = new SqlDataAdapter("select name, 'Approval' functionality from sysdatabases where name not in ('master','model','msdb','tempdb') order by name", cn);
-			da.SelectCommand.CommandTimeout = 300; // 30 sec timeout
+			da.SelectCommand.CommandTimeout = 300; // 300 sec timeout
 			DataSet ds = new DataSet();
 			try
 			{
-				da.Fill(ds);
+			da.Fill(ds);
 			}
 			catch (Exception ex)
 			{