--- loncom/interface/spreadsheet/lonspreadsheet.pm 2003/06/16 13:51:46 1.9 +++ loncom/interface/spreadsheet/lonspreadsheet.pm 2003/07/16 13:52:19 1.16 @@ -1,5 +1,5 @@ # -# $Id: lonspreadsheet.pm,v 1.9 2003/06/16 13:51:46 www Exp $ +# $Id: lonspreadsheet.pm,v 1.16 2003/07/16 13:52:19 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -93,18 +93,19 @@ sub file_dialogs { my $bgcolor = "#FFFFFF"; my $sheettype = $spreadsheet->{'type'}; my $result = ''; + my $message = ''; ## ## Deal with saving the spreadsheet - if (exists($ENV{'form.save'}) && + 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') { - $result .= "An error occurred while saving the spreadsheet". + $message .= "An error occurred while saving the spreadsheet". "There error is:".$save_status; return $result; } else { - $result .= "Spreadsheet saved as ".$ENV{'form.savefilename'}; + $message .= "Spreadsheet saved as ".$ENV{'form.savefilename'}; } } elsif (exists($ENV{'form.newformula'}) && exists($ENV{'form.cell'}) && @@ -116,8 +117,13 @@ sub file_dialogs { $spreadsheet->save_tmp(); # output that we are dealing with a temporary file $result .=&hiddenfield('workcopy',$sheettype); - $result .='
'.$ENV{'form.cell'}.' = '.
-                  $ENV{'form.newformula'}."
\n"; + if ($ENV{'form.newformula'} !~ /^\s*$/) { + $message .=''. + ''. + '
Cell '.$ENV{'form.cell'}.' = 
'.$ENV{'form.newformula'}."
\n"; + } else { + $message .= 'Deleted contents of cell '.$ENV{'form.cell'}.'.'; + } } ## ## Editing code @@ -126,15 +132,17 @@ sub file_dialogs { ## ## Create the save and load dialogs my $filename = $spreadsheet->filename(); - $filename = 'Default' if ($filename =~ /^default\.$sheettype/i); - $filename =~ s/_$sheettype$//; + my $truefilename = $filename; + if ($spreadsheet->is_default()) { + $filename = 'Default'; + } my $save_dialog = ''. ' '. ''. + $truefilename.'" />'. ''; my $makedefault_dialog = ''; + 'value="Save as & Make This Sheet the Default"/>'; # my $link = 'Select Spreadsheet File"; @@ -142,7 +150,7 @@ sub file_dialogs { \n
- + $link
  @@ -150,7 +158,6 @@ sub file_dialogs { END my $default_filename_set = 0; foreach my $sheetfilename ($spreadsheet->othersheets()) { - $sheetfilename =~ s/_$sheettype$//; $load_dialog .= ' '."\n"; - } else { - $load_dialog .= ''. - "\n"; - } $load_dialog .= " 
\n"; # $result .=< END - return $result; + return ($result,$message); } sub handler { @@ -237,32 +238,53 @@ sub handler { $name = $ENV{'form.sname'}; $domain = $ENV{'form.sdomain'}; } - # - # Open page, try to prevent browser cache. - # - $r->content_type('text/html'); - $r->header_out('Cache-control','no-cache'); - $r->header_out('Pragma','no-cache'); - $r->send_http_header; ## ## 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. + } # # Only those able to view others grades will be allowed to continue # if they are not requesting their own. - if (($sheettype eq 'classcalc') || - ($name ne $ENV{'user.name'} ) || - ($domain ne $ENV{'user.domain'})) { + if ($sheettype eq 'classcalc') { if (! $allowed_to_view) { - $r->print('

Access Permission Denied

'. - ''); - return OK; + $ENV{'user.error.msg'}= + $r->uri.":vgr:0:0:Access Permission Denied"; + return HTTP_NOT_ACCEPTABLE; + } + } + 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'}= + $r->uri.":vgr:0:0:Requested student not in your section."; + return HTTP_NOT_ACCEPTABLE; + } } } + + # + # Open page, try to prevent browser cache. + # + $r->content_type('text/html'); + &Apache::loncommon::no_cache($r); + $r->send_http_header; + # # Header.... # @@ -354,18 +376,47 @@ ENDSCRIPT $spreadsheet->initialize(); # # Output selector - $r->print('
'); ## ## Editing/loading/saving if ($allowed_to_edit) { + my ($html,$action_message) = &file_dialogs($spreadsheet); + if ($ENV{'form.makedefault'}) { + $spreadsheet->make_default(); + if ($action_message) { + $action_message .= '
'; + } + $action_message .= 'Made this spreadsheet the default'; + if ($sheettype eq 'classcalc') { + $action_message .= ' for the course'; + } elsif ($sheettype eq 'studentcalc') { + $action_message .= ' for all students'; + } elsif ($sheettype eq 'assesscalc') { + $action_message .= ' for all assessments'; + } + $action_message .= '.'; + } $r->print(''. - '
'.$spreadsheet->html_header().''. - &file_dialogs($spreadsheet)."
\n"); + ''.$html."\n"); + if ($action_message ne '') { + $r->print(< +Last Action: +   + $action_message + + +END + } $r->rflush(); } else { $r->print('
'.$spreadsheet->html_header(). "
\n"); } + $r->rflush(); + # + if ($sheettype eq 'classcalc') { + $r->print('
'); + } # # Keep track of the filename $r->print(&hiddenfield('filename',$filename)); @@ -378,9 +429,8 @@ ENDSCRIPT if ($allowed_to_view || $allowed_to_edit) { $r->print($spreadsheet->parent_link()); } + $r->rflush(); $spreadsheet->display($r); - } else { - $r->print("

Make your selections and bonk the 'update display' button

"); } $r->print(''); return OK;