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

Merge branch 'master' into 'master' 

Master

Update EV Req

See merge request !2
This commit is contained in:
wmcheng 2019-11-08 18:50:31 +08:00
parent 3f7d044539 44cc5f2a81
commit 9d8a256601
2 changed files with 3 additions and 1 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

@ -153,7 +153,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 + '</div>' + '<div class="event_summary">' + time_string + '<br>' + _event.hiring_person_name + '</div>'
_event.note + _event.note +
'</div>' + '</div>' +
'<div class="modal-footer" />' + '<div class="modal-footer" />' +

2
app/models/p_hire.rb
View File

@ -23,6 +23,8 @@ class PHire
{ {
:id => self.id.to_s, :id => self.id.to_s,
:title => self.reason_for_hire, :title => self.reason_for_hire,
:hiring_person_id => self.hiring_person_id,
:hiring_person_name => self.hiring_person_name,
:note => self.note_for_hire || "", :note => self.note_for_hire || "",
:start => self.start_time.rfc822, :start => self.start_time.rfc822,
:end => self.end_time.rfc822, :end => self.end_time.rfc822,