Add tags to available staffing requests table

b12io · May 19, 2021 · c3565d1 · c3565d1
1 parent 67fe26e
commit c3565d1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/orchestra/bots/staffbot.py b/orchestra/bots/staffbot.py
@@ -289,6 +289,7 @@ def get_staffing_request_metadata(self, staffing_request_inquiry):
                 worker.user)
         return {
             'user': user,
+            'tags': staffbot_request.task.tags.get('tags', []),
             'accept_url': accept_url,
             'reject_url': reject_url,
             'role_counter': staffbot_request.required_role_counter,

diff --git a/orchestra/static/dist/main.css b/orchestra/static/dist/main.css
@@ -1383,12 +1383,6 @@ li.checklist-item, .new-item {
   border: 1px solid #cccccc; }
 .collapsed-toggle {
   cursor: pointer; }
-
-.tags-col {
-  max-width: 150px; }
-  .tags-col span {
-    display: inline-block;
-    margin-right: 3px; }
 /**
  * Common stylesheet for Orchestra.
  *

diff --git a/orchestra/static/dist/orchestra/common/css/orchestra.css b/orchestra/static/dist/orchestra/common/css/orchestra.css
@@ -254,3 +254,12 @@ a.logo {
         width: 10%; }
       .staffing-container .card table .row-actions {
         width: 15%; }
+
+.tags-col {
+  max-width: 150px;
+}
+
+.tags-col span {
+  display: inline-block;
+  margin-right: 3px;
+}
diff --git a/orchestra/static/orchestra/dashboard/tasktable.scss b/orchestra/static/orchestra/dashboard/tasktable.scss
@@ -1,11 +1,3 @@
 .collapsed-toggle {
   cursor: pointer;
 }
-
-.tags-col {
-  max-width: 150px;
-  span {
-    display: inline-block;
-    margin-right: 3px;
-  }
-}
diff --git a/orchestra/templates/communication/available_staffing_requests.html b/orchestra/templates/communication/available_staffing_requests.html
@@ -15,7 +15,7 @@
       <table class="table">
         <tr>
           <th class="row-project">Project</th>
-          <th class="row-project-description">Project description</th>
+          <th class="row-project-description tags-col">Project description</th>
           <th class="row-task">Task</th>
           <th class="row-details">Details</th>
           <th class="row-created-at">Available since</th>
@@ -24,7 +24,15 @@
         {% for request in requests %}
         <tr>
           <td>{{ request.workflow_description }}</td>
-          <td>{{ request.project_description }}</td>
+          <td class="tags-col">
+            {{ request.project_description }}
+            <br>
+            {% for tag in request.tags %}
+              <span class="label label-{{tag.status}}">
+                {{tag.label}}
+              </span>
+            {% endfor %}
+          </td>
           <td>{% if request.role_counter > 0 %}[Review] {% endif %}{{ request.step_description }}</td>
           <td>{{ request.detailed_description | safe }}</td>
           <td>{{ request.available_datetime|date:"m/d/Y H:i" }}</td>