refactor out similar code in ln 138-140 and ln 225-227 of ReservationController

[ebmaher]

[shippy]

Using

git checkout `git rev-list -n 1 --before="2013-06-12 13:37" master`

I think Erin meant these lines:

# def checkout
            elsif !reservation_hash[:checkout_procedures].keys.include?(check.id.to_s) # if you didn't check it of, add to string
              procedures_not_done += "* " + check.step + "\n"
            end

and

# def checkin
          elsif !reservation_hash[:checkin_procedures].keys.include?(check.id.to_s) # if you didn"t check it of, add to string
            procedures_not_done += "* " + check.step + "\n"
          end

More generally, though, this is roughly the same functionality:

# def checkin
        # deal with checkout procedures
        procedures_not_done = "" # initialize
        r.equipment_model.checkin_procedures.each do |check|
          if reservation_hash[:checkin_procedures] == NIL # if none were checked, note that
            procedures_not_done += "* " + check.step + "\n"
          elsif !reservation_hash[:checkin_procedures].keys.include?(check.id.to_s) # if you didn"t check it of, add to string
            procedures_not_done += "* " + check.step + "\n"
          end
        end

        # add procedures_not_done to r.notes so admin gets the errors
        previous_notes = r.notes.present? ? "Checkout Notes:\n" + r.notes + "\n\n" : ""
        new_notes = reservation_hash[:notes].present? ? "Checkin Notes:\n" + reservation_hash[:notes] : ""

        if procedures_not_done.present?
          r.notes = previous_notes + new_notes + "\n\nThe following check-in procedures were not performed:\n" + procedures_not_done
          r.notes_unsent = true
        elsif new_notes.present? # if all procedures were done
          r.notes = previous_notes + new_notes # add blankline because there may well have been previous notes
          r.notes_unsent = true
        else
          r.notes = previous_notes
        end
        r.notes.strip! if r.notes?

# def checkout
          # deal with checkout procedures
          procedures_not_done = "" # initialize
          r.equipment_model.checkout_procedures.each do |check|
            if reservation_hash[:checkout_procedures] == nil # if none were checked, note that
              procedures_not_done += "* " + check.step + "\n"
            elsif !reservation_hash[:checkout_procedures].keys.include?(check.id.to_s) # if you didn't check it of, add to string
              procedures_not_done += "* " + check.step + "\n"
            end
          end

          # add procedures_not_done to r.notes so admin gets the errors
          # if no notes and some procedures not done
          if procedures_not_done.present?
            modified_notes = reservation_hash[:notes].present? ? reservation_hash[:notes] + "\n\n" : ""
            r.notes = modified_notes + "The following checkout procedures were not performed:\n" + procedures_not_done
            r.notes_unsent = true
          elsif reservation_hash[:notes].present? # if all procedures were done
            r.notes = reservation_hash[:notes]
            r.notes_unsent = true
          end
          r.notes.strip! if r.notes?

Consequently, this is a child issue of #349 and #350.

[shippy]

Moving discussion to #666.