first commit

app/assets/javascripts/request_history.js

@@ -5,13 +5,11 @@ $(document).ready(function() {
 	});
 
 
-
   $(document).on('keyup', '[id^="note-textarea_"]', function () {
-    checkCount($(this));
+    updateCharacterCount($(this));
   });
 
 
-
 	$('#history_popup').on('shown.bs.modal', function (e) {
 
 		var data_url = $("#request_history_log").data("url");
@@ -30,12 +28,11 @@ $(document).ready(function() {
 
 });
 
-/* Checks the count of the note text area and changes color to red if limit hit */
-function checkCount(textArea) {
-  var textAreaValue = textArea.val();
-  var itemId = textArea.attr('id').split('_').pop();
-  var remainingCounter = $(`#item_history_popup_${itemId} .remaining`);
-
+function updateCharacterCount($textArea) {
+  var textAreaValue = $textArea.val();
+  var itemId = $textArea.attr('id').split('_').pop();
+  var remainingCounter = $textArea.closest('.modal').find('.remaining');
+
   remainingCounter.text(textAreaValue.length);
 
   if (textAreaValue.length > 255) {

app/controllers/request_history_controller.rb

@@ -6,9 +6,13 @@ class RequestHistoryController < ApplicationController
   # skip_authorization_check
 
   def index 
-    @audits = @audits = @request.associated_audits.where.not(associated_type: 'item') # | @request.course.audits
+    associated_audits = @request.associated_audits.where.not(associated_type: 'item')
 
-    @audits_grouped = @audits.reverse.group_by { |a| a.created_at.at_beginning_of_day }
+    request_audits = @request.audits.where(auditable_type: 'Request', associated_id: nil, associated_type: nil)
+
+    @audits = (associated_audits + request_audits).sort_by(&:created_at)
+
+    @audits_grouped = @audits.reverse.group_by { |audit| audit.created_at.at_beginning_of_day }
 
     @users = User.all
     @locations = Location.active

app/views/request_history/create.js.erb

@@ -1,16 +1,22 @@
+<% if @aud.present? %>
+  <% is_associated = @aud.associated_id.present? %>
+  <% prefix = is_associated ? "#item_history_popup_#{@aud.associated_id}" : "" %>
+  <% log_error_selector = "#{prefix} #history_log_error" %>
+  <% form_reset_selector = is_associated ? "#history_popup_#{@aud.associated_id} form" : "#history_popup form" %>
+  <% textarea_selector = is_associated ? "#note-textarea_#{@aud.associated_id}" : nil %>
+  <% log_url_selector = is_associated ? "#request_history_log_#{@aud.associated_id}" : "#request_history_log" %>
 
-<% if @aud.comment.blank? %>
-    $("#item_history_popup_<%= @aud.associated_id %> #history_log_error").text("Note is blank. Please fill it in.").removeClass("hide");
-
-
-<% elsif @aud.comment.length > 255 %>
-  $("#item_history_popup_<%= @aud.associated_id %> #history_log_error").text("Note is blank. Please fill it in.").removeClass("hide");
-<% else %>
-    $("#note-textarea_<%= @aud.associated_id %>").val("");
-    $("#item_history_popup_<%= @aud.associated_id %> #history_log_error").addClass("hide");
-    $('#history_popup_<%= @aud.associated_id %> form').trigger("reset");  <!-- Reset the form for the specific item -->
-
-    var url = $("#request_history_log_<%= @aud.associated_id %>").data("url");  <!-- Get the URL for the specific item -->
-    $("#request_history_log_<%= @aud.associated_id %>").load(url);  <!-- Load the data for the specific item -->
-
+  <% if @aud.comment.blank? %>
+    $( "<%= log_error_selector %>" ).text("Note is blank. Please fill it in.").removeClass("hide");
+  <% elsif @aud.comment.length > 255 %>
+    $( "<%= log_error_selector %>" ).text("Note is more than 255 characters!").removeClass("hide");
+  <% else %>
+    $( "<%= log_error_selector %>" ).addClass("hide");
+    $( "<%= form_reset_selector %>" ).trigger("reset");
+    <% if textarea_selector %>
+      $( "<%= textarea_selector %>" ).val("");
+    <% end %>
+    var url = $( "<%= log_url_selector %>" ).data("url");
+    $( "<%= log_url_selector %>" ).load(url);
+  <% end %>
 <% end %>