version 1.542, 2015/12/07 08:11:55
|
version 1.546, 2016/04/02 04:30:39
|
Line 226 sub end_tex {
|
Line 226 sub end_tex {
|
sub homework_js { |
sub homework_js { |
my ($postsubmit,$timeout); |
my ($postsubmit,$timeout); |
if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) { |
if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) { |
my $crstype; |
my $crstype = &Apache::loncommon::course_type(); |
if (&Apache::loncommon::course_type() eq 'Community') { |
if ($crstype eq 'Community') { |
$crstype = 'community'; |
$crstype = 'community'; |
|
} elsif ($crstype eq 'Placement') { |
|
$crstype = 'placement'; |
} else { |
} else { |
if ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) { |
if ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) { |
$crstype = 'official'; |
$crstype = 'official'; |
Line 980 $show_all
|
Line 982 $show_all
|
'onclick="javascript:setmode(this.form,'."'editxml'".')" />'; |
'onclick="javascript:setmode(this.form,'."'editxml'".')" />'; |
if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) { |
if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) { |
my $uri = $env{'request.uri'}; |
my $uri = $env{'request.uri'}; |
my $daxeurl = '/adm/daxe/daxe.html?config=config/loncapa_config.xml&file=/daxeopen'.$uri. |
my $daxeurl = '/daxepage'.$uri; |
'&save=/daxesave'; |
|
$result .= '<input type="button" value="'.&mt('Edit with Daxe').'" '. |
$result .= '<input type="button" value="'.&mt('Edit with Daxe').'" '. |
'onclick="window.open(\''.$daxeurl.'\',\'_blank\');" />'; |
'onclick="window.open(\''.$daxeurl.'\',\'_blank\');" />'; |
} |
} |
Line 1287 sub store_aggregates {
|
Line 1288 sub store_aggregates {
|
} else { |
} else { |
$anoncounter{$symb."\0".$part} = 1; |
$anoncounter{$symb."\0".$part} = 1; |
} |
} |
my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}.':'}; |
my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}.'::'}; |
if ($needsrelease) { |
if ($needsrelease) { |
my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'}; |
my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'}; |
if ($curr_required eq '') { |
if ($curr_required eq '') { |
Line 1603 sub start_problem {
|
Line 1604 sub start_problem {
|
$form_tag_start.='<hr />'; |
$form_tag_start.='<hr />'; |
} elsif (($env{'request.state'} ne "construct") && |
} elsif (($env{'request.state'} ne "construct") && |
($Apache::lonhomework::type eq 'randomizetry') && |
($Apache::lonhomework::type eq 'randomizetry') && |
($status eq 'CAN_ANSWER')) { |
($status eq 'CAN_ANSWER') && |
|
($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement')) { |
my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries"); |
my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries"); |
my $problemstatus = &get_problem_status($Apache::inputtags::part); |
my $problemstatus = &get_problem_status($Apache::inputtags::part); |
$form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries); |
$form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries); |
Line 1732 sub start_problem {
|
Line 1734 sub start_problem {
|
'<input type="hidden" name="submitted" value="yes" />'; |
'<input type="hidden" name="submitted" value="yes" />'; |
# create a page header and exit |
# create a page header and exit |
if ($env{'request.state'} eq "construct") { |
if ($env{'request.state'} eq "construct") { |
unless ($env{'form.inhibitmenu'} eq 'yes') { |
if ($env{'form.inhibitmenu'} eq 'yes') { |
|
# error messages can be useful in any case |
|
$result.= &Apache::lonxml::message_location(); |
|
} else { |
$result.= &problem_web_to_edit_header($env{'form.rndseed'}); |
$result.= &problem_web_to_edit_header($env{'form.rndseed'}); |
} |
} |
if ($Apache::lonhomework::type eq 'practice') { |
if ($Apache::lonhomework::type eq 'practice') { |
Line 1920 sub end_problem {
|
Line 1925 sub end_problem {
|
# Added separately at end of this routine, after added |
# Added separately at end of this routine, after added |
# <script></script> so document will be valid xhtml. |
# <script></script> so document will be valid xhtml. |
# |
# |
$result.= &Apache::loncommon::end_page({'discussion' => 1, |
my $showdisc = 1; |
|
if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') { |
|
$showdisc = 0; |
|
} |
|
$result.= &Apache::loncommon::end_page({'discussion' => $showdisc, |
'notbody' => 1}); |
'notbody' => 1}); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $endminipage = ''; |
my $endminipage = ''; |