From 460d5a15f2c45d55d9c2cdacc1b1b61775f218a4 Mon Sep 17 00:00:00 2001 From: "BOYA,CHIU" Date: Thu, 26 Aug 2021 18:57:42 +0800 Subject: [PATCH] fix some error --- app/assets/javascripts/calendar_frontend.js | 16 ++++++++-------- app/assets/javascripts/calendar_widget.js | 20 ++++++++++---------- app/assets/javascripts/calendar_widget2.js | 20 ++++++++++---------- app/assets/stylesheets/calendar_widget1.css | 2 +- app/assets/stylesheets/calendar_widget2.css | 2 +- app/controllers/calendars_controller.rb | 18 +++++++++--------- modules/calendar/_calendar_widget1.html.erb | 2 +- modules/calendar/_calendar_widget2.html.erb | 2 +- modules/calendar/index.html.erb | 4 +++- modules/calendar/index2.html.erb | 2 +- modules/calendar/index3.html.erb | 2 +- 11 files changed, 46 insertions(+), 44 deletions(-) diff --git a/app/assets/javascripts/calendar_frontend.js b/app/assets/javascripts/calendar_frontend.js index 67b34a6..a3829e2 100644 --- a/app/assets/javascripts/calendar_frontend.js +++ b/app/assets/javascripts/calendar_frontend.js @@ -19,7 +19,7 @@ var Calendar = function(dom,page_id,event_date=''){ this.initialize = function(){ if (event_date != ''){ var event_dates = event_date.split("-"); - var date = new Date(event_dates[0],event_dates[1],event_dates[2]); + var date = new Date(Date.UTC(event_dates[0],event_dates[1],event_dates[2])); }else{ var date = new Date(); } @@ -358,8 +358,8 @@ var AgendaView = function(calendar){ } var eventsManager = function(){ var url = "/xhr/calendars/agenda", - sd = new Date(start_year,start_month,1), - ed = new Date(end_year,end_month+1,0), + sd = new Date(Date.UTC(start_year,start_month,1)), + ed = new Date(Date.UTC(end_year,end_month+1,0)), usd = Math.round(sd/1000), ued = Math.round(ed/1000); $.ajax({ @@ -395,7 +395,7 @@ var AgendaView = function(calendar){ c_m = s.getMonth(), c_d = s.getDate(), c_y = s.getFullYear(), - end_of_c_month = new Date(s.getFullYear(),s.getMonth()+1,0).getDate(); + end_of_c_month = new Date(Date.UTC(s.getFullYear(),s.getMonth()+1,0)).getDate(); for(var i = 0; i <= diffDays; i++){ var td = agenda_space.find("td[data-date-node="+c_d+"-"+c_m+"-"+c_y+"]"); @@ -485,8 +485,8 @@ var AgendaView = function(calendar){ this.monthDom = $("
"); var template = $(month_template); var list_template = $(event_list_template); - var firstDay = new Date(year,month,1); - var lastDay = new Date(year,month+1,0); + var firstDay = new Date(Date.UTC(year,month,1)); + var lastDay = new Date(Date.UTC(year,month+1,0)); var last_inserted_date = 1; var renderMonth = function(){ @@ -514,7 +514,7 @@ var AgendaView = function(calendar){ var day = 1, sat_counter = 0, sunday_counter = 0, - date = new Date(year, month, day); + date = new Date(Date.UTC(year, month, day)); while(date.getMonth() === month) { if(date.getDay() === 0) { @@ -523,7 +523,7 @@ var AgendaView = function(calendar){ sat_counter++; } day++; - date = new Date(year, month, day); + date = new Date(Date.UTC(year, month, day)); } return (sunday_counter == 5 && sat_counter == 5 ? 6 : 5); } diff --git a/app/assets/javascripts/calendar_widget.js b/app/assets/javascripts/calendar_widget.js index a22638b..571881a 100644 --- a/app/assets/javascripts/calendar_widget.js +++ b/app/assets/javascripts/calendar_widget.js @@ -10,10 +10,10 @@ fetchInterval = null, month = date.getMonth(), year = date.getFullYear(), - first_target_day = new Date(year,month,1), - last_target_day = new Date(year,month+1,0), - firstDay = new Date(year,month,1), - lastDay = new Date(year,month+1,0), + first_target_day = new Date(Date.UTC(year,month,1)), + last_target_day = new Date(Date.UTC(year,month+1,0)), + firstDay = new Date(Date.UTC(year,month,1)), + lastDay = new Date(Date.UTC(year,month+1,0)), today = date.getDate(), last_inserted_date = 1, monthDom = $("
"), @@ -337,7 +337,7 @@ if(dayDiff > 0){ var inserting_date = sd.getDate(); for(var i = 0;i <= dayDiff; i++){ - var dt = inserting_date + "-" + month + "-" + year, + var dt = inserting_date + "-" + sd.getMonth() + "-" + sd.getFullYear(), td = dom.find("td[data-date-node=" + dt + "]"); if (events[dt]==undefined){ events[dt]=[] @@ -370,7 +370,7 @@ } }) if (!toggle_data){ - if (dom.find('td.w-calendar-event.w-calendar-today').length != 0){ + if (dom.find('td.w-calendar-today').length != 0){ toggle_event(dom.find('td.w-calendar-today'),'show') }else{ toggle_event(dom.find('td'),'hide') @@ -410,8 +410,8 @@ year++; month = 0; } - firstDay = new Date(year,month,1); - lastDay = new Date(year,month+1,0); + firstDay = new Date(Date.UTC(year,month,1)); + lastDay = new Date(Date.UTC(year,month+1,0)); today = (initialDate.getMonth() == month && initialDate.getFullYear() == year ? initialDate.getDate() : 0); last_inserted_date = 1; var toggle_type,ele; @@ -438,8 +438,8 @@ year--; month = 11; } - firstDay = new Date(year,month,1); - lastDay = new Date(year,month+1,0); + firstDay = new Date(Date.UTC(year,month,1)); + lastDay = new Date(Date.UTC(year,month+1,0)); today = (initialDate.getMonth() == month && initialDate.getFullYear() == year ? initialDate.getDate() : 0); last_inserted_date = 1; var toggle_type,ele; diff --git a/app/assets/javascripts/calendar_widget2.js b/app/assets/javascripts/calendar_widget2.js index 93a368a..4b04d00 100644 --- a/app/assets/javascripts/calendar_widget2.js +++ b/app/assets/javascripts/calendar_widget2.js @@ -10,10 +10,10 @@ fetchInterval = null, month = date.getMonth(), year = date.getFullYear(), - first_target_day = new Date(year,month,1), - last_target_day = new Date(year,month+1,0), - firstDay = new Date(year,month,1), - lastDay = new Date(year,month+1,0), + first_target_day = new Date(Date.UTC(year,month,1)), + last_target_day = new Date(Date.UTC(year,month+1,0)), + firstDay = new Date(Date.UTC(year,month,1)), + lastDay = new Date(Date.UTC(year,month+1,0)), today = date.getDate(), last_inserted_date = 1, monthDom = $("
"), @@ -476,7 +476,7 @@ if(dayDiff > 0){ var inserting_date = sd.getDate(); for(var i = 0;i <= dayDiff; i++){ - var dt = inserting_date + "-" + month + "-" + year, + var dt = inserting_date + "-" + sd.getMonth() + "-" + sd.getFullYear(), td = dom.find("td[data-date-node=" + dt + "]"); if (events[dt]==undefined){ events[dt]=[] @@ -509,7 +509,7 @@ } }) if (!toggle_data){ - if (dom.find('td.w-calendar-event.w-calendar-today').length != 0){ + if (dom.find('td.w-calendar-today').length != 0){ toggle_event(dom.find('td.w-calendar-today'),'show') }else{ toggle_event(dom.find('td'),'hide') @@ -550,8 +550,8 @@ year++; month = 0; } - firstDay = new Date(year,month,1); - lastDay = new Date(year,month+1,0); + firstDay = new Date(Date.UTC(year,month,1)); + lastDay =new Date(Date.UTC(year,month+1,0)); today = (initialDate.getMonth() == month && initialDate.getFullYear() == year ? initialDate.getDate() : 0); last_inserted_date = 1; var toggle_type,ele; @@ -578,8 +578,8 @@ year--; month = 11; } - firstDay = new Date(year,month,1); - lastDay = new Date(year,month+1,0); + firstDay = new Date(Date.UTC(year,month,1)); + lastDay = new Date(Date.UTC(year,month+1,0)); today = (initialDate.getMonth() == month && initialDate.getFullYear() == year ? initialDate.getDate() : 0); last_inserted_date = 1; var toggle_type,ele; diff --git a/app/assets/stylesheets/calendar_widget1.css b/app/assets/stylesheets/calendar_widget1.css index 41fca23..368b04f 100644 --- a/app/assets/stylesheets/calendar_widget1.css +++ b/app/assets/stylesheets/calendar_widget1.css @@ -87,7 +87,7 @@ a.event-container{ margin-top: 2em; } .widget-calendar-1 .w-calendar-nav a { - top: 2em; + top: 0.5em; } .calendar-dialog div.ui-dialog-content { max-height: 20em !important; diff --git a/app/assets/stylesheets/calendar_widget2.css b/app/assets/stylesheets/calendar_widget2.css index f99f0cb..b06613a 100644 --- a/app/assets/stylesheets/calendar_widget2.css +++ b/app/assets/stylesheets/calendar_widget2.css @@ -71,7 +71,7 @@ a.event-container-one{ padding: 0.2em; font-size: 1.5em; } -.widget-calendar-2 table.w-calendar-table td.w-calendar-toggle div { +.widget-calendar-2 table.w-calendar-table td.w-calendar-toggle div, .widget-calendar-2 table.w-calendar-table td.w-calendar-toggle div{ background: #6f0007; border-radius: 1.5em; color: white; diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb index 330dc1b..f3c075c 100644 --- a/app/controllers/calendars_controller.rb +++ b/app/controllers/calendars_controller.rb @@ -42,8 +42,8 @@ class CalendarsController < ApplicationController events =[] if !page.nil? if params[:start].present? && params[:end].present? - sdt = Time.at(params[:start].to_i) - edt = Time.at(params[:end].to_i) + sdt = Time.at(params[:start].to_i).utc + edt = Time.at(params[:end].to_i).utc events = Event.monthly_event(sdt,edt).convert_front+Event.recurring_event(sdt,edt) end end @@ -64,15 +64,15 @@ class CalendarsController < ApplicationController calendar_types = [] end if params[:unix_start].present? && params[:unix_end].present? - agenda_start = Time.at(params[:unix_start].to_i).to_s - agenda_end = Time.at(params[:unix_end].to_i).to_s + agenda_start = Time.at(params[:unix_start].to_i).utc.to_s + agenda_end = Time.at(params[:unix_end].to_i).utc.to_s if !calendar_types.blank? events = Event.where(:calendar_type_id.in => calendar_types).agenda_events(agenda_start,agenda_end) else events = Event.agenda_events(agenda_start,agenda_end) end end - render json: {"events" => events,"calendar_title"=>get_calendar_title(Time.at(params[:month_start].to_i))}.to_json({"frontend" => true}) + render json: {"events" => events,"calendar_title"=>get_calendar_title(Time.at(params[:month_start].to_i).utc)}.to_json({"frontend" => true}) end end @@ -86,19 +86,19 @@ class CalendarsController < ApplicationController calendar_types = [] end if params[:unix_start].present? && params[:unix_end].present? - agenda_start = Time.at(params[:unix_start].to_i).to_s - agenda_end = Time.at(params[:unix_end].to_i).to_s + agenda_start = Time.at(params[:unix_start].to_i).utc.to_s + agenda_end = Time.at(params[:unix_end].to_i).utc.to_s if !calendar_types.blank? events = Event.where(:calendar_type_id.in => calendar_types).agenda_events(agenda_start,agenda_end) else events = Event.agenda_events(agenda_start,agenda_end) end end - render json: {"events" => events,"calendar_title"=>get_calendar_title(Time.at(params[:month_start].to_i))}.to_json({"frontend" => true}) + render json: {"events" => events,"calendar_title"=>get_calendar_title(Time.at(params[:month_start].to_i).utc)}.to_json({"frontend" => true}) end end def get_calendar_title(now_date=nil) - now_date = Time.now if now_date.nil? + now_date = Time.now.utc if now_date.nil? month_name = I18n.locale.to_s=='zh_tw' ? now_date.month : I18n.t("calendar.month_name.#{now_date.month}") I18n.t("calendar.calendar_title",year: now_date.year,month: month_name) end diff --git a/modules/calendar/_calendar_widget1.html.erb b/modules/calendar/_calendar_widget1.html.erb index bd6d006..ea4a52c 100644 --- a/modules/calendar/_calendar_widget1.html.erb +++ b/modules/calendar/_calendar_widget1.html.erb @@ -1,7 +1,7 @@

- + placeholder

diff --git a/modules/calendar/_calendar_widget2.html.erb b/modules/calendar/_calendar_widget2.html.erb index f5ffada..0de6d6f 100644 --- a/modules/calendar/_calendar_widget2.html.erb +++ b/modules/calendar/_calendar_widget2.html.erb @@ -5,7 +5,7 @@

- + placeholder

diff --git a/modules/calendar/index.html.erb b/modules/calendar/index.html.erb index f573205..452b673 100644 --- a/modules/calendar/index.html.erb +++ b/modules/calendar/index.html.erb @@ -27,7 +27,9 @@
-

+

+ placeholder +

diff --git a/modules/calendar/index2.html.erb b/modules/calendar/index2.html.erb index 6c9f015..cb42697 100644 --- a/modules/calendar/index2.html.erb +++ b/modules/calendar/index2.html.erb @@ -3,7 +3,7 @@

- + placeholder

diff --git a/modules/calendar/index3.html.erb b/modules/calendar/index3.html.erb index aa6bb89..a5b11d8 100644 --- a/modules/calendar/index3.html.erb +++ b/modules/calendar/index3.html.erb @@ -7,7 +7,7 @@

- + placeholder