From 0dc32eb76ef78ab71b3aa871b057e5859bba8e02 Mon Sep 17 00:00:00 2001
From: wmcheng <wmcheng@rulingcom.com>
Date: Mon, 1 Jul 2019 12:12:11 +0800
Subject: [PATCH 1/3] Update p_hire.rb per_name

---
 app/models/p_hire.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/p_hire.rb b/app/models/p_hire.rb
index 30f8ba1..53f157e 100644
--- a/app/models/p_hire.rb
+++ b/app/models/p_hire.rb
@@ -23,6 +23,7 @@ class PHire
     {
       :id => self.id.to_s,
       :title => self.reason_for_hire,
+      :hiring_person_name => self.hiring_person_name,
       :note => self.note_for_hire || "",
       :start => self.start_time.rfc822,
       :end => self.end_time.rfc822,

From 29da2e93429455c03bf7ae12ce537e3135bb606d Mon Sep 17 00:00:00 2001
From: wmcheng <wmcheng@rulingcom.com>
Date: Mon, 1 Jul 2019 12:14:28 +0800
Subject: [PATCH 2/3] Update hire_name

---
 app/assets/javascripts/property_hire_calendar_frontend.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/property_hire_calendar_frontend.js b/app/assets/javascripts/property_hire_calendar_frontend.js
index 8fb74a1..8f314f6 100644
--- a/app/assets/javascripts/property_hire_calendar_frontend.js
+++ b/app/assets/javascripts/property_hire_calendar_frontend.js
@@ -153,7 +153,7 @@ var EventDialog = function(calendar,event){
 								   '<h3>' + _event.title + '</h3>' +
 							   '</div>' +
 							   '<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 +
 							   '</div>' +
 							   '<div class="modal-footer" />' +

From 44cc5f2a81678b75f7c679bac980f0eea8e54d8f Mon Sep 17 00:00:00 2001
From: wmcheng <wmcheng@rulingcom.com>
Date: Fri, 8 Nov 2019 12:24:42 +0800
Subject: [PATCH 3/3] Update p_hire.rb

---
 app/models/p_hire.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/p_hire.rb b/app/models/p_hire.rb
index 53f157e..c257d58 100644
--- a/app/models/p_hire.rb
+++ b/app/models/p_hire.rb
@@ -23,6 +23,7 @@ class PHire
     {
       :id => self.id.to_s,
       :title => self.reason_for_hire,
+      :hiring_person_id => self.hiring_person_id,
       :hiring_person_name => self.hiring_person_name,
       :note => self.note_for_hire || "",
       :start => self.start_time.rfc822,