harrybomrah
/
property_hire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed the name for event to reason for hire

This commit is contained in:
rulingcom 2025-01-03 20:05:36 +08:00
parent 946a9666c6
commit 833e156206
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/property_hire_calendar_frontend.js
View File

@ -352,7 +352,7 @@ var EventDialog = function(calendar,event){
'<h3>' + _event.title + '</h3>' + '<h3>' + _event.title + '</h3>' +
'</div>' + '</div>' +
'<div class="modal-body">' + '<div class="modal-body">' +
'<div class="event_summary">' + time_string + '</br>' + _event.hiring_person_name + '</div>' + _event.note + '<div class="event_summary">' + time_string + '</br>' + _event.reason_for_hire + '</div>' + _event.note +
(_event.error_message ? ("<br><span style=\"color: #FC4040;\">" + _event.error_message + "</span>") : "") + (_event.error_message ? ("<br><span style=\"color: #FC4040;\">" + _event.error_message + "</span>") : "") +
'</div>' + '</div>' +
'<div class="modal-footer">' + '<div class="modal-footer">' +

3
app/models/p_hire.rb
View File

@ -61,7 +61,7 @@ class PHire
viewButton = true viewButton = true
end end
end end
title = startt.strftime("%H:%M") + " ~ " + endt.strftime("%H:%M") + " " + self.hiring_person_name title = startt.strftime("%H:%M") + " ~ " + endt.strftime("%H:%M") + " " + self.reason_for_hire
{ {
:id => self.id.to_s, :id => self.id.to_s,
# :title => (self.reason_for_hire.to_s + " "+ self.tmp_reason_for_hire.to_s).html_safe, # :title => (self.reason_for_hire.to_s + " "+ self.tmp_reason_for_hire.to_s).html_safe,
@ -69,6 +69,7 @@ class PHire
:title => title, :title => title,
:hiring_person_id => self.hiring_person_id, :hiring_person_id => self.hiring_person_id,
:hiring_person_name => self.hiring_person_name, :hiring_person_name => self.hiring_person_name,
:reason_for_hire => self.reason_for_hire,
:note => self.note_for_hire || "", :note => self.note_for_hire || "",
:start => startt.to_json.gsub('"',''), :start => startt.to_json.gsub('"',''),
:end => endt.to_json.gsub('"',''), :end => endt.to_json.gsub('"',''),