From 93d088505f1b52e7e4de7d93178034110f108b65 Mon Sep 17 00:00:00 2001
From: njdup <njdupoux1994@gmail.com>
Date: Thu, 14 Aug 2014 13:46:22 -0700
Subject: [PATCH] Instructor Dash: Display message when there are no tasks
 running

This commit adds a message to the instructor dashboard that is displayed when
no instructor tasks are currently running. This message is displayed where the
instructor pending tasks table would normally be placed, and is replaced
with the table when there are running tasks.
---
 .../coffee/src/instructor_dashboard/util.coffee      |  8 ++++++++
 lms/static/sass/course/instructor/_instructor_2.scss | 12 ++++++++++++
 .../instructor_dashboard_2/course_info.html          |  9 ++++++---
 .../instructor_dashboard_2/data_download.html        |  9 ++++++---
 .../instructor_dashboard_2/send_email.html           |  9 ++++++---
 .../instructor_dashboard_2/student_admin.html        |  9 ++++++---
 6 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/lms/static/coffee/src/instructor_dashboard/util.coffee b/lms/static/coffee/src/instructor_dashboard/util.coffee
index a9ace5f643..8957af6e78 100644
--- a/lms/static/coffee/src/instructor_dashboard/util.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/util.coffee
@@ -268,7 +268,9 @@ class PendingInstructorTasks
   ### Pending Instructor Tasks Section ####
   constructor: (@$section) ->
     # Currently running tasks
+    @$running_tasks_section = find_and_assert @$section, ".running-tasks-section"
     @$table_running_tasks = find_and_assert @$section, ".running-tasks-table"
+    @$no_tasks_message = find_and_assert @$section, ".no-pending-tasks-message"
 
     # start polling for task list
     # if the list is in the DOM
@@ -287,8 +289,14 @@ class PendingInstructorTasks
       success: (data) =>
         if data.tasks.length
           create_task_list_table @$table_running_tasks, data.tasks
+          @$no_tasks_message.hide()
+          @$running_tasks_section.show()
         else
           console.log "No pending instructor tasks to display"
+          @$running_tasks_section.hide()
+          @$no_tasks_message.empty()
+          @$no_tasks_message.append $('<p>').text gettext("No tasks currently running.")
+          @$no_tasks_message.show()
       error: std_ajax_err => console.error "Error finding pending instructor tasks to display"
     ### /Pending Instructor Tasks Section ####
 
diff --git a/lms/static/sass/course/instructor/_instructor_2.scss b/lms/static/sass/course/instructor/_instructor_2.scss
index c293dbad2b..1a266be8fc 100644
--- a/lms/static/sass/course/instructor/_instructor_2.scss
+++ b/lms/static/sass/course/instructor/_instructor_2.scss
@@ -224,6 +224,18 @@ section.instructor-dashboard-content-2 {
     .basic-data {
       padding: 6px;
     }
+
+    .running-tasks-section {
+      display: none;
+    }
+
+    .no-pending-tasks-message {
+      display: none;
+      p {
+        color: #a2a2a2;
+        font-style: italic;
+      }
+    }
   }
 }
 
diff --git a/lms/templates/instructor/instructor_dashboard_2/course_info.html b/lms/templates/instructor/instructor_dashboard_2/course_info.html
index c27119fb60..3e00ebf5bb 100644
--- a/lms/templates/instructor/instructor_dashboard_2/course_info.html
+++ b/lms/templates/instructor/instructor_dashboard_2/course_info.html
@@ -76,10 +76,13 @@
   <div class="running-tasks-container action-type-container">
     <hr>
     <h2> ${_("Pending Instructor Tasks")} </h2>
-    <p>${_("The status for any active tasks appears in a table below.")} </p>
-    <br />
+    <div class="running-tasks-section">
+      <p>${_("The status for any active tasks appears in a table below.")} </p>
+      <br />
 
-    <div class="running-tasks-table" data-endpoint="${ section_data['list_instructor_tasks_url'] }"></div>
+      <div class="running-tasks-table" data-endpoint="${ section_data['list_instructor_tasks_url'] }"></div>
+    </div>
+    <div class="no-pending-tasks-message"></div>
   </div>
 
 %endif
diff --git a/lms/templates/instructor/instructor_dashboard_2/data_download.html b/lms/templates/instructor/instructor_dashboard_2/data_download.html
index a3ce752df6..b931e93855 100644
--- a/lms/templates/instructor/instructor_dashboard_2/data_download.html
+++ b/lms/templates/instructor/instructor_dashboard_2/data_download.html
@@ -69,8 +69,11 @@
   <div class="running-tasks-container action-type-container">
     <hr>
     <h2> ${_("Pending Instructor Tasks")} </h2>
-    <p>${_("The status for any active tasks appears in a table below.")} </p>
-    <br />
-    <div class="running-tasks-table" data-endpoint="${ section_data['list_instructor_tasks_url'] }"></div>
+    <div class="running-tasks-section">
+      <p>${_("The status for any active tasks appears in a table below.")} </p>
+      <br />
+      <div class="running-tasks-table" data-endpoint="${ section_data['list_instructor_tasks_url'] }"></div>
+    </div>
+    <div class="no-pending-tasks-message"></div>
   </div>
 %endif
diff --git a/lms/templates/instructor/instructor_dashboard_2/send_email.html b/lms/templates/instructor/instructor_dashboard_2/send_email.html
index b44c87bc6c..54471cfd15 100644
--- a/lms/templates/instructor/instructor_dashboard_2/send_email.html
+++ b/lms/templates/instructor/instructor_dashboard_2/send_email.html
@@ -59,10 +59,13 @@
   <div class="running-tasks-container action-type-container">
     <hr>
     <h2> ${_("Pending Instructor Tasks")} </h2>
-    <p>${_("Email actions run in the background. The status for any active tasks - including email tasks - appears in a table below.")} </p>
-    <br />
+    <div class="running-tasks-section">
+      <p>${_("Email actions run in the background. The status for any active tasks - including email tasks - appears in a table below.")} </p>
+      <br />
 
-    <div class="running-tasks-table" data-endpoint="${ section_data['list_instructor_tasks_url'] }"></div>
+      <div class="running-tasks-table" data-endpoint="${ section_data['list_instructor_tasks_url'] }"></div>
+    </div>
+    <div class="no-pending-tasks-message"></div>
   </div>
 
 
diff --git a/lms/templates/instructor/instructor_dashboard_2/student_admin.html b/lms/templates/instructor/instructor_dashboard_2/student_admin.html
index 6e4bd3a879..c10c1c2384 100644
--- a/lms/templates/instructor/instructor_dashboard_2/student_admin.html
+++ b/lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -117,10 +117,13 @@
   <div class="running-tasks-container action-type-container">
     <hr>
     <h2> ${_("Pending Instructor Tasks")} </h2>
-    <p>${_("The status for any active tasks appears in a table below.")} </p>
-    <br />
+    <div class="running-tasks-section">
+      <p>${_("The status for any active tasks appears in a table below.")} </p>
+      <br />
 
-    <div class="running-tasks-table" data-endpoint="${ section_data['list_instructor_tasks_url'] }"></div>
+      <div class="running-tasks-table" data-endpoint="${ section_data['list_instructor_tasks_url'] }"></div>
+    </div>
+    <div class="no-pending-tasks-message"></div>
   </div>
 
 %endif