oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- bitwise OR vs short circuiting OR in epochToHuman

Browse source 
- time zone in humanToEpoch
- time zone in getSecondsFromEpoch
- monthStartEnd, returned start month was not the 1st day of the month
This commit is contained in:
Colin Kuskie 2006-01-17 04:23:32 +00:00
parent 80a5518717
commit 1ad601c8d9
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/WebGUI/Session/DateTime.pm
View file

@ -223,12 +223,13 @@ A string representing the output format for the date. Defaults to '%z %Z'. You c
sub epochToHuman { sub epochToHuman {
my $self = shift; my $self = shift;
my $epoch = shift || $self->session->datetime->time();
my $i18n = WebGUI::International->new($self->session); my $i18n = WebGUI::International->new($self->session);
my $language = $i18n->getLanguage($self->session->user->profileField("language")); my $language = $i18n->getLanguage($self->session->user->profileField("language"));
my $locale = $language->{languageAbbreviation} || "en"; my $locale = $language->{languageAbbreviation} || "en";
$locale .= "_".$language->{locale} if ($language->{locale}); $locale .= "_".$language->{locale} if ($language->{locale});
my $timeZone = $self->session->user->profileField("timeZone") || "America/Chicago"; my $timeZone = $self->session->user->profileField("timeZone") || "America/Chicago";
my $dt = DateTime->from_epoch( epoch=>shift|$self->session->datetime->time(), time_zone=>$timeZone, locale=>$locale ); my $dt = DateTime->from_epoch( epoch=>$epoch, time_zone=>$timeZone, locale=>$locale );
my $output = shift || "%z %Z"; my $output = shift || "%z %Z";
my $temp; my $temp;
#---date format preference #---date format preference
@ -453,13 +454,14 @@ The number of seconds since January 1, 1970 00:00:00.
sub getSecondsFromEpoch { sub getSecondsFromEpoch {
my $self = shift; my $self = shift;
my $dt = DateTime->from_epoch( epoch => shift ); my $timeZone = $self->session->user->profileField("timeZone") || "America/Chicago";
my $dt = DateTime->from_epoch( epoch => shift, time_zone => $timeZone );
my $start = $dt->clone; my $start = $dt->clone;
$start->set_hour(0); $start->set_hour(0);
$start->set_minute(0); $start->set_minute(0);
$start->set_second(0); $start->set_second(0);
my $duration = $dt - $start; my $duration = $dt - $start;
return $duration->delta_seconds; return $duration->delta_seconds + 60 * $duration->delta_minutes;
} }
@ -498,11 +500,12 @@ The human date string. YYYY-MM-DD HH:MM:SS
sub humanToEpoch { sub humanToEpoch {
my $self = shift; my $self = shift;
my $timeZone = $self->session->user->profileField("timeZone") || "America/Chicago";
my ($dateString,$timeString) = split(/ /,shift); my ($dateString,$timeString) = split(/ /,shift);
my @date = split(/-/,$dateString); my @date = split(/-/,$dateString);
my @time = split(/:/,$timeString); my @time = split(/:/,$timeString);
$time[0] = 0 if $time[0] == 24; $time[0] = 0 if $time[0] == 24;
my $dt = DateTime->new(year => $date[0], month=> $date[1], day=> $date[2], hour=> $time[0], minute => $time[1], second => $time[2]); my $dt = DateTime->new(year => $date[0], month=> $date[1], day=> $date[2], hour=> $time[0], minute => $time[1], second => $time[2], time_zone => $timeZone);
return $dt->epoch; return $dt->epoch;
} }
@ -602,6 +605,7 @@ sub monthStartEnd {
my $self = shift; my $self = shift;
my $dt = DateTime->from_epoch( epoch => shift); my $dt = DateTime->from_epoch( epoch => shift);
my $end = DateTime->last_day_of_month(year=>$dt->year, month=>$dt->month); my $end = DateTime->last_day_of_month(year=>$dt->year, month=>$dt->month);
$dt->set_day(1);
$dt->set_hour(0); $dt->set_hour(0);
$dt->set_minute(0); $dt->set_minute(0);
$dt->set_second(0); $dt->set_second(0);