Index: openacs-4/packages/proctoring-support/lib/proctoring-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/proctoring-support/lib/Attic/proctoring-display.tcl,v diff -u -r1.1.2.20 -r1.1.2.21 --- openacs-4/packages/proctoring-support/lib/proctoring-display.tcl 2 Mar 2022 17:43:32 -0000 1.1.2.20 +++ openacs-4/packages/proctoring-support/lib/proctoring-display.tcl 3 Mar 2022 09:18:57 -0000 1.1.2.21 @@ -111,7 +111,7 @@ set portrait_url [export_vars -base "/shared/portrait-bits.tcl" {user_id {size x200}}] set back_url $base_url - set bulk_flag_base [export_vars -base ${proctoring_url}review-all \ + set bulk_flag_base [export_vars -base ${proctoring_url}review \ {user_id object_id {return_url $user_url}}] set bulk_unflag_url ${bulk_flag_base}&flag=false set bulk_flag_url ${bulk_flag_base}&flag=true @@ -300,10 +300,16 @@ select a.user_id, p.last_name || ' ' || p.first_names as name, count(*) as n_artifacts, - count(a.metadata->'revisions') as n_reviewed, count( (select 1 from jsonb_path_query(a.metadata->'revisions', + '$[*] ? (@.flag == "false")') + fetch first 1 rows only + ) + ) as n_reviewed, + count( + (select 1 from + jsonb_path_query(a.metadata->'revisions', '$[*] ? (@.flag == "true")') fetch first 1 rows only ) @@ -323,6 +329,6 @@ set portrait_url /shared/portrait-bits.tcl?user_id=$user_id set filter [string tolower "$name $student_id"] - set completion [expr {round(100 * (($n_reviewed * 1.0) / ($n_artifacts * 1.0)))}] + set completion [expr {round(100 * ((($n_reviewed + $n_flagged) * 1.0) / ($n_artifacts * 1.0)))}] } }