fixed issue 16 and 20

app/controllers/items_controller.rb

@@ -118,12 +118,18 @@ def create_bulk
 
 
   def return
-    item = Item.find_by_barcode(params[:loan][:barcode])
+    if params.has_key?(:loan)
+      item = Item.find_by_barcode(params[:loan][:barcode])
+    else
+      item = Item.find_by_barcode(params[:id])
+    end
 
     respond_to do |format|
       # mark the loan oldest loan for this user and item as returned
       if user_active? && item.return(current_user)
         format.json { render json: {success: true, error:nil} }
+      elsif params.has_key?(:user) && item.return(User.find(params[:user]))
+        format.html {redirect_to loans_path}
       else
         format.json { render json: {error: "error"}}
       end

app/controllers/loans_controller.rb

@@ -9,10 +9,10 @@ class LoansController < ApplicationController
   def index
     if user_active?
       @search = Loan.ransack({"loan_user_search"=> current_user.id})
-      @loans  = @search.result.order("returned_on DESC").paginate(:page => params[:page], :per_page => 25)
+      @loans  = @search.result.order(:due_date).paginate(:page => params[:page], :per_page => 25)
     elsif admin_signed_in?
       @search = Loan.ransack(params[:q])
-      @loans  = @search.result.order("returned_on DESC").paginate(:page => params[:page], :per_page => 25)
+      @loans  = @search.result.order(:user_id,:due_date).paginate(:page => params[:page], :per_page => 25)
     else
       session_active?
     end

app/controllers/users_controller.rb

@@ -13,7 +13,7 @@ def index
   # GET /users/1
   # GET /users/1.json
   def show
-    @loans = Loan.where(user_id: @user.id).order( 'returned_on DESC' )
+    @loans = Loan.where(user_id: @user.id).order( 'due_date' )
   end
 
   # GET /users/new

app/models/item.rb

@@ -59,7 +59,7 @@ def to_label
   end
 
   def return(user)
-    loans = self.loans.where(returned_on: nil, user: user).order('created_at ASC')
+    loans = self.loans.where(returned_on: nil, user: user).order('due_date')
     if loans.nil? || loans.empty?
       false
     else

app/models/loan.rb

@@ -11,6 +11,14 @@ def self.loan_user_search(searchstr)
     end
   end
 
+  def overdue
+    if self.due_date < Time.now && self.returned_on.nil?
+      return true
+    else
+      return false
+    end
+  end
+
   def return_dates
     due_date = self.due_date
     dates = []

app/views/items/index.html.haml

@@ -31,7 +31,7 @@
         %th
           = sort_link @search, :barcode, "Barcode"
         %th
-          = sort_link @search, :location, "Location"
+          = sort_link @search, :location_id, "Location"
       %th
         = sort_link @search, :category_id, "Category"
       %th
@@ -60,7 +60,10 @@
         %td= item.title
         -if Rails.env.development? || admin_signed_in?
           %td= item.barcode
-          %td= item.location.to_label
+          - if item.location
+            %td= item.location.to_label
+          -else
+            %td Location missing
         %td
           = item.category.name.humanize unless item.category.nil?
         %td= item.publisher

app/views/layouts/application.html.haml

@@ -33,8 +33,15 @@
                 %a{:href => categories_path}=fa_icon('clipboard', text: "Categories")
               %li
                 %a{:href => locations_path}=fa_icon('building', text: "Locations")
-              %li
-                %a{:href => users_path}=fa_icon('user', text: "Borrowers")
+              %li.dropdown
+                %a.dropdown-toggle{'data-toggle' => 'dropdown'}
+                  =fa_icon('newspaper-o', text: "Reports")
+                  %span.caret
+                %ul#dashboard-dropdown.dropdown-menu{role: 'dashboardMenu'}
+                  %li
+                    %a{:href => users_path}=fa_icon('user', text: "Borrowers")
+                  %li
+                    %a{:href => loans_path}=fa_icon('calendar', text: "Loans")
               %li
                 %a{:href =>  item_request_index_path}=fa_icon('question-circle', text: "Requests")
           -if admin_signed_in?

app/views/loans/index.html.haml

@@ -13,17 +13,19 @@
       %th Returned on
       -if admin_signed_in?
         %th
-        %th
-        %th
 
   %tbody
     -if admin_signed_in?
       = search_form_for @search,:builder => SimpleForm::FormBuilder do |f|
         = f.input :loan_user_search,:label => "User", collection: User.all,include_blank: true
         = f.submit "Search",class: "btn btn-info search"
     - @loans.each do |loan|
-      %tr
-        %td= loan.user.to_label
+      - if loan.overdue
+        - info= 'danger'
+      - else
+        - info= ''
+      %tr{class:info}
+        %td= link_to loan.user.to_label, user_path(loan.user_id)
         %td= loan.item.to_label
         %td= loan.due_date
         - if loan.returned_on
@@ -32,11 +34,10 @@
           %th
             %p
               Active
-        -if admin_signed_in?
-          %td= link_to 'Show', loan
-          %td= link_to 'Edit', edit_loan_path(loan)
-          %td= link_to 'Destroy', loan, :method => :delete, :data => { :confirm => 'Are you sure?' }
-
+        -if admin_signed_in? && loan.returned_on.nil?
+          %td= link_to 'Return', return_item_path(loan.item.barcode,:user => loan.user), :method => :post, :data => { :confirm => 'Are you sure?' }
+        -else
+          %td
 %br
 = will_paginate @loans
 -#= link_to 'New Loan', new_loan_path, { :class=>"btn btn-success btn-lg" }

app/views/users/show.html.haml

@@ -31,7 +31,11 @@
             %th Returned on
         %tbody
           - @loans.each do |loan|
-            %tr
+            - if loan.overdue
+              - info= 'danger'
+            - else
+              - info= ''
+            %tr{class:info}
               %td= loan.item.title
               -if admin_signed_in?
                 %td= loan.item.barcode

config/routes.rb

@@ -29,6 +29,7 @@
       post :fImport
     end
     member do
+      post :return
       get :request_item
     end
   end