'.
&Apache::loncommon::help_open_faq(5).
@@ -197,7 +200,9 @@ sub problem_edit_header {
sub problem_edit_footer {
return '
- ';
+ '.
+ &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields).
+ "\n\n\n";
}
sub option {
@@ -213,10 +218,10 @@ sub option {
sub problem_web_to_edit_header {
my ($rndseed)=@_;
my $result.='
-
-
-
-
+
+
+
+
- ".&option('exam' ,'problemtype')."Exam Problem
- ".&option('problem','problemtype')."Homework problem
- ".&option('survey' ,'problemtype')."Survey Question
+ ".&option('exam' ,'problemtype').&mt("Exam Problem")."
+ ".&option('problem','problemtype').&mt("Homework problem")."
+ ".&option('survey' ,'problemtype').&mt("Survey Question")."
Feedback Mode:
-
+
";
my $numtoanalyze=$ENV{'form.numtoanalyze'};
if (!$numtoanalyze) { $numtoanalyze=20; }
@@ -330,20 +335,28 @@ sub checkout_msg {
ENDCHECKOUT
}
+sub firstaccess_msg {
+ my ($time,$symb)=@_;
+ my ($map)=&Apache::lonnet::decode_symb($symb);
+ my $foldertitle=&Apache::lonnet::gettitle($map);
+ &Apache::lonxml::debug("map is $map title is $foldertitle");
+ return (<The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".
+
+ENDCHECKOUT
+}
+
sub init_problem_globals {
my ($type)=@_;
#initialize globals
if ($type eq 'problem') {
$Apache::inputtags::part='0';
@Apache::inputtags::partlist=('0');
- $Apache::lonhomework::problemstatus=
- &Apache::lonnet::EXT('resource.0.problemstatus');
- &Apache::lonxml::debug("problem status is $Apache::lonhomework::problemstatus");
- &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
- if ($ENV{'request.state'} eq 'construct' &&
- defined($ENV{'form.problemstatus'})) {
- $Apache::lonhomework::problemstatus=$ENV{'form.problemstatus'};
- }
+
+ $Apache::lonhomework::problemstatus=&get_problem_status('0')
} else {
$Apache::inputtags::part='';
@Apache::inputtags::partlist=();
@@ -373,6 +386,26 @@ sub reset_problem_globals {
undef($Apache::lonhomework::name);
}
+sub set_problem_state {
+ my ($part)=@_;
+ if ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {
+ $Apache::lonhomework::history{"resource.$part.solved"}=
+ 'correct_by_student';
+ }
+}
+
+sub get_problem_status {
+ my ($part)=@_;
+ my $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
+ &Apache::lonxml::debug("problem status for $part is $problem_status");
+ &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
+ if ($ENV{'request.state'} eq 'construct' &&
+ defined($ENV{'form.problemstatus'})) {
+ $problem_status=$ENV{'form.problemstatus'};
+ }
+ return $problem_status;
+}
+
sub start_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
@@ -390,13 +423,18 @@ sub start_problem {
$Apache::lonhomework::scantronmode=1;
}
+ &initialize_storage();
if ($target ne 'analyze') {
- &initialize_storage();
if ($target eq 'web') {
&Apache::lonhomework::showhash(%Apache::lonhomework::history);
}
+ if ($ENV{'request.state'} eq 'construct') { &set_problem_state('0'); }
$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
- &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
+ if (($ENV{'request.state'} eq 'construct') &&
+ defined($ENV{'form.problemtype'})) {
+ $Apache::lonhomework::type=$ENV{'form.problemtype'};
+ }
+ &Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");
}
if ($Apache::lonhomework::type eq '' ) {
my $uri=$ENV{'request.uri'};
@@ -411,6 +449,7 @@ sub start_problem {
#added vars to the scripting enviroment
my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
+ $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
&Apache::run::run($expression,$safeeval);
my $status;
my $accessmsg;
@@ -434,7 +473,9 @@ sub start_problem {
}
$body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
}
-
+ if ($ENV{'form.markaccess'}) {
+ &Apache::lonnet::set_first_access('map');
+ }
#handle rand seed in construction space
my $rndseed=&setup_rndseed($safeeval);
my ($symb)=&Apache::lonxml::whichuser();
@@ -454,6 +495,7 @@ sub start_problem {
&Apache::lonxml::debug("Got $status");
if (( $status eq 'CLOSED' ) ||
( $status eq 'UNCHECKEDOUT') ||
+ ( $status eq 'NOT_YET_VIEWED') ||
( $status eq 'BANNED') ||
( $status eq 'UNAVAILABLE') ||
( $status eq 'INVALID_ACCESS')) {
@@ -462,14 +504,16 @@ sub start_problem {
$result.= $head_tag_start.'';
my $msg=$body_tag_start;
if ($status eq 'UNAVAILABLE') {
- $result.='
'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'
';
- } else {
- $result.='
'.&mt('Not open to be viewed').'
';
+ $msg.='
'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'
';
+ } elsif ($status ne 'NOT_YET_VIEWED') {
+ $msg.='
'.&mt('Not open to be viewed').'
';
}
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') {
@@ -569,13 +613,17 @@ 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);
@@ -587,7 +635,9 @@ sub end_problem {
) {
if ($target ne 'tex' &&
$ENV{'form.answer_output_mode'} ne 'tex') {
- $result.="