From 4d02c92e55447c95b7e0cdc7291160f23f3d5f9d Mon Sep 17 00:00:00 2001 From: Saagar Arya Date: Tue, 15 Oct 2024 16:01:03 -0400 Subject: [PATCH] Fix recreate_conflicts --- tools/recreate_conflicts.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/recreate_conflicts.php b/tools/recreate_conflicts.php index ba66aafbb7e..0c6dfc2d4f3 100755 --- a/tools/recreate_conflicts.php +++ b/tools/recreate_conflicts.php @@ -62,6 +62,7 @@ FROM flag JOIN session s ON (s.ID=flag.SessionID) JOIN candidate c ON (c.CandID=s.CandID) + JOIN test_names tn on tn.ID = flag.TestID WHERE Test_name=:testname AND CommentID NOT LIKE 'DDE%' AND s.Active='Y' AND c.Active='Y'", @@ -80,7 +81,8 @@ FROM flag sde JOIN session s ON (s.ID=sde.SessionID) JOIN candidate c ON (c.CandID=s.CandID) - WHERE sde.Test_name=:testname AND sde.CommentID + JOIN test_names tn ON (tn.ID = sde.TestID) + WHERE tn.Test_name=:testname AND sde.CommentID NOT LIKE 'DDE%' AND sde.Data_entry='Complete' AND s.Active='Y' AND c.Active='Y' AND EXISTS (SELECT 'x' FROM flag dde WHERE