loncom/homework/structuretags.pm - diff

Return to structuretags.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/structuretags.pm between versions 1.404 and 1.414

version 1.404, 2007/10/16 23:20:25	version 1.414, 2007/11/20 17:53:22
Line 199 sub page_start {	Line 199 sub page_start {
}	}
}	}

if (!defined($found{'body'})) {	if (!defined($found{'body'}) && $env{'request.state'} ne 'construct') {
$page_start .= &Apache::lonxml::message_location();	$page_start .= &Apache::lonxml::message_location();
}	}

Line 302 sub remember_problem_state {	Line 302 sub remember_problem_state {
sub problem_edit_header {	sub problem_edit_header {
return '<input type="hidden" name="submitted" value="edit" />'.	return '<input type="hidden" name="submitted" value="edit" />'.
&Apache::structuretags::remember_problem_state().'	&Apache::structuretags::remember_problem_state().'
	<div class="LC_edit_problem_header">
	<div class="LC_edit_problem_header_title">
	'.&mt('Problem Editing').&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
	</div>
	<div class="LC_edit_problem_discards">
<input type="hidden" name="problemmode" value="'.&mt('Edit').'" />	<input type="hidden" name="problemmode" value="'.&mt('Edit').'" />
<input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />	<input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
<input '.&Apache::edit::submit_ask_anyway().' type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />	<input '.&Apache::edit::submit_ask_anyway().' type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
<input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr />	<input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
<input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" />	</div>
<input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.	<div class="LC_edit_problem_saves">
&Apache::loncommon::help_open_menu('Problem Editing Help','Problem_Editor_XML_Index',5,'Authoring',undef,undef,undef,'Problem Editing Help')	<input type="submit" name="submit" accesskey="s" value="'.&mt('Save and Edit').'" />
.'</td></tr></table>'.	<input type="submit" name="submit" accesskey="v" value="'.&mt('Save and View').'" />
	</div>
	<hr class="LC_edit_problem_divide" />
	'.&Apache::lonxml::message_location().'
	</div>
	'.
'<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">';	'<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">';
}	}

sub problem_edit_footer {	sub problem_edit_footer {
return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />	return '</td></tr></table><br />
<input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />'.	<div class="LC_edit_problem_footer">
	<hr class="LC_edit_problem_divide" />
	<div class="LC_edit_problem_discards">
	<input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
	<input '.&Apache::edit::submit_ask_anyway().' type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
	<input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
	</div>
	<div class="LC_edit_problem_saves">
	<input type="submit" name="submit" value="'.&mt('Save and Edit').'" />
	<input type="submit" name="submit" value="'.&mt('Save and View').'" />
	</div>
	<hr class="LC_edit_problem_divide" />
	</div>
	'.

&Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).	&Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).
"\n</form>\n".&Apache::loncommon::end_page();	"\n</form>\n".&Apache::loncommon::end_page();
}	}
Line 332 sub option {	Line 356 sub option {

sub problem_web_to_edit_header {	sub problem_web_to_edit_header {
my ($rndseed)=@_;	my ($rndseed)=@_;
my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />';	my $result .= '<div class="LC_edit_problem_header">';
$result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />';
$result .= '<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />	if (!$Apache::lonhomework::parsing_a_task) {
<input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />	$result .=
<input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />	'<div class="LC_edit_problem_header_title">'.
<nobr><input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />	&mt('Problem Testing').
<input type="text" name="rndseed" size="10" value="'.	&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area').
$rndseed.'"	'</div>';
onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr>	} else {
<span class="LC_nobreak"><label><input type="checkbox" name="showallfoils" ';	$result .=
	'<div class="LC_edit_problem_header_title">'.
	&mt('Task Testing').
	'</div>';
	}

my $show_all_foils_text =	my $show_all_foils_text =
($Apache::lonhomework::parsing_a_task) ?	($Apache::lonhomework::parsing_a_task) ?
&mt(' Show All Instances')	&mt(' Show All Instances')
: &mt(' Show All Foils');	: &mt(' Show All Foils');

if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }	my $show_all= '<span class="LC_nobreak"><label><input type="checkbox" name="showallfoils" ';
$result.= ' />'.$show_all_foils_text.'</label></span>'.	if (defined($env{'form.showallfoils'})) { $show_all.='checked="checked"'; }
&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').	$show_all.= ' />'.$show_all_foils_text.'</label></span>';
'<hr />';
$result.=&mt('Apply style file: ').'
<input type="text" name="style_file" value="'.&HTML::Entities::encode($env{'construct.style'},'"<>&').'" />
<a href="javascript:openbrowser(\'lonhomework\',\'style_file\',\'sty\')">'.&mt('Select').'</a>
<input type="submit" name="clear_style_file" value="'.&mt('Clear').'" />
<br />';



	$result .= '<div class="LC_edit_problem_header_status_row">';
if (!$Apache::lonhomework::parsing_a_task) {	if (!$Apache::lonhomework::parsing_a_task) {
$result.="	$result.="
<nobr>	<div class='LC_edit_problem_header_row1'>
Problem Status:	<span class=\"LC_nobreak\">
	".&mt("Problem Status:")."
<select name='problemstate'>	<select name='problemstate'>
<option value=''></option>	<option value=''></option>
".&option('CLOSED' ,'problemstate').&mt("Closed")."</option>	".&option('CLOSED' ,'problemstate').&mt("Closed")."</option>
Line 369 Problem Status:	Line 396 Problem Status:
".&option('CANNOT_ANSWER_correct','problemstate').&mt("Open and correct")."</option>	".&option('CANNOT_ANSWER_correct','problemstate').&mt("Open and correct")."</option>
".&option('SHOW_ANSWER' ,'problemstate').&mt("Show Answer")."</option>	".&option('SHOW_ANSWER' ,'problemstate').&mt("Show Answer")."</option>
</select>	</select>
</nobr>	</span>
<nobr>	<span class=\"LC_nobreak\">
Problem Type:	".&mt("Problem Type:")."
<select name='problemtype'>	<select name='problemtype'>
<option value=''></option>	<option value=''></option>
".&option('exam' ,'problemtype').&mt("Exam Problem")."</option>	".&option('exam' ,'problemtype').&mt("Exam Problem")."</option>
".&option('problem','problemtype').&mt("Homework problem")."</option>	".&option('problem','problemtype').&mt("Homework problem")."</option>
".&option('survey' ,'problemtype').&mt("Survey Question")."</option>	".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
</select>	</select>
</nobr>	</span>
<nobr>	$show_all
Feedback Mode:	</div>
	<div class='LC_edit_problem_header_row2'>
	<span class=\"LC_nobreak\">
	".&mt("Feedback Mode:")."
<select name='problemstatus'>	<select name='problemstatus'>
<option value=''></option>	<option value=''></option>
".&option('yes','problemstatus').&mt("Show Feedback")."</option>	".&option('yes','problemstatus').&mt("Show Feedback")."</option>
".&option('no', 'problemstatus').&mt("Don't Show Feedback")."</option>	".&option('no', 'problemstatus').&mt("Don't Show Incorect/Correct Feedback")."</option>
	".&option('no_feedback_ever', 'problemstatus').&mt("Don't Show Any Feedback")."</option>
</select>	</select>
</nobr>	</span>
<input type='submit' name='changeproblemmode' value='".&mt("Change")."' />	";
<hr />";
my $numtoanalyze=$env{'form.numtoanalyze'};
if (!$numtoanalyze) { $numtoanalyze=20; }
$result.= '<input type="submit" name="problemmode" value='.
&mt('"Calculate answers').'" /> for
<input type="text" name="numtoanalyze" value="'.
$numtoanalyze.'" size="5" /> '.&mt('versions of this problem').
'.'.&Apache::loncommon::help_open_topic("Analyze_Problem",
'',undef,undef,300).
'<hr />';
} elsif ($Apache::lonhomework::parsing_a_task) {	} elsif ($Apache::lonhomework::parsing_a_task) {
$result.="	$result.="
<nobr>	<div class='LC_edit_problem_header_row1'>
Problem Status:	<span class=\"LC_nobreak\">
	".&mt("Problem Status:")."
<select name='problemstate'>	<select name='problemstate'>
<option value=''></option>	<option value=''></option>
".&option('CLOSED' ,'problemstate').&mt("Closed")."</option>	".&option('CLOSED' ,'problemstate').&mt("Closed")."</option>
Line 409 Problem Status:	Line 432 Problem Status:
".&option('WEB_GRADE' ,'problemstate').&mt("Criteria Grading")."</option>	".&option('WEB_GRADE' ,'problemstate').&mt("Criteria Grading")."</option>
".&option('SHOW_ANSWER' ,'problemstate').&mt("Show Feedback")."</option>	".&option('SHOW_ANSWER' ,'problemstate').&mt("Show Feedback")."</option>
</select>	</select>
</nobr>	</span>
<input type='submit' name='changeproblemmode' value='".&mt("Change")."' />	$show_all
<hr />";	";
	}

	$result.='
	<span class="LC_nobreak">
	'.&mt('Apply style file: ').'
	<input type="text" name="style_file" value="'.&HTML::Entities::encode($env{'construct.style'},'"<>&').'" />
	<a href="javascript:openbrowser(\'lonhomework\',\'style_file\',\'sty\')">'.&mt('Select').'</a>
	</span>
	</div>
	<input type="submit" name="changeproblemmode" value="'.&mt("Change View").'" />
	<input type="submit" name="clear_style_file" accesskey="d" value="'.&mt('Show Default View').'" />
	<input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
	</div>
	<hr class="LC_edit_problem_divide" />
	<div class="LC_edit_problem_header_randomize_row">
	<input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
	<input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
	<input type="text" name="rndseed" size="10" value="'.
	$rndseed.'"
	onchange="javascript:document.lonhomework.changerandseed.click()" />';

	if (!$Apache::lonhomework::parsing_a_task) {
	my $numtoanalyze=$env{'form.numtoanalyze'};
	if (!$numtoanalyze) { $numtoanalyze=20; }
	$result .= '<span class="LC_nobreak">'.
	&mt('[_1] for [_2] versions.',
	'<input type="submit" name="problemmode" value='.&mt('"Calculate answers').'" />',
	'<input type="text" name="numtoanalyze" value="'.
	$numtoanalyze.'" size="5" />').
	&Apache::loncommon::help_open_topic("Analyze_Problem",'',undef,undef,300).
	'</span>';

}	}

	$result.='
	</div>
	<div class="LC_edit_problem_header_edit_row">';
	$result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />';
	$result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />';
	$result .= '<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />';
	$result.='
	</div>
	'.&Apache::lonxml::message_location().'
	</div>';
return $result;	return $result;
}	}

