diff options
| author | adityacp | 2020-12-22 12:48:23 +0530 |
|---|---|---|
| committer | adityacp | 2020-12-22 12:48:23 +0530 |
| commit | a29473b7ac933b31368ca163c758e8eadb4c411e (patch) | |
| tree | d2b7215cad6e85c2d508575dc0edddd277e4c561 /yaksh | |
| parent | 6945328e7a3e5cb23bfa16376c0a4a976f586f6c (diff) | |
| download | online_test-a29473b7ac933b31368ca163c758e8eadb4c411e.tar.gz online_test-a29473b7ac933b31368ca163c758e8eadb4c411e.tar.bz2 online_test-a29473b7ac933b31368ca163c758e8eadb4c411e.zip | |
Fix UI in lesson statistics
Diffstat (limited to 'yaksh')
| -rw-r--r-- | yaksh/models.py | 2 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/show_lesson_statistics.html | 71 |
2 files changed, 45 insertions, 28 deletions
diff --git a/yaksh/models.py b/yaksh/models.py index 2978f43..a29e910 100644 --- a/yaksh/models.py +++ b/yaksh/models.py @@ -2830,7 +2830,7 @@ class TOCManager(models.Manager): if answers.exists(): answers = answers.values( "student__first_name", "student__last_name", "student__email", - "student_id", "toc_id" + "student_id", "student__profile__roll_number", "toc_id" ) df = pd.DataFrame(answers) answers = df.drop_duplicates().to_dict(orient='records') diff --git a/yaksh/templates/yaksh/show_lesson_statistics.html b/yaksh/templates/yaksh/show_lesson_statistics.html index dfce52c..0da20ee 100644 --- a/yaksh/templates/yaksh/show_lesson_statistics.html +++ b/yaksh/templates/yaksh/show_lesson_statistics.html @@ -81,8 +81,8 @@ {% else %} <div class="card"> <div class="card-header"> - {{question.summary}} - <div> + <b>{{question.summary}}</b> + <div style="font-size: 20px"> {% if question.language == "other" %} <small class="text text-muted"><strong>Topic:</strong> <span class="badge badge-primary">{{question.topic}}</small></span> {% else %} @@ -132,15 +132,21 @@ {{tc.options}} {% if per_tc_ans %} {% get_tc_percent tc.id per_tc_ans as percent %} - <div class="progress" style="width: 30%"> - {% if percent %} - <div class="progress-bar bg-success" role="progressbar" aria-valuenow="{{percent}}" - aria-valuemin="0" aria-valuemax="100" style="width:{{percent|floatformat}}%"> - <b style="color: white;">{{percent|floatformat}}%</b> + <div class="progress-wrapper col-md-4"> + <div class="progress-info"> + <div class="progress-percentage"> + <span> + {% if percent %} {{percent|floatformat}} {% else %} 0 {% endif %}% + </span> + </div> + </div> + <div class="progress"> + {% if percent %} + <div class="progress-bar bg-success" role="progressbar" aria-valuenow="{{percent}}" + aria-valuemin="0" aria-valuemax="100" style="width:{{percent|floatformat}}%"> + </div> + {% endif %} </div> - {% else %} - <b style="color: black;">0%</b> - {% endif %} </div> {% endif %} {% elif question.type == "integer" %} @@ -180,25 +186,36 @@ <br><br> {% endif %} {% include "yaksh/paginator.html" %} - <table class="table table-responsive" id="stats-table"> - <thead> - <tr> - <th>Sr No.</th> - <th>Student Name <i class="fa fa-sort"></i></th> - <th>Email <i class="fa fa-sort"></i></th> - <th>Latest Submission <i class="fa fa-sort"></i></th> - </tr> - </thead> - {% for data in objects.object_list %} + {% if objects.object_list|length > 10 %} + <div class="table-responsive" style="height: 700px"> + {% else %} + <div class="table-responsive"> + {% endif %} + <table class="table table-dark table-responsive" id="stats-table"> + <thead class="thead-dark"> <tr> - <td>{{ forloop.counter }}</td> - <td>{{data.student__first_name}} {{data.student__last_name}}</td> - <td>{{data.student__email}}</td> - {% get_answers data.toc_id data.student_id as user_answer %} - <td>{{ user_answer.0 }}</td> + <th>Sr No.</th> + <th>Student Name <i class="fa fa-sort"></i></th> + <th>Roll No <i class="fa fa-sort"></i></th> + <th>Email <i class="fa fa-sort"></i></th> + <th>Latest Submission <i class="fa fa-sort"></i></th> </tr> - {% endfor %} - </table> + </thead> + <tbody class="list"> + {% for data in objects.object_list %} + <tr> + <td>{{ forloop.counter }}</td> + <td>{{data.student__first_name}} {{data.student__last_name}}</td> + <td>{{data.student__profile__roll_number}}</td> + <td>{{data.student__email}}</td> + {% get_answers data.toc_id data.student_id as user_answer %} + <td>{{ user_answer.0 }}</td> + </tr> + {% endfor %} + </tbody> + </table> + </div> + <br> {% include "yaksh/paginator.html" %} {% endif %} </div> |