'
- .''.&mt('Half Points').' '
.''.&mt('Quarter Points').' '
.''.&mt('Tenths of a Point').' '
- .'';
+ .''
+ .&Apache::lonhtmlcommon::row_closure();
+
$gradeTable .=
&build_section_inputs().
''
@@ -1328,8 +1115,8 @@ LISTJAVASCRIPT
#---- Called from the listStudents routine
sub check_script {
- my ($form,$type) = @_;
- my $chkallscript = &Apache::lonhtmlcommon::scripttag('
+ my ($form, $type)=@_;
+ my $chkallscript= &Apache::lonhtmlcommon::scripttag('
function checkall() {
for (i=0; idir_config('lonIconsURL');
&commonJSfunctions($request);
@@ -1609,18 +1396,55 @@ sub sub_grademessage_js {
INNERJS
- my $start_page_msg_central =
+ my $inner_js_highlight_central= (<
+ function updateChoice(flag) {
+ opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);
+ opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);
+ opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);
+ opener.document.SCORE.refresh.value = "on";
+ if (opener.document.SCORE.keywords.value!=""){
+ opener.document.SCORE.submit();
+ }
+ self.close()
+ }
+
+INNERJS
+
+ my $start_page_msg_central =
&Apache::loncommon::start_page('Message Central',$inner_js_msg_central,
{'js_ready' => 1,
'only_body' => 1,
'bgcolor' =>'#FFFFFF',});
- my $end_page_msg_central =
+ my $end_page_msg_central =
&Apache::loncommon::end_page({'js_ready' => 1});
+ my $start_page_highlight_central =
+ &Apache::loncommon::start_page('Highlight Central',
+ $inner_js_highlight_central,
+ {'js_ready' => 1,
+ 'only_body' => 1,
+ 'bgcolor' =>'#FFFFFF',});
+ my $end_page_highlight_central =
+ &Apache::loncommon::end_page({'js_ready' => 1});
+
my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
$docopen=~s/^document\.//;
-
+ my %js_lt = &Apache::lonlocal::texthash(
+ keyw => 'Keywords list, separated by a space. Add/delete to list if desired.',
+ plse => 'Please select a word or group of words from document and then click this link.',
+ adds => 'Add selection to keyword list? Edit if desired.',
+ col1 => 'red',
+ col2 => 'green',
+ col3 => 'blue',
+ siz1 => 'normal',
+ siz2 => '+1',
+ siz3 => '+2',
+ sty1 => 'normal',
+ sty2 => 'italic',
+ sty3 => 'bold',
+ );
my %html_js_lt = &Apache::lonlocal::texthash(
comp => 'Compose Message for: ',
incl => 'Include',
@@ -1630,11 +1454,29 @@ INNERJS
new => 'New',
save => 'Save',
canc => 'Cancel',
+ kehi => 'Keyword Highlight Options',
+ txtc => 'Text Color',
+ font => 'Font Size',
+ fnst => 'Font Style',
);
+ &js_escape(\%js_lt);
&html_escape(\%html_js_lt);
&js_escape(\%html_js_lt);
$request->print(&Apache::lonhtmlcommon::scripttag(<");
pDoc.write("<\\/td><\\/tr><\\/table> ");
pDoc.write("
- function updateChoice(flag) {
- opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);
- opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);
- opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);
- opener.document.SCORE.refresh.value = "on";
- if (opener.document.SCORE.keywords.value!=""){
- opener.document.SCORE.submit();
- }
- self.close()
- }
-
-INNERJS
-
- my $start_page_highlight_central =
- &Apache::loncommon::start_page('Highlight Central',
- $inner_js_highlight_central,
- {'js_ready' => 1,
- 'only_body' => 1,
- 'bgcolor' =>'#FFFFFF',});
- my $end_page_highlight_central =
- &Apache::loncommon::end_page({'js_ready' => 1});
-
- my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
- $docopen=~s/^document\.//;
-
- my %js_lt = &Apache::lonlocal::texthash(
- keyw => 'Keywords list, separated by a space. Add/delete to list if desired.',
- plse => 'Please select a word or group of words from document and then click this link.',
- adds => 'Add selection to keyword list? Edit if desired.',
- col1 => 'red',
- col2 => 'green',
- col3 => 'blue',
- siz1 => 'normal',
- siz2 => '+1',
- siz3 => '+2',
- sty1 => 'normal',
- sty2 => 'italic',
- sty3 => 'bold',
- );
- my %html_js_lt = &Apache::lonlocal::texthash(
- save => 'Save',
- canc => 'Cancel',
- kehi => 'Keyword Highlight Options',
- txtc => 'Text Color',
- font => 'Font Size',
- fnst => 'Font Style',
- );
- &js_escape(\%js_lt);
- &html_escape(\%html_js_lt);
- &js_escape(\%html_js_lt);
- $request->print(&Apache::lonhtmlcommon::scripttag(<print(&mt('There are currently no submitted documents.'));
- return;
+ $r->print(&mt('There are currently no submitted documents.'));
+ return;
}
+
my $all_students =
join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo'));
@@ -2187,48 +1950,8 @@ sub download_all_link {
sub submit_download_link {
my ($request,$symb) = @_;
if (!$symb) { return ''; }
- my $res_error;
- my ($partlist,$handgrade,$responseType,$numresp,$numessay,$numdropbox) =
- &response_type($symb,\$res_error);
- if ($res_error) {
- $request->print(&mt('An error occurred retrieving response types'));
- return;
- }
- unless ($numessay) {
- $request->print(&mt('No essayresponse items found'));
- return;
- }
- my @chosenparts = &Apache::loncommon::get_env_multiple('form.vPart');
- if (@chosenparts) {
- $request->print(&showResourceInfo($symb,$partlist,$responseType,
- undef,undef,1));
- }
- if ($numessay) {
- my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
- my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
- my $getgroup = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
- (undef,undef,my $fullname) = &getclasslist($getsec,1,$getgroup,$symb,$submitonly,1);
- if (ref($fullname) eq 'HASH') {
- my @students = map { $_.':'.$fullname->{$_} } (keys(%{$fullname}));
- if (@students) {
- @{$env{'form.stuinfo'}} = @students;
- if ($numdropbox) {
- &download_all_link($request,$symb);
- } else {
- $request->print(&mt('No essayrespose items with dropbox found'));
- }
-# FIXME Need a mechanism to download essays, i.e., if $numessay > $numdropbox
-# Needs to omit user's identity if resource instance is for an anonymous survey.
- } else {
- $request->print(&mt('No students match the criteria you selected'));
- }
- } else {
- $request->print(&mt('Could not retrieve student information'));
- }
- } else {
- $request->print(&mt('No essayresponse items found'));
- }
- return;
+#FIXME: Figure out which type of problem this is and provide appropriate download
+ &download_all_link($request,$symb);
}
sub build_section_inputs {
@@ -2246,15 +1969,14 @@ sub build_section_inputs {
# --------------------------- show submissions of a student, option to grade
sub submission {
- my ($request,$counter,$total,$symb,$divforres,$calledby) = @_;
+ my ($request,$counter,$total,$symb) = @_;
my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});
$udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?
my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
$env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';
+ my $probtitle=&Apache::lonnet::gettitle($symb);
if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }
- my $probtitle=&Apache::lonnet::gettitle($symb);
- my ($essayurl,%coursedesc_by_cid);
if (!&canview($usec)) {
$request->print(
@@ -2266,20 +1988,9 @@ sub submission {
return;
}
- my $res_error;
- my ($partlist,$handgrade,$responseType,$numresp,$numessay) =
- &response_type($symb,\$res_error);
- if ($res_error) {
- $request->print(&navmap_errormsg());
- return;
- }
-
if (!$env{'form.lastSub'}) { $env{'form.lastSub'} = 'datesub'; }
if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; }
if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; }
- if (($numessay) && ($calledby eq 'submission') && (!exists($env{'form.compmsg'}))) {
- $env{'form.compmsg'} = 1;
- }
my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
my $checkIcon = ''.&mt('Syllabus').' '.
- (' 'x2).&mt('(shows course personnel)');
+ (' 'x2).&mt('(shows course personnel)');
my $default_form_data=&defaultFormData($symb);
my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');
&js_escape(\$nofile_alert);
@@ -9142,7 +8917,6 @@ sub scantron_upload_scantron_data {
return;
}
- '.$formatjs.'
'));
$r->print('
'.&mt('Send bubblesheet data to a course').'
@@ -9158,12 +8932,7 @@ sub scantron_upload_scantron_data {
&Apache::lonhtmlcommon::row_closure().
&Apache::lonhtmlcommon::row_title(&mt('Domain')).
''.
- ''.
- &mt('Bubblesheet type:').' '.
- &scantron_scantab().'
';
- $onclick = ' onclick="toggleScantab(this.form);"';
- $formatjs = <<"END";
-function toggleScantab(form) {
- var divid = 'bubbletype';
- if (document.getElementById(divid)) {
- var radioname = 'fileformat';
- var num = form.elements[radioname].length;
- if (num) {
- for (var i=0; i
'
+ );
if ($passed) {
$r->print(&mt('Students with exact correspondence between bubblesheet data and submissions are as follows:').'
-
+
'.&mt('Sections').'
'.&Apache::lonstatistics::SectionSelect('section','multiple',5).'
-
+
'.&mt('Groups').'
'.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
-
+
'.&mt('Access Status').'
@@ -10078,7 +9740,7 @@ sub selectfield {
'.&Apache::lonhtmlcommon::StatusOptions(undef,undef,5,undef,'mult').'
';
if ($full) {
- $result.='
+ $result.='
'.&mt('Submission Status').'
@@ -10100,14 +9762,6 @@ sub substatus_options {
);
}
-sub transtatus_options {
- return &Apache::lonlocal::texthash(
- 'yes' => 'with score transactions',
- 'incorrect' => 'with less than full credit',
- 'all' => 'with any status',
- );
-}
-
sub reset_perm {
undef(%perm);
}
@@ -10241,7 +9895,7 @@ sub process_clicker {
my $pcorrect=&mt("Percentage points for correct solution");
my $pincorrect=&mt("Percentage points for incorrect solution");
my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',
- {'iclicker' => 'i>clicker',
+ {'iclicker' => 'i>clicker',
'interwrite' => 'interwrite PRS',
'turning' => 'Turning Technologies'});
$symb = &Apache::lonenc::check_encrypt($symb);
@@ -10302,12 +9956,12 @@ ENDUPFORM
'.(<$pcorrect: $pincorrect:
'.
&Apache::loncommon::end_data_table_row().
@@ -10316,7 +9970,7 @@ ENDPERCFORM
}
sub process_clicker_file {
- my ($r,$symb) = @_;
+ my ($r,$symb)=@_;
if (!$symb) {return '';}
my %Saveable_Parameters=&clicker_grading_parameters();
@@ -10388,22 +10042,6 @@ sub process_clicker_file {
''.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').' '),1);
return $result;
}
- my $mimetype;
- if ($env{'form.upfiletype'} eq 'iclicker') {
- my $mm = new File::MMagic;
- $mimetype = $mm->checktype_contents($env{'form.upfile'});
- unless (($mimetype eq 'text/plain') || ($mimetype eq 'text/html')) {
- $result.= ''.
- &Apache::lonhtmlcommon::confirm_success(
- &mt('File format is neither csv (iclicker 6) nor xml (iclicker 7)'),1).'
';
- return $result;
- }
- } elsif (($env{'form.upfiletype'} ne 'interwrite') && ($env{'form.upfiletype'} ne 'turning')) {
- $result .= ''.
- &Apache::lonhtmlcommon::confirm_success(
- &mt('Invalid clicker type: choose one of: i>clicker, Interwrite PRS, or Turning Technologies.'),1).'
';
- return $result;
- }
# Were able to get all the info needed, now analyze the file
@@ -10430,14 +10068,12 @@ ENDHEADER
my $errormsg='';
my $number=0;
if ($env{'form.upfiletype'} eq 'iclicker') {
- if ($mimetype eq 'text/plain') {
- ($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses);
- } elsif ($mimetype eq 'text/html') {
- ($errormsg,$number)=&iclickerxml_eval(\@questiontitles,\%responses);
- }
- } elsif ($env{'form.upfiletype'} eq 'interwrite') {
+ ($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses);
+ }
+ if ($env{'form.upfiletype'} eq 'interwrite') {
($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses);
- } elsif ($env{'form.upfiletype'} eq 'turning') {
+ }
+ if ($env{'form.upfiletype'} eq 'turning') {
($errormsg,$number)=&turning_eval(\@questiontitles,\%responses);
}
$result.=''.&mt('Assigning grades based on clicker file').' '.
- &Apache::loncommon::end_data_table_header_row().
- &Apache::loncommon::start_data_table_row().'';
+ my $result=&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ ' '.&mt('Assigning grades based on clicker file').' '.
+ &Apache::loncommon::end_data_table_header_row().
+ &Apache::loncommon::start_data_table_row().'';
# Get correct result
# FIXME: Possibly need delimiter other than ":"
my @correct=();
@@ -10715,14 +10309,14 @@ sub assign_clicker_grades {
&mt('More than one entry found for [_1]!',''.$user.' ').
''.&mt('Select the problem or one of the problems you want to grade').' ');
}
@@ -10821,7 +10408,7 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
# see what command we need to execute
-
+
my @commands=&Apache::loncommon::get_env_multiple('form.command');
my $command=$commands[0];
@@ -10857,32 +10444,23 @@ sub handler {
if (($symb eq '' || $command eq '') && ($env{'request.course.id'})) {
#
# Not called from a resource, but inside a course
-#
+#
&startpage($request,undef,[],1,1);
&select_problem($request);
} else {
- if ($command eq 'submission' && $perm{'vgr'}) {
- my ($stuvcurrent,$stuvdisp,$versionform,$js,$onload);
+ if ($command eq 'submission' && $perm{'vgr'}) {
+ my ($stuvcurrent,$stuvdisp,$versionform,$js);
if (($env{'form.student'} ne '') && ($env{'form.userdom'} ne '')) {
($stuvcurrent,$stuvdisp,$versionform,$js) =
&choose_task_version_form($symb,$env{'form.student'},
$env{'form.userdom'});
}
- my $divforres;
- if ($env{'form.student'} eq '') {
- $js .= &part_selector_js();
- $onload = "toggleParts('gradesub');";
- } else {
- $divforres = 1;
- }
- &startpage($request,$symb,[{href=>"", text=>"Student Submissions"}],undef,undef,$stuvcurrent,$stuvdisp,undef,$js,$onload,$divforres);
+ &startpage($request,$symb,[{href=>"", text=>"Student Submissions"}],undef,undef,$stuvcurrent,$stuvdisp,undef,$js);
if ($versionform) {
- if ($divforres) {
- $request->print('
');
- }
$request->print($versionform);
}
- ($env{'form.student'} eq '' ? &listStudents($request,$symb,'',$divforres) : &submission($request,0,0,$symb,$divforres,$command));
+ $request->print('
');
+ {href=>'', text=>'Download submissions'}]);
&submit_download_link($request,$symb);
- } elsif ($command) {
+ } elsif ($command) {
&startpage($request,$symb,[{href=>'', text=>'Access denied'}]);
- $request->print(''.&mt('Access Denied ([_1])',$command).'
');
- }
+ $request->print(''.&mt('Access Denied ([_1])',$command).'
');
+ }
}
if ($ssi_error) {
&ssi_print_error($request);
}
- $request->print(&Apache::loncommon::end_page());
+ if ($env{'form.inhibitmenu'}) {
+ $request->print(&Apache::loncommon::end_page());
+ } else {
+ &Apache::lonquickgrades::endGradeScreen($request);
+ }
&reset_caches();
return OK;
}
@@ -11065,7 +10637,7 @@ described at http://www.lon-capa.org.
=head1 OVERVIEW
Do an ssi with retries:
-While I'd love to factor out this with the vesrion in lonprintout,
+While I'd love to factor out this with the version in lonprintout,
that would either require a data coupling between modules, which I refuse to perpetuate (there's quite enough of that already), or would require the invention of another infrastructure
I'm not quite ready to invent (e.g. an ssi_with_retry object).
@@ -11112,6 +10684,75 @@ ssi_with_retries()
=over
+=head1 Routines to display previous version of a Task for a specific student
+
+Tasks are graded pass/fail. Students who have yet to pass a particular Task
+can receive another opportunity. Access to tasks is slot-based. If a slot
+requires a proctor to check-in the student, a new version of the Task will
+be created when the student is checked in to the new opportunity.
+
+If a particular student has tried two or more versions of a particular task,
+the submission screen provides a user with vgr privileges (e.g., a Course
+Coordinator) the ability to display a previous version worked on by the
+student. By default, the current version is displayed. If a previous version
+has been selected for display, submission data are only shown that pertain
+to that particular version, and the interface to submit grades is not shown.
+
+=over 4
+
+=item show_previous_task_version()
+
+Displays a specified version of a student's Task, as the student sees it.
+
+Inputs: 2
+ request - request object
+ symb - unique symb for current instance of resource
+
+Output: None.
+
+Side Effects: calls &show_problem() to print version of Task, with
+ version contained in form item: $env{'form.previousversion'}
+
+=item choose_task_version_form()
+
+Displays a web form used to select which version of a student's view of a
+Task should be displayed. Either launches a pop-up window, or replaces
+content in existing pop-up, or replaces page in main window.
+
+Inputs: 4
+ symb - unique symb for current instance of resource
+ uname - username of student
+ udom - domain of student
+ nomenu - 1 if display is in a pop-up window, and hence no menu
+ breadcrumbs etc., are displayed
+
+Output: 4
+ current - student's current version
+ displayed - student's version being displayed
+ result - scalar containing HTML for web form used to switch to
+ a different version (or a link to close window, if pop-up).
+ js - javascript for processing selection in versions web form
+
+Side Effects: None.
+
+=item previous_display_javascript()
+
+Inputs: 2
+ nomenu - 1 if display is in a pop-up window, and hence no menu
+ breadcrumbs etc., are displayed.
+ current - student's current version number.
+
+Output: 1
+ js - javascript for processing selection in versions web form.
+
+Side Effects: None.
+
+=back
+
+=head1 Routines to process bubblesheet data.
+
+=over 4
+
=item scantron_get_correction() :
Builds the interface screen to interact with the operator to fix a
@@ -11121,7 +10762,7 @@ ssi_with_retries()
$r - Apache request object
$i - number of the current scanline
$scan_record - hash ref as returned from &scantron_parse_scanline()
- $scan_config - hash ref as returned from &Apache::lonnet::get_scantron_config()
+ $scan_config - hash ref as returned from &get_scantron_config()
$line - full contents of the current scanline
$error - error condition, valid values are
'incorrectCODE', 'duplicateCODE',
@@ -11148,6 +10789,7 @@ ssi_with_retries()
or code-based randompick and/or randomorder.
+
=item scantron_get_maxbubble() :
Arguments:
@@ -11227,7 +10869,9 @@ ssi_with_retries()
=item navmap_errormsg() :
Returns HTML mark-up inside a
with a link to re-initialize the course.
- Should be called whenever the request to instantiate a navmap object fails.
+ Should be called whenever the request to instantiate a navmap object fails.
+
+=back
=back