Skip to content

Commit

Permalink
[admin/audiences] research field in audience edition page (#712)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Drumor
Drumor committed Jan 5, 2022
1 parent 7254ce3 commit 5ccd530
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 94 deletions.
21 changes: 20 additions & 1 deletion inginious/frontend/static/js/all-minified.js
View file

Large diffs are not rendered by default.

87 changes: 34 additions & 53 deletions inginious/frontend/static/js/audiences.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,59 +72,40 @@ function audiences_tutor_remove(username, id) {
}

function audiences_student_add() {
if($("#tab_registered_student").hasClass("active")) {

var new_li = jQuery('<li/>', {
'class':"list-group-item group-entry",
'data-username':$("#registered_students :selected").val()
});

var new_user = jQuery('<span/>', {
id: new_li.data("username"),
text: ' ' + $("#registered_students :selected").text()
}).appendTo(new_li);

jQuery('<i/>', {
class: "fa fa-arrows",
}).prependTo(new_user);

$("#registered_students :selected").remove();
if(!$("#registered_students").val())
$("#registered_students").prop("disabled", true);
}
else {
var new_li = jQuery('<li/>', {
'class':"list-group-item group-entry",
'data-username': $("#new_student").val()
});

var new_user = jQuery('<span/>', {
id: new_li.data("username"),
text: ' ' + $("#new_student").val() + ' (will be registered)'
}).appendTo(new_li);

jQuery('<i/>', {
class: "fa fa-arrows",
}).prependTo(new_user);
var input_data = ($("#registered_students").val()).split(',');
for(var student_id in input_data) {
if (input_data[student_id] !== "") {
var new_li = jQuery('<li/>', {
'class': "list-group-item group-entry",
'data-username': input_data[student_id]
});
var new_user = jQuery('<span/>', {
id: new_li.data("username"),
text: ' ' + input_data[student_id]
}).appendTo(new_li);

jQuery('<i/>', {
class: "fa fa-arrows",
}).prependTo(new_user);

var user_del_link = jQuery('<a/>', {
'class': "pull-right",
'id': 'user_delete',
'href': '#',
'onclick': "javascript:student_remove('" + new_li.data("username") + "')",
'data-toggle': 'tooltip',
'data-placement': 'left',
'title': 'Remove student'
});

jQuery('<i/>', {
'class': 'fa fa-user-times'
}).appendTo(user_del_link);

new_li.append(user_del_link);
new_li.appendTo($("#group_0"));
}
}

var user_del_link = jQuery('<a/>', {
'class': "pull-right",
'id': 'user_delete',
'href': '#',
'onclick': "javascript:student_remove('" + new_li.data("username") + "')",
'data-toggle': 'tooltip',
'data-placement': 'left',
'title': 'Remove student'
});

jQuery('<i/>', {
'class': 'fa fa-user-times'
}).appendTo(user_del_link);

new_li.append(user_del_link);
new_li.appendTo($("#group_0"));

$("#student_modal").modal('hide');
}

Expand All @@ -147,4 +128,4 @@ function audience_delete(id) {
}).appendTo($('form'));

$('form').submit();
}
}
46 changes: 6 additions & 40 deletions inginious/frontend/templates/course_admin/audience_edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,47 +46,13 @@ <h4 class="modal-title">{{ _("Add student") }}</h4>
</div>
<div class="modal-body">
<form onsubmit="audiences_student_add();return false;">
<div class="card">
<div class="card-header">
<ul class="nav nav-tabs card-header-tabs">
<li role="presentation" class="nav-item">
<a href="#tab_registered_student" class="nav-link active" aria-controls="registered_student" role="tab" data-toggle="tab">
<i class="fa fa-user fa-fw"></i>&nbsp; {{ _("Registered student") }}</a>
</li>
<li role="presentation" class="nav-item">
<a href="#tab_new_student" class="nav-link" aria-controls="new_student" role="tab" data-toggle="tab">
<i class="fa fa-plus fa-fw"></i>&nbsp; {{ _("New student") }}</a>
</li>
</ul>
<div class="row">
<div class="col-md-3">
<label class="control-label" for="registered_students"> {{ _("Choose student :") }}</label>
</div>
<div class="tab-content">
<div role="tabpanel" class="card-body tab-pane active" id="tab_registered_student">
<div class="row">
<div class="col-md-3">
<label class="control-label" for="registered_students"> {{ _("Choose student :") }}</label>
</div>
<div class="col-md-9">
<select id="registered_students" name="registered_students" class="form-control">
{% for student in other_students %}
{% if users_info[student] is not none %}
<option value="{{student}}">{{ users_info[student].realname }} ({{ student }})</option>
{% else %}
<option value="{{student}}">{{ student }}</option>
{% endif %}
{% endfor %}
</select>
</div>
</div>
</div>
<div id="tab_new_student" role="tabpanel" class="card-body tab-pane">
<div class="row">
<div class="col-md-6">
<label class="control-label" for="new_student"> {{ _("Student username (will be registered) :") }}</label>
</div>
<div class="col-md-6">
<input id="new_student" name="new_student" type="text" class="form-control" placeholder="{{ _('Student username') }}">
</div>
</div>
<div class="col-md-9">
<div class="col-sm-10">
{{ user_selection_box(course_id=course.get_id(), current_users=[], name="registered_students", id="registered_students", placeholder=_("Enter something here to search for a user")) | safe }}
</div>
</div>
</div>
Expand Down

0 comments on commit 5ccd530

Please sign in to comment.