--- loncom/interface/spreadsheet/lonspreadsheet.pm 2005/04/07 06:56:23 1.40 +++ loncom/interface/spreadsheet/lonspreadsheet.pm 2010/12/03 21:33:56 1.58 @@ -1,5 +1,5 @@ # -# $Id: lonspreadsheet.pm,v 1.40 2005/04/07 06:56:23 albertel Exp $ +# $Id: lonspreadsheet.pm,v 1.58 2010/12/03 21:33:56 www 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(); ## @@ -73,12 +74,12 @@ use HTML::Entities(); sub textfield { my ($title,$name,$value)=@_; return "\n

$title:
". - ''; + ''; } sub hiddenfield { my ($name,$value)=@_; - return ''."\n"; + return ''."\n"; } sub selectbox { @@ -86,7 +87,7 @@ sub selectbox { my $selout="\n

$title:
".''; @@ -100,6 +101,7 @@ sub file_dialogs { my $message = ''; ## ## Deal with saving the spreadsheet + $spreadsheet->check_formulas_loaded(); if ((exists($env{'form.save'}) || exists($env{'form.makedefault'})) && exists($env{'form.savefilename'})) { $spreadsheet->filename($env{'form.savefilename'}); @@ -139,13 +141,13 @@ sub file_dialogs { if ($spreadsheet->is_default()) { $filename = 'Default'; } - my $save_dialog = ''. + my $save_dialog = ''. ' '. ''. - ''; + ''; my $makedefault_dialog = ''; + 'value="'.&mt('Save as & Make This Sheet the Default').'"/>'; # my $link = '".&mt('Select Spreadsheet File').""; @@ -153,9 +155,9 @@ sub file_dialogs { my $load_dialog = < - + - $link + $link   \n \n\n"; # + my $headline = &mt('File Dialogs'); $result .=< - File Dialogs + $headline --> @@ -198,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) { @@ -263,6 +256,17 @@ sub handler { } $env{'form.sname'} = $name; $env{'form.sdomain'} = $domain; + my $section = &Apache::lonnet::getsection($domain,$name, + $env{'request.course.id'}); + my @groups; + if (($env{'user.name'} eq $name) && ($env{'user.domain'} eq $domain)) { + @groups = &Apache::lonnet::sort_course_groups($env{'request.course.id'}, + split(':',$env{'request.course.groups'})); + } else { + @groups = &Apache::lonnet::get_users_groups($domain,$name, + $env{'request.course.id'}); + } + ## ## Check permissions my $allowed_to_edit = &Apache::lonnet::allowed('mgr', @@ -313,11 +317,11 @@ sub handler { # # Header.... # - $r->print('LON-CAPA Spreadsheet'); my $nothing = &Apache::lonhtmlcommon::javascript_nothing(); ## ## Spit out the javascript required for editing ## + my $js; if ($allowed_to_edit) { my %lt=( 'ce' => 'Cell', @@ -326,7 +330,20 @@ sub handler { ); my $extra_javascript = &Apache::loncommon::browser_and_searcher_javascript(); - $r->print(< 1, + 'js_ready' => 1, + 'add_entries' => { + 'onresize' => "resize_textarea('LC_newformula','LC_aftertextarea')", + 'onload' => "resize_textarea('LC_newformula','LC_aftertextarea')", + }}); + my $cell_edit_end = + &Apache::loncommon::end_page({'js_ready' => 1,}); + + $js = < // @@ -375,9 +394,19 @@ ENDSCRIPT text => 'Spreadsheet', faq => 134, bug => 'Spreadsheet'}); - $r->print(''.&Apache::loncommon::bodytag('Grades Spreadsheet'). - &Apache::lonhtmlcommon::breadcrumbs(undef,'Spreadsheet'). - '
'); + $r->print(&Apache::loncommon::start_page('Grades Spreadsheet',$js). + &Apache::lonhtmlcommon::breadcrumbs('Spreadsheet', + 'Spreadsheet_About')); + + # + # Tabs + # + &Apache::lonquickgrades::startGradeScreen($r,'spreadsheet'); + + # + # Open the form + # + $r->print(''); $r->print(&hiddenfield('sname' ,$env{'form.sname'}). &hiddenfield('sdomain',$env{'form.sdomain'}). &hiddenfield('usymb' ,$env{'form.usymb'})); @@ -399,7 +428,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'); @@ -437,13 +466,16 @@ ENDSCRIPT &Apache::Spreadsheet::initialize_spreadsheet_package(); my $spreadsheet = undef; if ($sheettype eq 'classcalc') { - $spreadsheet = Apache::classcalc->new($name,$domain,$filename,undef); + $spreadsheet = Apache::classcalc->new($name,$domain,$filename,undef, + $section,\@groups); } elsif ($sheettype eq 'studentcalc') { - $spreadsheet = Apache::studentcalc->new($name,$domain,$filename,undef); + $spreadsheet = Apache::studentcalc->new($name,$domain,$filename,undef, + $section,\@groups); } elsif ($sheettype eq 'assesscalc' && defined($symb) && $allowed_to_edit) { - $spreadsheet = Apache::assesscalc->new($name,$domain,$filename,$symb); + $spreadsheet = Apache::assesscalc->new($name,$domain,$filename,$symb, + $section,\@groups); } else { return HTTP_NOT_ACCEPTABLE; } @@ -516,7 +548,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()); @@ -526,7 +558,10 @@ END $r->rflush(); $spreadsheet->display($r); } - $r->print(''); + $r->print(''); + &Apache::lonquickgrades::endGradeScreen($r); + $r->print(&Apache::loncommon::end_page()); + $spreadsheet->clear_package(); return OK; }