--- loncom/interface/spreadsheet/lonspreadsheet.pm 2011/10/09 00:28:03 1.55.6.1 +++ loncom/interface/spreadsheet/lonspreadsheet.pm 2011/09/26 12:15:39 1.59 @@ -1,5 +1,5 @@ # -# $Id: lonspreadsheet.pm,v 1.55.6.1 2011/10/09 00:28:03 raeburn Exp $ +# $Id: lonspreadsheet.pm,v 1.59 2011/09/26 12:15:39 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -64,6 +64,7 @@ use Apache::lonnet; use Apache::lonhtmlcommon; use Apache::lonlocal; use Apache::loncoursedata(); +use Apache::lonquickgrades(); use HTML::Entities(); ## @@ -106,13 +107,10 @@ sub file_dialogs { $spreadsheet->filename($env{'form.savefilename'}); my $save_status = $spreadsheet->save(); if ($save_status ne 'ok') { - $message .= ''. - &mt('An error occurred while saving the spreadsheet. The error is: [_1].', - $save_status).''; + $message .= "An error occurred while saving the spreadsheet". + "There error is:".$save_status; } else { - $message .= ''.&mt('Spreadsheet saved as: [_1] .', - ''.$spreadsheet->filename().''). - ''; + $message .= "Spreadsheet saved as ".$spreadsheet->filename(); } } elsif (exists($env{'form.newformula'}) && exists($env{'form.cell'}) && @@ -203,16 +201,6 @@ END sub handler { my $r=shift; # - # Overload checking - # - # Check this server - my $loaderror=&Apache::lonnet::overloaderror($r); - if ($loaderror) { return $loaderror; } - # Check the course homeserver - $loaderror= &Apache::lonnet::overloaderror($r, - $env{'course.'.$env{'request.course.id'}.'.home'}); -# if ($loaderror) { return $loaderror; } - # # HTML Header # if ($r->header_only) { @@ -251,7 +239,7 @@ sub handler { # # Do not allow users without vgr or mgr priv to continue unless - # grading type is set to spreadsheet. + # grading type is set to spreadsheet. # if ((!$allowed_to_view) && (!$allowed_to_edit)) { @@ -285,21 +273,9 @@ sub handler { $symb = $env{'form.usymb'} if (exists($env{'form.usymb'})); my $name = $env{'user.name'}; my $domain = $env{'user.domain'}; - my $warning; if (exists($env{'form.sname'}) && $env{'form.sname'} ne '') { - if (($env{'form.sname'} ne $env{'user.name'}) || - ($env{'form.sdomain'} ne $env{'user.domain'})) { - if (($allowed_to_view) || ($allowed_to_edit)) { - if (&Apache::lonnet::homeserver($env{'form.sname'},$env{'form.sdomain'}) ne 'no_host') { - $name = $env{'form.sname'}; - $domain = $env{'form.sdomain'}; - } else { - $warning = &mt('Requested user: "[_1]" does not exist; your own sheet is displayed instead.',$env{'form.sname'}.':'.$env{'form.sdomain'}); - } - } else { - $warning = &mt('Your current role is not permitted to display this sheet for the requested user: "[_1]"; your own sheet is displayed instead.',$env{'form.sname'}.':'.$env{'form.sdomain'}); - } - } + $name = $env{'form.sname'}; + $domain = $env{'form.sdomain'}; } $env{'form.sname'} = $name; $env{'form.sdomain'} = $domain; @@ -425,18 +401,18 @@ ENDSCRIPT text => 'Spreadsheet', faq => 134, bug => 'Spreadsheet'}); - my $settingslink = &Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'), - 'grading'); - &Apache::lonhtmlcommon::add_breadcrumb_tool('advtools',$settingslink); $r->print(&Apache::loncommon::start_page('Grades Spreadsheet',$js). &Apache::lonhtmlcommon::breadcrumbs('Spreadsheet', 'Spreadsheet_About')); + # - # Open the form + # Tabs + # + &Apache::lonquickgrades::startGradeScreen($r,'spreadsheet'); + # - if ($warning) { - $r->print('

'.$warning.'

'); - } + # Open the form + # $r->print('
'); $r->print(&hiddenfield('sname' ,$env{'form.sname'}). &hiddenfield('sdomain',$env{'form.sdomain'}). @@ -459,7 +435,7 @@ ENDSCRIPT if (exists($env{'form.recalc'})) { &Apache::loncoursedata::delete_caches($env{'requres.course.id'}); } - if ($env{'form.recalc'} eq 'ilovewastingtime') { + if ($env{'form.recalc'} eq 'expireallsheets') { &Apache::lonnet::logthis('spreadsheet expired: entire course'); # expire ALL spreadsheets &Apache::lonnet::expirespread('','','studentcalc'); @@ -579,7 +555,7 @@ END $r->print(&hiddenfield('filename',$filename)); # # Keep track of the number of times we have been called, sort of. - $r->print(&hiddenfield('not_first_run','whatever')); + $r->print(&hiddenfield('not_first_run','1')); # if (exists($env{'form.not_first_run'}) || $sheettype ne 'classcalc') { $r->print($spreadsheet->get_html_title()); @@ -589,7 +565,9 @@ END $r->rflush(); $spreadsheet->display($r); } - $r->print('
'.&Apache::loncommon::end_page()); + $r->print(''); + &Apache::lonquickgrades::endGradeScreen($r); + $r->print(&Apache::loncommon::end_page()); $spreadsheet->clear_package(); return OK; }