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

Reformatted Calendar wobject to more closely conform to WGPB. Fixed a bug or two while I was at it.

Browse source
This commit is contained in:
Doug Bell 2007-01-30 15:07:03 +00:00
parent 3625526909
commit 83dbcf63e9
3 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/WebGUI/Asset/Wobject/Calendar.pm
View file

@ -44,11 +44,10 @@ use JSON;
#################################################################### ####################################################################
sub definition sub definition {
{ my $class = shift;
my $class = shift; my $session = shift;
my $session = shift; my $definition = shift || [];
my $definition = shift || [];
my $i18n = WebGUI::International->new($session, 'Asset_Calendar'); my $i18n = WebGUI::International->new($session, 'Asset_Calendar');

3
lib/WebGUI/Asset/Wobject/ProjectManager.pm
View file

@ -866,6 +866,7 @@ sub www_editTask {
$startEpoch = $endEpoch = time unless defined $startEpoch and defined $endEpoch; $startEpoch = $endEpoch = time unless defined $startEpoch and defined $endEpoch;
$startEpoch = $task->{startDate} if $task->{startDate}; $startEpoch = $task->{startDate} if $task->{startDate};
$endEpoch = $task->{endDate} if $task->{endDate}; $endEpoch = $task->{endDate} if $task->{endDate};
## Magic number = bad
$endEpoch += 86400 if $taskType eq 'timed' and !$task->{duration} and !$task->{endDate}; $endEpoch += 86400 if $taskType eq 'timed' and !$task->{duration} and !$task->{endDate};
my ($start, $end) = ($dt->epochToSet($startEpoch), $dt->epochToSet($endEpoch)); my ($start, $end) = ($dt->epochToSet($startEpoch), $dt->epochToSet($endEpoch));
@ -999,7 +1000,7 @@ sub www_editTask {
$var->{'task_resource_label'} = $i18n->get('task resource label'); $var->{'task_resource_label'} = $i18n->get('task resource label');
$var->{'task_save_label'} = $i18n->get('task save label'); $var->{'task_save_label'} = $i18n->get('task save label');
return $self->processTemplate($var,$self->getValue("editTaskTemplateId")) return $self->processTemplate($var,$self->getValue("editTaskTemplateId"));
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

36
lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm
View file

@ -54,13 +54,13 @@ See WebGUI::Workflow::Activity::defintion() for details.
=cut =cut
sub definition { sub definition {
my $class = shift; my $class = shift;
my $session = shift; my $session = shift;
my $definition = shift; my $definition = shift;
my $i18n = WebGUI::International->new($session, "Asset_Calendar"); my $i18n = WebGUI::International->new($session, "Asset_Calendar");
push(@{$definition}, { push(@{$definition}, {
name=>$i18n->get("workflow updateFeeds"), name => $i18n->get("workflow updateFeeds"),
properties=> { } properties => { }
}); });
return $class->SUPER::definition($session,$definition); return $class->SUPER::definition($session,$definition);
} }
@ -75,21 +75,21 @@ See WebGUI::Workflow::Activity::execute() for details.
=cut =cut
sub execute { sub execute {
my $self = shift; my $self = shift;
my $session = $self->session;
$self->session->user({userId => 3}); $self->session->user({userId => 3});
### TODO: If we take more than a minute, return WAITING so that some ### TODO: If we take more than a minute, return WAITING so that some
# other activity can run # other activity can run
my $ua = LWP::UserAgent->new(agent => "WebGUI"); my $ua = LWP::UserAgent->new(agent => "WebGUI");
my $dt = WebGUI::DateTime->new(time)->toMysql; my $dt = WebGUI::DateTime->new($session, time)->toMysql;
my $sth = $self->session->db->prepare("select * from Calendar_feeds"); my $sth = $self->session->db->prepare("select * from Calendar_feeds");
$sth->execute(); $sth->execute();
FEED:while (my $feed = $sth->hashRef) FEED:while (my $feed = $sth->hashRef) {
{
#!!! KLUDGE - If the feed is on the same server, set a scratch value #!!! KLUDGE - If the feed is on the same server, set a scratch value
# I do not know how dangerous this is, so THIS MUST CHANGE! # I do not know how dangerous this is, so THIS MUST CHANGE!
# Preferably: Spectre would add a userSession to the database, # Preferably: Spectre would add a userSession to the database,
@ -97,10 +97,9 @@ sub execute {
my $sitename = $self->session->config->get("sitename")->[0]; my $sitename = $self->session->config->get("sitename")->[0];
if ($feed->{url} =~ m{http://[^/]*$sitename}) if ($feed->{url} =~ m{http://[^/]*$sitename})
{ {
my $sessionId = $self->session->id->generate; $feed->{url} .= ( $feed->{url} =~ /[?]/ ? ";" : "?" ) . "adminId=".$session->getId;
$feed->{url} .= ";adminId=".$sessionId; $self->session->db->write("REPLACE INTO userSessionScratch (sessionId,name,value) VALUES (?,?,?)",
$self->session->db->write("INSERT INTO userSessionScratch (sessionId,name,value) VALUES (?,?,?)", [$session->getId,$feed->{assetId},"SPECTRE"]);
[$sessionId,$feed->{assetId},"SPECTRE"]);
} }
#/KLUDGE #/KLUDGE
#warn "FEED URL: ".$feed->{url} ."\n"; #warn "FEED URL: ".$feed->{url} ."\n";
@ -121,7 +120,8 @@ sub execute {
unless ($data =~ /^BEGIN:VCALENDAR/i) unless ($data =~ /^BEGIN:VCALENDAR/i)
{ {
# Update the result and last updated fields # Update the result and last updated fields
$self->session->db->write("update Calendar_feeds set lastResult=?,lastUpdated=? where feedId=?", $self->session->db->write(
"update Calendar_feeds set lastResult=?,lastUpdated=? where feedId=?",
["Not an iCalendar feed",$dt,$feed->{feedId}]); ["Not an iCalendar feed",$dt,$feed->{feedId}]);
next FEED; next FEED;
} }