From ac0436841ba144950472ee53f1d3a85188b2fe76 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Thu, 10 Jan 2019 16:15:17 +0530
Subject: Remove duplicate progress bars (Units/Lessons should not have
 progress bars)

---
 yaksh/templates/user.html                 |  1 -
 yaksh/templates/yaksh/course_modules.html | 19 +++----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html
index db65195..4ded0a3 100644
--- a/yaksh/templates/user.html
+++ b/yaksh/templates/user.html
@@ -28,7 +28,6 @@
             <a class="dropdown-item" href="{{ URL_ROOT }}/exam/reset/changepassword/"><i class="fa fa-key"></i> Change Password</a>
             <div class="dropdown-divider"></div>
             <a id="user_logout" class="dropdown-item" href="{{URL_ROOT}}/exam/logout/"><i class="fa fa-sign-out"></i> Logout</a>
-
           </div>
         </li>
         </ul>
diff --git a/yaksh/templates/yaksh/course_modules.html b/yaksh/templates/yaksh/course_modules.html
index 990c843..917f78c 100644
--- a/yaksh/templates/yaksh/course_modules.html
+++ b/yaksh/templates/yaksh/course_modules.html
@@ -110,15 +110,15 @@
                         {% get_module_status user module course as module_status %}
                         {% if module_status == "completed" %}
                         <div class="progress">
-                          <div class="progress-bar bg-success" role="progressbar" style="width: 100%; color: black;" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">100% completed</div>
+                          <div class="progress-bar bg-success" role="progressbar" style="width: 100%; color: black;" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">{{ percent }} % completed</div>
                         </div>
                         {% elif module_status == "inprogress" %}
                         <div class="progress">
-                          <div class="progress-bar bg-warning " role="progressbar" style="width: 50%; color: black;" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100">50% completed</div>
+                          <div class="progress-bar bg-warning " role="progressbar" style="width: 50%; color: black;" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100">{{ percent }} % completed</div>
                         </div>
                         {% else %}
                         <div class="progress">
-                          <div class="progress-bar bg-danger" role="progressbar" style="width: 1%; color: black;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">0% completed</div>
+                          <div class="progress-bar bg-danger" role="progressbar" style="width: 1%; color: black;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">{{ percent }} % completed</div>
                         </div>
                         {% endif %}
                     </div>
@@ -176,19 +176,6 @@
                                 ------
                             {% endif %}
                             </td>
-                            <td>
-                                <div class="progress">
-                                    {% if percent <= 50 %}
-                                    <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width:{{percent}}%">
-                                    {% elif percent <= 75 %}
-                                    <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width:{{percent}}%">
-                                    {% else %}
-                                    <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width:{{percent}}%">
-                                    {% endif %}
-                                    <b style="color: black;">{{percent}}% Completed</b>
-                                    </div>
-                                </div>
-                            </td>
                         </tr>
                         {% endfor %}
                         </table>
-- 
cgit