From 7467410aaf7f7ebca32d4f70ff29997f6d4f7fcf Mon Sep 17 00:00:00 2001
From: Luis Cielak <luis+dds@promptworks.com>
Date: Fri, 27 Jul 2018 13:24:13 -0400
Subject: [PATCH 1/5] Add fileds to members table

---
 atst/domain/workspaces.py           |  3 +++
 templates/workspace_members.html.to | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/atst/domain/workspaces.py b/atst/domain/workspaces.py
index 41b88194..ca848425 100644
--- a/atst/domain/workspaces.py
+++ b/atst/domain/workspaces.py
@@ -69,6 +69,7 @@ class Members(object):
                 "dod_id": "1257892124",
                 "workspace_role": "Developer",
                 "status": "Pending",
+                "num_projects": "4",
             },
             {
                 "first_name": "Mario",
@@ -77,6 +78,7 @@ class Members(object):
                 "dod_id": "4357892125",
                 "workspace_role": "CCPO",
                 "status": "Active",
+                "num_projects": "0",
             },
             {
                 "first_name": "Louise",
@@ -85,6 +87,7 @@ class Members(object):
                 "dod_id": "7257892125",
                 "workspace_role": "Admin",
                 "status": "Pending",
+                "num_projects": "43",
             },
         ]
 
diff --git a/templates/workspace_members.html.to b/templates/workspace_members.html.to
index a38f653e..71c45bdb 100644
--- a/templates/workspace_members.html.to
+++ b/templates/workspace_members.html.to
@@ -7,13 +7,19 @@
     <table>
       <thead>
         <tr>
-          <th scope="col">Name</th>
+          <th scope="col" width="50%">Name</th>
+          <th scope="col">&nbsp;</th>
+          <th scope="col">Status</th>
+          <th scope="col">Workspace Role</th>
         </tr>
       </thead>
       <tbody>
         {% for m in members %}
         <tr>
-          <td>{{ m['first_name'] }} {{ m['last_name'] }}</td>
+          <td><a href="#">{{ m['first_name'] }} {{ m['last_name'] }}</a></td>
+          <td>{% if m['num_projects'] == '0' %} <span class="label label--info">No Project Access</span> {% end %}</td>
+          <td>{{ m['status'] }}</a></td>
+          <td>{{ m['workspace_role'] }}</a></td>
         </tr>
         {% end %}
       </tbody>

From 9fb8131a7a6dcfba1168ed37bd7bc068beaafe5e Mon Sep 17 00:00:00 2001
From: Luis Cielak <luis+dds@promptworks.com>
Date: Fri, 27 Jul 2018 13:26:04 -0400
Subject: [PATCH 2/5] Add panel actions, search and filters

---
 templates/workspace_members.html.to | 31 +++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/templates/workspace_members.html.to b/templates/workspace_members.html.to
index 71c45bdb..93404f7f 100644
--- a/templates/workspace_members.html.to
+++ b/templates/workspace_members.html.to
@@ -2,6 +2,37 @@
 
 {% block workspace_content %}
 
+
+<div class='panel panel__actions'>
+  <div class='row'>
+    <div class='col col--grow col--pad'>
+      <form class="usa-search usa-search-small">
+        <label class="usa-sr-only" for="search-field-small">Search small</label>
+        <input id="search-field-small" type="search" name="search" placeholder="Search by name">
+        <button type="submit">
+          <span class="usa-sr-only">Search</span>
+        </button>
+      </form>
+    </div>
+    <div class='col col--grow col--pad'>
+      <select id="filter_role" name="filter_role" required="">
+        <option value="" selected disabled>Filter by role</option>
+        <option value="">Admin</option>
+        <option value="">CCPO</option>
+        <option value="">Developer</option>
+      </select>
+    </div>
+    <div class='col col--grow col--pad'>
+      <select id="filter_status" name="filter_status" required="">
+        <option value="" selected disabled>Filter by status</option>
+        <option value="">Active</option>
+        <option value="">Pending</option>
+        <option value="">Denied</option>
+      </select>
+    </div>
+  </div>
+</div>
+
 <div class="panel">
   <div class='responsive-table-wrapper'>
     <table>

From cea8cd3581747c8e74d344c2376c746a6b63eb5d Mon Sep 17 00:00:00 2001
From: Luis Cielak <luis+dds@promptworks.com>
Date: Fri, 27 Jul 2018 14:37:48 -0400
Subject: [PATCH 3/5] Reorder filters

---
 templates/workspace_members.html.to | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/workspace_members.html.to b/templates/workspace_members.html.to
index 93404f7f..053934d8 100644
--- a/templates/workspace_members.html.to
+++ b/templates/workspace_members.html.to
@@ -14,14 +14,6 @@
         </button>
       </form>
     </div>
-    <div class='col col--grow col--pad'>
-      <select id="filter_role" name="filter_role" required="">
-        <option value="" selected disabled>Filter by role</option>
-        <option value="">Admin</option>
-        <option value="">CCPO</option>
-        <option value="">Developer</option>
-      </select>
-    </div>
     <div class='col col--grow col--pad'>
       <select id="filter_status" name="filter_status" required="">
         <option value="" selected disabled>Filter by status</option>
@@ -30,6 +22,14 @@
         <option value="">Denied</option>
       </select>
     </div>
+    <div class='col col--grow col--pad'>
+      <select id="filter_role" name="filter_role" required="">
+        <option value="" selected disabled>Filter by role</option>
+        <option value="">Admin</option>
+        <option value="">CCPO</option>
+        <option value="">Developer</option>
+      </select>
+    </div>
   </div>
 </div>
 

From d2320b9a9b027f04f05a406b6451bd4d8edfaa7c Mon Sep 17 00:00:00 2001
From: luisgov <38014252+luisgov@users.noreply.github.com>
Date: Fri, 27 Jul 2018 16:05:26 -0400
Subject: [PATCH 4/5] Add definition to hidden column

---
 templates/workspace_members.html.to | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/workspace_members.html.to b/templates/workspace_members.html.to
index 053934d8..ae29ef3d 100644
--- a/templates/workspace_members.html.to
+++ b/templates/workspace_members.html.to
@@ -39,7 +39,7 @@
       <thead>
         <tr>
           <th scope="col" width="50%">Name</th>
-          <th scope="col">&nbsp;</th>
+          <th scope="col">&nbsp;<span class="hide>Status Flag</span></th>
           <th scope="col">Status</th>
           <th scope="col">Workspace Role</th>
         </tr>

From b30dde9f43404ba4f02aec3e5cb4be6e6dc4470c Mon Sep 17 00:00:00 2001
From: Luis Cielak <luis+dds@promptworks.com>
Date: Mon, 30 Jul 2018 11:02:19 -0400
Subject: [PATCH 5/5] Fix table heading

---
 templates/workspace_members.html.to | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/workspace_members.html.to b/templates/workspace_members.html.to
index ae29ef3d..e1e407ff 100644
--- a/templates/workspace_members.html.to
+++ b/templates/workspace_members.html.to
@@ -39,7 +39,7 @@
       <thead>
         <tr>
           <th scope="col" width="50%">Name</th>
-          <th scope="col">&nbsp;<span class="hide>Status Flag</span></th>
+          <th scope="col">&nbsp;<span class="hide">Status Flag</span></th>
           <th scope="col">Status</th>
           <th scope="col">Workspace Role</th>
         </tr>