SAK-50327 Assignments add support for LTI assignments when using clas…

…sic grader (sakaiproject#12761)
susowrc · Jul 30, 2024 · b7a924f · b7a924f
1 parent 524ef95
commit b7a924f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
@@ -4348,6 +4348,13 @@ protected String build_instructor_grade_submission_context(VelocityPortlet portl
         String siteId = (String) state.getAttribute(STATE_CONTEXT_STRING);
         String toolId = toolManager.getCurrentPlacement().getId();
 
+        if (assignment.isPresent()) {
+            if (assignment.get().getTypeOfSubmission() == Assignment.SubmissionType.EXTERNAL_TOOL_SUBMISSION) {
+                putExternalToolIntoContext(context, assignment.get(), state);
+                context.put("externalTool", Boolean.TRUE);
+            }
+        }
+
         String template = (String) getContext(data).get("template");
         if (useSakaiGrader()) {
             if (MODE_INSTRUCTOR_VIEW_STUDENTS_ASSIGNMENT.equals(state.getAttribute(FROM_VIEW))) {

diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm
@@ -3,7 +3,7 @@
 #set( $H = '-' )
 #set( $T = 'T' )
 #javascript("/library/js/lang-datepicker/lang-datepicker.js")
-
+<script type="module" src="/webcomponents/bundles/lti.js"></script>
 <script>
     focus_path = ['$fField'];
     $(document).ready(function () {
@@ -320,7 +320,7 @@
                 </p>
             #end
             ## Submitted Attachment
-            #set ($attachAllowed = $submissionType != 1 && $submissionType != 4)
+            #set ($attachAllowed = $submissionType != 1 && $submissionType != 4 && $submissionType != 6)
             #if ($attachAllowed || $size != 0) ##do not show attach messages if no attach are allowed unless an attach is present anyway.
                 <h3>
                     #if ($submissionType == 5)
@@ -449,6 +449,12 @@
         </script>
         #end
 
+        #if($submissionType == 6 && $value_ContentId && $value_ContentLaunchURL)
+            <p>
+                <sakai-lti-popup launch-url="$value_ContentLaunchURL"></sakai-lti-popup>
+            </p>
+        #end
+
         <div class="highlightPanel" style="width:80%">
             #if ($allowToGrade)
                 #if ($gradeType == 1)