From a7c689f23a8e6dacaa7dd13b060b7e76e3f99a30 Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 10 Apr 2013 14:18:57 +0000 Subject: [PATCH] Modified getAnnotationAuditsChronologyByItemIDandUnitID to use derived applicability Modified getContentAuditsSummaryByItemIDandUnitID to use derived applicability Modified getContentAuditsChronologyByItemIDandUnitID to use derived applicability --- PROMS/DataLoader/PROMSFixes.Sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PROMS/DataLoader/PROMSFixes.Sql b/PROMS/DataLoader/PROMSFixes.Sql index 8a0a2011..7f9c64d9 100644 --- a/PROMS/DataLoader/PROMSFixes.Sql +++ b/PROMS/DataLoader/PROMSFixes.Sql @@ -4727,7 +4727,7 @@ join @tci tci on tci.itemid = ii.itemid ) ah where itemid in (select itemid from vefn_tblchilditems (@procitemid,@itemid,0)) and dts > @dts - and (dbo.ve_GetItemApplicability(ItemID) = '-1' or ',' + dbo.ve_GetItemApplicability(ItemID) + ',' like '%,' + cast(@UnitID as varchar(10)) + ',%') + and (dbo.ve_GetItemDerivedApplicability(ItemID) = '-1' or ',' + dbo.ve_GetItemDerivedApplicability(ItemID) + ',' like '%,' + cast(@UnitID as varchar(10)) + ',%') --(select dts from versions where versionid = (select max(versionid) from revisions rr inner join versions vv on rr.revisionid = vv.revisionid --inner join stages ss on vv.stageid = ss.stageid where itemid = @procitemid and ss.isapproved = 1)) order by ordinalpath,annotationid,auditid--actionwhen @@ -4797,7 +4797,7 @@ begin -- on t.icontentid = r.contentid ---- where ActionDTS > procdts or dts > procdts -- ) ah - where dbo.ve_GetItemApplicability(ItemID) = '-1' or ',' + dbo.ve_GetItemApplicability(ItemID) + ',' like '%,' + cast(@UnitID as varchar(10)) + ',%' + where dbo.ve_GetItemDerivedApplicability(ItemID) = '-1' or ',' + dbo.ve_GetItemDerivedApplicability(ItemID) + ',' like '%,' + cast(@UnitID as varchar(10)) + ',%' -- order by OrdinalPath, contentid,auditid--actionwhen RETURN end @@ -4862,7 +4862,7 @@ ordinalpath nvarchar(max) ) insert into @Chrono select * from vefn_GetMyChronology(@ProcedureItemID,@SelectedItemID,@IncludeDeletedChildren,@DTS) -where dbo.ve_GetItemApplicability(ItemID) = '-1' or ',' + dbo.ve_GetItemApplicability(ItemID) + ',' like '%,' + cast(@UnitID as varchar(10)) + ',%' +where dbo.ve_GetItemDerivedApplicability(ItemID) = '-1' or ',' + dbo.ve_GetItemDerivedApplicability(ItemID) + ',' like '%,' + cast(@UnitID as varchar(10)) + ',%' select * from @Chrono where AuditID is null OR AuditID in (select min(auditID) from @Chrono group by contentid UNION select max(auditID) from @Chrono group by contentid) order by OrdinalPath, contentid,auditid