--- loncom/interface/lonhelper.pm 2015/08/16 00:21:21 1.196
+++ loncom/interface/lonhelper.pm 2018/08/29 20:21:30 1.201
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# .helper XML handler to implement the LON-CAPA helper
#
-# $Id: lonhelper.pm,v 1.196 2015/08/16 00:21:21 raeburn Exp $
+# $Id: lonhelper.pm,v 1.201 2018/08/29 20:21:30 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1800,7 +1800,7 @@ sub render {
if (lc($time) eq 'anytime') {
$anytime=1;
$date = &get_date_object(time);
- $date->min(0);
+ $date->set_minute(0);
} elsif (defined($time) && $time ne 0) {
$date = &get_date_object($time);
} else {
@@ -1810,7 +1810,7 @@ sub render {
if (!defined($date)) {
$date = &get_date_object(time);
- $date->min(0);
+ $date->set_minute(0);
}
if ($anytime) {
@@ -2047,7 +2047,9 @@ be filtered out. The 'addstatus' attribu
and long status display columns to the display. The 'addparts'
attribute will add in a part selector beside problems that have more
than 1 part. The 'includecourse' attribute if true, will include
-the toplevel default.sequence in the results.
+the toplevel default.sequence in the results. The 'modalLink' attribute,
+if true, will cause links to be launched as modal pop-ups, instead of
+replacing the resource selection listing, currently being displayed.
=head3 SUB-TAGS
@@ -2159,6 +2161,7 @@ sub start_resource {
$paramHash->{'toponly'} = $token->[2]{'toponly'};
$paramHash->{'addstatus'} = $token->[2]{'addstatus'};
$paramHash->{'addparts'} = $token->[2]{'addparts'};
+ $paramHash->{'modalLink'} = $token->[2]{'modallink'};
if ($paramHash->{'addparts'}) {
$helper->declareVar($paramHash->{'variable'}.'_part');
}
@@ -2365,6 +2368,7 @@ BUTTONS
my $option_texts = $self->{OPTION_TEXTS};
my $option_types = $self->{OPTION_TYPES};
my $addparts = $self->{'addparts'};
+ my $modalLink = $self->{'modalLink'};
my $headings_done = 0;
# Evaluate the map url as needed
@@ -2464,7 +2468,7 @@ BUTTONS
$resource_name . "'/> </td>";
} else {
$col .=
- "<td align='center'><input type=$option_type name ='$option_var".
+ "<td align='center'><input type='$option_type' name ='$option_var".
"_forminput' value='".
$resource_name . "' $checked /> </td>";
}
@@ -2549,7 +2553,8 @@ RADIO
'suppressEmptySequences' => $self->{'suppressEmptySequences'},
'include_top_level_map' => $self->{'include_top_level_map'},
'iterator_map' => $mapUrl,
- 'map_no_edit_link' => 1, }
+ 'map_no_edit_link' => 1,
+ 'modalLink' => $modalLink, }
);
$result .= $buttons;
@@ -3183,7 +3188,7 @@ It takes the standard attributes "variab
"allowempty" and "nextstate", meaning what they do for most other
elements.
-also takes a boolean 'onlysections' whcih will restrict this to only
+also takes a boolean 'onlysections' which will restrict this to only
have sections and not include groups
=cut
@@ -3277,6 +3282,10 @@ It takes the standard attributes "variab
"allowempty" and "nextstate", meaning what they do for most other
elements.
+also takes a boolean grouponly, which if true, will restrict choice to
+groups in which user is a member, unless user has the mdg priv in the course,
+in which case all groups will be possible choices. Defaults to false.
+
=cut
no strict;
@@ -3306,6 +3315,7 @@ sub start_group {
$helper->declareVar($paramHash->{'variable'});
$paramHash->{'multichoice'} = $token->[2]{'multichoice'};
$paramHash->{'allowempty'} = $token->[2]{'allowempty'};
+ $paramHash->{'grouponly'} = $token->[2]{'grouponly'};
if (defined($token->[2]{'nextstate'})) {
$paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
}
@@ -3313,7 +3323,12 @@ sub start_group {
# Populate the CHOICES element
my %choices;
- my %curr_groups = &Apache::longroup::coursegroups();
+ my %curr_groups;
+ if ((!$paramHash->{'grouponly'}) || (&Apache::lonnet::allowed('mdg',$Apache::lonnet::env{'request.course.id'}))) {
+ %curr_groups = &Apache::longroup::coursegroups();
+ } elsif ($Apache::lonnet::env{'request.course.groups'} ne '') {
+ map { $curr_groups{$_} = 1; } split(/,/,$Apache::lonnet::env{'request.course.groups'});
+ }
foreach my $group_name (sort {lc($a) cmp lc($b)} (keys(%curr_groups))) {
push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]);
}
@@ -3816,38 +3831,54 @@ sub render {
if ($vars->{GRANULARITY} eq 'whole_course') {
$resourceString .= '<li>'.&mt('for [_1]all resources in the course[_2]','<b>','</b>').'</li>';
if ($vars->{TARGETS} eq 'course') {
- $level = 14; # general course, see lonparmset.pm perldoc
+ $level = 18; # general course, see lonparmset.pm perldoc
} elsif ($vars->{TARGETS} eq 'section') {
- $level = 9;
+ $level = 12;
} elsif ($vars->{TARGETS} eq 'group') {
- $level = 6;
+ $level = 8;
} else {
- $level = 3;
+ $level = 4;
}
$affectedResourceId = "0.0";
$symb = 'a';
$paramlevel = 'general';
- } elsif ($vars->{GRANULARITY} eq 'map') {
+ } elsif (($vars->{GRANULARITY} eq 'map') || ($vars->{GRANULARITY} eq 'maprecurse')) {
my $navmap = Apache::lonnavmaps::navmap->new();
if (defined($navmap)) {
my $res = $navmap->getByMapPc($vars->{RESOURCE_ID});
my $title = $res->compTitle();
$symb = $res->symb();
- $resourceString .= '<li>'.&mt('for the map named [_1]',"<b>$title</b>").'</li>';
+ if ($vars->{GRANULARITY} eq 'map') {
+ $resourceString .= '<li>'.&mt('for the map named [_1]',"<b>$title</b>").'</li>';
+ } else {
+ $resourceString .= '<li>'.&mt('for the map named [_1] (applies recursively to sub-folders)',"<b>$title</b>").'</li>';
+ }
} else {
$resourceString .= '<li>'.&mt('for the map ID [_1] (name unavailable)','<b>'.$vars->{RESOURCE_ID}.'</b>').'</li>';
&Apache::lonnet::logthis('Retrieval of map title failed in lonhelper.pm - could not create navmap object for course.');
}
- if ($vars->{TARGETS} eq 'course') {
- $level = 13; # general course, see lonparmset.pm perldoc
- } elsif ($vars->{TARGETS} eq 'section') {
- $level = 8;
- } elsif ($vars->{TARGETS} eq 'group') {
- $level = 5;
- } else {
- $level = 2;
- }
+ if ($vars->{GRANULARITY} eq 'maprecurse') {
+ if ($vars->{TARGETS} eq 'course') {
+ $level = 17; # general course, see lonparmset.pm perldoc
+ } elsif ($vars->{TARGETS} eq 'section') {
+ $level = 11;
+ } elsif ($vars->{TARGETS} eq 'group') {
+ $level = 7;
+ } else {
+ $level = 3;
+ }
+ } else {
+ if ($vars->{TARGETS} eq 'course') {
+ $level = 16; # general course, see lonparmset.pm perldoc
+ } elsif ($vars->{TARGETS} eq 'section') {
+ $level = 10;
+ } elsif ($vars->{TARGETS} eq 'group') {
+ $level = 6;
+ } else {
+ $level = 2;
+ }
+ }
$affectedResourceId = $vars->{RESOURCE_ID};
$paramlevel = 'map';
} else {
@@ -3864,11 +3895,11 @@ sub render {
&Apache::lonnet::logthis('Retrieval of resource title failed in lonhelper.pm - could not create navmap object for course.');
}
if ($vars->{TARGETS} eq 'course') {
- $level = 10; # general course, see lonparmset.pm perldoc
+ $level = 13; # general course, see lonparmset.pm perldoc
} elsif ($vars->{TARGETS} eq 'section') {
- $level = 7;
+ $level = 9;
} elsif ($vars->{TARGETS} eq 'group') {
- $level = 4;
+ $level = 5;
} else {
$level = 1;
}
@@ -3884,7 +3915,7 @@ sub render {
if ($vars->{GRANULARITY} eq 'resource') {
$result .= "<input type='hidden' name='symb' value='".
HTML::Entities::encode($symb,"'<>&\"") . "' />\n";
- } elsif ($vars->{GRANULARITY} eq 'map') {
+ } elsif (($vars->{GRANULARITY} eq 'map') || ($vars->{GRANULARITY} eq 'maprecurse')) {
$result .= "<input type='hidden' name='pschp' value='".
$affectedResourceId."' />\n";
}