Line 554 ENDCHECKOUT	Line 620 ENDCHECKOUT

sub firstaccess_msg {	sub firstaccess_msg {
my ($time,$symb)=@_;	my ($time,$symb)=@_;
my ($map)=&Apache::lonnet::decode_symb($symb);	my $result;
my $foldertitle=&Apache::lonnet::gettitle($map);	my @interval=&Apache::lonnet::EXT("resource.0.interval");
&Apache::lonxml::debug("map is $map title is $foldertitle");	if ($interval[1] eq 'map') {
my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});	my ($map)=&Apache::lonnet::decode_symb($symb);
return (<<ENDCHECKOUT);	my $foldertitle=&Apache::lonnet::gettitle($map);

	&Apache::lonxml::debug("map is $map title is $foldertitle");
	$result .= (<<ENDCHECKOUT);
<h2>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".</h2>	<h2>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".</h2>
	ENDCHECKOUT
	} elsif ($interval[1] eq 'course') {
	my $course = $env{'course.'.$env{'request.course.id'}.'.description'};
	$result .= (<<ENDCHECKOUT);
	<h2>The resources in "$course" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources in "$course".</h2>
	ENDCHECKOUT
	} else {
	my $title=&Apache::lonnet::gettitle($symb);
	$result .= (<<ENDCHECKOUT);
	<h2>This resource "$title" is open for a limited time. Once you click the 'Show Resource' button below you have $time to complete this resource "$title".</h2>
	ENDCHECKOUT

	}
	my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
	$result .= (<<ENDCHECKOUT);
