Index: openacs-4/packages/assessment/www/asm-admin/send-mail-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/send-mail-oracle.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/send-mail-oracle.xql	29 May 2018 17:54:36 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/send-mail-oracle.xql	14 Jun 2018 13:13:06 -0000	1.4
@@ -43,45 +43,6 @@
 	</querytext>
     </partialquery>
 
-    <partialquery name="responded">
-	<querytext>
- 		select parties.email,
-               decode(acs_objects.object_type,
-                      'user',
-                      (select first_names
-                       from persons
-                       where person_id = parties.party_id),
-                      'group',
-                      (select group_name
-                       from groups
-                       where group_id = parties.party_id),
-                      'rel_segment',
-                      (select segment_name
-                       from rel_segments
-                       where segment_id = parties.party_id),
-                      '') as first_names,
-               decode(acs_objects.object_type,
-                      'user',
-                      (select last_name
-                       from persons
-                       where person_id = parties.party_id),
-                      '') as last_name
-            from 
-                 parties,
-                 acs_objects,
-                 users
-            where
-            parties.party_id = users.user_id                 
-            and parties.party_id = acs_objects.object_id
-	    and parties.party_id in (
-		select s.subject_id
-		from as_sessions s, cr_revisions r
-		where s.assessment_id = r.revision_id
-		and s.completed_datetime is not null
-		and r.item_id = $assessment_id)
-	</querytext>
-    </partialquery>
-
     <partialquery name="not_responded">
 	<querytext>
 		select parties.email,
Index: openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql	29 May 2018 17:54:36 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql	14 Jun 2018 13:13:06 -0000	1.5
@@ -38,45 +38,6 @@
 	</querytext>
     </partialquery>
 
-    <partialquery name="responded">
-	<querytext>
- 		select parties.email,
-	       (case acs_objects.object_type
-	       	     when 'user' then 
-                      (select first_names
-                       from persons
-                       where person_id = parties.party_id)
-		     when 'group' then
-                      (select group_name
-                       from groups
-                       where group_id = parties.party_id)
-		     when 'rel_segment' then
-                      (select segment_name
-                       from rel_segments
-                       where segment_id = parties.party_id)
-		     else '' end) as first_names,
-	       (case acs_objects.object_type
-	       	     when 'user' then
-                      (select last_name
-                       from persons
-                       where person_id = parties.party_id)
-		     else '' end) as last_name
-            from 
-                 parties,
-                 acs_objects,
-                 users
-            where
-            parties.party_id = users.user_id                 
-            and parties.party_id = acs_objects.object_id
-	    and parties.party_id in (
-		select s.subject_id
-		from as_sessions s, cr_revisions r
-		where s.assessment_id = r.revision_id
-		and s.completed_datetime is not null
-		and r.item_id = :assessment_id)
-	</querytext>
-    </partialquery>
-
     <partialquery name="not_responded">
 	<querytext>
 		select parties.email,
Index: openacs-4/packages/assessment/www/asm-admin/send-mail.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/send-mail.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/send-mail.xql	29 May 2018 17:54:36 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/send-mail.xql	14 Jun 2018 13:13:06 -0000	1.4
@@ -26,10 +26,35 @@
 
     <partialquery name="responded">
 	<querytext>
- 		select parties.email
-            from parties
+ 		select parties.email,
+	       (case acs_objects.object_type
+	       	     when 'user' then 
+                      (select first_names
+                       from persons
+                       where person_id = parties.party_id)
+		     when 'group' then
+                      (select group_name
+                       from groups
+                       where group_id = parties.party_id)
+		     when 'rel_segment' then
+                      (select segment_name
+                       from rel_segments
+                       where segment_id = parties.party_id)
+		     else '' end) as first_names,
+	       (case acs_objects.object_type
+	       	     when 'user' then
+                      (select last_name
+                       from persons
+                       where person_id = parties.party_id)
+		     else '' end) as last_name
+            from 
+                 parties,
+                 acs_objects,
+                 users
             where
-                parties.party_id in (
+            parties.party_id = users.user_id                 
+            and parties.party_id = acs_objects.object_id
+	    and parties.party_id in (
 		select s.subject_id
 		from as_sessions s, cr_revisions r
 		where s.assessment_id = r.revision_id