';
}
if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
$msg.='The problem '.$accessmsg;
} elsif ($status eq 'UNCHECKEDOUT') {
$msg.=&checkout_msg;
+ } elsif ($status eq 'NOT_YET_VIEWED') {
+ $msg.=&firstaccess_msg($accessmsg,$symb);
}
$result.=$msg.' ';
} elsif ($target eq 'tex') {
@@ -506,24 +609,24 @@ sub start_problem {
$body_tag_start \n $form_tag_start".
'';
# create a page header and exit
- if ($ENV{'request.state'} eq "construct") {
- $result.= &problem_web_to_edit_header($ENV{'form.rndseed'});
+ if ($env{'request.state'} eq "construct") {
+ $result.= &problem_web_to_edit_header($env{'form.rndseed'});
}
# if we are viewing someone else preserve that info
- if (defined $ENV{'form.grade_symb'}) {
+ if (defined $env{'form.grade_symb'}) {
foreach my $field ('symb','courseid','domain','username') {
$result .= ''."\n";
+ '" value="'.$env{"form.grade_$field"}.'" />'."\n";
}
}
} elsif ($target eq 'tex') {
my $startminipage = '';
- if (not $ENV{'form.problem_split'}=~/yes/) {
+ if (not $env{'form.problem_split'}=~/yes/) {
$startminipage = '\begin{minipage}{\textwidth}';
}
my $id = $Apache::inputtags::part;
my $weight = &Apache::lonnet::EXT("resource.$id.weight");
- my $packages=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');
+ my $packages=&Apache::lonnet::metadata($env{'request.uri'},'packages');
my @packages = split /,/,$packages;
my $allow_print_points = 0;
foreach my $partial_key (@packages) {
@@ -531,10 +634,12 @@ sub start_problem {
$allow_print_points=1;
}
}
+ my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
+ if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; }
my $duedate = &Apache::lonnet::EXT("resource.$id.duedate");
$duedate = POSIX::strftime("%c",localtime($duedate));
my $temp_file;
- my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";
+ my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
if (-e $filename) {
$temp_file = Apache::File->new($filename);
} else {
@@ -543,23 +648,23 @@ sub start_problem {
my @due_file_content = <$temp_file>;
my $due_file_content = $due_file_content[$#due_file_content];
chomp $due_file_content;
- my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval));
+ my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');
if ($due_file_content ne $duedate) {
$temp_file = Apache::File->new('>'.$filename);
print $temp_file "$duedate\n";
- if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ if (not $env{'request.symb'} =~ m/\.page_/) {
if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource
"'.$name_of_resourse.'"
located in '.$ENV{'request.uri'}.' STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource
"'.$name_of_resourse.'"
located in '.$env{'request.uri'}.' STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
} else {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource
"'.$name_of_resourse.'"
located in '.$ENV{'request.uri'}.' STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource
"'.$name_of_resourse.'"
located in '.$env{'request.uri'}.' STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
}
} else {
$result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
}
} else {
- if (not $ENV{'request.symb'} =~ m/\.page_/) {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource
"'.$name_of_resourse.'"
located in '.$ENV{'request.uri'}.' STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
+ if (not $env{'request.symb'} =~ m/\.page_/) {
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource
"'.$name_of_resourse.'"
located in '.$env{'request.uri'}.' STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
} else {
$result .= '\vskip 1mm \\\\\\\\';
@@ -589,38 +694,48 @@ sub end_problem {
my $status=$Apache::inputtags::status['-1'];
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex') {
- if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
- ($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode)) {
+ if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
# if part is zero, no s existed, so we need to the grading
- &Apache::inputtags::grade;
+ if ($status eq 'CAN_ANSWER' ||$Apache::lonhomework::scantronmode) {
+ &Apache::inputtags::grade;
+ } else {
+ # move any submission data to .hidden
+ &Apache::inputtags::hidealldata($Apache::inputtags::part);
+ }
} elsif ( ($target eq 'web' || $target eq 'tex') &&
$Apache::inputtags::part eq '0' &&
- $status ne 'UNCHECKEDOUT') {
+ $status ne 'UNCHECKEDOUT' && $status ne 'NOT_YET_VIEWED') {
# if part is zero, no s existed, so we need show the current
# grading status
my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
$result.= $gradestatus;
}
if (
- (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
+ (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
($target eq 'answer') || ($target eq 'tex')
) {
if ($target ne 'tex' &&
- $ENV{'form.answer_output_mode'} ne 'tex') {
- $result.="\n";
+ $env{'form.answer_output_mode'} ne 'tex') {
+ $result.="";
+ $result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
}
if ($target eq 'web') {
- $result.=&Apache::lonxml::xmlend();
+ $result.=&Apache::lonxml::xmlend().'';
} elsif ($target eq 'tex') {
my $endminipage = '';
- if (not $ENV{'form.problem_split'}=~/yes/) {
+ if (not $env{'form.problem_split'}=~/yes/) {
$endminipage = '\end{minipage}';
}
- $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
- if (not $ENV{'request.symb'} =~ m/\.page_/) {
- $result .= $endminipage.'\end{document} ';
+ if ($env{'form.print_discussions'} eq 'yes') {
+ $result.=&Apache::lonxml::xmlend($target,$parser);
+ $result=~s/<\/html>//;
} else {
- $result .= '';
+ $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
+ if (not $env{'request.symb'} =~ m/\.page_/) {
+ $result .= $endminipage.'\end{document} ';
+ } else {
+ $result .= '';
+ }
}
}
}
@@ -628,8 +743,8 @@ sub end_problem {
&Apache::lonhomework::showhash(%Apache::lonhomework::results);
&finalize_storage();
}
- if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct')
- && $ENV{'form.answer_output_mode'} ne 'tex') {
+ if ($target eq 'answer' && ($env{'request.state'} eq 'construct')
+ && $env{'form.answer_output_mode'} ne 'tex') {
$result.=''; # normally we get it from xmlend, but in CSTR
# we always show answer mode too.
}
@@ -639,12 +754,13 @@ sub end_problem {
$result=&Apache::response::mandatory_part_meta;
}
$result.=&Apache::response::meta_part_order();
+ $result.=&Apache::response::meta_response_order();
} elsif ($target eq 'edit') {
&Apache::lonxml::debug("in end_problem with $target, edit");
$result = &problem_edit_footer();
}
- if ($ENV{'request.state'} eq 'construct' && $target eq 'web') {
+ if ($env{'request.state'} eq 'construct' && $target eq 'web') {
&Apache::inputtags::check_for_duplicate_ids();
}
@@ -672,7 +788,7 @@ sub start_library {
$result=$token->[4];
$result.=&Apache::edit::handle_insert();
} elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
- $ENV{'request.state'} eq "construct" ) {
+ $env{'request.state'} eq "construct" ) {
($result,$head_tag_start,$body_tag_start,$form_tag_start)=
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
my $name=&get_resource_name($parstack,$safeeval);
@@ -691,8 +807,9 @@ sub end_library {
if ($target eq 'edit') {
$result=&problem_edit_footer();
} elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
- $ENV{'request.state'} eq "construct") {
- $result.=''.&Apache::lonxml::xmlend();
+ $env{'request.state'} eq "construct") {
+ $result.=''.&Apache::loncommon::endbodytag().
+ &Apache::lonxml::xmlend();
}
if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };
return $result;
@@ -826,8 +943,8 @@ sub start_instructorcomment {
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
- $result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);
- if ( ! $result ) {
+ $result=($env{'request.role'}=~/^(in|cc|au|ca|li)/);
+ if ( (! $result) or ($env{'form.instructor_comments'} eq 'hide')) {
my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
$parser,$style);
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
@@ -897,13 +1014,13 @@ sub end_while {
while ($return) {
if (time-$starttime >
$Apache::lonnet::perlvar{'lonScriptTimeout'}) {
- $return = 0; $error=1; next;
+ #$return = 0; $error=1; next;
}
$result.=&Apache::scripttag::xmlparse($bodytext);
$return = &Apache::run::run($code,$safeeval);
}
if ($error) {
- &Apache::lonxml::error('
'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occured while running <while$gt; on line').' '.$line.'
');
+ &Apache::lonxml::error('
'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occured while running <while> on line').' '.$line.'
');
}
} elsif ($target eq "edit") {
$result.= &Apache::edit::tag_end($target,$token,'');
@@ -975,12 +1092,13 @@ sub shuffle {
my $a=shift;
my $i;
if (defined(@$a)) {
- &Apache::response::setrandomnumber();
+ &Apache::response::pushrandomnumber();
for($i=@$a;--$i;) {
my $j=int(&Math::Random::random_uniform() * ($i+1));
next if $i == $j;
@$a[$i,$j] = @$a[$j,$i];
}
+ &Apache::response::poprandomnumber();
}
}
@@ -994,6 +1112,17 @@ sub end_randomlist {
return $result;
}
+sub ordered_show_check {
+ my $last_part=$Apache::inputtags::partlist[-2];
+ my $in_order=
+ &Apache::lonnet::EXT('resource.'.$Apache::inputtags::part.'.ordered');
+ my $in_order_show=1;
+ if ($last_part ne '0' && lc($in_order) eq 'yes') {
+ $in_order_show=&Apache::response::check_status($last_part);
+ }
+ return $in_order_show;
+}
+
sub start_part {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
@@ -1006,7 +1135,11 @@ sub start_part {
@Apache::inputtags::previous_version=();
$Apache::lonhomework::problemstatus=&get_problem_status($id);
my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
+ my $newtype=&Apache::lonnet::EXT("resource.$id.type");
+ if ($newtype) { $Apache::lonhomework::type=$newtype; }
+ my $in_order_show=&ordered_show_check();
my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
+ $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
&Apache::run::run($expression,$safeeval);
if ($target eq 'meta') {
@@ -1015,7 +1148,7 @@ sub start_part {
&Apache::response::meta_parameter_write('display','string',$display,'Part Description');
} elsif ($target eq 'web' || $target eq 'grade' ||
$target eq 'answer' || $target eq 'tex') {
- if ($hidden) {
+ if ($hidden || !$in_order_show) {
my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
} else {
my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
@@ -1023,11 +1156,12 @@ sub start_part {
my $expression='$external::datestatus="'.$status.'";';
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
&Apache::run::run($expression,$safeeval);
- if ($ENV{'request.state'} eq 'construct') {
+ if ($env{'request.state'} eq 'construct') {
&set_problem_state($Apache::inputtags::part);
}
if (( $status eq 'CLOSED' ) ||
( $status eq 'UNCHECKEDOUT') ||
+ ( $status eq 'NOT_YET_VIEWED') ||
( $status eq 'BANNED') ||
( $status eq 'UNAVAILABLE') ||
( $status eq 'INVALID_ACCESS')) {
@@ -1035,7 +1169,7 @@ sub start_part {
if ( $target eq "web" ) {
$result=" ".&mt('Part is not open to be viewed. It')." $accessmsg ";
} elsif ( $target eq 'tex' ) {
- if (not $ENV{'form.problem_split'}=~/yes/) {
+ if (not $env{'form.problem_split'}=~/yes/) {
$result="\\end{minipage}\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\\\begin{minipage}{\\textwidth}";
} else {
$result="\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\";
@@ -1043,11 +1177,15 @@ sub start_part {
}
} else {
if ($target eq 'tex') {
- if (not $ENV{'form.problem_split'}=~/yes/) {
- $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+ if (not $env{'form.problem_split'}=~/yes/) {
+ if ($$tagstack[-2] eq 'td') {
+ $result.='\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+ } else {
+ $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+ }
}
my $weight = &Apache::lonnet::EXT("resource.$id.weight");
- my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');
+ my $allkeys=&Apache::lonnet::metadata($env{'request.uri'},'packages');
my @allkeys = split /,/,$allkeys;
my $allow_print_points = 0;
foreach my $partial_key (@allkeys) {
@@ -1055,6 +1193,10 @@ sub start_part {
if ($1 ne '0') {$allow_print_points=1;}
}
}
+ my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
+ if (defined($maxtries) && $maxtries < 0) {
+ $allow_print_points=0;
+ }
if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
} elsif ($target eq 'web') {
$result.='';
@@ -1086,20 +1228,27 @@ sub end_part {
&Apache::lonxml::debug("in end_part $target ");
my $status=$Apache::inputtags::status['-1'];
my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
+ my $in_order_show=&ordered_show_check();
my $result='';
if ( $target eq 'meta' ) {
$result='';
- } elsif ($target eq 'grade' &&
- ($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
- !$hidden) {
- $result=&Apache::inputtags::grade;
- } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) {
+ } elsif ($target eq 'grade') {
+ if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
+ !$hidden && $in_order_show) {
+ $result=&Apache::inputtags::grade;
+ } else {
+ # move any submission data to .hidden
+ &Apache::inputtags::hidealldata($Apache::inputtags::part);
+ }
+ } elsif (($target eq 'web' || $target eq 'tex') &&
+ !$hidden && $in_order_show) {
my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
$target);
if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {
$gradestatus='';
}
$result=$gradestatus;
+ if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';}
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();
}
@@ -1177,6 +1326,48 @@ sub end_solved {
return '';
}
+sub start_problemtype {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result;
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze') {
+ my $mode=lc(&Apache::lonxml::get_param('mode',$parstack,$safeeval));
+ if (!defined($mode)) { $mode='show'; }
+ my $for=&Apache::lonxml::get_param('for',$parstack,$safeeval);
+ my $found=0;
+ foreach my $type (split(',',$for)) {
+ if ($Apache::lonhomework::type eq lc($type)) { $found=1; }
+ }
+ if ($mode eq 'show' && !$found) {
+ &Apache::lonxml::get_all_text("/problemtype",$parser);
+ }
+ if ($mode eq 'hide' && $found) {
+ &Apache::lonxml::get_all_text("/problemtype",$parser);
+ }
+ } elsif ($target eq 'edit') {
+ $result .=&Apache::edit::tag_start($target,$token);
+ $result.=&Apache::edit::select_arg('Mode:','mode',
+ [['show','Show'],
+ ['hide','Hide']]
+ ,$token);
+ $result .=&Apache::edit::checked_arg('When used as type(s):','for',
+ [ ['exam','Exam/Quiz Problem'],
+ ['survey','Survey'],
+ ['problem','Homework Problem'] ]
+ ,$token);
+ $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'mode','for');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+ }
+ return $result;
+}
+
+sub end_problemtype {
+ return '';
+}
+
sub start_startouttext {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my @result=(''.'');
@@ -1200,7 +1391,7 @@ sub end_startouttext {
&Apache::edit::end_row().
&Apache::edit::start_spanning_row()."\n"
. &Apache::loncommon::helpLatexCheatsheet () .
- &Apache::edit::editfield($token->[1],$text,"",80,4);
+ &Apache::edit::editfield($token->[1],$text,"",80,8,1);
}
if ($target eq 'modified') {
$result=''.&Apache::edit::modifiedfield("endouttext",$parser);
@@ -1245,12 +1436,14 @@ sub delete_startouttext {
sub start_simpleeditbutton {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
- if (($target eq 'web') &&
- (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
- my $url=$ENV{'request.noversionuri'};
+ if (($env{'form.simple_edit_button'} ne 'off') &&
+ ($target eq 'web') &&
+ (&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) {
+ my $url=$env{'request.noversionuri'};
$url=~s/\?.*$//;
+ my ($symb) = &Apache::lonxml::whichuser();
$result='
'.
- ''.&mt('Simple Problem Editor').' - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').
+ ''.&mt('Edit').' - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').
&Apache::loncommon::help_open_topic('Caching').'