fixes, css changes by ken, time duration changes

app/assets/javascripts/property_hire_calendar_frontend.js

@@ -132,6 +132,7 @@ var Calendar = function(dom, property_id, valid_range, currentView, display_hire
 		var dview = (c.currentView == "agenda" ? "dayGridMonth" : c.currentView);
 		c.calendar_dom.css("overflow","visible");
 		c.calendar_dom.fullCalendar({
+
 			themeSystem: 'bootstrap',
 			editable: false,
 			selectable: true,
@@ -161,6 +162,9 @@ var Calendar = function(dom, property_id, valid_range, currentView, display_hire
 					}
 				});
 			},
+
+			dayMaxEventRows:false, // for all non-TimeGrid views
+			eventLimit: false, // allow "more" link when too many events
 			// events: 'https://fullcalendar.io/demo-events.json',
 			editable: true,
 	        selectable: true,
@@ -209,13 +213,23 @@ var Calendar = function(dom, property_id, valid_range, currentView, display_hire
 					calendar_dom.trigger("select_time",[date_str]);
 				}
 			},
+			eventLimit: false, // allow "more" link when too many events
 			views: {
+				timeGridDay: {
+					duration: { days: 2 },
+				},
+				timeGridWeek: {
+					eventOrder: '-start',
+					eventOrderStrict: true
+
+				},
 				dayGridMonth: {
-				  dayMaxEvents: true
+					dayMaxEventRows:false, // for all non-TimeGrid views
+					eventLimit: false // allow "more" link when too many events
+				  
 				}
 			}
 		});
-		
 		c.nextBtn.click(function(){
 			c.dialog.dismiss();
 			c.calendar_dom.calendar.next();
@@ -294,6 +308,7 @@ var Calendar = function(dom, property_id, valid_range, currentView, display_hire
 
 	$(document).ready(function() {
 		c.initialize();
+
 	});
 };
 
@@ -323,16 +338,18 @@ var EventDialog = function(calendar,event){
 		var start_time = "",
 			end_time = "",
 			time_string = null;
+		_event.allDay = false; //force to be false.
 		if(_event.allDay) {
 			start_time = getDateString(_event._start,datetime_format, is_chinese);
-			if(_event._end)
+			if(_event._end){
 				end_time = getDateString(_event._end,datetime_format, is_chinese);
+			}
 			time_string = (_event._start === _event._end || !_event._end ? "<p class='start-date'><i class='icons-calendar' /></i>" + start_time + "</p>" : "<i class='icons-calendar' /></i>" + start_time + "<br><i class='icons-arrow-right-5' /></i>" + end_time + "");
 		} else {
 			start_time = getDateString(_event._start,date_format, is_chinese);
 			end_time = getDateString(_event._end,date_format, is_chinese);
-			var stime = getDateString(_event._start,time_format, is_chinese),
-			etime = getDateString(_event._end,time_format, is_chinese),
+			var stime = getDateString(new Date(_event.ostart),time_format, is_chinese), //send new dates and change
+			etime = getDateString(new Date(_event.oend),time_format, is_chinese), //send new dates and change
 			same = (start_time == end_time);
 			if( same ){
 				time_string = "<p class='date'><i class='icons-calendar' /></i> " + 

app/models/p_hire.rb

@@ -76,6 +76,8 @@ class PHire
       :note => self.note_for_hire || "",
       :start => startt.to_json.gsub('"',''),
       :end => endt.to_json.gsub('"',''),
+      :ostart => startt.to_json.gsub('"',''),
+      :oend => endt.to_json.gsub('"',''),
       :allDay => true,
       :diff_day => (self.end_time - self.start_time >= 1),
       # :eventColor => (self.passed ? "#3788d8" : "#FC4040"),

app/views/admin/property_hires/show.html.erb

@@ -47,7 +47,6 @@
       <%= stylesheet_link_tag css %>
     <% end %>
   <% end %>
-  <script src="https://polyfill.io/v3/polyfill.min.js?features=Intl.DateTimeFormat,Intl.DateTimeFormat.~locale.en,Intl.NumberFormat.~locale.en"></script>
   <script type="text/javascript" src="/assets/property_hire_fullcalendar.min.js"></script>
   <script type="text/javascript" src="/assets/property_hire_calendar_frontend.js"></script>
   <div id="orbit_calendar">

config/locales/zh_tw.yml

@@ -16,7 +16,7 @@ zh_tw:
     go_to_infos_page: 前往資訊頁面
     display_in_reason_for_hire: "顯示於使用用途"
     need_hire_before: "需提早多久預約"
-    _month: 個月
+    _month: 月模式
     _week: 週
     _day: 天
     _hour: 個小時