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

added master events calendar switch

Browse source
This commit is contained in:
JT Smith 2003-10-19 03:44:38 +00:00
parent dc0cf40f9e
commit c1d74cbfa2
3 changed files with 41 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/5.x.x.txt
View file

@ -21,6 +21,7 @@
with null values in their DataForm.
- If the Cache Timeout on a given page is set to 10 seconds or less, that
page will not be cached.
- Added master events calendar switch.
5.4.4

4
docs/upgrades/upgrade_5.4.4-5.5.0.sql
View file

@ -252,7 +252,6 @@ delete from international where namespace='MessageBoard' and internationalId=4;
delete from international where namespace='MessageBoard' and internationalId=22;
delete from international where namespace='MessageBoard' and internationalId=18;
delete from international where namespace='MessageBoard' and internationalId=16;
delete from international where namespace='MessageBoard' and internationalId=2;
delete from international where namespace='MessageBoard' and internationalId=15;
delete from international where namespace='MessageBoard' and internationalId=12;
delete from international where namespace='WebGUI' and internationalId=234;
@ -262,5 +261,6 @@ delete from international where namespace='WebGUI' and internationalId=571;
delete from international where namespace='WebGUI' and internationalId=402;
delete from international where languageId=1 and namespace='WebGUI' and internationalId=529;
insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (529,1,'WebGUI','results per page', 1066492301,'A label indicating the number of items per page to return in a list.');
insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (99,1,'EventsCalendar','Is master?', 1066511974,'Ask the user if this calendar should act as a master calendar.');
alter table EventsCalendar add column isMaster int not null default 0;

58
lib/WebGUI/Wobject/EventsCalendar.pm
View file

