From af014cae039753c7bb61c422cac2afebcd8b36fc Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Tue, 30 Oct 2018 15:14:12 -0400
Subject: [PATCH] Filter by status

---
 js/components/forms/requests_list.js | 13 ++++++++++---
 templates/requests/index.html        |  5 +++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/js/components/forms/requests_list.js b/js/components/forms/requests_list.js
index abc40852..51f1afa7 100644
--- a/js/components/forms/requests_list.js
+++ b/js/components/forms/requests_list.js
@@ -37,18 +37,25 @@ export default {
 
     computed: {
       filteredRequests: function () {
-        return this.applySearch(this.searchValue)
+        return this.applyFilters(this.applySearch(this.requests, this.searchValue), this.statusValue)
       }
     },
 
     methods: {
-      applySearch: function(query) {
-        return this.requests.filter(
+      applySearch: (requests, query) => {
+        return requests.filter(
           (request) => query !== '' ?
             request.name.toLowerCase().includes(query.toLowerCase()) :
             true
         )
       },
+      applyFilters: (requests, status) => {
+        return requests.filter(
+          (request) => status !== '' ?
+            request.simple_status.toLowerCase() === status :
+            true
+        )
+      },
       dollars: (value) => formatDollars(value, false),
     },
   }
diff --git a/templates/requests/index.html b/templates/requests/index.html
index 8c8aa472..73fe6810 100644
--- a/templates/requests/index.html
+++ b/templates/requests/index.html
@@ -79,8 +79,8 @@
     {% if extended_view %}
       <form class='search-bar'>
         <div class='usa-input search-input'>
-          <label for='requests-search'>Search requests by Order ID</label>
-          <input v-model='searchValue' type='search' id='requests-search' name='requests-search' placeholder="Search by Order ID"/>
+          <label for='requests-search'>Search requests by name</label>
+          <input v-model='searchValue' type='search' id='requests-search' name='requests-search' placeholder="Search by name"/>
           <button type="submit">
             <span class="hide">Search</span>
           </button>
@@ -90,6 +90,7 @@
           <label for='filter-status'>Filter requests by status</label>
           <select v-model="statusValue" id="filter-status" name="filter-status">
             <option value="" selected disabled>Filter by status</option>
+            <option value="">All</option>
             <option value="active">Active</option>
             <option value="pending">Pending</option>
             <option value="denied">Denied</option>