From 1856174656cbb7867135d9275f9ab75c98659367 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Thu, 8 Aug 2024 15:52:45 +0100 Subject: [PATCH] TD-4469 Limits details query by learner centre ID and updates related tests --- .../DataServices/ActivityDataService.cs | 6 +++--- .../TestData/ActivityDataDownloadTest.xlsx | Bin 9780 -> 9796 bytes .../Services/ActivityService.cs | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs b/DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs index 6d039b66d9..d452b890e4 100644 --- a/DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs @@ -102,9 +102,9 @@ public int GetActivityDetailRowCount( { return connection.QuerySingleOrDefault( @"SELECT COUNT(1) FROM - tActivityLog AS al + tActivityLog AS al INNER JOIN DelegateAccounts AS da ON al.CandidateID = da.ID WHERE(al.LogDate >= @startDate) AND(@endDate IS NULL OR - al.LogDate <= @endDate) AND(al.CentreID = @centreId) AND(@jobGroupId IS NULL OR + al.LogDate <= @endDate) AND(al.CentreID = @centreId) AND (da.CentreID = @centreId) AND (@jobGroupId IS NULL OR al.JobGroupID = @jobGroupId) AND(@customisationId IS NULL OR al.CustomisationID = @customisationId) AND(@courseCategoryId IS NULL OR al.CourseCategoryID = @courseCategoryId) AND(al.Registered = 1 OR @@ -160,7 +160,7 @@ Users AS u INNER JOIN DelegateAccounts AS da ON u.ID = da.UserID ON al.CandidateID = da.ID INNER JOIN Customisations AS c ON al.CustomisationID = c.CustomisationID WHERE (al.LogDate >= @startDate) AND (@endDate IS NULL OR - al.LogDate <= @endDate) AND (al.CentreID = @centreId) AND (@jobGroupId IS NULL OR + al.LogDate <= @endDate) AND (al.CentreID = @centreId) AND (da.CentreID = @centreId) AND (@jobGroupId IS NULL OR al.JobGroupID = @jobGroupId) AND (@customisationId IS NULL OR al.CustomisationID = @customisationId) AND (@courseCategoryId IS NULL OR al.CourseCategoryID = @courseCategoryId) AND (al.Registered = 1 OR diff --git a/DigitalLearningSolutions.Web.Tests/TestData/ActivityDataDownloadTest.xlsx b/DigitalLearningSolutions.Web.Tests/TestData/ActivityDataDownloadTest.xlsx index 66a79ed7883f64a866a3f7e654ab195c7e8248c2..3a20ee29a687de5e4a99175b42fbadd4d7f2d4f7 100644 GIT binary patch delta 1654 zcmV-+28sE!OvFsE*aisyze^lFU;xG_>Uuplr@_R^}LY71g6@{%9 zsk^Fr;{~ZQi6K@UJ8L@yRQ2C?oN#H&OSg@{w@HrA%$%9ivvn!Z6Vrw(nPSojFk&)O zIhV^6-`!q#eTabazh_`b;sR#MYZ6_a3D ze<)p23tPSPO{E#lO~IHgg&zh%97+#)3UBN%G2;29gMtS*_fEr@1M^^v>L4>5WG*K z_4eFCJUCr&!R}k>B3e~{Xz4N~FcQ?*pEu^HTzq0&7h`0e_G%s zj5JH=++0yxpjwL*kCNFntCX3IFK_O{*_bc6rQ(uNEunC4l&G76=uFwXa|^zknH$H{ z(%CE7(&HNW58=|xg~W%Lw7lE(`}hETo$SPUWi^8JWPAw;x}i^yE)Ye&t>y{jgPc6b zOef^wIqr_5xYr+gVc0+Sy63~5e;1Dktm5vl+mGYuq(@%B8672=qO~oyN^sCA?n2s+ zOuy-RXCXmS^ZY>LIoLj)o8JvP+lzD9^}Kt|R_34?w?*qIm$_P{*bDn{2ySim2gGex zjd{v*TY&81pu0c&#rU!S&ZO6Ohfp1kTZ-Rs8n>J-;PKq>hLit_RMTI9GF&qw+0?|H zp-YBLT|&RxKtFda*hL$9m`>bPdXkeSo4cg&FtobAFi|VdR4_N|e?>4==#u zezv`p%8EVbpacyjc*0tYe0u{p?f)ETlntjY!lH_uR&h7k zN-o82A!66?yXMA zhFCAM6h7R?osSA`P^XLRWpJJ6C$|@md*~LXg+V*R!4tX|UfrDx&ryPM)@5`zCBG-* ztxd`0)u2#}&6g#=l$Xxgd47qrHf^(n9w+QD;yCMY)_$vl{g|(7EPv=#y#I;&2|bEm z&h~kia@yG-egU#3_s^%3eFBq#859Ysf8M5r0RR96vt}S60e??V<1i4#?@0R{BHyV~ zc7;&o7$IQA0Ys&??0MFiG!~8>d8Sdzr^iV|NnuZWn?Fy_KR;Vt?;DqO7|8}-i1{oR z8F~{+>$ip2tbdmO%o8AFSaEmD>&JQbp5ZWmILsj&f?rL|9+ zD#QjjwQ(y$RexE7cfsr$^eiv({8Hkc(U(}Bw?{)UIxaf?U(+&}o{wJEhc*FgbS=k`Ji(pr>$BUaCn=Hbp?)4$@N`ZIECmSTJW5(dfC_vwQGr^{(lqVE7gchN+!WL9LlM7TH9ZG zJ_u5AD(nqLkhC~OTw8WX&(#tl|ATlwB_0??-VtX*u*HmaO#|`p4Rg48I`GR8kJi7^ zrd@|SVEl;ibf{J}L@ZP4$B2&u^^nqwt~a@@!Edqr(0pI?5B@U#YCXT4S!sra-4001_Vo+C~Ks|f%AlhFwplL{m%0p61}Bt-(<50e296_b%9 zDgktpyd*jSf0OqlK?1BAlh7I^lV2q&0jZOUB_|s*&Eyeu0RRAp0ssIJ0000000000 z000000JW3MB_tcFf8M5r0RR960{{RJ0000000000000000AP~~CL;zLBLDyZ0QIp5 Ap8x;= delta 1651 zcmV-(28{W{Oteg}*aitF=_X&i0ssI^li>yze^p&?+AtJ-pS1sA`90*LkV4c@4Hz0y zH&y-O1*tNQAyyqbvz$k|_>50Y*$x zm2tUF@$Jpj>tkdrkr@$6vJ^itgU^TGznyKAepo8?fPg@n6zA5KiSHYlvx1n8Dwzai zf2DLmEG+ffH>GAIGdW|n5PlQ{v0o4_al?@4k8r5fic>aGv?`di4T)xgSdedWUYeGz zpdXO_kE)^siX|7^KGmcc6*QTxrP5?6Ana|}Lt72M82(`ZL)5+rprcn6oN8s% z%65R-Z$ux(9|nFHzDdFMI0qkN>iU{Je{y$*dsRCAq^fw&6(7jL;LB_wSgZC*0?GR% zTW_x|!o#x_7woRFE+S?5hZOFl1V(}w`!nN~Whp*|rP{E=21KQ+a#V2vXcWg$jQ!!> z&X*d2`&q+vlXElQ`P@AOp7n6cOiY%ZZ-EfS72^*#r{@YGpH%Be-?xZ zBcTadnoDAHRB4goak98#r80|*uel{cFrp=ttWlz>OJOl-fQub)-2$CCTXt?B9cJOi z39)4H%E{!oZ2rT`gt{#GkftV-=Kg)kAR?W#e!a9B!ToG<0cUni9^nMRC)uvRXK+N} z$-SgH3GbhS{%9Oc2Ltb9)IagMf8!|d20=9OMx$xm??vNi6m?%97#$~6k;>*fb2#c0 zcfkoq&~LJBkuXRqo*iU72fNF2^ShzNUR=Pg4c>9KF$WvDCECup%+w~uUexaoppibc z8*y|B%S{c>d1iBPVt+6IYc_ko7+>e0IqaPddQNuaw59lsrb(k|3YX`GIyaj9SEA~c z3*zb-$+}E#4OugEZK3TM%PI8D8g&VW&ZZOhHa*M2`aoL(N(6NU0+V|%sKNF_F#HFz zr3oGs37T}UZd(BW0C2O+9U=jLT}#6-7=`Zz|3k@rm!@TImac;-yHE#$m5FyDdAEf% zA0%T5AOp zbO48@X1;Il)2`3yUuqUA<-Pq$zT{M!=nU7O<@z@v~aKejn5%k1H?nxisJ zQW7WkF&R~4n3F6g>1UhZYQD{TypX3H{}Zz~8OQ0cO2&B>h@&3y3@E$Y*MFq^1^@v6 z{{sL}O9KQH00saE0000X0F-vXe1-u400;vB01yBO0c3AuP;zgxgdh|Ff6Z>&Fc5_A z1^NyG?=j`H2nvH@P$VsKXi)>U)AN>ESwv`3;BExFPv4b!>zq2w?2!twh*YVTxm#&X zuEhh;Le^0>P09ygY4cvEf2Q#c?~{8zU}Sw=mNy!YjIqZ0syiF1$#K>5|C-jx4Se*t zJ#_+X&F8KQ-T})k?RW2TqSSEl<>)XNJzpB3+n{^So=>(kdfu9igMfEpY#RuKM!ycs z1Hus68hj>edS3PDIOT%;Z;9<%6~BORz^POZ*+XQ(8e~&5)}bTLfA(j}Pt+nZ87+co zIF@tmy!IdMaui5$DI5$Y5LsLzZaoL2AI%yv|ATlrCmtCl-U(+%u*YJ4~#DE3vrM2i{|ZOc=N~UW83A; zqWn 0 ? 1 : 0); int currentRun = 1; List activityLogDetails = new List();