From 7433f472fd8909211d962eb24a4fd7dc12a6e88f Mon Sep 17 00:00:00 2001 From: aditya palaparthy Date: Thu, 16 Feb 2017 12:22:25 +0530 Subject: Display students info in course --- yaksh/templates/yaksh/addteacher.html | 6 + yaksh/templates/yaksh/course_detail.html | 312 ++++++++++++------------------- 2 files changed, 127 insertions(+), 191 deletions(-) diff --git a/yaksh/templates/yaksh/addteacher.html b/yaksh/templates/yaksh/addteacher.html index 755ba20..86f5806 100644 --- a/yaksh/templates/yaksh/addteacher.html +++ b/yaksh/templates/yaksh/addteacher.html @@ -5,6 +5,11 @@ {% block css %} + {% endblock %} {% block content %} @@ -51,6 +56,7 @@ {% endif %} {% endfor %} +
{% endif %} {% endif %} diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html index 5fb92f9..0cccb60 100644 --- a/yaksh/templates/yaksh/course_detail.html +++ b/yaksh/templates/yaksh/course_detail.html @@ -7,202 +7,132 @@ {% block script %} {% endblock %} +{% block css %} + +{% endblock %} {% block content %}
-
- {% if course.active %}Deactivate Course {% else %} Activate Course {% endif %} +
+
+ -
+
-
-
Requests

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

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

+{% if course.get_requests %} + Select all +
+ + + + + + + + + +{% csrf_token %} +{% for request in course.get_requests %} + + + + + + + + +{% endfor %} +
Full NameEmailRoll NumberInstituteDepartmentEnroll/Reject
{{request.get_full_name}} {{request.email}} {{request.profile.roll_number}} {{request.profile.institute}} {{request.profile.department}} + Enroll Reject +
+ +
+{% endif %} +

-
-
-
Enrolled

- {% if course.get_enrolled %} -  Select all -
- {% for enrolled in course.get_enrolled %} -
- {% csrf_token %} -
-
-
-   - - {{ enrolled.username }} - -
- Reject -
-
- {% endfor %} - -
- {% endif %} - -
+
+
Enrolled

+{% if course.get_enrolled %} + Select all +
+ + + + + + + + + {% for enrolled in course.get_enrolled %} + + {% csrf_token %} + + + + + + + + + + {% endfor %} +
Full NameEmailRoll NumberInstituteDepartmentReject
{{ enrolled.get_full_name|title }} {{enrolled.email}} {{enrolled.profile.roll_number}} {{enrolled.profile.institute}} {{enrolled.profile.department}} Reject +
+ +
+{% endif %} + +
+
+
+
Rejected

