Skip to content

Commit accb229

Browse files
adrianfishern
adrianfish
authored and
ern
committed
SAK-41307 Moved Rubrics to litelement (sakaiproject#6608)
1 parent 110b2be commit accb229

File tree

107 files changed

+10382
-4211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+10382
-4211
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ rsf/sakai-rsf-web/templates/overlays
2222
rsf/sakai-rsf-web/test/overlays
2323
.mvn/wrapper/maven-wrapper.jar
2424
.checkstyle
25+
assets

‎assignment/tool/src/webapp/js/assignments.js

+7-18
Original file line numberDiff line numberDiff line change
@@ -999,28 +999,17 @@ ASN.handleReportsTriangleDisclosure = function (header, content)
999999
}
10001000

10011001
// rubrics-specific code
1002-
ASN.rubricsEventHandlers = function ()
1003-
{
1004-
$('body').on('rubrics-event', function(e, payload){
1005-
if (payload.event == "total-points-updated") {
1006-
ASN.handleRubricsTotalPointChange(payload.value);
1007-
}
1008-
if (payload.event == "rubric-ratings-changed") {
1009-
console.log('rubric-ratings-changed');
1010-
ASN.rubricChanged = true;
1011-
}
1012-
});
1002+
ASN.rubricsEventHandlers = function () {
10131003

1014-
console.log('Rubrics event handlers loaded');
1015-
}
1004+
$('body').on('total-points-updated', function (e) {
1005+
1006+
e.stopPropagation();
10161007

1017-
// handles point changes for assignments, updating the grade field if it exists.
1018-
ASN.handleRubricsTotalPointChange = function (points)
1019-
{
10201008
var gradeField = $('#grade');
1021-
if (gradeField.length && ((gradeField.val() === "" || gradeField.val() === points) || ASN.rubricChanged)) {
1022-
gradeField.val(points);
1009+
if (gradeField.length) {
1010+
gradeField.val(e.detail.value);
10231011
}
1012+
});
10241013
}
10251014

10261015
ASN.changeVisibleDate = function()

‎assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm

+5-10
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,9 @@
2121

2222
<!-- RUBRICS JAVASCRIPT -->
2323
<script>
24-
var imports = [
25-
'/rubrics-service/imports/sakai-rubric-grading.html'
26-
];
27-
var Polymerdom = 'shady';
28-
var rbcstoken = "$!rbcs-token";
2924
ASN.rubricsEventHandlers();
3025
</script>
3126

32-
<script src="/rubrics-service/js/sakai-rubrics.js"></script>
3327
<!-- END RUBRICS JAVASCRIPT -->
3428

3529
<div class="portletBody">
@@ -491,12 +485,13 @@
491485
<div role="tabpanel" class="tab-pane" id="rubric">
492486
<sakai-rubric-grading
493487
## grade-field-id="grade"
494-
tool-id="sakai.assignment"
495-
entity-id="$assignment.Id"
496-
evaluated-item-id="$submission.Id"
488+
token="$!rbcs-token"
489+
toolId="sakai.assignment"
490+
entityId="$assignment.Id"
491+
evaluatedItemId="$submission.Id"
497492

498493
#if($rbcs-state-details && "$!rbcs-state-details" != "")
499-
state-details="$rbcs-state-details"
494+
stateDetails="$rbcs-state-details"
500495
#end
501496
></sakai-rubric-grading>
502497
</div>

‎assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm

+10-21
Original file line numberDiff line numberDiff line change
@@ -128,18 +128,6 @@
128128
</script>
129129
#javascript("/library/js/lang-datepicker/lang-datepicker.js")
130130

131-
<!-- RUBRICS JAVASCRIPT -->
132-
<script>
133-
var imports = [
134-
'/rubrics-service/imports/sakai-rubric-association.html'
135-
];
136-
var Polymerdom = 'shady';
137-
var rbcstoken = "$!rbcs-token";
138-
</script>
139-
140-
<script src="/rubrics-service/js/sakai-rubrics.js"></script>
141-
<!-- END RUBRICS JAVASCRIPT -->
142-
143131
<div class="portletBody container-fluid">
144132
#navBarOnClick( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "newAssignmentForm" "new" )
145133

@@ -1349,22 +1337,23 @@
13491337
#end
13501338

13511339
<sakai-rubric-association style="display:none;"
1352-
dont-associate-label="$tlang.getString("dont.associate.label")"
1353-
dont-associate-value="0"
1354-
associate-label="$tlang.getString("associate.label")"
1355-
associate-value="1"
1340+
token="$!rbcs-token"
1341+
dontAssociateLabel="$tlang.getString("dont.associate.label")"
1342+
dontAssociateValue="0"
1343+
associateLabel="$tlang.getString("associate.label")"
1344+
associateValue="1"
1345+
toolId="sakai.assignment"
13561346

13571347
#if("$!assignment.Id" != "")
1358-
tool-id="sakai.assignment"
1359-
entity-id="$assignment.Id"
1348+
entityId="$assignment.Id"
13601349
#end
13611350

13621351
#if($rbcs-state-details && "$!rbcs-state-details" != "")
1363-
state-details="$rbcs-state-details"
1352+
stateDetails="$rbcs-state-details"
13641353
#end
13651354

1366-
config-fine-tune-points="$tlang.getString("option.pointsoverride")"
1367-
config-hide-student-preview="$tlang.getString("option.studentpreview")"
1355+
fineTunePoints="$tlang.getString("option.pointsoverride")"
1356+
hideStudentPreview="$tlang.getString("option.studentpreview")"
13681357
></sakai-rubric-association>
13691358

13701359
## SAK-17606 - Show the anonymous grading checkbox if enabled

‎assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm

+4-15
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,6 @@
1717
});
1818
</script>
1919