@ -52,8 +52,10 @@ sub _drawBigCalendar {
$calendar->header('<h2 align="center">'.$calendar->monthname.' '.$calendar->year.'</h2>');
($start,$end) = monthStartEnd($_[1]);
my $canEdit = ($session{var}{adminOn} && WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
$sth = WebGUI::SQL->read("select * from EventsCalendar_event where wobjectId="
.$_[0]->get("wobjectId")." order by startDate,endDate");
my $query = "select * from EventsCalendar_event";
$query .= " where wobjectId=".$_[0]->get("wobjectId") unless ($_[0]->get("isMaster"));
$query .= " order by startDate,endDate";
$sth = WebGUI::SQL->read($query);
while (%event = $sth->hash) {
if (epochToHuman($event{startDate},"%M %y") eq $thisMonth
|| epochToHuman($event{endDate},"%M %y") eq $thisMonth) {
@ -109,8 +111,10 @@ sub _drawSmallCalendar {
$calendar->monthname(WebGUI::DateTime::getMonthName($calendar->month));
$calendar->header('<b>'.$calendar->monthname.' '.$calendar->year.'</b>');
($start,$end) = monthStartEnd($_[1]);
$sth = WebGUI::SQL->read("select * from EventsCalendar_event where wobjectId="
.$_[0]->get("wobjectId")." order by startDate,endDate");
my $query = "select * from EventsCalendar_event";
$query .= " where wobjectId=".$_[0]->get("wobjectId") unless ($_[0]->get("isMaster"));
$query .= " order by startDate,endDate";
$sth = WebGUI::SQL->read($query);
while (%event = $sth->hash) {
if (epochToHuman($event{startDate},"%M %y") eq $thisMonth || epochToHuman($event{endDate},"%M %y") eq $thisMonth) {
if ($event{startDate} == $event{endDate}) {
@ -180,7 +184,10 @@ sub new {
},
paginateAfter=>{
defaultValue=>50
}
},
isMaster=>{
defaultValue=>0,
}
},
-useTemplate=>1
);
@ -233,7 +240,7 @@ sub www_edit {
-label=>WebGUI::International::get(80,$_[0]->get("namespace")),
-afterEdit=>$afterEdit
);
$properties->select(
$properties->selectList(
-name=>"startMonth",
-options=>{
"january"=>WebGUI::International::get(15),
@ -254,13 +261,13 @@ sub www_edit {
"after3"=>WebGUI::International::get(89,$_[0]->get("namespace")),
"current"=>WebGUI::International::get(82,$_[0]->get("namespace"))
);
$properties->select(
$properties->selectList(
-name=>"endMonth",
-options=>\%options,
-label=>WebGUI::International::get(84,$_[0]->get("namespace")),
-value=>[$_[0]->getValue("endMonth")]
);
$properties->select(
$properties->selectList(
-name=>"defaultMonth",
-options=>{
"current"=>WebGUI::International::get(82,$_[0]->get("namespace")),
@ -270,6 +277,11 @@ sub www_edit {
-label=>WebGUI::International::get(90,$_[0]->get("namespace")),
-value=>[$_[0]->getValue("defaultMonth")]
);
$properties->yesNo(
-name=>"isMaster",
-value=>$_[0]->getValue("isMaster"),
-label=>WebGUI::International::get(99,$_[0]->get("namespace"))
);
$layout->integer(
-name=>"paginateAfter",
-label=>WebGUI::International::get(19,$_[0]->get("namespace")),
@ -433,8 +445,9 @@ sub www_view {
$var{"addevent.url"} = WebGUI::URL::page('func=editEvent&eid=new&wid='.$_[0]->get("wobjectId"));
$var{"addevent.label"} = WebGUI::International::get(20,$_[0]->get("namespace"));
if ($_[0]->get("startMonth") eq "first") {
($minDate) = WebGUI::SQL->quickArray("select min(startDate) from EventsCalendar_event
where wobjectId=".$_[0]->get("wobjectId"));
my $query = "select min(startDate) from EventsCalendar_event";
$query .= " where wobjectId=".$_[0]->get("wobjectId") unless ($_[0]->get("isMaster"));
($minDate) = WebGUI::SQL->quickArray($query);
} elsif ($_[0]->get("startMonth") eq "january") {
$minDate = WebGUI::DateTime::humanToEpoch(WebGUI::DateTime::epochToHuman("","%y")."-01-01 00:00:00");
} else {
@ -444,8 +457,9 @@ sub www_view {
($minDate,$junk) = WebGUI::DateTime::monthStartEnd($minDate);
}
if ($_[0]->get("endMonth") eq "last") {
($maxDate) = WebGUI::SQL->quickArray("select max(endDate) from EventsCalendar_event where
wobjectId=".$_[0]->get("wobjectId"));
my $query = "select max(endDate) from EventsCalendar_event";
$query .= " where wobjectId=".$_[0]->get("wobjectId") unless ($_[0]->get("isMaster"));
($maxDate) = WebGUI::SQL->quickArray($query);
} elsif ($_[0]->get("endMonth") eq "after12") {
$maxDate = WebGUI::DateTime::addToDate($minDate,0,11,0);
} elsif ($_[0]->get("endMonth") eq "after9") {
@ -488,8 +502,10 @@ sub www_view {
$session{form}{pn} = "";
}
$p = WebGUI::Paginator->new(WebGUI::URL::page("func=view&wid=".$_[0]->get("wobjectId")),[],$_[0]->get("paginateAfter"));
$p->setDataByQuery("select * from EventsCalendar_event where wobjectId=".$_[0]->get("wobjectId")
." and endDate>=$minDate and startDate<=$maxDate order by startDate,endDate");
my $query = "select * from EventsCalendar_event where ";
$query .= " wobjectId=".$_[0]->get("wobjectId")." and " unless ($_[0]->get("isMaster"));
$query .= " endDate>=$minDate and startDate<=$maxDate order by startDate,endDate";
$p->setDataByQuery($query);
my $events = $p->getPageData;
foreach my $event (@$events) {
if ($event->{startDate} == $previous{startDate} && $event->{endDate} == $previous{endDate}) {
@ -550,14 +566,16 @@ sub www_viewEvent {
$var{"delete.url"} = WebGUI::URL::page('func=deleteEvent&eid='.$session{form}{eid}.'&wid='
.$session{form}{wid}.'&rid='.$event{EventsCalendar_recurringId});
$var{"delete.label"} = WebGUI::International::get(576);
($id) = WebGUI::SQL->quickArray("select EventsCalendar_eventId from EventsCalendar_event
where EventsCalendar_eventId<>$event{EventsCalendar_eventId} and wobjectId=".$_[0]->get("wobjectId")." and
startDate<=$event{startDate} order by startDate desc, endDate desc");
my $query = "select EventsCalendar_eventId from EventsCalendar_event where EventsCalendar_eventId<>$event{EventsCalendar_eventId}";
$query .= " and wobjectId=".$_[0]->get("wobjectId") unless ($_[0]->get("isMaster"));
$query .= " and startDate<=$event{startDate} order by startDate desc, endDate desc";
($id) = WebGUI::SQL->quickArray($query);
$var{"previous.label"} = '&laquo;'.WebGUI::International::get(92,$_[0]->get("namespace"));
$var{"previous.url"} = WebGUI::URL::page("func=viewEvent&wid=".$_[0]->get("wobjectId")."&eid=".$id) if ($id);
($id) = WebGUI::SQL->quickArray("select EventsCalendar_eventId from EventsCalendar_event
where EventsCalendar_eventId<>$event{EventsCalendar_eventId} and wobjectId=".$_[0]->get("wobjectId")." and
startDate>=$event{startDate} order by startDate, endDate");
$query = "select EventsCalendar_eventId from EventsCalendar_event where EventsCalendar_eventId<>$event{EventsCalendar_eventId}";
$query .= " and wobjectId=".$_[0]->get("wobjectId") unless ($_[0]->get("isMaster"));
$query .= " and startDate>=$event{startDate} order by startDate, endDate";
($id) = WebGUI::SQL->quickArray($query);
$var{"next.label"} = WebGUI::International::get(93,$_[0]->get("namespace")).'&raquo;';
$var{"next.url"} = WebGUI::URL::page("func=viewEvent&wid=".$_[0]->get("wobjectId")."&eid=".$id) if ($id);
$var{description} = $event{description};