# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2014-09-17 13:20:01
# Node ID 2d5e2b9fa726817f3d883eb5f1b7299acc8e9241
# Parent  ce576ec8e8c3b35ac12b883b6fa9589d2fa715d8

fix date time

diff --git a/app/controllers/report_controller.rb b/app/controllers/report_controller.rb
--- a/app/controllers/report_controller.rb
+++ b/app/controllers/report_controller.rb
@@ -16,12 +16,14 @@
 
     date_and_time = '%Y-%m-%d %H:%M'
     begin
-      @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
+      md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
+      @since_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
     rescue
       @since_time = DateTime.new(1000,1,1)
     end
     begin
-      @until_time = DateTime.strptime(params[:until_datetime],date_and_time)
+      md = params[:until_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
+      @until_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
     rescue
       @until_time = DateTime.new(3000,1,1)
     end