+{% if course.get_rejected %} + Select all +
+ + + + + + + + +{% for rejected in course.get_rejected %} + +{% csrf_token %} + + + + + + + + + +{% endfor %} +
Full NameEmailRoll NumberInstituteDepartmentEnroll
{{rejected.get_full_name|title}} {{rejected.email}} {{rejected.profile.roll_number}} {{rejected.profile.institute}} {{rejected.profile.department}} + Enroll +
+
+ +
+{% endif %} + +
+
+
- {% endblock %} -- cgit From 33fda6a4cf8bacabddaba26b448dfeeafe8519f4 Mon Sep 17 00:00:00 2001 From: aditya palaparthy Date: Thu, 16 Feb 2017 12:40:44 +0530 Subject: Modify students information table --- yaksh/templates/yaksh/addteacher.html | 7 +------ yaksh/templates/yaksh/course_detail.html | 11 +++-------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/yaksh/templates/yaksh/addteacher.html b/yaksh/templates/yaksh/addteacher.html index 86f5806..478da77 100644 --- a/yaksh/templates/yaksh/addteacher.html +++ b/yaksh/templates/yaksh/addteacher.html @@ -5,11 +5,6 @@ {% block css %} - {% endblock %} {% block content %} @@ -32,7 +27,7 @@ table, th, td{ {% else %}
Search Results

Search results does not include teachers already added

- +
diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html index 0cccb60..94b19a9 100644 --- a/yaksh/templates/yaksh/course_detail.html +++ b/yaksh/templates/yaksh/course_detail.html @@ -7,11 +7,6 @@ {% block script %} {% endblock %} -{% block css %} - -{% endblock %} {% block content %}

@@ -33,7 +28,7 @@ table, th, td { border: 1px solid black;} {% if course.get_requests %}  Select all
-
Username First Name
+
@@ -67,7 +62,7 @@ table, th, td { border: 1px solid black;} {% if course.get_enrolled %}  Select all
-
Full Name Email
+
@@ -101,7 +96,7 @@ table, th, td { border: 1px solid black;} {% if course.get_rejected %}  Select all
-
Full Name Email
+
-- cgit From 304d1606a72f1bb0ec3197e2fb102817dde3881e Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 16 Feb 2017 18:16:45 +0530 Subject: Wrap lines to 80 cols with proper indentation --- yaksh/templates/yaksh/course_detail.html | 229 ++++++++++++++++--------------- 1 file changed, 120 insertions(+), 109 deletions(-) diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html index 94b19a9..dc85080 100644 --- a/yaksh/templates/yaksh/course_detail.html +++ b/yaksh/templates/yaksh/course_detail.html @@ -17,117 +17,128 @@
  • Enrolled Students
  • Rejected Students
  • - {% if course.active %}Deactivate Course {% else %} Activate Course {% endif %} + + {% if course.active %}Deactivate Course {% else %} Activate Course {% endif %}
  • + -
    -
    -
    -
    Requests

    -{% if course.get_requests %} - Select all -
    -
    Full Name Email
    - - - - - - - - -{% csrf_token %} -{% for request in course.get_requests %} - - - - - - - - -{% endfor %} -
    Full NameEmailRoll NumberInstituteDepartmentEnroll/Reject
    {{request.get_full_name}} {{request.email}} {{request.profile.roll_number}} {{request.profile.institute}} {{request.profile.department}} - Enroll Reject -
    - -
    -{% endif %} - -
    -
    -
    -
    Enrolled

    -{% if course.get_enrolled %} - Select all -
    - - - - - - - - - {% for enrolled in course.get_enrolled %} - - {% csrf_token %} - - - - - - - - - - {% endfor %} -
    Full NameEmailRoll NumberInstituteDepartmentReject
    {{ enrolled.get_full_name|title }} {{enrolled.email}} {{enrolled.profile.roll_number}} {{enrolled.profile.institute}} {{enrolled.profile.department}} Reject -
    - -
    -{% endif %} - -
    -
    -
    -
    Rejected

    -{% if course.get_rejected %} - Select all -
    - - - - - - - - -{% for rejected in course.get_rejected %} - -{% csrf_token %} - - - - - - - - - -{% endfor %} -
    Full NameEmailRoll NumberInstituteDepartmentEnroll
    {{rejected.get_full_name|title}} {{rejected.email}} {{rejected.profile.roll_number}} {{rejected.profile.institute}} {{rejected.profile.department}} - Enroll -
    -
    - -
    -{% endif %} - -
    - - +
    +
    +
    +
    Requests

    + {% if course.get_requests %} +  Select all +
    + + + + + + + + + + {% csrf_token %} + {% for request in course.get_requests %} + + + + + + + + + + {% endfor %} +
    Full NameEmailRoll NumberInstituteDepartmentEnroll/Reject
    {{request.get_full_name}} {{request.email}} {{request.profile.roll_number}} {{request.profile.institute}} {{request.profile.department}} + + Enroll + + Reject +
    + +
    + {% endif %} + +
    +
    +
    +
    Enrolled

    + {% if course.get_enrolled %} +  Select all +
    + + + + + + + + + {% for enrolled in course.get_enrolled %} + + {% csrf_token %} + + + + + + + + + + {% endfor %} +
    Full NameEmailRoll NumberInstituteDepartmentReject
    {{ enrolled.get_full_name|title }} {{enrolled.email}} {{enrolled.profile.roll_number}} {{enrolled.profile.institute}} {{enrolled.profile.department}} + Reject +
    + +
    + {% endif %} + +
    +
    +
    +
    Rejected

    + {% if course.get_rejected %} +  Select all +
    + + + + + + + + + {% for rejected in course.get_rejected %} + + {% csrf_token %} + + + + + + + + + + {% endfor %} +
    Full NameEmailRoll NumberInstituteDepartmentEnroll
    {{rejected.get_full_name|title}} {{rejected.email}} {{rejected.profile.roll_number}} {{rejected.profile.institute}} {{rejected.profile.department}} + + Enroll +
    +
    + +
    + {% endif %} + +
    +
    {% endblock %} -- cgit