version 1.27, 2014/12/04 15:41:30
|
version 1.28, 2014/12/06 17:46:40
|
Line 38 use Apache::lonxml();
|
Line 38 use Apache::lonxml();
|
use Apache::lonhtmlcommon; |
use Apache::lonhtmlcommon; |
use Apache::loncommon; |
use Apache::loncommon; |
use Apache::lonnavmaps; |
use Apache::lonnavmaps; |
|
use Apache::essayresponse; |
use LONCAPA qw(:DEFAULT :match); |
use LONCAPA qw(:DEFAULT :match); |
|
|
BEGIN { |
BEGIN { |
Line 74 sub start_externalresponse {
|
Line 75 sub start_externalresponse {
|
} |
} |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
$result=&Apache::response::meta_package_write('externalresponse'); |
$result=&Apache::response::meta_package_write('externalresponse'); |
} |
} elsif ($target eq 'web') { |
elsif ($target eq 'web' && |
|
$Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
|
my $part= $Apache::inputtags::part; |
my $part= $Apache::inputtags::part; |
my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators"); |
my $coll; |
my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"'); |
if ($Apache::lonhomework::history{"resource.$part.$id.collaborators"} =~ /\S/) { |
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
$coll = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"'); |
$uploadedfiletypes=~s/[^\w\,]//g; |
|
my $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize"); |
|
if (!defined($maxfilesize)) { |
|
$maxfilesize = 10.0; #FIXME This should become a domain configuration |
|
} |
} |
if($uploadedfiletypes){ |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
|
my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators"); |
|
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
|
$uploadedfiletypes=~s/[^\w\,]//g; |
|
my $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize"); |
|
if (!defined($maxfilesize)) { |
|
$maxfilesize = 10.0; #FIXME This should become a domain configuration |
|
} |
my $hiddendraft; |
my $hiddendraft; |
|
if ($uploadedfiletypes) { |
if (($Apache::lonhomework::type eq 'survey') || |
if (($Apache::lonhomework::type eq 'survey') || |
($Apache::lonhomework::type eq 'surveycred') || |
($Apache::lonhomework::type eq 'surveycred') || |
($Apache::lonhomework::type eq 'anonsurvey') || |
($Apache::lonhomework::type eq 'anonsurvey') || |
($Apache::lonhomework::type eq 'anonsurveycred')) { |
($Apache::lonhomework::type eq 'anonsurveycred')) { |
$hiddendraft = '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" />'; |
$hiddendraft = '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" />'; |
} else { |
} else { |
my $status_text = &mt('Submission type'); |
$result = &Apache::essayresponse::draft_row($part,$id,$ncol,$uploadedfiletypes); |
if ($Apache::lonhomework::history{"resource.$part.award"} eq 'DRAFT') { |
|
$status_text .= '<br />'.&mt('(Currently -- draft)'); |
|
} |
|
$result = &Apache::lonhtmlcommon::row_title($status_text); |
|
my $closure; |
|
unless ($ncol || $uploadedfiletypes) { |
|
$closure = 1; |
|
} |
|
$result.= |
|
'<label>'. |
|
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '. |
|
&mt('Submit entries below as answer to receive credit'). |
|
'</label> <br />'. |
|
'<label>'. |
|
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '. |
|
&mt('Save entries below (not submitted for credit yet)'). |
|
'</label>'. |
|
&Apache::lonhtmlcommon::row_closure($closure); |
|
} |
} |
|
|
if ($ncol > 0) { |
if ($ncol > 0) { |
$result.= &Apache::lonhtmlcommon::row_title(&mt('Collaborators')). |
$result .= &Apache::essayresponse::get_collab_row($part,$id,$coll,$ncol); |
'<label>'. |
|
&mt('Collaborators:').' <input type="text" size="70" max="80" name="HWCOL'. |
|
$part.'_'.$id.'" value="'.$coll.'" /><br />'. |
|
&mt('Enter a maximum of [quant,_1,collaborator] using username or username:domain, e.g. smithje or smithje:[_2].',$ncol,$env{'user.domain'}); |
|
if ($ncol > 1) { |
|
$result .= '<br />'.&mt('If entering more than one, use spaces to separate the collaborators.'); |
|
} |
|
$result .= '</label><br />'; |
|
$result .= &Apache::essayresponse::check_collaborators($ncol,$coll) if ($coll =~ /\w+/); |
|
$result .= &Apache::lonhtmlcommon::row_closure(); |
|
} |
} |
my $filesfrom = 'both'; |
my $filesfrom = 'both'; |
my $stuname = &Apache::lonnet::EXT('user.name'); |
my $stuname = &Apache::lonnet::EXT('user.name'); |
my $studom = &Apache::lonnet::EXT('user.domain'); |
my $studom = &Apache::lonnet::EXT('user.domain'); |
if (!&Apache::lonnet::usertools_access($stuname,$studom,'portfolio')) { |
if (!&Apache::lonnet::usertools_access($stuname,$studom,'portfolio')) { |
$filesfrom = 'uploadonly'; |
$filesfrom = 'uploadonly'; |
} |
} |
$result.=&Apache::inputtags::file_selector($part,$id,$uploadedfiletypes, |
$result.=&Apache::inputtags::file_selector($part,$id,$uploadedfiletypes, |
$filesfrom,undef,$maxfilesize); |
$filesfrom,undef,$maxfilesize); |
if ($result) { |
} else { |
$result = |
if ($ncol > 0) { |
'<div>'.$hiddendraft. |
$result = &Apache::essayresponse::get_collab_row($part,$id,$coll,$ncol,1); |
&Apache::lonhtmlcommon::start_pick_box(). |
|
$result. |
|
&Apache::lonhtmlcommon::end_pick_box().'</div>'; |
|
} else { |
|
$result = $hiddendraft; |
|
} |
} |
|
} |
|
if ($result) { |
|
$result = |
|
'<div>'.$hiddendraft. |
|
&Apache::lonhtmlcommon::start_pick_box(). |
|
$result. |
|
&Apache::lonhtmlcommon::end_pick_box().'</div>'; |
|
} else { |
|
$result = $hiddendraft; |
|
} |
|
} else { |
|
$result = &Apache::essayresponse::show_status_table($part,$id,$coll); |
} |
} |
} elsif ($target eq 'web' && |
} |
$Apache::inputtags::status[-1] ne 'CAN_ANSWER') { |
|
my $part= $Apache::inputtags::part; |
|
my @msgs; |
|
if ($Apache::lonhomework::history{"resource.$part.$id.collaborators"} =~ /\S/) { |
|
my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"'); |
|
$result .= '<td><i>'.&mt('Collaborated with [_1]',$coll).'</i></td>'; |
|
} |
|
|
|
my $current_files_display = &Apache::inputtags::current_file_submissions($part,$id); |
|
if ($current_files_display) { |
|
$result .= '<td><b>'.&mt('Submitted files:').'</b><br />'. |
|
$current_files_display.'</td>'; |
|
} |
|
|
|
if ($result ne '') { |
|
$result = |
|
'<table class="LC_pastsubmission"><tr>'.$result. |
|
'</tr></table>'; |
|
} |
|
} |
|
return $result; |
return $result; |
} |
} |
|
|
Line 178 sub end_externalresponse {
|
Line 139 sub end_externalresponse {
|
my $id = $Apache::inputtags::response['-1']; |
my $id = $Apache::inputtags::response['-1']; |
my $increment = 1; |
my $increment = 1; |
if ($target eq 'grade') { |
if ($target eq 'grade') { |
|
&Apache::essayresponse::get_collaborators($part,$id); |
if ( &Apache::response::submitted('scantron') ) { |
if ( &Apache::response::submitted('scantron') ) { |
my $increment=&Apache::response::scored_response($part,$id); |
my $increment=&Apache::response::scored_response($part,$id); |
} elsif ( &Apache::response::submitted() ) { |
} elsif ( &Apache::response::submitted() ) { |