version 1.134, 2016/10/27 21:02:02
|
version 1.136, 2017/12/22 02:00:46
|
Line 465 sub get_consumed_uniqueperiods {
|
Line 465 sub get_consumed_uniqueperiods {
|
return 'error: Unable to determine current status'; |
return 'error: Unable to determine current status'; |
} |
} |
my @problems = $navmap->retrieveResources(undef, |
my @problems = $navmap->retrieveResources(undef, |
sub { $_[0]->is_problem() },1,0); |
sub { $_[0]->is_gradable() },1,0); |
my %used_slots; |
my %used_slots; |
foreach my $problem (@problems) { |
foreach my $problem (@problems) { |
my $symb = $problem->symb(); |
my $symb = $problem->symb(); |
Line 805 sub release_reservation {
|
Line 805 sub release_reservation {
|
if ($passed_resource->is_map()) { |
if ($passed_resource->is_map()) { |
my ($a_resource) = |
my ($a_resource) = |
$navmap->retrieveResources($passed_resource, |
$navmap->retrieveResources($passed_resource, |
sub {$_[0]->is_problem()},0,1); |
sub {$_[0]->is_gradable()},0,1); |
$symb = $a_resource->symb(); |
$symb = $a_resource->symb(); |
} |
} |
} else { |
} else { |
Line 2028 sub manage_reservations {
|
Line 2028 sub manage_reservations {
|
if (ref($resource)) { |
if (ref($resource)) { |
my $symb = $resource->symb(); |
my $symb = $resource->symb(); |
$contents{$lastcontainer} ++; |
$contents{$lastcontainer} ++; |
next if (!$resource->is_problem() && !$resource->is_sequence() && |
next if (!$resource->is_gradable() && !$resource->is_sequence() && |
!$resource->is_page()); |
!$resource->is_page()); |
$count ++; |
$count ++; |
if (($resource->is_sequence()) || ($resource->is_page())) { |
if (($resource->is_sequence()) || ($resource->is_page())) { |
Line 2036 sub manage_reservations {
|
Line 2036 sub manage_reservations {
|
$container{$lastcontainer} = $resource; |
$container{$lastcontainer} = $resource; |
$container_title{$lastcontainer} = $resource->compTitle(); |
$container_title{$lastcontainer} = $resource->compTitle(); |
} |
} |
if ($resource->is_problem()) { |
if ($resource->is_gradable()) { |
my ($useslots) = $resource->slot_control(); |
my ($useslots) = $resource->slot_control(); |
next if (($useslots eq '') || ($useslots =~ /^\s*no\s*$/i)); |
next if (($useslots eq '') || ($useslots =~ /^\s*no\s*$/i)); |
push(@ordered,$symb); |
push(@ordered,$symb); |
Line 2945 sub csv_upload_map {
|
Line 2945 sub csv_upload_map {
|
if (!$env{'form.datatoken'}) { |
if (!$env{'form.datatoken'}) { |
$datatoken=&Apache::loncommon::upfile_store($r); |
$datatoken=&Apache::loncommon::upfile_store($r); |
} else { |
} else { |
$datatoken=$env{'form.datatoken'}; |
$datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'}); |
&Apache::loncommon::load_tmp_file($r); |
if ($datatoken ne '') { |
|
&Apache::loncommon::load_tmp_file($r,$datatoken); |
|
} |
} |
} |
my @records=&Apache::loncommon::upfile_record_sep(); |
my @records=&Apache::loncommon::upfile_record_sep(); |
if ($env{'form.noFirstLine'}) { shift(@records); } |
if ($env{'form.noFirstLine'}) { shift(@records); } |
Line 2997 sub csvupload_fields {
|
Line 2999 sub csvupload_fields {
|
|
|
sub csv_upload_assign { |
sub csv_upload_assign { |
my ($r,$mgr)= @_; |
my ($r,$mgr)= @_; |
&Apache::loncommon::load_tmp_file($r); |
my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'}); |
|
if ($datatoken ne '') { |
|
&Apache::loncommon::load_tmp_file($r,$datatoken); |
|
} |
my @slotdata = &Apache::loncommon::upfile_record_sep(); |
my @slotdata = &Apache::loncommon::upfile_record_sep(); |
if ($env{'form.noFirstLine'}) { shift(@slotdata); } |
if ($env{'form.noFirstLine'}) { shift(@slotdata); } |
my %fields=&Apache::grades::get_fields(); |
my %fields=&Apache::grades::get_fields(); |