SAK-47407: Worklog: Adding worklog on new grader (sakaiproject#10683)

* SAK-47407: Worklog: Adding worklog on new grader * SAK-47407: relocate div in sakai-grader.js
Amos09 · Jun 27, 2022 · e7ee163 · e7ee163
1 parent f2e5370
commit e7ee163
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/assignment/api/src/resources/assignment.properties b/assignment/api/src/resources/assignment.properties
@@ -109,6 +109,7 @@ gen.filatt        = File attachment
 gen.folatt        = Folder attachment
 gen.forpoi        = Max Points
 gen.assign.gra	  = Grade
+gen.assign.spent  = Time spent:
 gen.gra           = Grade
 gen.gra2          = Grade:
 gen.grade.override  = Override grade with:

diff --git a/assignment/api/src/resources/assignment_es.properties b/assignment/api/src/resources/assignment_es.properties
@@ -108,6 +108,7 @@ gen.filatt=Adjuntar fichero
 gen.folatt=Adjuntar carpeta
 gen.forpoi=Por puntos, introduzca el m\u00e1ximo posible
 gen.assign.gra=Calificaci\u00f3n
+gen.assign.spent  = Tiempo dedicado:
 gen.gra=Calificaci\u00f3n
 gen.gra2=Calificaci\u00f3n\:
 gen.grade.override=Sobreescribir nota con\:

diff --git a/...t/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java b/...t/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java
@@ -1537,6 +1537,7 @@ public class SimpleSubmitter {
         private String displayId;
         private String grade;
         private boolean overridden;
+        private String timeSpent;
 
         public SimpleSubmitter(AssignmentSubmissionSubmitter ass, boolean anonymousGrading) throws UserNotDefinedException {
 
@@ -1554,6 +1555,7 @@ public SimpleSubmitter(AssignmentSubmissionSubmitter ass, boolean anonymousGradi
                 this.displayName = ass.getSubmission().getId() + " " + rb.getString("grading.anonymous.title");
                 this.sortName = this.displayName;
             }
+            this.timeSpent = ass.getTimeSpent();
         }
     }
 

diff --git a/webcomponents/tool/src/main/frontend/js/grader/sakai-grader.js b/webcomponents/tool/src/main/frontend/js/grader/sakai-grader.js
@@ -379,6 +379,12 @@ export class SakaiGrader extends gradableDataMixin(SakaiElement) {
                 <div class="attachment-link"><a href="javascript;" data-url="${r.url}" @click=${this.previewAttachment}>${r.name}</a></div>
               `)}` : ""}
           </div>
+          <div class="timeSpent-block">
+            ${this.submission.submitters[0].timeSpent ? html`
+              <span>${this.assignmentsI18n["gen.assign.spent"]}</span>
+              <span> ${this.submission.submitters[0].timeSpent}</span>
+            ` : ""}
+          </div>
         </div> <!-- /grader-submitted-block -->
 
         ${this.submission.originalityShowing ? html`