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

Allow approval to work if no existing approved versions

Browse Source 
Try too set margins if bottom margin is undefined for MSWord section
Corrected comment
This commit is contained in:
Rich 2012-06-15 16:41:39 +00:00
parent 0927762693
commit 25db26519e
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -925,9 +925,12 @@ namespace VEPROMS
foreach (ApprovalProcedure ap in MyProcedures) //spin thru looking for updating current revision foreach (ApprovalProcedure ap in MyProcedures) //spin thru looking for updating current revision
{ {
RevisionInfo ric = RevisionInfo.GetCurrentByItemID(ap.ProcInfo.ItemID); RevisionInfo ric = RevisionInfo.GetCurrentByItemID(ap.ProcInfo.ItemID);
VersionInfo vi = ric.LatestVersion; if (ric != null)
if (ap.RevNumber == ric.RevisionNumber && nsi.IsApproved == 0 && vi.MyStage.IsApproved == 1) {
sb.AppendLine(string.Format("{0} - '{1}'", ap.ProcInfo.DisplayNumber, vi.MyStage.Name)); 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) if (sb.Length > 0)
{ {

14
PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
View File

@ -784,6 +784,20 @@ namespace VEPROMS.CSLA.Library
myDoc.PageSetup.LeftMargin = newLeft; myDoc.PageSetup.LeftMargin = newLeft;
myDoc.PageSetup.TopMargin = newTop; 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 else
{ {

4
PROMS/VEPROMS.CSLA.Library/Generated/Database.cs
View File

@ -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 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, 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); 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(); DataSet ds = new DataSet();
try try
{ {
da.Fill(ds); da.Fill(ds);
} }
catch (Exception ex) catch (Exception ex)
{ {