--- loncom/interface/spreadsheet/lonspreadsheet.pm 2004/01/15 03:18:20 1.32 +++ loncom/interface/spreadsheet/lonspreadsheet.pm 2013/07/15 14:33:06 1.64 @@ -1,5 +1,5 @@ # -# $Id: lonspreadsheet.pm,v 1.32 2004/01/15 03:18:20 www Exp $ +# $Id: lonspreadsheet.pm,v 1.64 2013/07/15 14:33:06 bisitz 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,32 +101,36 @@ sub file_dialogs { my $message = ''; ## ## Deal with saving the spreadsheet - if ((exists($ENV{'form.save'}) || exists($ENV{'form.makedefault'})) && - exists($ENV{'form.savefilename'})) { - $spreadsheet->filename($ENV{'form.savefilename'}); + $spreadsheet->check_formulas_loaded(); + if ((exists($env{'form.save'}) || exists($env{'form.makedefault'})) && + exists($env{'form.savefilename'})) { + $spreadsheet->filename($env{'form.savefilename'}); my $save_status = $spreadsheet->save(); if ($save_status ne 'ok') { - $message .= "An error occurred while saving the spreadsheet". - "There error is:".$save_status; + $message .= ''. + &mt('An error occurred while saving the spreadsheet. The error is: [_1].', + $save_status).''; } else { - $message .= "Spreadsheet saved as ".$spreadsheet->filename(); - } - } elsif (exists($ENV{'form.newformula'}) && - exists($ENV{'form.cell'}) && - $ENV{'form.cell'} ne '' ) { + $message .= ''.&mt('Spreadsheet saved as: [_1] .', + ''.$spreadsheet->filename().''). + ''; + } + } elsif (exists($env{'form.newformula'}) && + exists($env{'form.cell'}) && + $env{'form.cell'} ne '' ) { ## ## Make any requested modifications to the spreadsheet - $spreadsheet->modify_cell($ENV{'form.cell'}, - $ENV{'form.newformula'}); + $spreadsheet->modify_cell($env{'form.cell'}, + $env{'form.newformula'}); $spreadsheet->save_tmp(); # output that we are dealing with a temporary file $result .=&hiddenfield('workcopy',$sheettype); - if ($ENV{'form.newformula'} !~ /^\s*$/) { + if ($env{'form.newformula'} !~ /^\s*$/) { $message .=''. - ''. - '
'.&mt('Cell').' '.$ENV{'form.cell'}.' = 
'.$ENV{'form.newformula'}."
\n"; + '