20-
<!-- RUBRICS JAVASCRIPT -->
21-
<script>
22-
var imports = [
23-
'/rubrics-service/imports/sakai-rubric-student.html'
24-
];
25-
var Polymerdom = 'shady';
26-
var rbcstoken = "$!rbcs-token";
27-
</script>
28-
29-
<script src="/rubrics-service/js/sakai-rubrics.js"></script>
30-
<!-- END RUBRICS JAVASCRIPT -->
31-
3220
<div class="portletBody">
3321
#if ($taggable)
3422
#if (!$itemHelpers.isEmpty())
@@ -418,9 +406,10 @@
418406

419407
#if ($submission.Graded && ($submission.GradeReleased || $returned))
420408
<sakai-rubric-student
421-
tool-id="sakai.assignment"
422-
entity-id="$assignment.Id"
423-
evaluated-item-id="$submission.Id"
409+
token="$!rbcs-token"
410+
toolId="sakai.assignment"
411+
entityId="$assignment.Id"
412+
evaluatedItemId="$submission.Id"
424413
></sakai-rubric-student>
425414
#end
426415

‎assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm

+4-15
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,6 @@ $(document).ready(function(){
2626
## Include other javascript specific to this page
2727
#javascript("/sakai-assignment-tool/js/studentViewSubmission.js")
2828

29-
<!-- RUBRICS JAVASCRIPT -->
30-
<script>
31-
var imports = [
32-
'/rubrics-service/imports/sakai-rubric-student.html'
33-
];
34-
var Polymerdom = 'shady';
35-
var rbcstoken = "$!rbcs-token";
36-
</script>
37-
38-
<script src="/rubrics-service/js/sakai-rubrics.js"></script>
39-
<!-- END RUBRICS JAVASCRIPT -->
40-
4129
<div class="portletBody">
4230
## submission times
4331
#set($dateReturned=false)
@@ -385,9 +373,10 @@ $(document).ready(function(){
385373

386374
#if ($submission.Graded && ($submission.GradeReleased || $returned))
387375
<sakai-rubric-student
388-
tool-id="sakai.assignment"
389-
entity-id="$assignment.Id"
390-
evaluated-item-id="$submission.Id"
376+
token="$!rbcs-token"
377+
toolId="sakai.assignment"
378+
entityId="$assignment.Id"
379+
evaluatedItemId="$submission.Id"
391380
></sakai-rubric-student>
392381
#end
393382

‎gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.html

+2-13
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,12 @@
2525
<div wicket:id="bulkEditItemsWindow" />
2626

2727
<div wicket:id="rubricGradeWindow" />
28-
<input wicket:id="rubricsTokenHiddenField" type="hidden" />
2928
<script>
30-
var tokenAttr = $("[name$='rubricsTokenHiddenField']").val();
31-
var imports = [
32-
'/rubrics-service/imports/sakai-rubric-association.html',
33-
'/rubrics-service/imports/sakai-rubric-grading.html',
34-
'/rubrics-service/imports/sakai-rubric-student.html'
35-
];
36-
var Polymerdom = 'shady';
37-
var rbcstoken = tokenAttr;
38-
3929
rubricGradingPoints = 0;
40-
$('body').on('rubrics-event', function(e, payload){
41-
rubricGradingPoints = payload.value;
30+
$('body').on('total-points-updated', function (e) {
31+
rubricGradingPoints = e.detail.value;
4232
});
4333
</script>
44-
<script src="/rubrics-service/js/sakai-rubrics.js"></script>
4534

4635
<div wicket:id="gradeTableArea">
4736
<div wicket:id="noAssignments" class="gb-noGbItems">

‎gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.java

-4
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,6 @@ public GradebookPage() {
185185
this.rubricGradeWindow.setPositionAtTop(true);
186186
this.form.add(this.rubricGradeWindow);
187187

188-
String rubricsToken = rubricsService.generateJsonWebToken(RubricsConstants.RBCS_TOOL_GRADEBOOKNG);
189-
final HiddenField<String> rubricsTokenHiddenField = new HiddenField<String>("rubricsTokenHiddenField", Model.of(rubricsToken));
190-
this.form.add(rubricsTokenHiddenField);
191-
192188
this.gradeLogWindow = new GbModalWindow("gradeLogWindow");
193189
this.form.add(this.gradeLogWindow);
194190

‎gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/StudentPage.html

-13
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,6 @@ <h2 wicket:id="heading">Grade Report for Tony Stark</h2>
1313

1414
<div wicket:id="summary" id="studentGradeSummary"></div>
1515

16-
<input wicket:id="rubricsTokenHiddenField" type="hidden" />
17-
18-
<script>
19-
var tokenAttr = $("[name$='rubricsTokenHiddenField']").val();
20-
var imports = [
21-
'/rubrics-service/imports/sakai-rubric-student.html'
22-
];
23-
var Polymerdom = 'shady';
24-
var rbcstoken = tokenAttr;
25-
</script>
26-
27-
<script src="/rubrics-service/js/sakai-rubrics.js"></script>
28-
2916
<script>
3017
$(document).ready(function() {
3118
new GradebookGradeSummary($("#studentGradeSummary"));

‎gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/AddOrEditGradeItemPanelContent.java

+11-10
Original file line numberDiff line numberDiff line change
@@ -279,16 +279,17 @@ protected void onUpdate(final AjaxRequestTarget target) {
279279
add(extraCredit);
280280

281281
final WebMarkupContainer sakaiRubricAssociation = new WebMarkupContainer("sakai-rubric-association");
282-
sakaiRubricAssociation.add(AttributeModifier.append("dont-associate-label", new ResourceModel("rubrics.dont_associate_label")));
283-
sakaiRubricAssociation.add(AttributeModifier.append("dont-associate-value", "0"));
284-
sakaiRubricAssociation.add(AttributeModifier.append("associate-label", new ResourceModel("rubrics.associate_label")));
285-
sakaiRubricAssociation.add(AttributeModifier.append("associate-value", "1"));
286-
sakaiRubricAssociation.add(AttributeModifier.append("config-fine-tune-points", new ResourceModel("rubrics.option_pointsoverride")));
287-
sakaiRubricAssociation.add(AttributeModifier.append("config-hide-student-preview", new ResourceModel("rubrics.option_studentpreview")));
288-
sakaiRubricAssociation.add(AttributeModifier.append("tool-id", RubricsConstants.RBCS_TOOL_GRADEBOOKNG));
289-
290-
if (assignment.getId() != null) {
291-
sakaiRubricAssociation.add(AttributeModifier.append("entity-id", assignment.getId()));
282+
sakaiRubricAssociation.add(AttributeModifier.append("dontAssociateLabel", new ResourceModel("rubrics.dont_associate_label")));
283+
sakaiRubricAssociation.add(AttributeModifier.append("dontAssociateValue", "0"));
284+
sakaiRubricAssociation.add(AttributeModifier.append("associateLabel", new ResourceModel("rubrics.associate_label")));
285+
sakaiRubricAssociation.add(AttributeModifier.append("associateValue", "1"));
286+
sakaiRubricAssociation.add(AttributeModifier.append("fineTunePoints", new ResourceModel("rubrics.option_pointsoverride")));
287+
sakaiRubricAssociation.add(AttributeModifier.append("hideStudentPreview", new ResourceModel("rubrics.option_studentpreview")));
288+
sakaiRubricAssociation.add(AttributeModifier.append("toolId", RubricsConstants.RBCS_TOOL_GRADEBOOKNG));
289+
sakaiRubricAssociation.add(AttributeModifier.append("token", rubricsService.generateJsonWebToken(RubricsConstants.RBCS_TOOL_GRADEBOOKNG)));
290+
291+
if (assignment.getId() != null) {
292+
sakaiRubricAssociation.add(AttributeModifier.append("entityId", assignment.getId()));
292293
}
293294
add(sakaiRubricAssociation);
294295

‎gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricGradePanel.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@ public void onInitialize() {
5858

5959
final WebMarkupContainer sakaiRubricGrading = new WebMarkupContainer("sakai-rubric-grading");
6060
sakaiRubricGrading.add(AttributeModifier.append("id", assignmentId));
61-
sakaiRubricGrading.add(AttributeModifier.append("tool-id", RubricsConstants.RBCS_TOOL_GRADEBOOKNG));
62-
sakaiRubricGrading.add(AttributeModifier.append("entity-id", assignmentId));
63-
sakaiRubricGrading.add(AttributeModifier.append("evaluated-item-id", assignmentId + "." + studentUuid));
61+
sakaiRubricGrading.add(AttributeModifier.append("toolId", RubricsConstants.RBCS_TOOL_GRADEBOOKNG));
62+
sakaiRubricGrading.add(AttributeModifier.append("entityId", assignmentId));
63+
sakaiRubricGrading.add(AttributeModifier.append("evaluatedItemId", assignmentId + "." + studentUuid));
64+
sakaiRubricGrading.add(AttributeModifier.append("token", rubricsService.generateJsonWebToken(RubricsConstants.RBCS_TOOL_GRADEBOOKNG)));
6465
form.add(sakaiRubricGrading);
6566

6667
final GbAjaxButton submit = new GbAjaxButton("submit") {

‎gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricStudentPanel.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import org.apache.wicket.model.IModel;
2424
import org.apache.wicket.model.ResourceModel;
2525

26+
import org.sakaiproject.rubrics.logic.RubricsConstants;
27+
2628
public class RubricStudentPanel extends BasePanel {
2729

2830
private final ModalWindow window;
@@ -41,9 +43,10 @@ public void onInitialize() {
4143
super.onInitialize();
4244

4345
final WebMarkupContainer sakaiRubricStudent = new WebMarkupContainer("sakai-rubric-student");
44-
sakaiRubricStudent.add(AttributeModifier.append("tool-id", toolId));
45-
sakaiRubricStudent.add(AttributeModifier.append("entity-id", assignmentId));//this only works for Assignments atm
46-
sakaiRubricStudent.add(AttributeModifier.append("evaluated-item-id", studentUuid));
46+
sakaiRubricStudent.add(AttributeModifier.append("token", rubricsService.generateJsonWebToken(RubricsConstants.RBCS_TOOL_GRADEBOOKNG)));
47+
sakaiRubricStudent.add(AttributeModifier.append("toolId", toolId));
48+
sakaiRubricStudent.add(AttributeModifier.append("entityId", assignmentId));//this only works for Assignments atm
49+
sakaiRubricStudent.add(AttributeModifier.append("evaluatedItemId", studentUuid));
4750
sakaiRubricStudent.add(AttributeModifier.append("instructor", instructor));
4851
add(sakaiRubricStudent);
4952

‎library/pom.xml

-48
Original file line numberDiff line numberDiff line change
@@ -220,54 +220,6 @@
220220
<version>1.7.13</version>
221221
<scope>runtime</scope>
222222
</dependency>
223-
<dependency>
224-
<groupId>org.webjars.bowergithub.polymer</groupId>
225-
<artifactId>polymer</artifactId>
226-
<version>1.7.0</version>
227-
<scope>runtime</scope>
228-
</dependency>
229-
<dependency>
230-
<groupId>org.webjars.bowergithub.polymerelements</groupId>
231-
<artifactId>iron-ajax</artifactId>
232-
<version>1.4.4</version>
233-
<scope>runtime</scope>
234-
</dependency>
235-
<dependency>
236-
<groupId>org.webjars.bowergithub.polymerelements</groupId>
237-
<artifactId>iron-icons</artifactId>
238-
<version>1.1.3</version>
239-
<scope>runtime</scope>
240-
</dependency>
241-
<dependency>
242-
<groupId>org.webjars.bowergithub.polymerelements</groupId>
243-
<artifactId>iron-collapse</artifactId>
244-
<version>1.3.0</version>
245-
<scope>runtime</scope>
246-
</dependency>
247-
<dependency>
248-
<groupId>org.webjars.bowergithub.lostinbrittany</groupId>
249-
<artifactId>granite-bootstrap</artifactId>
250-
<version>3.3.7-5</version>
251-
<scope>runtime</scope>
252-
<exclusions>
253-
<exclusion>
254-
<groupId>org.webjars.bowergithub.polymer</groupId>
255-
<artifactId>polymer</artifactId>
256-
</exclusion>
257-
</exclusions>
258-
</dependency>
259-
<dependency>
260-
<groupId>org.webjars.bowergithub.polymerelements</groupId>
261-
<artifactId>iron-a11y-keys</artifactId>
262-
<version>1.0.9</version>
263-
<scope>runtime</scope>
264-
</dependency>
265-
<dependency>
266-
<groupId>org.webjars.npm</groupId>
267-
<artifactId>sortablejs</artifactId>
268-
<version>1.7.0</version>
269-
<scope>runtime</scope>
270-
</dependency>
271223
</dependencies>
272224
<profiles>
273225
<profile>

0 commit comments

Comments
 (0)