Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions feedback/locale/fi/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,10 @@ msgstr "näytä lisää"
msgid "This feedback has unsaved changes!"
msgstr "Palautteessa on tallentamattomia muutoksia!"

#: feedback/templates_j2/feedback/_form.html
msgid "Feedback received."
msgstr "Palaute vastaanotettu."

#: feedback/templates_j2/feedback/_form.html
msgid "Submit"
msgstr "Lähetä"
Expand Down
34 changes: 22 additions & 12 deletions feedback/templates_j2/feedback/_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -164,29 +164,39 @@
{{ _("This feedback has unsaved changes!") }}
</div>

<div>
<div class="btn-toolbar gap-2">
<input
type="submit"
value="{{ _('Submit') }}"
class="btn btn-primary aplus-submit mr-2">
<input
type="reset"
value="{{ _('Reset changes') }}"
class="btn btn-danger only-when-edited">
</div>
<div id="feedback-received-message" class="alert alert-info" style="display: none">
{{ _("Feedback received.") }}
</div>

<div class="btn-toolbar gap-2">
<input
type="submit"
value="{{ _('Submit') }}"
class="btn btn-primary aplus-submit mr-2">
<input
type="reset"
value="{{ _('Reset changes') }}"
class="btn btn-danger only-when-edited">
</div>
</form>

{# UI interaction #}
<script>
(function($) {
const f = $('#{{ form_id }}');
// implement feedback received notification
// needs to be only shown when feedback has just been sent by student
const feedbackJustReceived = f.closest('.exercise-response').data('aplus-grader-feedback-just-received');
if (feedbackJustReceived) {
$('#feedback-received-message').show();
}
// implement show more
const c = f.find('.history-well'), m = c.find('.show-more');
m.click(function() { c.find('li.initially-hidden').removeClass('initially-hidden').show(); m.hide(); });
// empty textfields
c.next('textarea, input[type="text"]').val("");
window.setTimeout(function() {
c.next('textarea, input[type="text"]').val("");
})
// implement edited notification
const o = f.find('.only-when-edited'), i = f.serialize();
let s = false;
Expand Down