From c140d65ab1a3c4faa97789e08223d563cf283d25 Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 31 Mar 2016 19:42:44 +0530 Subject: changes in edit profile, enrollment, change password --- yaksh/static/yaksh/js/course.js | 38 ++++++++++++++++++++++ yaksh/templates/yaksh/course_detail.html | 55 +++++++++++++++++--------------- yaksh/templates/yaksh/editprofile.html | 4 +-- yaksh/templates/yaksh/view_profile.html | 22 +++++++------ yaksh/urls.py | 9 +++--- yaksh/views.py | 19 ++++++++--- 6 files changed, 101 insertions(+), 46 deletions(-) create mode 100644 yaksh/static/yaksh/js/course.js diff --git a/yaksh/static/yaksh/js/course.js b/yaksh/static/yaksh/js/course.js new file mode 100644 index 0000000..3a21f0d --- /dev/null +++ b/yaksh/static/yaksh/js/course.js @@ -0,0 +1,38 @@ +$(document).ready(function(){ +$(".checkall").click( function(){ + if($(this).attr("checked")) { + $("#enroll-all input:checkbox").each(function(index, element) { + $(this).attr('checked', true); + }); + } + else { + $("#enroll-all input:checkbox").each(function(index, element) { + $(this).attr('checked', false); + }); + } + }); +$(".enroll").click( function(){ + if($(this).attr("checked")) { + $("#enroll input:checkbox").each(function(index, element) { + $(this).attr('checked', true); + }); + } + else { + $("#enroll input:checkbox").each(function(index, element) { + $(this).attr('checked', false); + }); + } + }); +$(".reject").click( function(){ + if($(this).attr("checked")) { + $("#reject input:checkbox").each(function(index, element) { + $(this).attr('checked', true); + }); + } + else { + $("#reject input:checkbox").each(function(index, element) { + $(this).attr('checked', false); + }); + } + }); +}); diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html index 2e17035..dbb7b73 100644 --- a/yaksh/templates/yaksh/course_detail.html +++ b/yaksh/templates/yaksh/course_detail.html @@ -9,73 +9,78 @@ {% endblock %} {% block script %} - + {% endblock %} {% block manage %}
Requests

-
- {% csrf_token %} - Enroll all + {% if course.get_requests %} +  Select all
+ + {% csrf_token %} {% for request in course.get_requests %}
-
-   {{ request.username }}
+
+   {{ request.username }}
Enroll Reject
{% endfor %} +
+ {% endif %} +
Rejected

+ {% if course.get_rejected %} +  Select all +
{% for rejected in course.get_rejected %} +
+ {% csrf_token %}
- {{ rejected.username }} +  {{ rejected.username }}
Enroll
{% endfor %} + +
+ {% endif %} +

- -
Enrolled

+ {% if course.get_enrolled %} +  Select all +
{% for enrolled in course.get_enrolled %} +
+ {% csrf_token %}
- {{ enrolled.username }} +  {{ enrolled.username }}
Reject
{% endfor %} + +
+ {% endif %} +
diff --git a/yaksh/templates/yaksh/editprofile.html b/yaksh/templates/yaksh/editprofile.html index b4cf037..f04f8fb 100644 --- a/yaksh/templates/yaksh/editprofile.html +++ b/yaksh/templates/yaksh/editprofile.html @@ -14,8 +14,8 @@ {{ form.as_table }} -
-
+
+
{% endblock content %} diff --git a/yaksh/templates/yaksh/view_profile.html b/yaksh/templates/yaksh/view_profile.html index 27bc5da..a419d92 100644 --- a/yaksh/templates/yaksh/view_profile.html +++ b/yaksh/templates/yaksh/view_profile.html @@ -5,44 +5,46 @@ {% block pagetitle %} Online Test {% endblock %} {% block css %} + {% endblock %} {% block content %} - +
- + - + - + - + - + - + - +

Your Profile Information

Firstname:

Firstname:

{{ user.first_name }}

Lastname:

Lastname:

{{ user.last_name }}

Email:

Email:

{{ user.email }}

Institute:

Institute:

{{ user.profile.institute }}

Department:

Department:

{{ user.profile.department }}

Roll Number:

Roll Number:

{{ user.profile.roll_number }}

Position:

Position:

{{ user.profile.position }}
+
{% endblock %} diff --git a/yaksh/urls.py b/yaksh/urls.py index 584064d..ab9f90a 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -12,8 +12,10 @@ urlpatterns = [ name='password_reset_done'), url(r'^password_reset/complete/$', password_reset_complete, name='password_reset_complete'), - url(r'^changepassword/$', 'password_change', name='password_change'), - url(r'^password_change/done/$', 'password_change_done', name='password_change_done'), + url(r'^password_change/$', password_change, + name='password_change'), + url(r'^password_change/done/$', password_change_done, + name='password_change_done'), ] urlpatterns += [ url(r'^$', views.index), @@ -79,5 +81,4 @@ urlpatterns += [ url(r'^manage/editprofile/$', views.edit_profile), url(r'^manage/viewprofile/$', views.view_profile), url(r'^manage/enroll/(?P\d+)', views.enroll) -] - +] \ No newline at end of file diff --git a/yaksh/views.py b/yaksh/views.py index 2738a26..8001520 100644 --- a/yaksh/views.py +++ b/yaksh/views.py @@ -624,7 +624,8 @@ def enroll(request, course_id, user_id=None, was_rejected=False): return my_render_to_response('yaksh/course_detail.html', {'course': course}, context_instance=ci) else: - course.enroll(was_rejected, *enroll_ids) + enroll_users = User.objects.filter(id__in=enroll_ids) + course.enroll(was_rejected, *enroll_users) else: user = get_object_or_404(User, pk=user_id) course.enroll(was_rejected, user) @@ -632,13 +633,22 @@ def enroll(request, course_id, user_id=None, was_rejected=False): @login_required -def reject(request, course_id, user_id, was_enrolled=False): +def reject(request, course_id, user_id=None, was_enrolled=False): user = request.user if not is_moderator(user): raise Http404('You are not allowed to view this page') course = get_object_or_404(Course, creator=user, pk=course_id) - user = get_object_or_404(User, pk=user_id) - course.reject(was_enrolled, user) + if request.method == 'POST': + reject_ids = request.POST.getlist('check') + if reject_ids is None: + return my_render_to_response('yaksh/course_detail.html', {'course': course}, + context_instance=ci) + else: + reject_users = User.objects.filter(id__in=reject_ids) + course.reject(was_enrolled, *reject_users) + else: + user = get_object_or_404(User, pk=user_id) + course.reject(was_enrolled, user) return course_detail(request, course_id) @@ -970,7 +980,6 @@ def design_questionpaper(request): def view_profile(request): """ view moderators and users profile """ - context = {} user = request.user ci = RequestContext(request) if not user.is_authenticated(): -- cgit