wth - Additional Detail Submissions Table Improvement

app/controllers/additional_details/submissions_controller.rb

@@ -56,12 +56,15 @@ def create
   def update
     @service = Service.find(params[:service_id])
     @submission = Submission.find(params[:id])
+    @protocol = Protocol.find(@submission.protocol_id)
+    @submissions = @protocol.submissions
     if params[:sr_id]
       @service_request = ServiceRequest.find(params[:sr_id])
     end
     @submission.update_attributes(submission_params)
     respond_to do |format|
       if @submission.save
+        @submission.touch(:updated_at)
         format.js
       else
         format.js

app/views/additional_details/submissions/_submissions_panel.html.haml

@@ -22,32 +22,41 @@
   .panel.panel-default
     .panel-heading
       %h4.panel-title
-        Additional Detail Submissions
+        = t(:additional_details)[:submissions][:completed_forms]
     .panel-body
       %table.table.table-striped.table-bordered.table-hover
         %thead
           %tr
             %th.text-center
-              = 'ID'
+              = t(:additional_details)[:submissions][:table_fields][:sr_id]
             %th.text-center
-              = 'Service Name'
+              = t(:additional_details)[:submissions][:table_fields][:service]
             %th.text-center
-              = 'View'
+              = t(:additional_details)[:submissions][:table_fields][:completion_time]
             %th.text-center
-              = 'Edit'
+              = t(:additional_details)[:submissions][:table_fields][:view]
             %th.text-center
-              = 'Delete'
+              = t(:additional_details)[:submissions][:table_fields][:edit]
+            %th.text-center
+              = t(:additional_details)[:submissions][:table_fields][:delete]
         %tbody
           - submissions.each do |submission|
             - service = Service.find(submission.service_id)
+            - ssr = SubServiceRequest.find(submission.line_item.sub_service_request_id)
             %tr{ class: "submission", data: { id: "#{submission.id}", service_id: "#{service.id}" } }
               %td
                 .text-center
-                  = submission.id
+                  = "#{ssr.display_id}"
               %td
                 .text-center
-                  = link_to_if current_identity.is_super_user? || current_identity.is_service_provider?(SubServiceRequest.find(submission.line_item.sub_service_request_id)), "#{service.name}",
+                  = link_to_if current_identity.is_super_user? || current_identity.is_service_provider?(ssr), "#{service.name}",
                     service_additional_details_questionnaires_path(service), target: '_blank'
+              %td
+                .text-center
+                  - if submission.created_at == submission.updated_at
+                    = submission.created_at.strftime("%m/%d/%Y")
+                  - else
+                    = submission.updated_at.strftime("%m/%d/%Y")
               %td.text-center
                 = link_to service_additional_details_submission_path(service, submission),
                   remote: true, class: 'btn btn-primary' do

app/views/additional_details/submissions/update.js.coffee

@@ -1,4 +1,5 @@
 <% if @submission.save %>
+$('.additional-details-submissions-panel').html("<%= j render 'submissions_panel', protocol: @protocol, submissions: @submissions %>")
 swal("Success!", "Submission saved", "success")
 $('#submissionModal').modal('hide')
 <% else %>

config/locales/additional_details.en.yml

@@ -55,7 +55,13 @@ en:
 
     submissions:
       header: "Additional Detail Submissions"
+      completed_forms: 'Completed Forms'
       table_fields:
         id: "ID"
+        sr_id: 'SRID'
         service: "Service Name"
+        completion_time: 'Completion Time'
+        view: 'View'
+        edit: 'Edit'
+        delete: 'Delete'
       none: "No Records Found"

spec/controllers/additional_details/submissions_controller_spec.rb

@@ -102,7 +102,7 @@
       protocol = create( :protocol_without_validations )
       line_item = create( :line_item_without_validations )
       service_request = create( :service_request_without_validations )
-      submission = create( :submission )
+      submission = create( :submission, protocol: protocol)
       response = { "0" => { content: "This is the updated text "} }
       new_submission = { protocol_id: protocol.id,
                          line_item_id: line_item.id,
@@ -149,4 +149,4 @@
       expect{ xhr :delete, :destroy, service_id: service.id, id: submission, protocol_id: protocol.id }.to change{ protocol.submissions.count }.by( -1 )
     end
   end
-end
+end