From a99d33e0658a387a5597346d5300321f40cfcd1e Mon Sep 17 00:00:00 2001 From: Rich Date: Mon, 20 Jan 2014 04:22:22 +0000 Subject: [PATCH] Modified getRevisionsByItemIDandUnitID and getRevisionsByItemID stored procedures Add changes to Byron/Braidwood formats --- PROMS/DataLoader/PROMSFixes.Sql | 40 ++++++++++++++++++++++++++++ PROMS/fmtxml/PlantSpecific_ByrBwd.cs | 11 +++++--- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/PROMS/DataLoader/PROMSFixes.Sql b/PROMS/DataLoader/PROMSFixes.Sql index 9b54c476..815a615e 100644 --- a/PROMS/DataLoader/PROMSFixes.Sql +++ b/PROMS/DataLoader/PROMSFixes.Sql @@ -5336,6 +5336,7 @@ AS cross apply config.nodes('//Applicability') t1(r1) WHERE [ItemID] = @ItemID and r1.value('@Index','int') = @UnitID +and (SELECT COUNT(*) FROM [Versions] WHERE [Versions].[RevisionID]=[Revisions].[RevisionID]) > 0 ORDER BY [RevisionID] DESC RETURN GO @@ -8414,3 +8415,42 @@ GO IF (@@Error = 0) PRINT 'Procedure Creation: vesp_ResetSecurity Succeeded' ELSE PRINT 'Procedure Creation: vesp_ResetSecurity Error on Creation' GO + +/****** Object: StoredProcedure [getRevisionsByItemID] ******/ +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getRevisionsByItemID]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) + DROP PROCEDURE [getRevisionsByItemID]; +GO + +/***************************************************************************** + Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE + Copyright 2012 - Volian Enterprises, Inc. All rights reserved. +*****************************************************************************/ +CREATE PROCEDURE [dbo].[getRevisionsByItemID] +( + @ItemID int +) +WITH EXECUTE AS OWNER +AS + SELECT + [RevisionID], + [ItemID], + [TypeID], + [RevisionNumber], + [RevisionDate], + [Notes], + [Config], + [DTS], + [UserID], + [LastChanged], + (SELECT COUNT(*) FROM [Checks] WHERE [Checks].[RevisionID]=[Revisions].[RevisionID]) [CheckCount], + (SELECT COUNT(*) FROM [Versions] WHERE [Versions].[RevisionID]=[Revisions].[RevisionID]) [VersionCount] + FROM [Revisions] + WHERE [ItemID] = @ItemID +and (SELECT COUNT(*) FROM [Versions] WHERE [Versions].[RevisionID]=[Revisions].[RevisionID]) > 0 + ORDER BY [RevisionID] DESC + RETURN +GO +-- Display the status of Proc creation +IF (@@Error = 0) PRINT 'Procedure Creation: getRevisionsByItemID Succeeded' +ELSE PRINT 'Procedure Creation: getRevisionsByItemID Error on Creation' +GO diff --git a/PROMS/fmtxml/PlantSpecific_ByrBwd.cs b/PROMS/fmtxml/PlantSpecific_ByrBwd.cs index 75f4bdd9..604db22d 100644 --- a/PROMS/fmtxml/PlantSpecific_ByrBwd.cs +++ b/PROMS/fmtxml/PlantSpecific_ByrBwd.cs @@ -24,10 +24,10 @@ namespace fmtxml fmtdata.BoxData[1].End = 420F; fmtdata.BoxData[1].TxtStart = 151F; fmtdata.BoxData[1].TxtWidth = 254F; - fmtdata.SectData.StepSectionData.StpSectLayData.RNOWidthAdj = "-13"; + fmtdata.SectData.StepSectionData.StpSectLayData.RNOWidthAlt = "212,212"; + fmtdata.SectData.StepSectionData.StpSectLayData.RNOWidthAdj = "-40"; fmtdata.StepData[6].StepLayoutData.EveryNLines = "-99"; fmtdata.StepData[7].StepLayoutData.EveryNLines = "-99"; - fmtdata.StepData[40].WidthOverride = "192"; } private void AddCWE00fmt(ref FormatData fmtdata) { @@ -62,6 +62,9 @@ namespace fmtxml private void AddEXCLN01fmt(ref FormatData fmtdata) { fmtdata.SectData.StepSectionData.StpSectLayData.WidSTablePrint = "489,229.2,144"; + fmtdata.SectData.StepSectionData.StpSectLayData.BoxLeftAdj = "-43.2"; + fmtdata.StepData[6].StepLayoutData.EveryNLines = "-99"; + fmtdata.StepData[7].StepLayoutData.EveryNLines = "-99"; } } public partial class FmtToXml @@ -85,8 +88,8 @@ namespace fmtxml private void AddCWEDoc(ref DocStyles dcstyles) { dcstyles.DcStyles[0].PageWidth = 580.2F; - dcstyles.DcStyles[1].LeftMargin = 43.2F; - dcstyles.DcStyles[1].PageWidth = 572.2F; + dcstyles.DcStyles[1].LeftMargin = 48F; + dcstyles.DcStyles[1].PageWidth = 579.2F; } private void AddEXEDEVDoc(ref DocStyles dcstyles) {