+
+
+
+
+ @events.timestamp@
- -
-
- ![]()
-
-
- ![]()
-
-
-
-
-
+
+
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 -N -r1.1.2.12 -r1.1.2.13
--- openacs-4/packages/proctoring-support/lib/proctoring-display.tcl 15 Feb 2022 14:36:28 -0000 1.1.2.12
+++ openacs-4/packages/proctoring-support/lib/proctoring-display.tcl 17 Feb 2022 18:28:26 -0000 1.1.2.13
@@ -124,30 +124,37 @@
# their own pace. The rows so produced are then sorted by
# timestamp, so that the "events" are chronologically sorted.
db_multirow events get_artifacts {
- select camera.file as camera_url,
+ select coalesce(camera.artifact_id,
+ desktop.artifact_id) as artifact_id,
+ camera.file as camera_url,
desktop.file as desktop_url,
coalesce(camera.timestamp,
desktop.timestamp) as timestamp,
- null as audio_url
- from (select timestamp,
+ null as audio_url,
+ camera.revisions || desktop.revisions as revisions
+ from (select artifact_id,
+ timestamp,
file,
rank() over (
partition by object_id, user_id
order by timestamp asc
- ) as order
- from proctoring_object_artifacts
+ ) as order,
+ coalesce(metadata->'revisions', '[]') as revisions
+ from proctoring_object_artifacts
where object_id = :object_id
and user_id = :user_id
and type = 'image'
and name = 'camera') camera
join
- (select timestamp,
+ (select artifact_id,
+ timestamp,
file,
rank() over (
partition by object_id, user_id
order by timestamp asc
- ) as order
- from proctoring_object_artifacts
+ ) as order,
+ coalesce(metadata->'revisions', '[]') as revisions
+ from proctoring_object_artifacts
where object_id = :object_id
and user_id = :user_id
and type = 'image'
@@ -156,10 +163,12 @@
union
- select null as camera_url,
+ select artifact_id,
+ null as camera_url,
null as desktop_url,
timestamp,
- file as audio_url
+ file as audio_url,
+ metadata->'revisions' as revisions
from proctoring_object_artifacts
where object_id = :object_id
and user_id = :user_id
@@ -180,6 +189,8 @@
set audio_url [export_vars -base $user_url {{file $audio_url}}]
}
}
+
+ set total [::template::multirow size events]
}
} else {
set folder [::proctoring::folder \
Index: openacs-4/packages/proctoring-support/www/review.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/proctoring-support/www/Attic/review.tcl,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/proctoring-support/www/review.tcl 17 Feb 2022 18:28:26 -0000 1.1.2.1
@@ -0,0 +1,103 @@
+ad_page_contract {
+ AJAX backend fot the reviewing of proctoring artifacts.
+
+ @param artifact_id on which artifact we are operating
+ @param comment textual comment. Can be empty, for instance, when
+ we are flagging the artifact.
+ @param flag are we flagging this artifact for review. Can be empty
+ and defaults to false in this case.
+ @param delete_record an optional JSON record representing a review
+ comment that we want to delete.
+
+ @return In case of error, the response will be returned to the
+ user. In case of success, the updated list of review
+ comments will be returned in JSON format.
+} {
+ artifact_id:naturalnum,notnull
+ {comment ""}
+ {flag:boolean ""}
+ {deleted_record ""}
+}
+
+set user_id [ad_conn user_id]
+
+if {$deleted_record eq "" && $comment eq ""} {
+ if {$flag} {
+ set comment [_ proctoring-support.user_has_flagged_this_artifact_msg]
+ } else {
+ set comment [_ proctoring-support.user_has_unflagged_this_artifact_msg]
+ }
+}
+
+try {
+ set revisions [::xo::dc get_value update_comments {
+ with
+ updated_revisions as (
+ select jsonb_agg(u.revision)
+
+ -- The flag is stored on each review comment, but counts
+ -- as a single property. Therefore, we set for all review
+ -- comments the same flag, when specified. This because we
+ -- might want to handle the flag on single messages in the
+ -- future.
+ from (select revision || (case when :flag is null then '{}'
+ else (select to_jsonb(f.*) from
+ (select :flag as flag from dual) f)
+ end) as revision
+ from (
+
+ -- These are all of the existing messages, minus the
+ -- eventually deleted one.
+ select revision
+ from
+ (select jsonb_array_elements(metadata->'revisions') as revision
+ from proctoring_object_artifacts a
+ where a.artifact_id = :artifact_id
+ ) existing
+ where :deleted_record is null or
+ not (:deleted_record @> revision
+ and revision @> :deleted_record)
+
+ union all
+
+ -- This is the new message, when some comment is
+ -- there to store.
+ select to_jsonb(record) as revision from
+ (select person_id as user_id,
+ to_char(current_timestamp, 'YYYY-MM-DD HH24:MI:SS') as timestamp,
+ p.first_names || ' ' || p.last_name as author,
+ :comment as comment,
+ false as flag
+ from persons p
+ where person_id = :user_id
+ and :comment is not null) record
+ ) u
+
+ -- Sort the updated revisions by timestamp
+ order by revision->'timestamp' asc
+ ) u
+ ),
+ update as (
+ -- Now, take the aggregated JSON structure built above and
+ -- replace the field "revisions" in the "medatata" JSON
+ -- column of the artifacts table.
+ update proctoring_object_artifacts set
+ metadata = jsonb_set(coalesce(metadata, '{}'),
+ '{revisions}',
+ (select * from updated_revisions))
+ where artifact_id = :artifact_id
+ and acs_permission.permission_p(object_id, :user_id, 'admin')
+ returning metadata->'revisions' as revisions
+ )
+
+ -- Return the final result as a JSON array
+ select revisions from update
+ }]
+
+ ns_return 200 text/plain $revisions
+
+} on error {errmsg} {
+
+ ns_return 500 text/html $errmsg
+
+}
+
+
+ ![]()
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
-
+
+
-
+ @events.timestamp@
+
+
+
+
+
+
+
+