exam draft notification and submission
This commit is contained in:
@@ -198,7 +198,7 @@ $fileAccept = implode(',', array_map(static fn ($x) => '.' . $x, $allowedExtensi
|
||||
<label class="form-check-label" for="minor_<?= (int) ($draft['id'] ?? 0) ?>">Minor edits</label>
|
||||
</div>
|
||||
</div>
|
||||
<textarea name="reviewer_comment" class="form-control form-control-sm js-review-comment" rows="3" placeholder="Feedback for the teacher"><?= esc($draft['reviewer_comment'] ?? $draft['admin_comments'] ?? '') ?></textarea>
|
||||
<textarea name="reviewer_comment" class="form-control form-control-sm js-review-comment" rows="3" placeholder="Feedback for the teacher"><?= esc($draft['reviewer_comment'] ?? $draft['reviewer_comments'] ?? $draft['admin_comments'] ?? '') ?></textarea>
|
||||
<div class="d-flex flex-wrap gap-2">
|
||||
<span class="text-muted small js-review-status"></span>
|
||||
</div>
|
||||
@@ -392,19 +392,27 @@ document.addEventListener('DOMContentLoaded', () => {
|
||||
}
|
||||
};
|
||||
|
||||
const saveRow = (row) => {
|
||||
const saveRow = (row, options = {}) => {
|
||||
const form = row.querySelector('form');
|
||||
if (!form) {
|
||||
return;
|
||||
}
|
||||
const statusSelect = form.querySelector('select[name="review_status"]');
|
||||
if (!statusSelect || statusSelect.value === '') {
|
||||
if (!statusSelect) {
|
||||
return;
|
||||
}
|
||||
const statusLabel = form.querySelector('.js-review-status');
|
||||
const data = new FormData(form);
|
||||
data.delete('final_file');
|
||||
data.delete('old_exam_file');
|
||||
if (options.commitComment) {
|
||||
const commentInput = form.querySelector('textarea[name="reviewer_comment"]');
|
||||
if (commentInput) {
|
||||
const raw = commentInput.value || '';
|
||||
const committed = raw.endsWith('\n') ? raw : raw + '\n';
|
||||
data.set('reviewer_comment', committed);
|
||||
}
|
||||
}
|
||||
const csrfToken = syncCsrfToken(form);
|
||||
if (csrfToken) {
|
||||
data.set(csrfTokenName, csrfToken);
|
||||
@@ -480,10 +488,29 @@ document.addEventListener('DOMContentLoaded', () => {
|
||||
return;
|
||||
}
|
||||
const row = target.closest('tr');
|
||||
if (row) {
|
||||
debouncedSave(row);
|
||||
if (row && target.value.endsWith('\n')) {
|
||||
const lastCommitted = target.dataset.lastCommitted || '';
|
||||
if (target.value !== lastCommitted) {
|
||||
target.dataset.lastCommitted = target.value;
|
||||
debouncedSave(row, { commitComment: true });
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
document.addEventListener('blur', (event) => {
|
||||
const target = event.target;
|
||||
if (!(target instanceof HTMLTextAreaElement) || target.name !== 'reviewer_comment') {
|
||||
return;
|
||||
}
|
||||
const row = target.closest('tr');
|
||||
if (row) {
|
||||
const lastCommitted = target.dataset.lastCommitted || '';
|
||||
if (target.value !== lastCommitted) {
|
||||
target.dataset.lastCommitted = target.value;
|
||||
debouncedSave(row, { commitComment: true });
|
||||
}
|
||||
}
|
||||
}, true);
|
||||
});
|
||||
</script>
|
||||
<?= $this->endSection() ?>
|
||||
@@ -496,13 +523,15 @@ document.addEventListener('DOMContentLoaded', () => {
|
||||
word-break: break-word;
|
||||
}
|
||||
.exam-drafts-table th {
|
||||
min-width: 120px;
|
||||
min-width: 0;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.exam-drafts-table td {
|
||||
max-width: 220px;
|
||||
max-width: none;
|
||||
}
|
||||
.exam-drafts-table {
|
||||
table-layout: auto;
|
||||
width: max-content;
|
||||
}
|
||||
.exam-drafts-table thead th {
|
||||
background-color: #f8f9fa;
|
||||
|
||||
Reference in New Issue
Block a user