--- loncom/homework/bridgetask.pm 2012/04/11 11:40:00 1.259 +++ loncom/homework/bridgetask.pm 2020/09/01 17:07:59 1.264.8.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.259 2012/04/11 11:40:00 goltermann Exp $ +# $Id: bridgetask.pm,v 1.264.8.1 2020/09/01 17:07:59 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -65,8 +65,9 @@ sub initialize_bridgetask { sub proctor_check_auth { my ($slot_name,$slot,$type)=@_; my $user=$env{'form.proctorname'}; + $user =~ s/^\s+|\s+$//g; my $domain=$env{'form.proctordomain'}; - + my @allowed=split(",",$slot->{'proctor'}); foreach my $possible (@allowed) { my ($puser,$pdom)=(split(':',$possible)); @@ -252,11 +253,11 @@ sub add_grading_button { $size=scalar(keys(%sections))+2; } my $sec_select = "\n".'\n"; + $sec_select .= "\t".'\n\n"; my $uri=$env{'request.uri'}; if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } @@ -681,7 +682,7 @@ sub start_Task { $target eq 'tex') { if ($env{'form.markaccess'}) { my @interval=&Apache::lonnet::EXT("resource.0.interval"); - &Apache::lonnet::set_first_access($interval[1]); + &Apache::lonnet::set_first_access($interval[1],$interval[0]); } } @@ -719,7 +720,15 @@ sub start_Task { 'slot' => $slot_name}); ($version,$previous)=&get_version(); } - + if (($target eq 'web') && ($version ne '') && ($slot_name ne '')) { + if (ref($slot) eq 'HASH') { + if ($slot->{'endtime'} > time()) { + $result .= + &Apache::lonhtmlcommon::set_due_date($slot->{'endtime'}); + } + } + } + my $status_id = 'LC_task_take'; if ($previous && $target eq 'answer') { $status_id = 'LC_task_answer'; @@ -988,7 +997,7 @@ sub get_key_todo { my $classlist=&get_limited_classlist(); if (!&allow_grade_user($classlist->{$uname.':'.$udom})) { return (undef,'not_allowed', - &mt('Requested student ([_1]) is in a section you aren\'t allowed to grade.',$uname.':'.$udom)); + &mt("Requested student ([_1]) is in a section you aren't allowed to grade.",$uname.':'.$udom)); } } my $gradingkey=&encode_queue_key($symb,$udom,$uname); @@ -1788,7 +1797,7 @@ sub show_queue { $result.=(<$status -
+ @@ -2207,7 +2216,7 @@ sub select_user { $result.=&Apache::loncommon::start_data_table_row(); $result.=< - + @@ -3277,9 +3286,9 @@ sub proctor_validation_screen { - - - + + +
$lt{'prus'}
$lt{'pasw'}
$lt{'prdo'}
$lt{'prus'}
$lt{'pasw'}
$lt{'prdo'}