fix MR comments

This commit is contained in:
Bilal
2020-07-08 12:32:05 +02:00
parent 49ab21a3cf
commit 11c6575b47
4 changed files with 10 additions and 29 deletions

View File

@@ -5,4 +5,12 @@ module TooltipHelper
concat tag.div(class: "tooltip-inner")
end
end
def get_approval_data_for_medical_release(medical_release)
if medical_release.approved_by_user_name.present?
"#{medical_release.approved_by_user_name} [#{medical_release.approved_by_user_email}]"
else
medical_release.approved_by_user_email
end
end
end

View File

@@ -105,7 +105,7 @@ class MedicalRelease < ApplicationRecord
self.approved_by_user_name = user.full_name
self.approved_by_user_email = user.email
self.approved_at = DateTime.now
self.approved_at = Time.zone.now
end
def approved?

View File

@@ -2,11 +2,7 @@
<td data-behavior="select"><%= check_box_tag "medical_release_ids[]", medical_release.id, false %></td>
<td class="text-center">
<% if medical_release.approved? %>
<% if medical_release.approved_by_user_name.present? %>
<% tooltip_user_data = "#{medical_release.approved_by_user_name} [#{medical_release.approved_by_user_email}]" %>
<% else %>
<% tooltip_user_data = medical_release.approved_by_user_email %>
<% end %>
<% tooltip_user_data = get_approval_data_for_medical_release(medical_release) %>
<i class="fa fa-check-circle fa-2x text-success"
data-toggle="tooltip"
title="<%= t '.messages.approved_tooltip', user: tooltip_user_data, timestamp: medical_release.approved_at %>"></i>

View File

@@ -88,27 +88,4 @@ RSpec.describe MedicalReleasesController, type: :controller do
}.to change(MedicalRelease, :count).by(-1)
end
end
describe "#review" do
let!(:medical_release) { create(:medical_release, project: project) }
it "responds successfully" do
get :review, params: { project_id: project, id: medical_release }
expect(response).to be_successful
end
end
describe "#approve" do
it "changes approval status successfully" do
medical_release = create(:medical_release, project: project)
expect(MedicalRelease.last.approved?).to eq false
patch :approve, params: { project_id: project, id: medical_release }
expect(response).to redirect_to [project, :medical_releases]
expect(MedicalRelease.last.approved?).to eq true
end
end
end