From c4e3ba10c6857cfe4f2dfd9049839748930a03b8 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Fri, 22 Mar 2024 09:19:59 -0400 Subject: [PATCH 1/6] B2024-016 - For Robinson, all local transitions will now have the option of including a page number. Generic, transitions defined to never include a step number will not display a list of steps in the Transitions Step Properties panel --- PROMS/Formats/fmtall/CPLAall.xml | Bin 56866 -> 59662 bytes PROMS/Formats/fmtall/CPLall.xml | Bin 68474 -> 69372 bytes .../Properties/AssemblyInfo.cs | 5 +++-- .../DisplayTransition.cs | 21 ++++++++++++++---- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/PROMS/Formats/fmtall/CPLAall.xml b/PROMS/Formats/fmtall/CPLAall.xml index 60326212277b3d221752241e76795647fad80acc..2040ee2898469613aefc703b5be01d58bcac9036 100644 GIT binary patch delta 2735 zcmb_eO-oxr6ul71qToWZ(1PGYq#%g3erzNvp+OY1woSU0potMQk$fN$!r)%qykDR@ zHzK%gm;D3&k}kXS%o``~&b)aszQ`kFzVEsB+U{iAi^vb|0S8Zah0rV|_uAb;xMt8BihQr_0pk+^RFMrW? zU`+d_0Z7jZ0CNBj^7yYH4sCeW3Vhb^a~L^6OwJLJI)Imr*`CLNlbi4(*`*rX&tM84Do^k zm~=AQwKNVkh~H1d%>2P>&9(oiS~mF zpdQni#&aX|l#kjOGduVVbvgObDSFFRz@wrkX^hguVHx+3ktqh5g0#nq&0!997rJ4N zYz_q1OQoP1P!2+LVcar_?jZQiKdW}r!SkZ&=l;g&?8>WT=nFNxG$axI9t+Mo6a8Ki z@eEo7CI^GUl}~`MdJ?2lgkMdjI;$_i0#ppka2EG#RGZzeM{{kS#`zPI74c*0=hW3R Df9u)k delta 26 icmeCX#Jp$^^M)UR-1-c547?0n44e#{o8QOC_W%HS#Rv!h diff --git a/PROMS/Formats/fmtall/CPLall.xml b/PROMS/Formats/fmtall/CPLall.xml index c0b73adf33be681b1b37d37a83fcd548efbab230..9966297b02355bc1b37336bf0ae690cf31d3ba4d 100644 GIT binary patch delta 426 zcmex0jpff=mJO#e`4t#Y;N**$>XXDcCbMLVFd9ytU!XX7RgTf*e+6RP3Jlc@0St)@ z=?tlpC+15|K9{Y;>da8eP&C=FKpC4cllO76O=ij#V>E)ABc`hZw5*yzkD-~ delta 103 zcmew}m*v+qmJO#eCp&2JO!muDntYFkZSt!evB?T07LzS<%O-CsvYK3wcVzONJif^R zIZBfYifSgyX>n}+mmkD9`CGog Date: Fri, 22 Mar 2024 12:56:36 -0400 Subject: [PATCH 2/6] B2023-110-Symbols-in-tables --- PROMS/Formats/fmtall/BNPP1Newall.xml | Bin 230412 -> 230718 bytes PROMS/Formats/fmtall/BNPP1all.xml | Bin 186890 -> 186892 bytes PROMS/Formats/fmtall/BNPP2all.xml | Bin 199430 -> 199432 bytes PROMS/Formats/fmtall/BNPPalrall.xml | Bin 238092 -> 238094 bytes PROMS/Formats/fmtall/BNPPbckall.xml | Bin 166244 -> 166246 bytes PROMS/Formats/fmtall/BNPPsamall.xml | Bin 171374 -> 171376 bytes .../frmVersionsProperties.Designer.cs | 671 +++++++++--------- .../frmVersionsProperties.cs | 10 + .../frmVersionsProperties.resx | 18 + .../Config/ROFSTLookup.cs | 26 +- .../Extension/DisplayText.cs | 6 +- .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 4 +- 12 files changed, 389 insertions(+), 346 deletions(-) diff --git a/PROMS/Formats/fmtall/BNPP1Newall.xml b/PROMS/Formats/fmtall/BNPP1Newall.xml index 1e86a983be3a037b813893ceb88d1c826a6a2454..468b33e066e86ff973a501e84d7fe01d48f7c1d0 100644 GIT binary patch delta 156 zcmeC_;M>>5x51*F-HjoUA%~%O^7~fN=AicWpmxUXLG4VR{CRm9xEK^*aJt}SCPn#B z20sQ*h7h1&H3N+82W0s&I5D^~1WjLfg-My!n8BREbo#^3OwN-pbm%Y|PTv^9tUY}~ w6qCgCf@e%zj0)2i-eS_-p74*Ui)DJjO(vG9kang|{@a5%nRl^lH@M5hw*mk#_YWWd diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml index 48fa3d86f2c53a44a289d3a00dbc337db267f1d1..cb366256195718766dc898d4eb4da0ddcc702e63 100644 GIT binary patch delta 30 mcmeC$!rilld&8xe$s)o6lTSqRG{1>ye-p#F{Y?y$TrB|5=nXai delta 26 icmeC#!rirnd&8xe$t}@R&F^B`-^DO)e;30fR|^2EvJ5-` diff --git a/PROMS/Formats/fmtall/BNPP2all.xml b/PROMS/Formats/fmtall/BNPP2all.xml index 5c07739bc080ef08385e186d4b32fad44423d572..047aca34d2f206ccc8d2998627975327144442ae 100644 GIT binary patch delta 26 icmZph#?vv4XTvY=$$4Hf%_2VSB0h}UMSPe(?E?UhYYIaE delta 27 jcmeB}#?v;9XTvY==|{dW3N-WhwDb5dZs+k~`m+xJq)iJh diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml index 932a023d737308f921ac5f79c831bddf46980c2a..d785ad41ef616d13aa946a1da202b19957c097ee 100644 GIT binary patch delta 34 pcmeA#e-p_F#7x`YL^3OQ000;*4@Lk0 delta 30 kcmeA>!q;=H-$gP4G1K;Uk<1Dn0NsTRhX4Qo diff --git a/PROMS/Formats/fmtall/BNPPbckall.xml b/PROMS/Formats/fmtall/BNPPbckall.xml index 658518a26903ef6c56581accb41fc6f91dd67a56..15195ae0109703cb93e881019f8d917844027366 100644 GIT binary patch delta 34 qcmaDdiR;-Ut_>>o>~0K+3^@$NlLhTWo9*n|?d%!1+u1Xzc>w^*iwZ>m delta 30 mcmaDhiR;NEt_>>olSP~aCd=4yH9Oe1JJ>UBcd%zt^8x^_4GFgZ diff --git a/PROMS/Formats/fmtall/BNPPsamall.xml b/PROMS/Formats/fmtall/BNPPsamall.xml index c67c9c8d0e354ea35c17d808701fac1566e73f20..1e3215b320fcf22dc8b696819ddd3bbdf760be8b 100644 GIT binary patch delta 26 icmaF2i|fNKt_{nyCiiH{G#}7vKcL09{eTwJx*`CsjtlJo delta 26 icmeyci|gGkt_{nyCLhriXx^dKzC(*~`wlIp9Yp}J> 415, 17 + + 415, 17 + + + 643, 17 + Allows you to specify the default format to use for all procedures in this set. @@ -210,9 +216,21 @@ Check "Show Default Settings" to display the "default" duplexing setting (below 817, 17 + + 17, 65 + + + 817, 17 + 118, 17 + + 118, 17 + + + 17, 17 + 17, 17 diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs index 656bbd98..2a1ed189 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs @@ -285,16 +285,24 @@ namespace VEPROMS.CSLA.Library #region ROTextConvertMethods // B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing // step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode. - public static string ROConvertSymbols(string retval) + public static string ROConvertSymbols(string retval, ItemInfo MyItemInfo = null) { - retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow - retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow - retval = retval.Replace("->", @"\u8594?"); // Right Arrow - retval = retval.Replace("<-", @"\u8592?"); // Left Arrow - retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal - retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal - retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus - retval = retval.Replace("+-", @"\'b1"); // plus minus + // _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue || + // _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue + if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue) + { + retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow + retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow + retval = retval.Replace("->", @"\u8594?"); // Right Arrow + retval = retval.Replace("<-", @"\u8592?"); // Left Arrow + } + if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue) + { + retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal + retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal + retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus + retval = retval.Replace("+-", @"\'b1"); // plus minus + } return retval; } #endregion diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs index c573b818..5adba7a0 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs @@ -695,9 +695,9 @@ namespace VEPROMS.CSLA.Library newvalue = newvalue.Replace("`", @"\'b0"); // B2023-037: Handle <=, >=, +-, -> and <- symbols. If the format has flags to convert these RO symbols, it // is done here so that output (print & edit/view) has symbol, not 2 characters. - if (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue || - _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue) - newvalue = ROFSTLookup.ROConvertSymbols(newvalue); + if (!_MyItemInfo.IsTable && (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue || + _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue)) + newvalue = ROFSTLookup.ROConvertSymbols(newvalue, _MyItemInfo); if (gg != newvalue) text = text.Substring(0, myIndex) + newvalue + text.Substring(myIndex + myLength); diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 0252740d..821aa997 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -1184,7 +1184,9 @@ namespace VEPROMS.CSLA.Library if (sectionInfo != null) { // B2023-037: loading print text, resolve the RO symbols - string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues,sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue|| sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue); + bool GTLT = sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue; + bool GLTArrows = sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue; + string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, itemInfo.IsTable && GTLT || GLTArrows); ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID); itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo); } -- 2.47.2 From 5db530f4e8d9cb1492b85a6011e6dfd9b1dd4caa Mon Sep 17 00:00:00 2001 From: John Jenko Date: Fri, 22 Mar 2024 15:22:28 -0400 Subject: [PATCH 3/6] F2024-046 - In Robinson format CPL, fixed transition {Section Number} {Page Num} so that it does not prompt saying you need to select a step. --- PROMS/Formats/fmtall/CPLall.xml | Bin 69372 -> 69402 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/CPLall.xml b/PROMS/Formats/fmtall/CPLall.xml index 9966297b02355bc1b37336bf0ae690cf31d3ba4d..8b7eebbff267568df8a655c75e13cd5e3bb6aa0f 100644 GIT binary patch delta 26 icmew}mu1#GmJO$hCl{2;P1brXG1)IqX){a7k68e!kqk=! delta 18 acmbO=kLAx?mJO$hCvPgU+N@OaV-^5ezzLH8 -- 2.47.2 From eeacf9b969d7cdd3c64f3931681373bf65dcd1d6 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Mon, 25 Mar 2024 09:15:07 -0400 Subject: [PATCH 4/6] F2024-030 - Fixed PC/PC procedure number in transitions so that only one appears. --- PROMS/Formats/fmtall/VEGP1all.xml | Bin 184684 -> 184770 bytes PROMS/Formats/fmtall/VEGP2all.xml | Bin 228856 -> 228942 bytes .../Extension/TransitionExt.cs | 3 ++- .../Format/PlantFormat.cs | 9 +++++++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index d28cf81a07934f0643b4c6497a3e759636366dc4..e5b180081e901be193a1b07797843d370c4873e1 100644 GIT binary patch delta 91 zcmaE}i2KlD?uIRlbDp~fFcdN5GbA(kFr+e+0dWpP0E06a+cGFIgaBnrfuc$b3Jl&r fI+dY-!Ji=yNW)ZxFeEahPyWcFx_!fQ#yu|qKercz delta 56 zcmV-80LTBrqYLb!3xKo%oadLW*8vijyy*cHmq6|T7MBp&0SuSG=>Z~>a6bl@7VQBR Om+tEUBDb380VwI&iWubp diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index cfe8ce0939975c48278746e25d7736d3b220f361..faa4bd0f57fbdd35fe7e9ac8abdbb502ac91a29a 100644 GIT binary patch delta 92 zcmezIoA=xw-i9rVYaUJhz`|kc!;s2Q2E;iG0SwMyY|Eg;5W-NzPzn@PVo+f42GXev i1q}WSc|aPbDuf}CA$|J#ON`3x`yMfF-}i{gYBm7q1R6mA delta 31 pcmV+)0O0@5{0;c~4S=)(tm2oz(g6~eZsY+JhbZF#w"); retstr = retstr.Substring(indx + 1); diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index d7a16080..653c3df8 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -7279,6 +7279,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ProcLevelPCPC, "@ProcLevelPCPC"); } } + // F2024-030 for Vogtle Units 3 & 4, added KeepOnePCPCTag flag to keep one of the PC/PC tokens when editing + private LazyLoad _KeepOnePCPCTag; + public bool KeepOnePCPCTag + { + get + { + return LazyLoad(ref _KeepOnePCPCTag, "@KeepOnePCPCTag"); + } + } } #endregion #region TransType -- 2.47.2 From da4cbfd112361153efbb531951d7d59c06833b19 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 27 Mar 2024 09:50:33 -0400 Subject: [PATCH 5/6] F2024-021 -Adjusted the page margins in the Vogtle 2 column format --- PROMS/Formats/fmtall/VEGP2all.xml | Bin 228942 -> 229004 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index faa4bd0f57fbdd35fe7e9ac8abdbb502ac91a29a..da5cca778d69f6a4de55ffaa9e1ec00465a00724 100644 GIT binary patch delta 2623 zcmcImZ){Ul6o2=e)<4mXvUP6GQQLi(%ZQ_WYu8nWD|MTa7!z^XrbaA;Xi(77z+}43 zju5j5ObWOo#7IqyCW55FWmi8b1eN$_sYJ*$OWX{ZprXZKwk%uXdGBrO=m?BpKfTj? z&$;)UbAP|z>A<9A=aePdCnBfmqe0=3J*P!6Qu}sMB!>n?PyWyg z_Xtr*YbN0!MZbjY6leq!H8esFxyHl9Og7IDPH~0m56hE=YXEKElf$St1 z>w{YbC34{P1*b!tP6HiYjx};1AI4W_Co!XYxgFpUZn|iPJo#h?*tKT0b;431REpWa zPvJ?inWFu$j{2i;hfwABQP{um){^xQJS)r#+c%vQCphk0{#jjQ?C~^?q z?VW6sSKWqZdH6}61?vS<(z1mR5h(C#4(CjU>(~dufP^c)_{#tr^GF?br}|#(5+NatP;Dh zik16VueeLPJQ%u(8>g?YpfmSjV0M#uGbmf{$FPO}p>SL+m9E5~z8~9&&AmR%k;#?V ziB~va+95>Tr4pHV6zh;@hkl4>)$}1+2HGWMl>An(c6=yoWKD3k6_4ZdW=geVkbZ8N z>-^$sY?8a5zym;mhp^SWS&1lHq}z{c1ijsY4P>h4hYxQ=yFQ%s5;^8q(-ktDxjiVW z)?rIVb2$CS> E12^kc*#H0l delta 2176 zcmb_de@K*R5Z;;jw7POxY`aXh#g3yk&2INo%*wh=E6xbBU$RA*#NAO6i~asVZWyn2%|Kz{>3l?*4*Sb7V8QrJ)tw={j5PTI59^U=CN0 zpqF^x#V#&ChuIvRPs6M!CU@^ggWC(q%|~;nm)knAj{Dz2wph)E06%{V z)8*m|JeO?u;8x0)V>ht>v)gSeEZn8!tK2>YJIw8E=;Q7gWbn!J==!$;hQ^47r`3}w zE#3I;vw@~YB8kzorhs1#;6;mCx%m*I>F?mz9DjmyQ+M^-k~#ev*YdNl>gM-Y8oDs9 zxc{!3cjvv7$FTubmTJc(!vk27au!QS6mXQv`pbAVIZj%{j`S1u|Ddn=RMhdfG=^~%)nS7#1`O)0Irm5}g2D%m(huCyy=k{F!41mx}D;7X!By(wCy+8UgNEhP~XAOQ-C}^dzHSW+$V+ zy;LU)DiFak8&Y5%=b zVwDu3iN5$FRlk#$80h3%n<<++TJ<^Wt)e{Qju4e|*@iLq`#Aa#YB+uk-0ZpqlX=_s z0 iWtbL~XAe Date: Wed, 27 Mar 2024 10:06:37 -0400 Subject: [PATCH 6/6] B2024-018: enhanced linking with subsections --- PROMS/VEPROMS User Interface/PROMSFixes.Sql | 80 ++++++++++++++++++++- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index b85e31f3..d8640387 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -22148,8 +22148,84 @@ AS [Folders].[FormatID]=@FormatID RETURN + GO +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListUnlinkedItems]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) + DROP PROCEDURE [vesp_ListUnlinkedItems]; +GO + + /***************************************************************************** + Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE + Copyright 2024 - Volian Enterprises, Inc. All rights reserved. + *****************************************************************************/ + /* + ========================================================================================================== + Author: Kathy Ruffing + Create Date: 03/27/2024 + Description: B2024-018: Gets list of procedures/sections/steps for possible enhanced linking + ========================================================================================================== + */ +Create Procedure[dbo].[vesp_ListUnlinkedItems] +( + @ItemID int, + @EnhType int +) +WITH EXECUTE AS OWNER +AS +BEGIN +DECLARE @ParItemID int + DECLARE @EItemID int + set @EItemID = (select top 1 VIS.EItemID from vefn_AllSiblingItems(@ItemID)--Find All Siblings + outer apply vefn_GetNewEnhancedData(ItemID,@EnhType) VIS -- That are Linked + where EitemID is not null) + if @EItemID is null + BEGIN + select @EItemID = epp.ItemID + from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID)))SPP -- FindParent + JOIN ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID + outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent + JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID + JOIN PARTS EPP ON EPP.ContentID = EII.ContentID and SPP.FromType = epp.FromType -- Get first Child + END + if @EItemID is null -- B2024-018: If not found at the current level, check at the parent level + BEGIN + + select @ParItemID = dbo.ve_getparentitem(@ItemID) + select @EItemID = epp.ItemID + from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ParItemID)))SPP -- FindParent + JOIN ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID + outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent + JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID + JOIN PARTS EPP ON EPP.ContentID = EII.ContentID --and SPP.FromType = epp.FromType (had to remove types may be proc/sect) + + END + if @EItemID is null + BEGIN + select @EItemID = DV2.ItemID from (select *,cast(config as xml) xconfig from DocVersions + where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID))) SDV -- Source DocVersion + cross apply (select * from vefn_GetEnhancedDocVersions(SDV.VersionID) where @EnhType = Type) EDV -- Enhanced DocVersion + Join DocVersions DV2 ON DV2.VersionID = EDV.VersionID -- First Procedure + END + Select ItemID,PreviousID,II.ContentID,II.[DTS],II.[UserID],II.[LastChanged], + (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=[II].[ItemID]) [AnnotationCount], + (SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=[II].[ItemID]) [DocVersionCount], + (SELECT COUNT(*) FROM [Items] [Children] WHERE [Children].[PreviousID]=[II].[ItemID]) [NextCount], + (SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=[II].[ItemID]) [PartCount], + (SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=[II].[ItemID]) [Transition_RangeIDCount], + (SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=[II].[ItemID]) [Transition_ToIDCount] + from Items II + Left Join Entries EE ON II.ContentID = EE.ContentID + where ItemID In (select SIB.ItemID from vefn_AllSiblingItems(@EItemID) SIB + outer apply vefn_GetNewEnhancedData(ItemID,0) VIE + Where VIE.EItemID is null) + and EE.ContentID is null +END +Go + + IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Succeeded' + ELSE PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Error on Creation' + GO ----------------------------------------------------------------------------- /* --------------------------------------------------------------------------- @@ -22184,8 +22260,8 @@ BEGIN TRY -- Try Block DECLARE @RevDate varchar(255) DECLARE @RevDescription varchar(255) - set @RevDate = '10/03/2023 11:00 AM' - set @RevDescription = 'C2023-017: Added logic to filter the format list when selecting a format to be applied to a section' + set @RevDate = '03/27/2024 11:00 AM' + set @RevDescription = 'B2024-018: Enhanced link issue with sub-sections in source but not in enhanced' Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription -- 2.47.2