--- loncom/interface/lonhelper.pm 2016/03/05 21:49:44 1.198 +++ loncom/interface/lonhelper.pm 2022/06/27 20:35:51 1.204 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # .helper XML handler to implement the LON-CAPA helper # -# $Id: lonhelper.pm,v 1.198 2016/03/05 21:49:44 raeburn Exp $ +# $Id: lonhelper.pm,v 1.204 2022/06/27 20:35:51 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,9 @@ sub start_resource { $paramHash->{'toponly'} = $token->[2]{'toponly'}; $paramHash->{'addstatus'} = $token->[2]{'addstatus'}; $paramHash->{'addparts'} = $token->[2]{'addparts'}; + $paramHash->{'modalLink'} = $token->[2]{'modallink'}; + $paramHash->{'nocurrloc'} = $token->[2]{'nocurrloc'}; + $paramHash->{'suppressNavmap'} = $token->[2]{'suppressNavmap'}; if ($paramHash->{'addparts'}) { $helper->declareVar($paramHash->{'variable'}.'_part'); } @@ -2365,6 +2370,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 +2470,7 @@ BUTTONS $resource_name . "'/> "; } else { $col .= - " "; } @@ -2540,6 +2546,10 @@ RADIO push @$cols, (Apache::lonnavmaps::part_status_summary()); } + my $caller; + if ($helper->{TITLE} eq 'Printing Helper') { + $caller = 'printout'; + } $result .= &Apache::lonnavmaps::render( { 'cols' => $cols, 'showParts' => 0, @@ -2549,7 +2559,11 @@ 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, + 'nocurrloc' => $self->{'nocurrloc'}, + 'suppressNavmap' => $self->{'suppressNavmap'}, + 'caller' => $caller, } ); $result .= $buttons; @@ -3322,7 +3336,7 @@ sub start_group { 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'}); + 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]);