'.&mt('Cell').' '.$env{'form.cell'}.' =
'. + '
'.$env{'form.newformula'}."
\n"; } else { - $message .= &mt('Deleted contents of cell').' '.$ENV{'form.cell'}.'.'; + $message .= &mt('Deleted contents of cell').' '.$env{'form.cell'}.'.'; } } ## @@ -139,13 +144,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 +158,9 @@ sub file_dialogs { my $load_dialog = < - + - $link + $link   \n \n\n"; # + my $headline = &mt('File Dialogs'); $result .=< - File Dialogs + $headline --> @@ -198,16 +204,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) { @@ -219,81 +215,114 @@ sub handler { # Roles Checking # # Needs to be in a course - if (! $ENV{'request.course.fn'}) { + if (! $env{'request.course.fn'}) { # Not in a course, or not allowed to modify parms - $ENV{'user.error.msg'}= + $env{'user.error.msg'}= $r->uri.":opa:0:0:Cannot modify spreadsheet"; return HTTP_NOT_ACCEPTABLE; } - my $courseid = $ENV{'request.course.id'}; + my ($sheettype) = ($r->uri=~/\/(\w+)$/); + my $courseid = $env{'request.course.id'}; + + ## + ## Check permissions + my $allowed_to_edit = &Apache::lonnet::allowed('mgr', + $env{'request.course.id'}); + # Only those instructors/tas/whatevers with complete access + # (not section restricted) are able to modify spreadsheets. + my $allowed_to_view = &Apache::lonnet::allowed('vgr', + $env{'request.course.id'}); + if (! $allowed_to_view) { + $allowed_to_view = &Apache::lonnet::allowed('vgr', + $env{'request.course.id'}.'/'.$env{'request.course.sec'}); + # Those who are restricted by section are allowed to view. + # The routines in lonstatistics which decide which students' + # will be shown take care of the restriction by section. + } + # - # Do not allow students to continue if standard or external grading is in - # effect. + # Do not allow users without vgr or mgr priv to continue unless + # grading type is set to spreadsheet. # - if ($ENV{'request.role'} =~ /^st\./) { - if ($ENV{'course.'.$courseid.'.grading'} eq 'standard' || - $ENV{'course.'.$courseid.'.grading'} eq 'external' ) { - return HTTP_NOT_ACCEPTABLE; + + if ((!$allowed_to_view) && (!$allowed_to_edit)) { + if ($env{'course.'.$courseid.'.grading'} eq 'spreadsheet') { + if ($sheettype ne 'studentcalc') { + $r->internal_redirect('/adm/studentcalc'); + return OK; + } + } else { + $r->internal_redirect('/adm/quickgrades'); + return OK; } } # # Get query string for limited number of parameters # &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['sname','sdomain','usymb','filename','recalc']); + ($ENV{'QUERY_STRING'},['sname','sdomain','usymb','filename','recalc', + 'output_format','not_first_run']); # # Deal with restricted student permissions # - if ($ENV{'request.role'} =~ /^st\./) { - delete $ENV{'form.cell'} if (exists($ENV{'form.cell'})); - delete $ENV{'form.newformula'} if (exists($ENV{'form.newformula'})); + if ($env{'request.role'} =~ /^st\./) { + delete $env{'form.cell'} if (exists($env{'form.cell'})); + delete $env{'form.newformula'} if (exists($env{'form.newformula'})); } # # Determine basic information about the spreadsheet - my ($sheettype) = ($r->uri=~/\/(\w+)$/); # my $symb = undef; - $symb = $ENV{'form.usymb'} if (exists($ENV{'form.usymb'})); - my $name = $ENV{'user.name'}; - my $domain = $ENV{'user.domain'}; - if (exists($ENV{'form.sname'})) { - $name = $ENV{'form.sname'}; - $domain = $ENV{'form.sdomain'}; + $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'}); + } + } } - ## - ## Check permissions - my $allowed_to_edit = &Apache::lonnet::allowed('mgr', - $ENV{'request.course.id'}); - # Only those instructors/tas/whatevers with complete access - # (not section restricted) are able to modify spreadsheets. - my $allowed_to_view = &Apache::lonnet::allowed('vgr', - $ENV{'request.course.id'}); - if (! $allowed_to_view) { - $allowed_to_view = &Apache::lonnet::allowed('vgr', - $ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'}); - # Those who are restricted by section are allowed to view. - # The routines in lonstatistics which decide which students' - # will be shown take care of the restriction by section. + $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'}); } + # # Only those able to view others grades will be allowed to continue # if they are not requesting their own. if ($sheettype eq 'classcalc') { - if (! $allowed_to_view) { - $ENV{'user.error.msg'}= - $r->uri.":vgr:0:0:Access Permission Denied"; - return HTTP_NOT_ACCEPTABLE; + if (!$allowed_to_view) { + $r->internal_redirect('/adm/studentcalc'); + return OK; } } - if ((($name ne $ENV{'user.name'} ) || - ($domain ne $ENV{'user.domain'})) && $sheettype ne 'classcalc') { + if ((($name ne $env{'user.name'} ) || + ($domain ne $env{'user.domain'})) && $sheettype ne 'classcalc') { # Check that the student is in their section? - if (exists($ENV{'request.course.sec'}) && - $ENV{'request.course.sec'} ne '' ) { - my $stu_sec = &Apache::lonnet::usection($domain,$name, - $ENV{'request.course.id'}); - if ($stu_sec ne $ENV{'request.course.sec'}) { - $ENV{'user.error.msg'}= + if (exists($env{'request.course.sec'}) && + $env{'request.course.sec'} ne '' ) { + my $stu_sec = &Apache::lonnet::getsection($domain,$name, + $env{'request.course.id'}); + if ($stu_sec ne $env{'request.course.sec'}) { + $env{'user.error.msg'}= $r->uri.":vgr:0:0:Requested student not in your section."; return HTTP_NOT_ACCEPTABLE; } @@ -310,20 +339,33 @@ 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=( + my %lt=&Apache::lonlocal::texthash( 'ce' => 'Cell', - 'ac' => 'Accept', - 'dc' => 'Discard Changes' + 'ac' => 'Save', + 'dc' => 'Cancel' ); 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 = < // ENDSCRIPT } - $r->print(''.&Apache::loncommon::bodytag('Grades Spreadsheet'). - &Apache::loncommon::help_open_faq(134). - &Apache::loncommon::help_open_bug('Spreadsheet'). - '
'); - $r->print(&hiddenfield('sname' ,$ENV{'form.sname'}). - &hiddenfield('sdomain',$ENV{'form.sdomain'}). - &hiddenfield('usymb' ,$ENV{'form.usymb'})); + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb + ({href => $r->uri, + title => 'Spreadsheet', + text => 'Spreadsheet', + faq => 134, + bug => '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 + # + if ($warning) { + $r->print('

'.$warning.'

