Show discontinued items with request link on items page

Closes #83
cseg-michigan · Aug 1, 2014 · c69349f · c69349f
1 parent bbeee46
commit c69349f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/chezbetty/__init__.py b/chezbetty/__init__.py
@@ -67,6 +67,7 @@ def debug(request):
     config.add_route('item',             '/item/{barcode}/json')
     config.add_route('item_request',     '/item/request')
     config.add_route('item_request_new', '/item/request/new')
+    config.add_route('item_request_by_id', '/item/request/by_id/{id}')
 
     config.add_route('shame', '/shame')
     config.add_route('user',  '/user/{umid}')

diff --git a/chezbetty/templates/items.jinja2 b/chezbetty/templates/items.jinja2
@@ -56,6 +56,27 @@ Betty stops selling something you would like back, feel free to
             </tbody>
 
           </table>
+
+          <h4>Discontinued Items:</h4>
+
+          <table class="table table-bordered table-striped sortable">
+            <thead>
+              <tr>
+                <th>Item</th>
+                <th style="width: 15%"></th>
+              </tr>
+            </thead>
+
+            <tbody>
+            {% for item in disabled_items %}
+              <tr>
+                <td class="item-name">{{ item.name }}</td>
+                <td><a href="/item/request/by_id/{{ item.id }}" class="btn btn-default">Request Return</a></td>
+              </tr>
+            {% endfor %}
+            </tbody>
+
+          </table>
         </div>
       </div>
     </div>

diff --git a/chezbetty/views.py b/chezbetty/views.py
@@ -61,7 +61,10 @@ def items(request):
     items = DBSession.query(Item)\
                      .filter(Item.enabled==True)\
                      .order_by(Item.name).all()
-    return {'items': items}
+    disabled_items = DBSession.query(Item)\
+                     .filter(Item.enabled==False)\
+                     .order_by(Item.name).all()
+    return {'items': items, 'disabled_items': disabled_items}
 
 
 @view_config(route_name='item_request', renderer='templates/item_request.jinja2')
@@ -293,6 +296,12 @@ def item_request_new(request):
         request.session.flash('Error adding request.', 'error')
         return HTTPFound(location=request.route_url('index'))
 
+@view_config(route_name='item_request_by_id')
+def item_request_by_id(request):
+    item = Item.from_id(request.matchdict['id'])
+    datalayer.new_request(None, item.name)
+    request.session.flash('Request for {} added successfully'.format(item.name), 'success')
+    return HTTPFound(location=request.route_url('index'))
 
 @view_config(route_name='purchase_new', request_method='POST', renderer='json', permission='service')
 def purchase_new(request):