diff --git a/backend/db/models/assignment.js b/backend/db/models/assignment.js
index c11a01e7d..55798067d 100644
--- a/backend/db/models/assignment.js
+++ b/backend/db/models/assignment.js
@@ -32,16 +32,16 @@ module.exports = (sequelize, DataTypes) => {
label: "Maximum Revisions:",
type: "slider",
class: "custom-slider-class",
- min: 1,
+ min: 0,
max: 20,
step: 1,
unit: "revision(s)",
unlimitedAtMax: true,
unlimitedLabel: "unlimited",
- unlimitedStoredValue: 0,
+ unlimitedStoredValue: -1,
required: true,
default: 1,
- help: "Maximum number of allowed revision copies for this assignment. Move to the end for unlimited.",
+ help: "Maximum number of allowed resubmissions after the original submission (e.g. 1 revision = original + 1 resubmission = 2 submissions total). Move to the end for unlimited.",
},
{
key: "start",
diff --git a/backend/webserver/sockets/document.js b/backend/webserver/sockets/document.js
index cfa4538f1..9138c6d07 100644
--- a/backend/webserver/sockets/document.js
+++ b/backend/webserver/sockets/document.js
@@ -897,8 +897,8 @@ class DocumentSocket extends Socket {
transaction,
});
- // Check revision limit (0 = unlimited)
- if (assignment && assignment.maxRevisions > 0 && assignmentSubmissions.length >= assignment.maxRevisions) {
+ // Check revision limit (-1 = unlimited)
+ if (assignment && assignment.maxRevisions !== -1 && assignmentSubmissions.length >= assignment.maxRevisions + 1) {
throw new Error(`Revision limit reached: user ${submission.userId} already has ${assignmentSubmissions.length} submission(s) for this assignment (max: ${assignment.maxRevisions}).`);
}
@@ -1197,7 +1197,7 @@ class DocumentSocket extends Socket {
previousSubmissionId = chainTails.sort((a, b) => b - a)[0];
}
- if (assignment.maxRevisions !== null && assignment.maxRevisions !== undefined && previousSubmissionId) {
+ if (assignment.maxRevisions !== null && assignment.maxRevisions !== undefined && assignment.maxRevisions !== -1 && previousSubmissionId) {
let chainDepth = 0;
let currentId = previousSubmissionId;
const visited = new Set();
@@ -1210,7 +1210,7 @@ class DocumentSocket extends Socket {
if (chainDepth >= assignment.maxRevisions) {
throw new Error(
- `Maximum revisions reached for this assignment (${chainDepth}/${assignment.maxRevisions})`
+ `Maximum revisions reached for this assignment submission`
);
}
}
diff --git a/frontend/src/components/dashboard/Assignments.vue b/frontend/src/components/dashboard/Assignments.vue
index a0a48dfb1..1298c443e 100644
--- a/frontend/src/components/dashboard/Assignments.vue
+++ b/frontend/src/components/dashboard/Assignments.vue
@@ -292,7 +292,7 @@ export default {
canCloseAssignment: (this.isAssignmentOwner(assignment) || this.canEditAssignments) && !assignment.closed,
submissionStatus: this.getSubmissionStatus(assignment),
assignedRoles,
- maxRevisions: assignment.maxRevisions ?? 1,
+ maxRevisions: assignment.maxRevisions === -1 ? "∞" : (assignment.maxRevisions ?? 1),
disable: assignment.disable,
start: assignment.start ? new Date(assignment.start).toLocaleString() : "-",
end: assignment.end ? new Date(assignment.end).toLocaleString() : "-",
diff --git a/frontend/src/components/dashboard/Submissions.vue b/frontend/src/components/dashboard/Submissions.vue
index 53f9495c3..01f6d4fe7 100644
--- a/frontend/src/components/dashboard/Submissions.vue
+++ b/frontend/src/components/dashboard/Submissions.vue
@@ -20,23 +20,33 @@
collapsed
>
-
+
+
+
+ {{ remainingSubmissionsForAssignment(assignment) }} submission(s) left
+
+
+
+ {{ timeBadgeText(assignment) }}
+
+
+
-
- {{ assignment.end ? assignmentTimes[assignment.id] : "no due date" }}
-
@@ -61,15 +71,24 @@
collapsable
collapsed
>
-
-
+
+
+
+
+ {{ remainingSubmissionsForAssignment(assignment) }} submission(s) left
+
+
+
import Card from "@/basic/dashboard/card/Card.vue";
import BasicButton from "@/basic/Button.vue";
+import LoadIcon from "@/basic/Icon.vue";
import AssignmentUploadModal from "@/components/dashboard/assignments/AssignmentUploadModal.vue";
import AssignmentSubmissionsTable from "@/components/dashboard/assignments/AssignmentSubmissionsTable.vue";
import ConfirmModal from "@/basic/modal/ConfirmModal.vue";
@@ -97,8 +117,14 @@ import { getTimeDiffString } from "@/assets/utils";
export default {
name: "DashboardSubmission",
subscribeTable: ["assignment", "submission", "user", "document"],
- components: { Card, BasicButton, AssignmentUploadModal, AssignmentSubmissionsTable, ConfirmModal },
+ components: { Card, BasicButton, LoadIcon, AssignmentUploadModal, AssignmentSubmissionsTable, ConfirmModal },
computed: {
+ isAdmin() {
+ return this.$store.getters["auth/isAdmin"];
+ },
+ canUploadForOthers() {
+ return this.$store.getters["auth/checkRight"]("frontend.dashboard.assignments.uploadForOthers");
+ },
userId() {
return this.$store.getters["auth/getUserId"];
},
@@ -186,10 +212,42 @@ export default {
},
isRevisionLimitReachedForAssignment(assignment) {
const maxRevisions = this.maxRevisionsForAssignment(assignment);
- if (maxRevisions === 0) {
+ if (maxRevisions === -1) {
return false;
}
- return this.currentUserMaxRevisionDepth(assignment.id) >= maxRevisions;
+ return this.currentUserMaxRevisionDepth(assignment.id) >= maxRevisions + 1;
+ },
+ remainingSubmissionsForAssignment(assignment) {
+ const maxRevisions = this.maxRevisionsForAssignment(assignment);
+ if (maxRevisions === -1) {
+ return "Unlimited";
+ }
+ return Math.max(maxRevisions + 1 - this.currentUserMaxRevisionDepth(assignment.id), 0);
+ },
+ submissionsBadgeClass(assignment) {
+ return this.remainingSubmissionsForAssignment(assignment) === 0
+ ? "bg-success text-white"
+ : "bg-light text-dark border";
+ },
+ isAssignmentOverdue(assignment) {
+ return !!assignment.end && new Date(assignment.end) < new Date();
+ },
+ isAssignmentClosingSoon(assignment) {
+ if (!assignment.end) return false;
+ const msLeft = new Date(assignment.end) - new Date();
+ return msLeft > 0 && msLeft <= 24 * 60 * 60 * 1000;
+ },
+ timeBadgeClass(assignment) {
+ if (this.isAssignmentOverdue(assignment)) return "bg-danger text-white";
+ if (this.isAssignmentClosingSoon(assignment)) return "bg-warning text-dark";
+ return "bg-light text-dark border";
+ },
+ timeBadgeText(assignment) {
+ console.log(assignment)
+ if (!assignment.end) return "no due date";
+ return this.isAssignmentOverdue(assignment)
+ ? `Overdue by ${this.assignmentTimes[assignment.id]}`
+ : this.assignmentTimes[assignment.id];
},
canUploadSubmissionForAssignment(assignment) {
const statusAllowsUpload = this.getAssignmentStatus(assignment) === "open";
@@ -199,7 +257,7 @@ export default {
if (this.isRevisionLimitReachedForAssignment(assignment)) {
this.eventBus.emit("toast", {
title: "Revision limit reached",
- message: `You have reached the maximum number of revisions (${this.maxRevisionsForAssignment(assignment)}).`,
+ message: `You have reached the maximum number of submissions for this assignment (${this.maxRevisionsForAssignment(assignment) + 1}).`,
variant: "warning",
});
return;
diff --git a/frontend/src/components/dashboard/assignments/AssignmentModal.vue b/frontend/src/components/dashboard/assignments/AssignmentModal.vue
index abc352a52..4dab05fb7 100644
--- a/frontend/src/components/dashboard/assignments/AssignmentModal.vue
+++ b/frontend/src/components/dashboard/assignments/AssignmentModal.vue
@@ -205,6 +205,7 @@ export default {
delete this.formData.id;
this.formData.userId = this.currentUserId;
this.formData.closed = null;
+ this.formData.parentAssignmentId = assignmentId;
}
this.$refs.stepperModal.open();