'); + } + $r->print(''); + $r->print(&hiddenfield('sname' ,$env{'form.sname'}). + &hiddenfield('sdomain',$env{'form.sdomain'}). + &hiddenfield('usymb' ,$env{'form.usymb'})); $r->rflush(); ## ## Determine the filename to use my $filename = undef; if ($allowed_to_edit) { - $filename = $ENV{'form.filename'} if (exists($ENV{'form.filename'})); + $filename = $env{'form.filename'} if (exists($env{'form.filename'})); # - if (exists($ENV{'form.load'}) && exists($ENV{'form.loadfilename'})) { - $filename = $ENV{'form.loadfilename'}; - $ENV{'form.workcopy'} = 'no'; + if (exists($env{'form.load'}) && exists($env{'form.loadfilename'})) { + $filename = $env{'form.loadfilename'}; + $env{'form.workcopy'} = 'no'; } } ## ## Take care of "backdoor" spreadsheet expiration / recalc stuff - if ($allowed_to_edit && exists($ENV{'form.recalc'})) { - if (exists($ENV{'form.recalc'})) { - &Apache::loncoursedata::delete_caches($ENV{'requres.course.id'}); + if ($allowed_to_edit && exists($env{'form.recalc'})) { + if (exists($env{'form.recalc'})) { + &Apache::loncoursedata::delete_caches($env{'requres.course.id'}); } - if ($ENV{'form.recalc'} eq 'ilovewastingtime') { - &Apache::lonnet::logthis('ilovewastingtime'); + if ($env{'form.recalc'} eq 'expireallsheets') { + &Apache::lonnet::logthis('spreadsheet expired: entire course'); # expire ALL spreadsheets &Apache::lonnet::expirespread('','','studentcalc'); &Apache::lonnet::expirespread('','','assesscalc'); - } elsif ($ENV{'form.recalc'} =~ /^symb:/) { + $r->print('

'. + &mt('Expired spreadsheet caches for all students'). + '

'); + } elsif ($env{'form.recalc'} =~ /^symb:/) { # expire for all students on this symb - my ($symb) = ($ENV{'form.recalc'} =~ /^symb:(.*)$/); - &Apache::lonnet::logthis('symb = '.$symb); + my ($symb) = ($env{'form.recalc'} =~ /^symb:(.*)$/); + &Apache::lonnet::logthis('spreadsheet expired: symb = '.$symb); &Apache::lonnet::expirespread('','','assesscalc',$symb); &Apache::lonnet::expirespread('','','studentcalc'); - } elsif ($ENV{'form.recalc'} =~ /^student:/) { + $r->print('

'. + &mt('Expired spreadsheet caches for all students for symb [_1]', + $symb). + '

'); + } elsif ($env{'form.recalc'} =~ /^student:/) { # expire all assessment spreadsheets for this user - my ($sname,$sdom) = ($ENV{'form.recalc'}=~/^student:(.*):(.*)$/); - &Apache::lonnet::logthis('student = '.$sname.':'.$sdom); + my ($sname,$sdom) = ($env{'form.recalc'}=~/^student:(.*):(.*)$/); + &Apache::lonnet::logthis('spreadsheet expired: student = '. + $sname.'@'.$sdom); if (defined($sname) && defined($sdom)) { &Apache::lonnet::expirespread($sname,$sdom,'assesscalc'); &Apache::lonnet::expirespread($sname,$sdom,'studentcalc'); + $r->print('

'. + &mt('Expired spreadsheet caches for student [_1]', + $sname.'@'.$sdom). + '

'); } } } @@ -416,13 +491,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; } @@ -437,7 +515,7 @@ ENDSCRIPT ## Editing/loading/saving if ($allowed_to_edit) { my ($html,$action_message) = &file_dialogs($spreadsheet); - if ($ENV{'form.makedefault'}) { + if ($env{'form.makedefault'}) { $spreadsheet->make_default(); if ($action_message) { $action_message .= '
'; @@ -452,17 +530,16 @@ ENDSCRIPT } $action_message .= '.'; } - $r->print('
'. - '
'.$spreadsheet->html_header().''.$html."
\n"); + $r->print(''. + '
'. + $spreadsheet->html_header(). + ''.$html."
\n"); if ($action_message ne '') { - $r->print(< -Last Action: -   - $action_message - - -END + $r->print( + &Apache::loncommon::confirmwrapper( + &mt('Last Action:') + .$action_message) + ); } $r->rflush(); } else { @@ -478,13 +555,13 @@ END if ($allowed_to_view) { $r->print(''. &Apache::loncommon::help_open_topic("Spreadsheet_About", - 'Spreadsheet Help'). + &mt('Spreadsheet Help')). ''); } if ($allowed_to_edit) { $r->print(''. &Apache::loncommon::help_open_topic("Spreadsheet_Editing", - 'Editing Help'). + &mt('Editing Help')). ''); } $r->print(''); @@ -493,9 +570,9 @@ 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') { + if (exists($env{'form.not_first_run'}) || $sheettype ne 'classcalc') { $r->print($spreadsheet->get_html_title()); if ($allowed_to_view || $allowed_to_edit) { $r->print($spreadsheet->parent_link()); @@ -503,7 +580,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; }