<form name="markaccess" method="POST" action="$uri">	<form name="markaccess" method="POST" action="$uri">
<input type="hidden" name="markaccess" value="yes" />	<input type="hidden" name="markaccess" value="yes" />
<input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" />	<input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" />
</form>	</form>
ENDCHECKOUT	ENDCHECKOUT
	return $result;
}	}

sub init_problem_globals {	sub init_problem_globals {
Line 576 sub init_problem_globals {	Line 661 sub init_problem_globals {
if ($type eq 'problem') {	if ($type eq 'problem') {
$Apache::inputtags::part='0';	$Apache::inputtags::part='0';
@Apache::inputtags::partlist=('0');	@Apache::inputtags::partlist=('0');
$Apache::lonhomework::problemstatus=&get_problem_status('0');	&Apache::lonhomework::set_show_problem_status(&get_problem_status('0'));
$Apache::lonhomework::ignore_response_errors=0;	$Apache::lonhomework::ignore_response_errors=0;

} elsif ($type eq 'library') {	} elsif ($type eq 'library') {
$Apache::inputtags::part='';	$Apache::inputtags::part='';
@Apache::inputtags::partlist=();	@Apache::inputtags::partlist=();
$Apache::lonhomework::problemstatus='';	&Apache::lonhomework::reset_show_problem_status();
$Apache::lonhomework::ignore_response_errors=1;	$Apache::lonhomework::ignore_response_errors=1;

} elsif ($type eq 'Task') {	} elsif ($type eq 'Task') {
$Apache::inputtags::part='0';	$Apache::inputtags::part='0';
@Apache::inputtags::partlist=('0');	@Apache::inputtags::partlist=('0');
$Apache::lonhomework::problemstatus='';	&Apache::lonhomework::reset_show_problem_status();
$Apache::lonhomework::ignore_response_errors=1;	$Apache::lonhomework::ignore_response_errors=1;
}	}
@Apache::inputtags::responselist = ();	@Apache::inputtags::responselist = ();
Line 617 sub reset_problem_globals {	Line 702 sub reset_problem_globals {
undef($Apache::lonhomework::default_type);	undef($Apache::lonhomework::default_type);
undef($Apache::lonhomework::type);	undef($Apache::lonhomework::type);
undef($Apache::lonhomework::scantronmode);	undef($Apache::lonhomework::scantronmode);
undef($Apache::lonhomework::problemstatus);
undef($Apache::lonhomework::ignore_response_errors);	undef($Apache::lonhomework::ignore_response_errors);
	&Apache::lonhomework::reset_show_problem_status();
}	}

sub set_problem_state {	sub set_problem_state {
Line 671 sub start_problem {	Line 756 sub start_problem {
if ($target ne 'analyze') {	if ($target ne 'analyze') {
$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');	$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
if (($env{'request.state'} eq 'construct') &&	if (($env{'request.state'} eq 'construct') &&
defined($env{'form.problemtype'})) {	$env{'form.problemtype'} =~ /\S/) {
$Apache::lonhomework::type=$env{'form.problemtype'};	$Apache::lonhomework::type=$env{'form.problemtype'};
}	}
&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");	&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
Line 732 sub start_problem {	Line 817 sub start_problem {
$result.=&Apache::lonxml::printtokenheader($target,$token);	$result.=&Apache::lonxml::printtokenheader($target,$token);
}	}
if ($env{'form.markaccess'}) {	if ($env{'form.markaccess'}) {
&Apache::lonnet::set_first_access('map');	my @interval=&Apache::lonnet::EXT("resource.0.interval");
	&Apache::lonnet::set_first_access($interval[1]);
}	}
#handle rand seed in construction space	#handle rand seed in construction space
my $rndseed=&setup_rndseed($safeeval);	my $rndseed=&setup_rndseed($safeeval);
Line 1488 sub start_part {	Line 1574 sub start_part {
@Apache::inputtags::response=();	@Apache::inputtags::response=();
@Apache::inputtags::previous=();	@Apache::inputtags::previous=();
@Apache::inputtags::previous_version=();	@Apache::inputtags::previous_version=();
$Apache::lonhomework::problemstatus=&get_problem_status($id);	&Apache::lonhomework::set_show_problem_status(&get_problem_status($id));
&Apache::response::reset_params();	&Apache::response::reset_params();

my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);	my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.404
changed lines
	Added in v.1.414