[system] / branches / rel-2-4-dev / webwork-modperl / lib / WeBWorK / ContentGenerator / Instructor / SetMaker.pm Repository:
ViewVC logotype

Diff of /branches/rel-2-4-dev/webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 2116 Revision 4735
1################################################################################ 1################################################################################
2# WeBWorK Online Homework Delivery System 2# WeBWorK Online Homework Delivery System
3# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/ 3# Copyright © 2000-2006 The WeBWorK Project, http://openwebwork.sf.net/
4# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm,v 1.7 2004/05/07 21:04:07 jj Exp $ 4# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm,v 1.76 2006/10/30 20:51:25 sh002i Exp $
5# 5#
6# This program is free software; you can redistribute it and/or modify it under 6# This program is free software; you can redistribute it and/or modify it under
7# the terms of either: (a) the GNU General Public License as published by the 7# the terms of either: (a) the GNU General Public License as published by the
8# Free Software Foundation; either version 2, or (at your option) any later 8# Free Software Foundation; either version 2, or (at your option) any later
9# version, or (b) the "Artistic License" which comes with this package. 9# version, or (b) the "Artistic License" which comes with this package.
10# 10#
11# This program is distributed in the hope that it will be useful, but WITHOUT 11# This program is distributed in the hope that it will be useful, but WITHOUT
12# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 12# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
13# FOR A PARTICULAR PURPOSE. See either the GNU General Public License or the 13# FOR A PARTICULAR PURPOSE. See either the GNU General Public License or the
14# Artistic License for more details. 14# Artistic License for more details.
15################################################################################ 15################################################################################
16 16
17 17
18package WeBWorK::ContentGenerator::Instructor::SetMaker; 18package WeBWorK::ContentGenerator::Instructor::SetMaker;
19use base qw(WeBWorK::ContentGenerator::Instructor); 19use base qw(WeBWorK::ContentGenerator::Instructor);
20 20
21=head1 NAME 21=head1 NAME
22 22
23WeBWorK::ContentGenerator::Instructor::SetMaker - Make problem sets. 23WeBWorK::ContentGenerator::Instructor::SetMaker - Make homework sets.
24 24
25=cut 25=cut
26 26
27use strict; 27use strict;
28use warnings; 28use warnings;
29 29
30use CGI::Pretty qw(); 30
31#use CGI qw(-nosticky);
32use WeBWorK::CGI;
33use WeBWorK::Debug;
31use WeBWorK::Form; 34use WeBWorK::Form;
32use WeBWorK::Utils qw(readDirectory max); 35use WeBWorK::Utils qw(readDirectory max sortByName);
33use WeBWorK::Utils::Tasks qw(renderProblems); 36use WeBWorK::Utils::Tasks qw(renderProblems);
37use File::Find;
34 38
35require WeBWorK::Utils::ListingDB; 39require WeBWorK::Utils::ListingDB;
36 40
37use constant MAX_SHOW => 20; 41use constant MAX_SHOW_DEFAULT => 20;
42use constant NO_LOCAL_SET_STRING => 'No sets in this course yet';
43use constant SELECT_SET_STRING => 'Select a Set from this Course';
44use constant SELECT_LOCAL_STRING => 'Select a Problem Collection';
45use constant MY_PROBLEMS => ' My Problems ';
46use constant MAIN_PROBLEMS => ' Unclassified Problems ';
47use constant CREATE_SET_BUTTON => 'Create New Set';
48use constant ALL_CHAPTERS => 'All Chapters';
49use constant ALL_SUBJECTS => 'All Subjects';
50use constant ALL_SECTIONS => 'All Sections';
51use constant ALL_TEXTBOOKS => 'All Textbooks';
52
53use constant LIB2_DATA => {
54 'dbchapter' => {name => 'library_chapters', all => 'All Chapters'},
55 'dbsection' => {name => 'library_sections', all =>'All Sections' },
56 'dbsubject' => {name => 'library_subjects', all => 'All Subjects' },
57 'textbook' => {name => 'library_textbook', all => 'All Textbooks'},
58 'textchapter' => {name => 'library_textchapter', all => 'All Chapters'},
59 'textsection' => {name => 'library_textsection', all => 'All Sections'},
60 'keywords' => {name => 'library_keywords', all => '' },
61 };
38 62
39## Flags for operations on files 63## Flags for operations on files
40 64
41use constant ADDED => 1; 65use constant ADDED => 1;
42use constant HIDDEN => (1 << 1); 66use constant HIDDEN => (1 << 1);
43use constant SUCCESS => (1 << 2); 67use constant SUCCESS => (1 << 2);
44 68
45## Maybe this should be in ContentGenerator.pm 69## for additional problib buttons
70my %problib; ## filled in in global.conf
71my %ignoredir = (
72 '.' => 1, '..' => 1, 'Library' => 1, 'CVS' => 1, 'tmpEdit' => 1,
73 'headers' => 1, 'macros' => 1, 'email' => 1,
74);
46 75
47sub adderrmsg { 76sub prepare_activity_entry {
48 my $self = shift; 77 my $self=shift;
49 my $msg = shift; 78 my $r = $self->r;
50 $self->addmessage(CGI::div({class=>"ResultsWithError"}, $msg)); 79 my $user = $self->r->param('user') || 'NO_USER';
80 return("In SetMaker as user $user");
51} 81}
52
53sub addgoodmsg {
54 my $self = shift;
55 my $msg = shift;
56 $self->addmessage(CGI::div({class=>"ResultsWithoutError"}, $msg));
57}
58
59 82
60## This is for searching the disk for directories containing pg files. 83## This is for searching the disk for directories containing pg files.
61## to make the recursion work, this returns an array where the first 84## to make the recursion work, this returns an array where the first
62## item is 1 or 0 depending on whether or not the current 85## item is the number of pg files in the directory. The second is a
63## directory has any pg files. The second is a list of directories 86## list of directories which contain pg files.
64## which contain pg files. 87##
88## If a directory contains only one pg file and the directory name
89## is the same as the file name, then the directory is considered
90## to be part of the parent directory (it is probably in a separate
91## directory only because it has auxiliary files that want to be
92## kept together with the pg file).
93##
94## If a directory has a file named "=library-ignore", it is never
95## included in the directory menu. If a directory contains a file
96## called "=library-combine-up", then its pg are included with those
97## in the parent directory (and the directory does not appear in the
98## menu). If it has a file called "=library-no-combine" then it is
99## always listed as a separate directory even if it contains only one
100## pg file.
101
65sub get_library_sets { 102sub get_library_sets {
66 my $amtop = shift; 103 my $top = shift; my $dir = shift;
67 my $topdir = shift; 104 # ignore directories that give us an error
68 my @lis = readDirectory($topdir); 105 my @lis = eval { readDirectory($dir) };
106 if ($@) {
107 warn $@;
108 return (0);
109 }
110 return (0) if grep /^=library-ignore$/, @lis;
111
69 my @pgs = grep { m/\.pg$/ and (not m/Header\.pg/) and -f "$topdir/$_"} @lis; 112 my @pgfiles = grep { m/\.pg$/ and (not m/(Header|-text)\.pg$/) and -f "$dir/$_"} @lis;
70 my $havepg = scalar(@pgs)>0 ? 1 : 0; 113 my $pgcount = scalar(@pgfiles);
71 my @mdirs = grep {$_ ne "." and $_ ne ".." and $_ ne "Library" 114 my $pgname = $dir; $pgname =~ s!.*/!!; $pgname .= '.pg';
72 and -d "$topdir/$_"} @lis; 115 my $combineUp = ($pgcount == 1 && $pgname eq $pgfiles[0] && !(grep /^=library-no-combine$/, @lis));
73 if($amtop) { # we don't want the library 116
74 @mdirs = grep {$_ ne "Library"} @mdirs; 117 my @pgdirs;
75 } 118 my @dirs = grep {!$ignoredir{$_} and -d "$dir/$_"} @lis;
76 my ($adir, @results, @thisresult); 119 if ($top == 1) {@dirs = grep {!$problib{$_}} @dirs}
77 for $adir (@mdirs) { 120 foreach my $subdir (@dirs) {
78 @results = get_library_sets(0, "$topdir/$adir"); 121 my @results = get_library_sets(0, "$dir/$subdir");
79 my $isadirok = shift @results; 122 $pgcount += shift @results; push(@pgdirs,@results);
80 @thisresult = (@thisresult, @results); 123 }
81 if ($isadirok) {
82 @thisresult = ("$topdir/$adir", @thisresult);
83 }
84 }
85 return(($havepg, @thisresult));
86}
87 124
88## List all the pg files in the requested directory 125 return ($pgcount, @pgdirs) if $top || $combineUp || grep /^=library-combine-up$/, @lis;
126 return (0,@pgdirs,$dir);
127}
128
129sub get_library_pgs {
130 my $top = shift; my $base = shift; my $dir = shift;
131 my @lis = readDirectory("$base/$dir");
132 return () if grep /^=library-ignore$/, @lis;
133 return () if !$top && grep /^=library-no-combine$/, @lis;
134
135 my @pgs = grep { m/\.pg$/ and (not m/(Header|-text)\.pg$/) and -f "$base/$dir/$_"} @lis;
136 my $others = scalar(grep { (!m/\.pg$/ || m/(Header|-text)\.pg$/) &&
137 !m/(\.(tmp|bak)|~)$/ && -f "$base/$dir/$_" } @lis);
138
139 my @dirs = grep {!$ignoredir{$_} and -d "$base/$dir/$_"} @lis;
140 if ($top == 1) {@dirs = grep {!$problib{$_}} @dirs}
141 foreach my $subdir (@dirs) {push(@pgs, get_library_pgs(0,"$base/$dir",$subdir))}
142
143 return () unless $top || (scalar(@pgs) == 1 && $others) || grep /^=library-combine-up$/, @lis;
144 return (map {"$dir/$_"} @pgs);
145}
146
89sub list_pg_files { 147sub list_pg_files {
90 my $templatedir = shift; 148 my ($templates,$dir) = @_;
149 my $top = ($dir eq '.')? 1 : 2;
150 my @pgs = get_library_pgs($top,$templates,$dir);
151 return sortByName(undef,@pgs);
152}
153
154## Search for set definition files
155
156sub get_set_defs {
91 my $topdir = shift; 157 my $topdir = shift;
158 my @found_set_defs;
159 # get_set_defs_wanted is a closure over @found_set_defs
160 my $get_set_defs_wanted = sub {
161 #my $fn = $_;
162 #my $fdir = $File::Find::dir;
163 #return() if($fn !~ /^set.*\.def$/);
164 ##return() if(not -T $fn);
165 #push @found_set_defs, "$fdir/$fn";
166 push @found_set_defs, $_ if m|/set[^/]*\.def$|;
167 };
168 find({ wanted => $get_set_defs_wanted, follow_fast=>1, no_chdir=>1}, $topdir);
169 map { $_ =~ s|^$topdir/?|| } @found_set_defs;
170 return @found_set_defs;
171}
92 172
93 my @lis = readDirectory("$templatedir/$topdir"); 173## Try to make reading of set defs more flexible. Additional strategies
94 my @pgs = grep { m/\.pg$/ and (not m/Header\.pg/) and -f "$templatedir/$topdir/$_"} @lis; 174## for fixing a path can be added here.
95 @pgs = map { "$topdir/$_" } @pgs; 175
176sub munge_pg_file_path {
177 my $self = shift;
178 my $pg_path = shift;
179 my $path_to_set_def = shift;
180 my $end_path = $pg_path;
181 # if the path is ok, don't fix it
182 return($pg_path) if(-e $self->r->ce->{courseDirs}{templates}."/$pg_path");
183 # if we have followed a link into a self contained course to get
184 # to the set.def file, we need to insert the start of the path to
185 # the set.def file
186 $end_path = "$path_to_set_def/$pg_path";
187 return($end_path) if(-e $self->r->ce->{courseDirs}{templates}."/$end_path");
188 # if we got this far, this path is bad, but we let it produce
189 # an error so the user knows there is a troublesome path in the
190 # set.def file.
191 return($pg_path);
192}
193
194## Read a set definition file. This could be abstracted since it happens
195## elsewhere. Here we don't have to process so much of the file.
196
197sub read_set_def {
198 my $self = shift;
199 my $r = $self->r;
200 my $filePathOrig = shift;
201 my $filePath = $r->ce->{courseDirs}{templates}."/$filePathOrig";
202 $filePathOrig =~ s/set.*\.def$//;
203 $filePathOrig =~ s|/$||;
204 $filePathOrig = "." if ($filePathOrig !~ /\S/);
205 my @pg_files = ();
206 my ($line, $got_to_pgs, $name, @rest) = ("", 0, "");
207 if ( open (SETFILENAME, "$filePath") ) {
208 while($line = <SETFILENAME>) {
209 chomp($line);
210 $line =~ s|(#.*)||; # don't read past comments
211 if($got_to_pgs) {
212 unless ($line =~ /\S/) {next;} # skip blank lines
213 ($name,@rest) = split (/\s*,\s*/,$line);
214 $name =~ s/\s*//g;
215 push @pg_files, $name;
216 } else {
217 $got_to_pgs = 1 if ($line =~ /problemList\s*=/);
218 }
219 }
220 } else {
221 $self->addbadmessage("Cannot open $filePath");
222 }
223 # This is where we would potentially munge the pg file paths
224 # One possibility
225 @pg_files = map { $self->munge_pg_file_path($_, $filePathOrig) } @pg_files;
96 return(@pgs); 226 return(@pg_files);
97} 227}
98 228
99## go through past page getting a list of identifiers for the problems 229## go through past page getting a list of identifiers for the problems
100## and whether or not they are selected, and whether or not they should 230## and whether or not they are selected, and whether or not they should
101## be hidden 231## be hidden
102 232
103sub get_past_problem_files { 233sub get_past_problem_files {
104 my $r = shift; 234 my $r = shift;
105 my @found=(); 235 my @found=();
106 my $count =1; 236 my $count =1;
107 while (defined($r->param("filetrial$count"))) { 237 while (defined($r->param("filetrial$count"))) {
108 my $val = 0; 238 my $val = 0;
109 $val |= ADDED if($r->param("trial$count")); 239 $val |= ADDED if($r->param("trial$count"));
110 $val |= HIDDEN if($r->param("hideme$count")); 240 $val |= HIDDEN if($r->param("hideme$count"));
111 push @found, [$r->param("filetrial$count"), $val]; 241 push @found, [$r->param("filetrial$count"), $val];
112 $count++; 242 $count++;
113 } 243 }
114 return(\@found); 244 return(\@found);
115} 245}
116 246
117#### For adding new problems 247#### For adding new problems
118 248
119sub add_selected { 249sub add_selected {
120 my $self = shift; 250 my $self = shift;
121 my $db = shift; 251 my $db = shift;
122 my $setName = shift; 252 my $setName = shift;
123 my @past_problems = @{$self->{past_problems}}; 253 my @past_problems = @{$self->{past_problems}};
124 my @selected = @past_problems; 254 my @selected = @past_problems;
125 my (@path, $file, $selected, $freeProblemID); 255 my (@path, $file, $selected, $freeProblemID);
256 # DBFIXME count would work just as well
126 $freeProblemID = max($db->listGlobalProblems($setName)) + 1; 257 $freeProblemID = max($db->listGlobalProblems($setName)) + 1;
127 my $addedcount=0; 258 my $addedcount=0;
128 259
129 for $selected (@selected) { 260 for $selected (@selected) {
130 if($selected->[1] & ADDED) { 261 if($selected->[1] & ADDED) {
131 $file = $selected->[0]; 262 $file = $selected->[0];
132 @path = split "/", $selected->[0]; 263 my $problemRecord = $self->addProblemToSet(setName => $setName,
133 pop @path; # Remove the file name from the path 264 sourceFile => $file, problemID => $freeProblemID);
134 shift @path if $path[0] eq ""; # remove the null element from the begining 265 $freeProblemID++;
135 my $problemRecord = $db->newGlobalProblem();
136 $problemRecord->problem_id($freeProblemID++);
137 $problemRecord->set_id($setName);
138 $problemRecord->source_file($file);
139 $problemRecord->value("1");
140 $problemRecord->max_attempts("-1");
141 $db->addGlobalProblem($problemRecord);
142 $self->assignProblemToAllSetUsers($problemRecord); 266 $self->assignProblemToAllSetUsers($problemRecord);
143 $selected->[1] &= SUCCESS; 267 $selected->[1] |= SUCCESS;
144 $addedcount++; 268 $addedcount++;
145 } 269 }
146 } 270 }
147 return($addedcount); 271 return($addedcount);
148} 272}
149 273
150 274
151############# List of sets of problems in templates directory 275############# List of sets of problems in templates directory
152 276
153sub get_problem_directories { 277sub get_problem_directories {
154 my $ce = shift; 278 my $ce = shift;
279 my $lib = shift;
280 my $source = $ce->{courseDirs}{templates};
281 my $main = MY_PROBLEMS; my $isTop = 1;
282 if ($lib) {$source .= "/$lib"; $main = MAIN_PROBLEMS; $isTop = 2}
155 my @all_problem_directories = get_library_sets(1, $ce->{courseDirs}->{templates}); 283 my @all_problem_directories = get_library_sets($isTop, $source);
156 my $includetop = shift @all_problem_directories; 284 my $includetop = shift @all_problem_directories;
157 my $j; 285 my $j;
158 for ($j=0; $j<scalar(@all_problem_directories); $j++) { 286 for ($j=0; $j<scalar(@all_problem_directories); $j++) {
159 $all_problem_directories[$j] =~ s|^$ce->{courseDirs}->{templates}/?||; 287 $all_problem_directories[$j] =~ s|^$ce->{courseDirs}->{templates}/?||;
160 } 288 }
161 @all_problem_directories = sort @all_problem_directories; 289 @all_problem_directories = sortByName(undef, @all_problem_directories);
162 unshift @all_problem_directories, ' -- Top -- ' if($includetop); 290 unshift @all_problem_directories, $main if($includetop);
163 return (\@all_problem_directories); 291 return (\@all_problem_directories);
164} 292}
293
294############# Everyone has a view problems line. Abstract it
295sub view_problems_line {
296 my $internal_name = shift;
297 my $label = shift;
298 my $r = shift; # so we can get parameter values
299 my $result = CGI::submit(-name=>"$internal_name", -value=>$label);
300
301 my %display_modes = %{WeBWorK::PG::DISPLAY_MODES()};
302 my @active_modes = grep { exists $display_modes{$_} }
303 @{$r->ce->{pg}->{displayModes}};
304 push @active_modes, 'None';
305 # We have our own displayMode since its value may be None, which is illegal
306 # in other modules.
307 my $mydisplayMode = $r->param('mydisplayMode') || $r->ce->{pg}->{options}->{displayMode};
308 $result .= '&nbsp;Display&nbsp;Mode:&nbsp;'.CGI::popup_menu(-name=> 'mydisplayMode',
309 -values=>\@active_modes,
310 -default=> $mydisplayMode);
311 # Now we give a choice of the number of problems to show
312 my $defaultMax = $r->param('max_shown') || MAX_SHOW_DEFAULT;
313 $result .= '&nbsp;Max. Shown:&nbsp'.
314 CGI::popup_menu(-name=> 'max_shown',
315 -values=>[5,10,15,20,25,30,50,'All'],
316 -default=> $defaultMax);
317
318 return($result);
319}
320
165 321
166### The browsing panel has three versions 322### The browsing panel has three versions
167##### Version 1 is local problems 323##### Version 1 is local problems
168sub browse_local_panel { 324sub browse_local_panel {
169 my $self = shift; 325 my $self = shift;
170 my $library_selected = shift; 326 my $library_selected = shift;
171 327 my $lib = shift || ''; $lib =~ s/^browse_//;
328 my $name = ($lib eq '')? 'Local' : $problib{$lib};
329
172 my $list_of_prob_dirs= get_problem_directories($self->r->ce); 330 my $list_of_prob_dirs= get_problem_directories($self->r->ce,$lib);
173 if(scalar(@$list_of_prob_dirs) == 0) { 331 if(scalar(@$list_of_prob_dirs) == 0) {
174 $library_selected = "Found no directories containing problems"; 332 $library_selected = "Found no directories containing problems";
175 unshift @{$list_of_prob_dirs}, $library_selected; 333 unshift @{$list_of_prob_dirs}, $library_selected;
176 } else { 334 } else {
177 my $default_value = "Select a Local Problem Collection"; 335 my $default_value = SELECT_LOCAL_STRING;
178 if (not $library_selected or $library_selected eq $default_value) { 336 if (not $library_selected or $library_selected eq $default_value) {
179 unshift @{$list_of_prob_dirs}, $default_value; 337 unshift @{$list_of_prob_dirs}, $default_value;
180 $library_selected = $default_value; 338 $library_selected = $default_value;
181 } 339 }
182 } 340 }
183 341 debug("library is $lib and sets are $library_selected");
342 my $view_problem_line = view_problems_line('view_local_set', 'View Problems', $self->r);
184 print CGI::Tr(CGI::td({-class=>"InfoPanel"}, "Local Problems: ", 343 print CGI::Tr({}, CGI::td({-class=>"InfoPanel", -align=>"left"}, "$name Problems: ",
185 CGI::popup_menu(-name=> 'library_sets', 344 CGI::popup_menu(-name=> 'library_sets',
186 -values=>$list_of_prob_dirs, 345 -values=>$list_of_prob_dirs,
187 -default=> $library_selected), 346 -default=> $library_selected),
188 CGI::br(), 347 CGI::br(),
189 CGI::submit(-name=>"view_local_set", -value=>"View Problems"), 348 $view_problem_line,
190 )); 349 ));
191} 350}
192 351
193##### Version 2 is local problem sets 352##### Version 2 is local homework sets
194sub browse_mysets_panel { 353sub browse_mysets_panel {
195 my $self = shift; 354 my $self = shift;
196 my $library_selected = shift; 355 my $library_selected = shift;
197 my $list_of_local_sets = shift; 356 my $list_of_local_sets = shift;
198 my $default_value = "Select a Problem Set"; 357 my $default_value = "Select a Homework Set";
199 358
200 if(scalar(@$list_of_local_sets) == 0) { 359 if(scalar(@$list_of_local_sets) == 0) {
201 $list_of_local_sets = ['There are no local sets yet']; 360 $list_of_local_sets = [NO_LOCAL_SET_STRING];
202 } elsif (not $library_selected or $library_selected eq $default_value) { 361 } elsif (not $library_selected or $library_selected eq $default_value) {
203 unshift @{$list_of_local_sets}, $default_value; 362 unshift @{$list_of_local_sets}, $default_value;
204 $library_selected = $default_value; 363 $library_selected = $default_value;
205 } 364 }
206 365
207 print CGI::Tr(CGI::td({-class=>"InfoPanel"}, "Browse from: ", 366 my $view_problem_line = view_problems_line('view_mysets_set', 'View Problems', $self->r);
367 print CGI::Tr({},
368 CGI::td({-class=>"InfoPanel", -align=>"left"}, "Browse from: ",
208 CGI::popup_menu(-name=> 'library_sets', 369 CGI::popup_menu(-name=> 'library_sets',
209 -values=>$list_of_local_sets, 370 -values=>$list_of_local_sets,
210 -default=> $library_selected), 371 -default=> $library_selected),
211 CGI::br(), 372 CGI::br(),
212 CGI::submit(-name=>"view_mysets_set", -value=>"View This Set"), 373 $view_problem_line
213 )); 374 ));
214} 375}
215 376
216##### Version 3 is the problem library 377##### Version 3 is the problem library
378#
379# This comes in 3 forms, problem library version 1, and for version 2 there
380# is the basic, and the advanced interfaces. This function checks what we are
381# supposed to do, or aborts if the problem library has not been installed.
217 382
218
219# There a different levels, and you can pick a new chapter,
220# pick a new section, pick all from chapter, pick all from section
221#
222# Incoming data - current chapter, current section
223sub browse_library_panel { 383sub browse_library_panel {
224 my $self = shift; 384 my $self=shift;
225 my $r = $self->r; 385 my $r = $self->r;
226 my $ce = $r->ce; 386 my $ce = $r->ce;
227 387
228 my $libraryRoot = $r->{ce}->{webworkDirs}->{libraryRoot}; 388 # See if the problem library is installed
389 my $libraryRoot = $r->{ce}->{problemLibrary}->{root};
229 390
230 unless($libraryRoot) { 391 unless($libraryRoot) {
231 print CGI::Tr(CGI::td(CGI::div({class=>'ResultsWithError', align=>"center"}, 392 print CGI::Tr(CGI::td(CGI::div({class=>'ResultsWithError', align=>"center"},
232 "The problem library has not been installed."))); 393 "The problem library has not been installed.")));
233 return; 394 return;
234 } 395 }
235 # Test if the Library directory exists. If not, try to make it 396 # Test if the Library directory link exists. If not, try to make it
236 unless(-d "$ce->{courseDirs}->{templates}/Library") { 397 unless(-d "$ce->{courseDirs}->{templates}/Library") {
237 unless(symlink($libraryRoot, "$ce->{courseDirs}->{templates}/Library")) { 398 unless(symlink($libraryRoot, "$ce->{courseDirs}->{templates}/Library")) {
238 my $msg = <<"HERE"; 399 my $msg = <<"HERE";
239You are missing the directory <code>templates/Library</code>, which is needed 400You are missing the directory <code>templates/Library</code>, which is needed
240for the Problem Library to function. It should be a link pointing to 401for the Problem Library to function. It should be a link pointing to
241<code>$libraryRoot</code>, which you set in <code>conf/global.conf</code>. 402<code>$libraryRoot</code>, which you set in <code>conf/global.conf</code>.
242I tried to make the link for you, but that failed. Check the permissions 403I tried to make the link for you, but that failed. Check the permissions
243in your <code>templates</code> directory. 404in your <code>templates</code> directory.
244HERE 405HERE
245 $self->adderrmsg($msg); 406 $self->addbadmessage($msg);
246 } 407 }
247 } 408 }
248 409
249 my $default_chap = "All Chapters"; 410 # Now check what version we are supposed to use
250 my $default_sect = "All Sections"; 411 my $libraryVersion = $r->{ce}->{problemLibrary}->{version} || 1;
412 if($libraryVersion == 1) {
413 return $self->browse_library_panel1;
414 } elsif($libraryVersion == 2) {
415 return $self->browse_library_panel2 if($self->{library_basic}==1);
416 return $self->browse_library_panel2adv;
417 } else {
418 print CGI::Tr(CGI::td(CGI::div({class=>'ResultsWithError', align=>"center"},
419 "The problem library version is set to an illegal value.")));
420 return;
421 }
422}
251 423
424sub browse_library_panel1 {
425 my $self = shift;
426 my $r = $self->r;
427 my $ce = $r->ce;
428
252 my @chaps = WeBWorK::Utils::ListingDB::getAllChapters($r->{ce}); 429 my @chaps = WeBWorK::Utils::ListingDB::getAllChapters($r->{ce});
253 unshift @chaps, $default_chap; 430 unshift @chaps, LIB2_DATA->{dbchapter}{all};
254 my $chapter_selected = $r->param('library_chapters') || $default_chap; 431 my $chapter_selected = $r->param('library_chapters') || LIB2_DATA->{dbchapter}->{all};
255 432
256 my @sects=(); 433 my @sects=();
257 if ($chapter_selected ne $default_chap) { 434 if ($chapter_selected ne LIB2_DATA->{dbchapter}{all}) {
258 @sects = WeBWorK::Utils::ListingDB::getAllSections($r->{ce}, $chapter_selected); 435 @sects = WeBWorK::Utils::ListingDB::getAllSections($r->{ce}, $chapter_selected);
259 } 436 }
260 437
261 my @textbooks = ('Textbook info not ready'); 438 unshift @sects, ALL_SECTIONS;
262
263 unshift @sects, $default_sect;
264 my $section_selected = $r->param('library_sections') || $default_sect; 439 my $section_selected = $r->param('library_sections') || LIB2_DATA->{dbsection}{all};
265 440
441 my $view_problem_line = view_problems_line('lib_view', 'View Problems', $self->r);
442
266 print CGI::Tr(CGI::td({-class=>"InfoPanel"}, 443 print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"left"},
267 CGI::start_table(), 444 CGI::start_table(),
268 CGI::Tr( 445 CGI::Tr({},
269 CGI::td(["Chapter:", 446 CGI::td(["Chapter:",
270 CGI::popup_menu(-name=> 'library_chapters', 447 CGI::popup_menu(-name=> 'library_chapters',
271 -values=>\@chaps, 448 -values=>\@chaps,
272 -default=> $chapter_selected, 449 -default=> $chapter_selected,
273 -onchange=>"submit();return true" 450 -onchange=>"submit();return true"
274 ), 451 ),
275 CGI::submit(-name=>"lib_select_chapter", -value=>"Update Section List")])), 452 CGI::submit(-name=>"lib_select_chapter", -value=>"Update Section List")])),
276 CGI::Tr( 453 CGI::Tr({},
277 CGI::td("Section:"), 454 CGI::td("Section:"),
278 CGI::td({-colspan=>2}, 455 CGI::td({-colspan=>2},
279 CGI::popup_menu(-name=> 'library_sections', 456 CGI::popup_menu(-name=> 'library_sections',
280 -values=>\@sects, 457 -values=>\@sects,
281 -default=> $section_selected 458 -default=> $section_selected
282 ))), 459 ))),
283 460
284# CGI::Tr( 461 CGI::Tr(CGI::td({-colspan=>3}, $view_problem_line)),
285# CGI::td("Textbook:"),
286# CGI::td({-colspan=>2},
287# CGI::popup_menu(-name=> 'library_textbooks',
288# -values=>\@textbooks,
289# # -default=> $section_selected
290# ))),
291
292# CGI::Tr(
293# CGI::td("Keywords:"),
294# CGI::td({-colspan=>2}, CGI::textfield(-name=>"keywords",
295# -default=>"Keywords not implemented yet",
296# -override=>1, -size=>60))),
297 CGI::Tr(CGI::td({-colspan=>3},CGI::submit(-name=>"lib_view", -value=>"View Problems"))),
298 CGI::end_table(), 462 CGI::end_table(),
299 )); 463 ));
464}
465
466sub browse_library_panel2 {
467 my $self = shift;
468 my $r = $self->r;
469 my $ce = $r->ce;
470
471 my @subjs = WeBWorK::Utils::ListingDB::getAllDBsubjects($r);
472 unshift @subjs, LIB2_DATA->{dbsubject}{all};
473
474 my @chaps = WeBWorK::Utils::ListingDB::getAllDBchapters($r);
475 unshift @chaps, LIB2_DATA->{dbchapter}{all};
476
477 my @sects=();
478 @sects = WeBWorK::Utils::ListingDB::getAllDBsections($r);
479 unshift @sects, LIB2_DATA->{dbsection}{all};
480
481 my $subject_selected = $r->param('library_subjects') || LIB2_DATA->{dbsubject}{all};
482 my $chapter_selected = $r->param('library_chapters') || LIB2_DATA->{dbchapter}{all};
483 my $section_selected = $r->param('library_sections') || LIB2_DATA->{dbsection}{all};
484
485 my $view_problem_line = view_problems_line('lib_view', 'View Problems', $self->r);
486
487 my $count_line = WeBWorK::Utils::ListingDB::countDBListings($r);
488 if($count_line==0) {
489 $count_line = "There are no matching pg files";
490 } else {
491 $count_line = "There are $count_line matching WeBWorK problem files";
492 }
493
494 print CGI::Tr({},
495 CGI::td({-class=>"InfoPanel", -align=>"left"},
496 CGI::hidden(-name=>"library_is_basic", -default=>1,-override=>1),
497 CGI::start_table({-width=>"100%"}),
498 CGI::Tr({},
499 CGI::td(["Subject:",
500 CGI::popup_menu(-name=> 'library_subjects',
501 -values=>\@subjs,
502 -default=> $subject_selected,
503 -onchange=>"submit();return true"
504 )]),
505 CGI::td({-colspan=>2, -align=>"right"},
506 CGI::submit(-name=>"lib_select_subject", -value=>"Update Chapter/Section Lists"))
507 ),
508 CGI::Tr({},
509 CGI::td(["Chapter:",
510 CGI::popup_menu(-name=> 'library_chapters',
511 -values=>\@chaps,
512 -default=> $chapter_selected,
513 -onchange=>"submit();return true"
514 )]),
515 CGI::td({-colspan=>2, -align=>"right"},
516 CGI::submit(-name=>"library_advanced", -value=>"Advanced Search"))
517 ),
518 CGI::Tr({},
519 CGI::td(["Section:",
520 CGI::popup_menu(-name=> 'library_sections',
521 -values=>\@sects,
522 -default=> $section_selected,
523 -onchange=>"submit();return true"
524 )]),
525 ),
526 CGI::Tr(CGI::td({-colspan=>3}, $view_problem_line)),
527 CGI::Tr(CGI::td({-colspan=>3, -align=>"center"}, $count_line)),
528 CGI::end_table(),
529 ));
530
531}
532
533sub browse_library_panel2adv {
534 my $self = shift;
535 my $r = $self->r;
536 my $ce = $r->ce;
537 my $right_button_style = "width: 18ex";
538
539 my @subjs = WeBWorK::Utils::ListingDB::getAllDBsubjects($r);
540 if(! grep { $_ eq $r->param('library_subjects') } @subjs) {
541 $r->param('library_subjects', '');
542 }
543 unshift @subjs, LIB2_DATA->{dbsubject}{all};
544
545 my @chaps = WeBWorK::Utils::ListingDB::getAllDBchapters($r);
546 if(! grep { $_ eq $r->param('library_chapters') } @chaps) {
547 $r->param('library_chapters', '');
548 }
549 unshift @chaps, LIB2_DATA->{dbchapter}{all};
550
551 my @sects = WeBWorK::Utils::ListingDB::getAllDBsections($r);
552 if(! grep { $_ eq $r->param('library_sections') } @sects) {
553 $r->param('library_sections', '');
554 }
555 unshift @sects, LIB2_DATA->{dbsection}{all};
556
557 my $texts = WeBWorK::Utils::ListingDB::getDBTextbooks($r);
558 my @textarray = map { $_->[0] } @{$texts};
559 my %textlabels = ();
560 for my $ta (@{$texts}) {
561 $textlabels{$ta->[0]} = $ta->[1]." by ".$ta->[2]." (edition ".$ta->[3].")";
562 }
563 if(! grep { $_ eq $r->param('library_textbook') } @textarray) {
564 $r->param('library_textbook', '');
565 }
566 unshift @textarray, LIB2_DATA->{textbook}{all};
567 my $atb = LIB2_DATA->{textbook}{all}; $textlabels{$atb} = LIB2_DATA->{textbook}{all};
568
569 my $textchap_ref = WeBWorK::Utils::ListingDB::getDBTextbooks($r, 'textchapter');
570 my @textchaps = map { $_->[0] } @{$textchap_ref};
571 if(! grep { $_ eq $r->param('library_textchapter') } @textchaps) {
572 $r->param('library_textchapter', '');
573 }
574 unshift @textchaps, LIB2_DATA->{textchapter}{all};
575
576 my $textsec_ref = WeBWorK::Utils::ListingDB::getDBTextbooks($r, 'textsection');
577 my @textsecs = map { $_->[0] } @{$textsec_ref};
578 if(! grep { $_ eq $r->param('library_textsection') } @textsecs) {
579 $r->param('library_textsection', '');
580 }
581 unshift @textsecs, LIB2_DATA->{textsection}{all};
582
583 my %selected = ();
584 for my $j (qw( dbsection dbchapter dbsubject textbook textchapter textsection )) {
585 $selected{$j} = $r->param(LIB2_DATA->{$j}{name}) || LIB2_DATA->{$j}{all};
586 }
587
588 my $text_popup = CGI::popup_menu(-name => 'library_textbook',
589 -values =>\@textarray,
590 -labels => \%textlabels,
591 -default=>$selected{textbook},
592 -onchange=>"submit();return true");
593
594
595 my $library_keywords = $r->param('library_keywords') || '';
596
597 my $view_problem_line = view_problems_line('lib_view', 'View Problems', $self->r);
598
599 my $count_line = WeBWorK::Utils::ListingDB::countDBListings($r);
600 if($count_line==0) {
601 $count_line = "There are no matching pg files";
602 } else {
603 $count_line = "There are $count_line matching WeBWorK problem files";
604 }
605
606 print CGI::Tr({},
607 CGI::td({-class=>"InfoPanel", -align=>"left"},
608 CGI::hidden(-name=>"library_is_basic", -default=>2,-override=>1),
609 CGI::start_table({-width=>"100%"}),
610 # Html done by hand since it is temporary
611 CGI::Tr(CGI::td({-colspan=>4, -align=>"center"}, 'All Selected Constraints Joined by "And"')),
612 CGI::Tr({},
613 CGI::td(["Subject:",
614 CGI::popup_menu(-name=> 'library_subjects',
615 -values=>\@subjs,
616 -default=> $selected{dbsubject},
617 -onchange=>"submit();return true"
618 )]),
619 CGI::td({-colspan=>2, -align=>"right"},
620 CGI::submit(-name=>"lib_select_subject", -value=>"Update Menus",
621 -style=> $right_button_style))),
622 CGI::Tr({},
623 CGI::td(["Chapter:",
624 CGI::popup_menu(-name=> 'library_chapters',
625 -values=>\@chaps,
626 -default=> $selected{dbchapter},
627 -onchange=>"submit();return true"
628 )]),
629 CGI::td({-colspan=>2, -align=>"right"},
630 CGI::submit(-name=>"library_reset", -value=>"Reset",
631 -style=>$right_button_style))
632 ),
633 CGI::Tr({},
634 CGI::td(["Section:",
635 CGI::popup_menu(-name=> 'library_sections',
636 -values=>\@sects,
637 -default=> $selected{dbsection},
638 -onchange=>"submit();return true"
639 )]),
640 CGI::td({-colspan=>2, -align=>"right"},
641 CGI::submit(-name=>"library_basic", -value=>"Basic Search",
642 -style=>$right_button_style))
643 ),
644 CGI::Tr({},
645 CGI::td(["Textbook:", $text_popup]),
646 ),
647 CGI::Tr({},
648 CGI::td(["Text chapter:",
649 CGI::popup_menu(-name=> 'library_textchapter',
650 -values=>\@textchaps,
651 -default=> $selected{textchapter},
652 -onchange=>"submit();return true"
653 )]),
654 ),
655 CGI::Tr({},
656 CGI::td(["Text section:",
657 CGI::popup_menu(-name=> 'library_textsection',
658 -values=>\@textsecs,
659 -default=> $selected{textsection},
660 -onchange=>"submit();return true"
661 )]),
662 ),
663 CGI::Tr({},
664 CGI::td("Keywords:"),CGI::td({-colspan=>2},
665 CGI::textfield(-name=>"library_keywords",
666 -default=>$library_keywords,
667 -override=>1,
668 -size=>40))),
669 CGI::Tr(CGI::td({-colspan=>3}, $view_problem_line)),
670 CGI::Tr(CGI::td({-colspan=>3, -align=>"center"}, $count_line)),
671 CGI::end_table(),
672 ));
673
674}
675
676
677##### Version 4 is the set definition file panel
678
679sub browse_setdef_panel {
680 my $self = shift;
681 my $r = $self->r;
682 my $ce = $r->ce;
683 my $library_selected = shift;
684 my $default_value = "Select a Set Definition File";
685 # in the following line, the parens after sort are important. if they are
686 # omitted, sort will interpret get_set_defs as the name of the comparison
687 # function, and ($ce->{courseDirs}{templates}) as a single element list to
688 # be sorted. *barf*
689 my @list_of_set_defs = sort(get_set_defs($ce->{courseDirs}{templates}));
690 if(scalar(@list_of_set_defs) == 0) {
691 @list_of_set_defs = (NO_LOCAL_SET_STRING);
692 } elsif (not $library_selected or $library_selected eq $default_value) {
693 unshift @list_of_set_defs, $default_value;
694 $library_selected = $default_value;
695 }
696 my $view_problem_line = view_problems_line('view_setdef_set', 'View Problems', $self->r);
697 my $popupetc = CGI::popup_menu(-name=> 'library_sets',
698 -values=>\@list_of_set_defs,
699 -default=> $library_selected).
700 CGI::br(). $view_problem_line;
701 if($list_of_set_defs[0] eq NO_LOCAL_SET_STRING) {
702 $popupetc = "there are no set definition files in this course to look at."
703 }
704 print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"left"}, "Browse from: ",
705 $popupetc
706 ));
300} 707}
301 708
302sub make_top_row { 709sub make_top_row {
303 my $self = shift; 710 my $self = shift;
304 my $r = $self->r; 711 my $r = $self->r;
712 my $ce = $r->ce;
305 my %data = @_; 713 my %data = @_;
306 714
307 my $list_of_local_sets = $data{all_set_defs}; 715 my $list_of_local_sets = $data{all_db_sets};
308 my $have_local_sets = scalar(@$list_of_local_sets); 716 my $have_local_sets = scalar(@$list_of_local_sets);
309 my $browse_which = $data{browse_which}; 717 my $browse_which = $data{browse_which};
310 my $library_selected = $r->param('library_sets'); 718 my $library_selected = $self->{current_library_set};
311 my $set_selected = $r->param('local_sets'); 719 my $set_selected = $r->param('local_sets');
312 720 my (@dis1, @dis2, @dis3, @dis4) = ();
313 my ($dis1, $dis2, $dis3) = ("","","");
314 $dis1 = '-disabled' if($browse_which eq 'browse_library'); 721 @dis1 = (-disabled=>1) if($browse_which eq 'browse_library');
315 $dis2 = '-disabled' if($browse_which eq 'browse_local'); 722 @dis2 = (-disabled=>1) if($browse_which eq 'browse_local');
316 $dis3 = '-disabled' if($browse_which eq 'browse_mysets'); 723 @dis3 = (-disabled=>1) if($browse_which eq 'browse_mysets');
724 @dis4 = (-disabled=>1) if($browse_which eq 'browse_setdefs');
317 725
726 ## Make buttons for additional problem libraries
727 my $libs = '';
728 foreach my $lib (sort(keys(%problib))) {
729 $libs .= ' '. CGI::submit(-name=>"browse_$lib", -value=>$problib{$lib},
730 ($browse_which eq "browse_$lib")? (-disabled=>1): ())
731 if (-d "$ce->{courseDirs}{templates}/$lib");
732 }
733 $libs = CGI::br()."or Problems from".$libs if $libs ne '';
734
318 my $these_widths = "width: 27ex"; 735 my $these_widths = "width: 23ex";
319 print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"center"},
320 CGI::submit(-name=>"browse_library", -value=>"Browse Problem Library", -style=>$these_widths, $dis1),
321 CGI::submit(-name=>"browse_local", -value=>"Browse Local Problems", -style=>$these_widths, $dis2),
322 CGI::submit(-name=>"browse_mysets", -value=>"Browse From This Course", -style=>$these_widths, $dis3),
323 ));
324 736
325 print CGI::Tr(CGI::td({-bgcolor=>"black"}));
326
327 if ($browse_which eq 'browse_local') {
328 $self->browse_local_panel($library_selected);
329 } elsif ($browse_which eq 'browse_mysets') {
330 $self->browse_mysets_panel($library_selected, $list_of_local_sets);
331 } else {
332 $self->browse_library_panel();
333 }
334
335 print CGI::Tr(CGI::td({-bgcolor=>"black"}));
336
337 if($have_local_sets ==0) { 737 if($have_local_sets ==0) {
338 $list_of_local_sets = ['There are no local sets yet']; 738 $list_of_local_sets = [NO_LOCAL_SET_STRING];
339 } elsif (not $set_selected or $set_selected eq "Select a Set for This Course") { 739 } elsif (not defined($set_selected) or $set_selected eq ""
340 if ($list_of_local_sets->[0] eq "Select a Problem Set") { 740 or $set_selected eq SELECT_SET_STRING) {
341 shift @{$list_of_local_sets}; 741 unshift @{$list_of_local_sets}, SELECT_SET_STRING;
342 } 742 $set_selected = SELECT_SET_STRING;
343 unshift @{$list_of_local_sets}, "Select a Set for This Course"; 743 }
344 $set_selected = "Select a Set for This Course"; 744 my $myjs = 'document.mainform.selfassign.value=confirm("Should I assign the new set to you now?\nUse OK for yes and Cancel for no.");true;';
345 }
346 745
347 print CGI::Tr(CGI::td({-class=>"InfoPanel"}, "Current Set: ", 746 print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"left"}, "Add problems to ",
747 CGI::b("Target Set: "),
348 CGI::popup_menu(-name=> 'local_sets', 748 CGI::popup_menu(-name=> 'local_sets',
349 -values=>$list_of_local_sets, 749 -values=>$list_of_local_sets,
350 -default=> $set_selected), 750 -default=> $set_selected,
751 -override=>1),
351 CGI::submit(-name=>"edit_local", -value=>"Edit Current Set"), 752 CGI::submit(-name=>"edit_local", -value=>"Edit Target Set"),
753 CGI::hidden(-name=>"selfassign", -default=>0,-override=>1).
352 CGI::br(), 754 CGI::br(),
353 CGI::br(), 755 CGI::br(),
354 CGI::submit(-name=>"new_local_set", -value=>"Create New Local Set:"), 756 CGI::submit(-name=>"new_local_set", -value=>"Create a New Set in This Course:",
757 -onclick=>$myjs
758 ),
355 " ", 759 " ",
356 CGI::textfield(-name=>"new_set_name", 760 CGI::textfield(-name=>"new_set_name",
357 -default=>"Name for new set here", 761 -default=>"Name for new set here",
358 -override=>1, -size=>30), 762 -override=>1, -size=>30),
359 CGI::br(), 763 ));
360 ));
361 764
362 print CGI::Tr(CGI::td({-bgcolor=>"black"})); 765 print CGI::Tr(CGI::td({-bgcolor=>"black"}));
363 766
767 # Tidy this list up since it is used in two different places
768 if ($list_of_local_sets->[0] eq SELECT_SET_STRING) {
769 shift @{$list_of_local_sets};
770 }
771
364 print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"center"}, 772 print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"center"},
773 "Browse ",
774 CGI::submit(-name=>"browse_library", -value=>"Problem Library", -style=>$these_widths, @dis1),
775 CGI::submit(-name=>"browse_local", -value=>"Local Problems", -style=>$these_widths, @dis2),
776 CGI::submit(-name=>"browse_mysets", -value=>"From This Course", -style=>$these_widths, @dis3),
777 CGI::submit(-name=>"browse_setdefs", -value=>"Set Definition Files", -style=>$these_widths, @dis4),
778 $libs,
779 ));
780
781 #print CGI::Tr(CGI::td({-bgcolor=>"black"}));
782 print CGI::hr();
783
784 if ($browse_which eq 'browse_local') {
785 $self->browse_local_panel($library_selected);
786 } elsif ($browse_which eq 'browse_mysets') {
787 $self->browse_mysets_panel($library_selected, $list_of_local_sets);
788 } elsif ($browse_which eq 'browse_library') {
789 $self->browse_library_panel();
790 } elsif ($browse_which eq 'browse_setdefs') {
791 $self->browse_setdef_panel($library_selected);
792 } else { ## handle other problem libraries
793 $self->browse_local_panel($library_selected,$browse_which);
794 }
795
796 print CGI::Tr(CGI::td({-bgcolor=>"black"}));
797
798 print CGI::Tr({},
799 CGI::td({-class=>"InfoPanel", -align=>"center"},
800 CGI::start_table({-border=>"0"}),
801 CGI::Tr({}, CGI::td({ -align=>"center"},
802 CGI::submit(-name=>"select_all", -style=>$these_widths,
803 -value=>"Mark All For Adding"),
365 CGI::submit(-name=>"update", -style=>$these_widths, 804 CGI::submit(-name=>"select_none", -style=>$these_widths,
366 -value=>"Act on Marked Problems"), 805 -value=>"Clear All Marks"),
806 )),
807 CGI::Tr({},
808 CGI::td({},
809 CGI::submit(-name=>"update", -style=>$these_widths. "; font-weight:bold",
810 -value=>"Update Set"),
367 CGI::submit(-name=>"rerandomize", 811 CGI::submit(-name=>"rerandomize",
368 -style=>$these_widths, 812 -style=>$these_widths,
369 -value=>"Rerandomize"), 813 -value=>"Rerandomize"),
370 CGI::submit(-name=>"cleardisplay", 814 CGI::submit(-name=>"cleardisplay",
371 -style=>$these_widths, 815 -style=>$these_widths,
372 -value=>"Clear Problem Display"))); 816 -value=>"Clear Problem Display")
373 817 )),
818 CGI::end_table()));
374} 819}
375 820
376sub make_data_row { 821sub make_data_row {
377 my $self = shift; 822 my $self = shift;
378 my $sourceFileName = shift; 823 my $sourceFileName = shift;
379 my $pg = shift; 824 my $pg = shift;
380 my $cnt = shift; 825 my $cnt = shift;
826 my $mark = shift || 0;
381 827
382 $sourceFileName =~ s|^./||; # clean up top ugliness 828 $sourceFileName =~ s|^./||; # clean up top ugliness
383 829
384 my $urlpath = $self->r->urlpath; 830 my $urlpath = $self->r->urlpath;
385 my $problem_output = $pg->{flags}->{error_flag} ? 831 my $problem_output = $pg->{flags}->{error_flag} ?
386 CGI::em("This problem produced an error") 832 CGI::div({class=>"ResultsWithError"}, CGI::em("This problem produced an error"))
387 : CGI::div({class=>"RenderSolo"}, $pg->{body_text}); 833 : CGI::div({class=>"RenderSolo"}, $pg->{body_text});
834 $problem_output .= $pg->{flags}->{comment} if($pg->{flags}->{comment});
388 835
389 836
390 my $edit_link = '';
391 #if($self->{r}->param('browse_which') ne 'browse_library') { 837 #if($self->{r}->param('browse_which') ne 'browse_library') {
392 if($sourceFileName !~ /^Library\//) { 838 my $problem_seed = $self->{'problem_seed'} || 1234;
839 my $edit_link = CGI::a({href=>$self->systemLink(
393 $edit_link = CGI::a({href=>$self->systemLink($urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor", 840 $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",
841 courseID =>$urlpath->arg("courseID"),
842 setID=>"Undefined_Set",
843 problemID=>"1"),
844 params=>{sourceFilePath => "$sourceFileName", problemSeed=> $problem_seed}
845 ), target=>"WW_Editor"}, "Edit it" );
846
847 my $displayMode = $self->r->param("mydisplayMode");
848 $displayMode = $self->r->ce->{pg}->{options}->{displayMode}
849 if not defined $displayMode or $displayMode eq "None";
850 my $try_link = CGI::a({href=>$self->systemLink(
851 $urlpath->newFromModule("WeBWorK::ContentGenerator::Problem",
394 courseID =>$urlpath->arg("courseID"), 852 courseID =>$urlpath->arg("courseID"),
395 setID=>"Undefined_Set", 853 setID=>"Undefined_Set",
396 problemID=>"1"), 854 problemID=>"1"),
397 params=>{sourceFilePath => "$sourceFileName"} 855 params =>{
398 )}, "Edit it" );
399 }
400
401 my $try_link = CGI::a({href=>$self->systemLink($urlpath->newFromModule("WeBWorK::ContentGenerator::Problem",
402 courseID =>$urlpath->arg("courseID"),
403 setID=>"Undefined_Set",
404 problemID=>"1"),
405 params =>{effectiveUser => $self->r->param('user'), 856 effectiveUser => scalar($self->r->param('user')),
406 editMode => "SetMaker", 857 editMode => "SetMaker",
858 problemSeed=> $problem_seed,
407 sourceFilePath => "$sourceFileName"} )}, "Try it"); 859 sourceFilePath => "$sourceFileName",
860 displayMode => $displayMode,
861 }
862 ), target=>"WW_View"}, "Try it");
408 863
409 864 my %add_box_data = ( -name=>"trial$cnt",-value=>1,-label=>"Add this problem to the target set on the next update");
865 if($mark & SUCCESS) {
866 $add_box_data{ -label } .= " (just added this problem)";
867 } elsif($mark & ADDED) {
868 $add_box_data{ -checked } = 1;
869 }
410 870
871 my $inSet = ($self->{isInSet}{$sourceFileName})?
872 CGI::span({-style=>"float:right; text-align: right"},
873 CGI::i(CGI::b("(This problem is in the target set)"))) : "";
874
411 print CGI::Tr({-align=>"left"}, CGI::td( 875 print CGI::Tr({-align=>"left"}, CGI::td(
412
413 CGI::div({-style=>"background-color: #DDDDDD; margin: 0px auto"}, 876 CGI::div({-style=>"background-color: #DDDDDD; margin: 0px auto"},
414CGI::span({-style=>"float:left ; text-align: left"},"File name: $sourceFileName "), 877 CGI::span({-style=>"float:left ; text-align: left"},"File name: $sourceFileName "),
415CGI::span({-style=>"float:right ; text-align: right"}, $edit_link, " ", $try_link) 878 CGI::span({-style=>"float:right ; text-align: right"}, $edit_link, " ", $try_link)
416 ), CGI::br(), 879 ), CGI::br(),
417
418
419
420
421 CGI::checkbox(-name=>"hideme$cnt",-value=>1,-label=>"Don't show me on the next update"), 880 CGI::checkbox(-name=>"hideme$cnt",-value=>1,-label=>"Don't show this problem on the next update",-override=>1),
422 CGI::br(), 881 CGI::br(),
423 CGI::checkbox(-name=>"trial$cnt",-value=>1,-label=>"Add me to the current set on the next update"), 882 $inSet,
883 CGI::checkbox((%add_box_data),-override=>1),
424 CGI::hidden(-name=>"filetrial$cnt", -default=>[$sourceFileName]). 884 CGI::hidden(-name=>"filetrial$cnt", -default=>$sourceFileName,-override=>1).
425 CGI::p($problem_output), 885 CGI::p($problem_output),
426 )); 886 ));
427} 887}
428 888
889sub clear_default {
890 my $r = shift;
891 my $param = shift;
892 my $default = shift;
893 my $newvalue = $r->param($param) || '';
894 $newvalue = '' if($newvalue eq $default);
895 $r->param($param, $newvalue);
896}
429 897
430sub pre_header_initialize { 898sub pre_header_initialize {
431 my ($self) = @_; 899 my ($self) = @_;
432 my $r = $self->r; 900 my $r = $self->r;
433 ## For all cases, lets set some things 901 ## For all cases, lets set some things
434 $self->{error}=0; 902 $self->{error}=0;
435 my $ce = $r->ce; 903 my $ce = $r->ce;
436 my $db = $r->db; 904 my $db = $r->db;
905 my $maxShown = $r->param('max_shown') || MAX_SHOW_DEFAULT;
906 $maxShown = 10000000 if($maxShown eq 'All'); # let's hope there aren't more
907 my $library_basic = $r->param('library_is_basic') || 1;
908 $self->{problem_seed} = $r->param('problem_seed') || 1234;
909 ## Fix some parameters
910 for my $key (keys(%{ LIB2_DATA() })) {
911 clear_default($r, LIB2_DATA->{$key}->{name}, LIB2_DATA->{$key}->{all} );
912 }
913 ## Grab library sets to display from parameters list. We will modify this
914 ## as we go through the if/else tree
915 $self->{current_library_set} = $r->param('library_sets');
916
917 ## These directories will have individual buttons
918 %problib = %{$ce->{courseFiles}{problibs}} if $ce->{courseFiles}{problibs};
437 919
438
439 my $userName = $r->param('user'); 920 my $userName = $r->param('user');
440 my $user = $db->getUser($userName); # checked 921 my $user = $db->getUser($userName); # checked
441 die "record for user $userName (real user) does not exist." 922 die "record for user $userName (real user) does not exist."
442 unless defined $user; 923 unless defined $user;
443 my $authz = $r->authz; 924 my $authz = $r->authz;
444 unless ($authz->hasPermissions($userName, "modify_problem_sets")) { 925 unless ($authz->hasPermissions($userName, "modify_problem_sets")) {
445 return(""); # Error message already produced in the body 926 return(""); # Error message already produced in the body
446 } 927 }
447 928
448 ## Now one action we have to deal with here 929 ## Now one action we have to deal with here
449 if ($r->param('edit_local')) { 930 if ($r->param('edit_local')) {
450 my $urlpath = $r->urlpath; 931 my $urlpath = $r->urlpath;
451 my $db = $r->db; 932 my $db = $r->db;
452 my $checkset = $db->getGlobalSet($r->param('local_sets')); 933 my $checkset = $db->getGlobalSet($r->param('local_sets'));
453 if (not defined($checkset)) { 934 if (not defined($checkset)) {
454 $self->{error} = 1; 935 $self->{error} = 1;
455 $self->adderrmsg('You need to select a "Current Set" before you can edit it.'); 936 $self->addbadmessage('You need to select a "Target Set" before you can edit it.');
456 } else { 937 } else {
457 my $page = $urlpath->newFromModule('WeBWorK::ContentGenerator::Instructor::ProblemSetEditor', setID=>$r->param('local_sets'), courseID=>$urlpath->arg("courseID")); 938 my $page = $urlpath->newFromModule('WeBWorK::ContentGenerator::Instructor::ProblemSetDetail', setID=>$r->param('local_sets'), courseID=>$urlpath->arg("courseID"));
458 my $url = $self->systemLink($page); 939 my $url = $self->systemLink($page);
459 $self->reply_with_redirect($url); 940 $self->reply_with_redirect($url);
460 } 941 }
461 } 942 }
462 943
463 ## Next, lots of set up so that errors can be reported with message() 944 ## Next, lots of set up so that errors can be reported with message()
464 945
465 ############# List of problems we have already printed 946 ############# List of problems we have already printed
466 947
467 $self->{past_problems} = get_past_problem_files($r); 948 $self->{past_problems} = get_past_problem_files($r);
949 # if we don't end up reusing problems, this will be wiped out
950 # if we do redisplay the same problems, we must adjust this accordingly
951 my @past_marks = map {$_->[1]} @{$self->{past_problems}};
468 my $none_shown = scalar(@{$self->{past_problems}})==0; 952 my $none_shown = scalar(@{$self->{past_problems}})==0;
469 my @pg_files=(); 953 my @pg_files=();
470 my $use_previous_problems = 1; 954 my $use_previous_problems = 1;
471 my $first_shown = $r->param('first_shown') || 0; 955 my $first_shown = $r->param('first_shown') || 0;
472 my $last_shown = $r->param('last_shown'); 956 my $last_shown = $r->param('last_shown');
473 if (not defined($last_shown)) { 957 if (not defined($last_shown)) {
474 $last_shown = -1; 958 $last_shown = -1;
475 } 959 }
476 my @all_past_list = (); # these are include requested, but not shown 960 my @all_past_list = (); # these are include requested, but not shown
477 my $j = 0; 961 my $j = 0;
478 while (defined($r->param("all_past_list$j"))) { 962 while (defined($r->param("all_past_list$j"))) {
479 push @all_past_list, $r->param("all_past_list$j"); 963 push @all_past_list, $r->param("all_past_list$j");
480 $j++; 964 $j++;
481 } 965 }
482 966
483 ############# Default of which problem selector to display 967 ############# Default of which problem selector to display
484 968
485 my $browse_which = $r->param('browse_which') || 'browse_local'; 969 my $browse_which = $r->param('browse_which') || 'browse_local';
486 970
487 my $problem_seed = $r->param('problem_seed') || 0; 971
488 $r->param('problem_seed', $problem_seed); # if it wasn't defined before
489 972
973 ## check for problem lib buttons
974 my $browse_lib = '';
975 foreach my $lib (keys %problib) {
976 if ($r->param("browse_$lib")) {
977 $browse_lib = "browse_$lib";
978 last;
979 }
980 }
981
490 ########### Start the logic through if elsif elsif ... 982 ########### Start the logic through if elsif elsif ...
491 983 debug("browse_lib", $r->param("$browse_lib"));
984 debug("browse_library", $r->param("browse_library"));
985 debug("browse_mysets", $r->param("browse_mysets"));
986 debug("browse_setdefs", $r->param("browse_setdefs"));
492 ##### Asked to browse certain problems 987 ##### Asked to browse certain problems
988 if ($browse_lib ne '') {
989 $browse_which = $browse_lib;
990 $self->{current_library_set} = "";
991 $use_previous_problems = 0; @pg_files = (); ## clear old problems
493 if ($r->param('browse_library')) { 992 } elsif ($r->param('browse_library')) {
494 $browse_which = 'browse_library'; 993 $browse_which = 'browse_library';
495 $r->param('library_sets', ""); 994 $self->{current_library_set} = "";
995 $use_previous_problems = 0; @pg_files = (); ## clear old problems
496 } elsif ($r->param('browse_local')) { 996 } elsif ($r->param('browse_local')) {
497 $browse_which = 'browse_local'; 997 $browse_which = 'browse_local';
498 $r->param('library_sets', ""); 998 #$self->{current_library_set} = "";
999 $use_previous_problems = 0; @pg_files = (); ## clear old problems
499 } elsif ($r->param('browse_mysets')) { 1000 } elsif ($r->param('browse_mysets')) {
500 $browse_which = 'browse_mysets'; 1001 $browse_which = 'browse_mysets';
501 $r->param('library_sets', ""); 1002 $self->{current_library_set} = "";
1003 $use_previous_problems = 0; @pg_files = (); ## clear old problems
1004 } elsif ($r->param('browse_setdefs')) {
1005 $browse_which = 'browse_setdefs';
1006 $self->{current_library_set} = "";
1007 $use_previous_problems = 0; @pg_files = (); ## clear old problems
502 1008
503 ##### Change the seed value 1009 ##### Change the seed value
504 1010
505 } elsif ($r->param('rerandomize')) { 1011 } elsif ($r->param('rerandomize')) {
506 $problem_seed++; 1012 $self->{problem_seed}= 1+$self->{problem_seed};
507 $r->param('problem_seed', $problem_seed); 1013 #$r->param('problem_seed', $problem_seed);
508 $self->adderrmsg('Changing the problem seed for display, but there are no problems showing.') if $none_shown; 1014 $self->addbadmessage('Changing the problem seed for display, but there are no problems showing.') if $none_shown;
509 1015
510 ##### Clear the display 1016 ##### Clear the display
511 1017
512 } elsif ($r->param('cleardisplay')) { 1018 } elsif ($r->param('cleardisplay')) {
513 @pg_files = (); 1019 @pg_files = ();
514 $use_previous_problems=0; 1020 $use_previous_problems=0;
515 $self->adderrmsg('The display was already cleared.') if $none_shown; 1021 $self->addbadmessage('The display was already cleared.') if $none_shown;
516 1022
517 ##### View problems selected from the local list 1023 ##### View problems selected from the local list
518 1024
519 } elsif ($r->param('view_local_set')) { 1025 } elsif ($r->param('view_local_set')) {
520 1026
521 my $set_to_display = $r->param('library_sets'); 1027 my $set_to_display = $self->{current_library_set};
522 if (not defined($set_to_display) or $set_to_display eq "Select a Local Problem Collection" or $set_to_display eq "Found no directories containing problems") { 1028 if (not defined($set_to_display) or $set_to_display eq SELECT_LOCAL_STRING or $set_to_display eq "Found no directories containing problems") {
523 $self->adderrmsg('You need to select a set to view.'); 1029 $self->addbadmessage('You need to select a set to view.');
524 } else { 1030 } else {
525 $set_to_display = '.' if $set_to_display eq ' -- Top -- '; 1031 $set_to_display = '.' if $set_to_display eq MY_PROBLEMS;
1032 $set_to_display = substr($browse_which,7) if $set_to_display eq MAIN_PROBLEMS;
526 @pg_files = list_pg_files($ce->{courseDirs}->{templates}, 1033 @pg_files = list_pg_files($ce->{courseDirs}->{templates},
527 "$set_to_display"); 1034 "$set_to_display");
528 $use_previous_problems=0; 1035 $use_previous_problems=0;
529 } 1036 }
530 1037
531 ##### View problems selected from the a set in this course 1038 ##### View problems selected from the a set in this course
532 1039
533 } elsif ($r->param('view_mysets_set')) { 1040 } elsif ($r->param('view_mysets_set')) {
534 1041
535 my $set_to_display = $r->param('library_sets'); 1042 my $set_to_display = $self->{current_library_set};
1043 debug("set_to_display is $set_to_display");
536 if (not defined($set_to_display) 1044 if (not defined($set_to_display)
537 or $set_to_display eq "Select a Problem Set" 1045 or $set_to_display eq "Select a Homework Set"
538 or $set_to_display eq 'There are no local sets yet') { 1046 or $set_to_display eq NO_LOCAL_SET_STRING) {
539 $self->adderrmsg("You need to select a set from this course to view."); 1047 $self->addbadmessage("You need to select a set from this course to view.");
540 } else { 1048 } else {
1049 # DBFIXME don't use ID list, use an iterator
541 my @problemList = $db->listGlobalProblems($set_to_display); 1050 my @problemList = $db->listGlobalProblems($set_to_display);
542 my $problem; 1051 my $problem;
543 @pg_files=(); 1052 @pg_files=();
544 for $problem (@problemList) { 1053 for $problem (@problemList) {
545 my $problemRecord = $db->getGlobalProblem($set_to_display, $problem); # checked 1054 my $problemRecord = $db->getGlobalProblem($set_to_display, $problem); # checked
546 die "global $problem for set $set_to_display not found." unless 1055 die "global $problem for set $set_to_display not found." unless
547 $problemRecord; 1056 $problemRecord;
548 push @pg_files, $problemRecord->source_file; 1057 push @pg_files, $problemRecord->source_file;
549 1058
550 } 1059 }
1060 @pg_files = sortByName(undef,@pg_files);
551 $use_previous_problems=0; 1061 $use_previous_problems=0;
552 } 1062 }
553 1063
554 ##### View whole chapter from the library 1064 ##### View from the library database
555 ## This will change somewhat later
556 1065
557 } elsif ($r->param('lib_view')) { 1066 } elsif ($r->param('lib_view')) {
558 1067
559 @pg_files=(); 1068 @pg_files=();
560 my $chap = $r->param('library_chapters') || "";
561 $chap = "" if($chap eq "All Chapters");
562 my $sect = $r->param('library_sections') || "";
563 $sect = "" if($sect eq "All Sections");
564 my @dbsearch = WeBWorK::Utils::ListingDB::getSectionListings($r->{ce}, "$chap", "$sect"); 1069 my @dbsearch = WeBWorK::Utils::ListingDB::getSectionListings($r);
565 my ($result, $tolibpath); 1070 my ($result, $tolibpath);
566 for $result (@dbsearch) { 1071 for $result (@dbsearch) {
567 $tolibpath = "Library/$result->{path}/$result->{filename}"; 1072 $tolibpath = "Library/$result->{path}/$result->{filename}";
568 1073
569 ## Too clunky!!!! 1074 ## Too clunky!!!!
570 push @pg_files, $tolibpath; 1075 push @pg_files, $tolibpath;
571 } 1076 }
572 $use_previous_problems=0; 1077 $use_previous_problems=0;
573 1078
1079 ##### View a set from a set*.def
1080
1081 } elsif ($r->param('view_setdef_set')) {
1082
1083 my $set_to_display = $self->{current_library_set};
1084 debug("set_to_display is $set_to_display");
1085 if (not defined($set_to_display)
1086 or $set_to_display eq "Select a Set Definition File"
1087 or $set_to_display eq NO_LOCAL_SET_STRING) {
1088 $self->addbadmessage("You need to select a set definition file to view.");
1089 } else {
1090 @pg_files= $self->read_set_def($set_to_display);
1091 }
1092 $use_previous_problems=0;
1093
574 ##### Edit the current local problem set 1094 ##### Edit the current local homework set
575 1095
576 } elsif ($r->param('edit_local')) { ## Jump to set edit page 1096 } elsif ($r->param('edit_local')) { ## Jump to set edit page
577 1097
578 ; # already handled 1098 ; # already handled
579 1099
580 1100
581 ##### Make a new local problem set 1101 ##### Make a new local homework set
582 1102
583 } elsif ($r->param('new_local_set')) { 1103 } elsif ($r->param('new_local_set')) {
584 if ($r->param('new_set_name') !~ /^[\w.-]*$/) { 1104 if ($r->param('new_set_name') !~ /^[\w .-]*$/) {
585 $self->adderrmsg("The name ".$r->param('new_set_name')." is not a valid set name. Use only letters, digits, -, _, and ."); 1105 $self->addbadmessage("The name ".$r->param('new_set_name')." is not a valid set name. Use only letters, digits, -, _, and .");
586 } else { 1106 } else {
587 my $newSetName = $r->param('new_set_name'); 1107 my $newSetName = $r->param('new_set_name');
588 $newSetName =~ s/^set//; 1108 # if we want to munge the input set name, do it here
589 $newSetName =~ s/\.def$//; 1109 $newSetName =~ s/\s/_/g;
590 $r->param('local_sets',$newSetName); 1110 debug("local_sets was ", $r->param('local_sets'));
1111 $r->param('local_sets',$newSetName); ## use of two parameter param
1112 debug("new value of local_sets is ", $r->param('local_sets'));
591 my $newSetRecord = $db->getGlobalSet($newSetName); 1113 my $newSetRecord = $db->getGlobalSet($newSetName);
592 if (defined($newSetRecord)) { 1114 if (defined($newSetRecord)) {
593 $self->adderrmsg("The set name $newSetName is already in use. Pick a different name if you would like to start a new set."); 1115 $self->addbadmessage("The set name $newSetName is already in use.
1116 Pick a different name if you would like to start a new set.");
594 } else { # Do it! 1117 } else { # Do it!
1118 # DBFIXME use $db->newGlobalSet
595 $newSetRecord = $db->{set}->{record}->new(); 1119 $newSetRecord = $db->{set}->{record}->new();
596 $newSetRecord->set_id($newSetName); 1120 $newSetRecord->set_id($newSetName);
597 $newSetRecord->set_header(""); 1121 $newSetRecord->set_header("");
598 $newSetRecord->problem_header(""); 1122 $newSetRecord->hardcopy_header("");
599 $newSetRecord->open_date(time()+60*60*24*7); # in one week 1123 $newSetRecord->open_date(time()+60*60*24*7); # in one week
600 $newSetRecord->due_date(time()+60*60*24*7*2); # in two weeks 1124 $newSetRecord->due_date(time()+60*60*24*7*2); # in two weeks
601 $newSetRecord->answer_date(time()+60*60*24*7*3); # in three weeks 1125 $newSetRecord->answer_date(time()+60*60*24*7*3); # in three weeks
602 eval {$db->addGlobalSet($newSetRecord)}; 1126 eval {$db->addGlobalSet($newSetRecord)};
603 } 1127 if ($@) {
604 } 1128 $self->addbadmessage("Problem creating set $newSetName<br> $@");
1129 } else {
1130 $self->addgoodmessage("Set $newSetName has been created.");
1131 my $selfassign = $r->param('selfassign') || "";
1132 $selfassign = "" if($selfassign =~ /false/i); # deal with javascript false
1133 if($selfassign) {
1134 $self->assignSetToUser($userName, $newSetRecord);
1135 $self->addgoodmessage("Set $newSetName was assigned to $userName.");
1136 }
1137 }
1138 }
1139 }
605 1140
606 ##### Add selected problems to the current local set 1141 ##### Add selected problems to the current local set
607 1142
608 } elsif ($r->param('update')) { 1143 } elsif ($r->param('update')) {
609 ## first handle problems to be added before we hide them 1144 ## first handle problems to be added before we hide them
610 my($localSet, @selected); 1145 my($localSet, @selected);
611 1146
612 @pg_files = grep {($_->[1] & ADDED) != 0 } @{$self->{past_problems}}; 1147 @pg_files = grep {($_->[1] & ADDED) != 0 } @{$self->{past_problems}};
613 @selected = map {$_->[0]} @pg_files; 1148 @selected = map {$_->[0]} @pg_files;
614 1149
615 my @action_files = grep {$_->[1] > 0 } @{$self->{past_problems}}; 1150 my @action_files = grep {$_->[1] > 0 } @{$self->{past_problems}};
1151 # There are now good reasons to do an update without selecting anything.
616 if(scalar(@action_files) == 0) { 1152 #if(scalar(@action_files) == 0) {
617 $self->adderrmsg('Act on marked problems requested, but no problems were marked.'); 1153 # $self->addbadmessage('Update requested, but no problems were marked.');
618 } 1154 #}
619 1155
620 if (scalar(@selected)>0) { # if some are to be added, they need a place to go 1156 if (scalar(@selected)>0) { # if some are to be added, they need a place to go
621 $localSet = $r->param('local_sets'); 1157 $localSet = $r->param('local_sets');
622 if (not defined($localSet)) { 1158 if (not defined($localSet) or
623 $self->adderrmsg('You are trying to add problems to something, but you did not select a "Current Set" name as a target.'); 1159 $localSet eq SELECT_SET_STRING or
624 } else { 1160 $localSet eq NO_LOCAL_SET_STRING) {
1161 $self->addbadmessage('You are trying to add problems to something,
1162 but you did not select a "Target Set" name as a target.');
1163 } else {
625 my $newSetRecord = $db->getGlobalSet($localSet); 1164 my $newSetRecord = $db->getGlobalSet($localSet);
626 if (not defined($newSetRecord)) { 1165 if (not defined($newSetRecord)) {
627 $self->adderrmsg("You are trying to add problems to $localSet, but that set does not seem to exist! I bet you used your \"Back\" button."); 1166 $self->addbadmessage("You are trying to add problems to $localSet,
1167 but that set does not seem to exist! I bet you used your \"Back\" button.");
1168 } else {
1169 my $addcount = add_selected($self, $db, $localSet);
1170 if($addcount > 0) {
1171 $self->addgoodmessage("Added $addcount problem".(($addcount>1)?'s':'').
1172 " to $localSet.");
1173 }
1174 }
1175 }
1176 }
1177 ## now handle problems to be hidden
1178
1179 ## only keep the ones which are not hidden
1180 @pg_files = grep {($_->[1] & HIDDEN) ==0 } @{$self->{past_problems}};
1181 @past_marks = map {$_->[1]} @pg_files;
1182 @pg_files = map {$_->[0]} @pg_files;
1183 @all_past_list = (@all_past_list[0..($first_shown-1)],
1184 @pg_files,
1185 @all_past_list[($last_shown+1)..(scalar(@all_past_list)-1)]);
1186 $last_shown = $first_shown+$maxShown -1; debug("last_shown 3: ", $last_shown);
1187 $last_shown = (scalar(@all_past_list)-1) if($last_shown>=scalar(@all_past_list)); debug("last_shown 4: ", $last_shown);
1188
1189 } elsif ($r->param('next_page')) {
1190 $first_shown = $last_shown+1;
1191 $last_shown = $first_shown+$maxShown-1; debug("last_shown 5: ", $last_shown);
1192 $last_shown = (scalar(@all_past_list)-1) if($last_shown>=scalar(@all_past_list)); debug("last_shown 6: ", $last_shown);
1193 @past_marks = ();
1194 } elsif ($r->param('prev_page')) {
1195 $last_shown = $first_shown-1;
1196 $first_shown = $last_shown - $maxShown+1;
1197
1198 $first_shown = 0 if($first_shown<0);
1199 @past_marks = ();
1200
1201 } elsif ($r->param('select_all')) {
1202 @past_marks = map {1} @past_marks;
1203 } elsif ($r->param('library_basic')) {
1204 $library_basic = 1;
1205 for my $jj (qw(textchapter textsection textbook)) {
1206 $r->param('library_'.$jj,'');
1207 }
1208 } elsif ($r->param('library_advanced')) {
1209 $library_basic = 2;
1210 } elsif ($r->param('library_reset')) {
1211 for my $jj (qw(chapters sections subjects textbook keywords)) {
1212 $r->param('library_'.$jj,'');
1213 }
1214 } elsif ($r->param('select_none')) {
1215 @past_marks = ();
628 } else { 1216 } else {
629 my $addcount = add_selected($self, $db, $localSet);
630 if($addcount > 0) {
631 $self->adderrmsg("Successfully added $addcount problem".(($addcount>1)?'s':'').
632 " to $localSet.");
633 }
634 }
635 }
636 }
637 ## now handle problems to be hidden
638
639 ## only keep the ones which are not hidden
640 @pg_files = grep {($_->[1] & HIDDEN) ==0 } @{$self->{past_problems}};
641 @pg_files = map {$_->[0]} @pg_files;
642 @all_past_list = (@all_past_list[0..($first_shown-1)],
643 @pg_files,
644 @all_past_list[($last_shown+1)..(scalar(@all_past_list)-1)]);
645 $last_shown = $first_shown+MAX_SHOW -1;
646 $last_shown = (scalar(@all_past_list)-1) if($last_shown>=scalar(@all_past_list));
647
648 ## FIXME: you should say something if no problems are selected
649 ## maybe the add button should be disabled if there are no problems
650 ## showing
651
652
653 } elsif ($r->param('next_page')) {
654 $first_shown = $last_shown+1;
655 $last_shown = $first_shown+MAX_SHOW-1;
656 $last_shown = (scalar(@all_past_list)-1) if($last_shown>=scalar(@all_past_list));
657 } elsif ($r->param('prev_page')) {
658 $last_shown = $first_shown-1;
659 $first_shown = $last_shown - MAX_SHOW+1;
660
661 $first_shown = 0 if($first_shown<0);
662
663 ##### No action requested, probably our first time here 1217 ##### No action requested, probably our first time here
664
665 } else {
666 #my $c = $r->connection;
667 #print "Debug info: ". $r->get_remote_host ."<p>". $c->remote_ip ;
668 ;
669 } ##### end of the if elsif ... 1218 } ##### end of the if elsif ...
670 1219
671 1220
672 ############# List of local sets 1221 ############# List of local sets
673 1222
1223 # DBFIXME sorting in database, please!
674 my @all_set_defs = $db->listGlobalSets; 1224 my @all_db_sets = $db->listGlobalSets;
675 for ($j=0; $j<scalar(@all_set_defs); $j++) { 1225 @all_db_sets = sortByName(undef, @all_db_sets);
676 $all_set_defs[$j] =~ s|^set||;
677 $all_set_defs[$j] =~ s|\.def||;
678 }
679 1226
680 if ($use_previous_problems) { 1227 if ($use_previous_problems) {
681 @pg_files = @all_past_list; 1228 @pg_files = @all_past_list;
682 } else { 1229 } else {
683 $first_shown = 0; 1230 $first_shown = 0;
684 $last_shown = scalar(@pg_files)<MAX_SHOW ? scalar(@pg_files) : MAX_SHOW; 1231 $last_shown = scalar(@pg_files)<$maxShown ? scalar(@pg_files) : $maxShown;
685 $last_shown--; # to make it an array index 1232 $last_shown--; # to make it an array index
686 } 1233 @past_marks = ();
1234 }
687 ############# Now store data in self for retreival by body 1235 ############# Now store data in self for retreival by body
688 $self->{first_shown} = $first_shown; 1236 $self->{first_shown} = $first_shown;
689 $self->{last_shown} = $last_shown; 1237 $self->{last_shown} = $last_shown;
690 $self->{browse_which} = $browse_which; 1238 $self->{browse_which} = $browse_which;
691 $self->{problem_seed} = $problem_seed; 1239 #$self->{problem_seed} = $problem_seed;
692 $self->{pg_files} = \@pg_files; 1240 $self->{pg_files} = \@pg_files;
1241 $self->{past_marks} = \@past_marks;
693 $self->{all_set_defs} = \@all_set_defs; 1242 $self->{all_db_sets} = \@all_db_sets;
694 1243 $self->{library_basic} = $library_basic;
1244 debug("past_marks is ", join(" ", @{$self->{past_marks}}));
695} 1245}
696 1246
697 1247
698sub title { 1248sub title {
699 return "Problem Set Maker"; 1249 return "Library Browser";
1250}
1251
1252# hide view options panel since it distracts from SetMaker's built-in view options
1253sub options {
1254 return "";
700} 1255}
701 1256
702sub body { 1257sub body {
703 my ($self) = @_; 1258 my ($self) = @_;
704 1259
705 my $r = $self->r; 1260 my $r = $self->r;
706 my $ce = $r->ce; # course environment 1261 my $ce = $r->ce; # course environment
707 my $db = $r->db; # database 1262 my $db = $r->db; # database
708 my $j; # garden variety counter 1263 my $j; # garden variety counter
709 1264
710 my $userName = $r->param('user'); 1265 my $userName = $r->param('user');
711 1266
712 my $user = $db->getUser($userName); # checked 1267 my $user = $db->getUser($userName); # checked
713 die "record for user $userName (real user) does not exist." 1268 die "record for user $userName (real user) does not exist."
714 unless defined $user; 1269 unless defined $user;
715 1270
716 ### Check that this is a professor 1271 ### Check that this is a professor
717 my $authz = $r->authz; 1272 my $authz = $r->authz;
718 unless ($authz->hasPermissions($userName, "modify_problem_sets")) { 1273 unless ($authz->hasPermissions($userName, "modify_problem_sets")) {
719 print "User $userName returned " . 1274 print "User $userName returned " .
720 $authz->hasPermissions($user, "modify_problem_sets") . 1275 $authz->hasPermissions($user, "modify_problem_sets") .
721 " for permission"; 1276 " for permission";
722 return(CGI::div({class=>'ResultsWithError'}, 1277 return(CGI::div({class=>'ResultsWithError'},
723 CGI::em("You are not authorized to access the Instructor tools."))); 1278 CGI::em("You are not authorized to access the Instructor tools.")));
724 } 1279 }
725 1280
726 ########## Extract information computed in pre_header_initialize 1281 ########## Extract information computed in pre_header_initialize
727 1282
728 my $first_shown = $self->{first_shown}; 1283 my $first_shown = $self->{first_shown};
729 my $last_shown = $self->{last_shown}; 1284 my $last_shown = $self->{last_shown};
730 my $browse_which = $self->{browse_which}; 1285 my $browse_which = $self->{browse_which};
731 my $problem_seed = $self->{problem_seed}; 1286 my $problem_seed = $self->{problem_seed}||1234;
732 my @pg_files = @{$self->{pg_files}}; 1287 my @pg_files = @{$self->{pg_files}};
733 my @all_set_defs = @{$self->{all_set_defs}}; 1288 my @all_db_sets = @{$self->{all_db_sets}};
734 1289
735 my @pg_html=($last_shown>=$first_shown) ? 1290 my @pg_html=($last_shown>=$first_shown) ?
736 renderProblems($r,$user, @pg_files[$first_shown..$last_shown]) : (); 1291 renderProblems(r=> $r,
1292 user => $user,
1293 problem_list => [@pg_files[$first_shown..$last_shown]],
1294 displayMode => $r->param('mydisplayMode')) : ();
737 1295
1296 my %isInSet;
1297 my $setName = $r->param("local_sets");
1298 if ($setName) {
1299 # DBFIXME where clause, iterator
1300 # DBFIXME maybe instead of hashing here, query when checking source files?
1301 # DBFIXME definitely don't need to be making full record objects
1302 # DBFIXME SELECT source_file FROM whatever_problem WHERE set_id=? GROUP BY source_file ORDER BY NULL;
1303 # DBFIXME (and stick result directly into hash)
1304 foreach my $problem ($db->listGlobalProblems($setName)) {
1305 my $problemRecord = $db->getGlobalProblem($setName, $problem);
1306 $isInSet{$problemRecord->source_file} = 1;
1307 }
1308 }
1309 $self->{isInSet} = \%isInSet;
1310
738 ########## Top part 1311 ########## Top part
739 print CGI::startform({-method=>"POST", -action=>$r->uri}), 1312 print CGI::start_form({-method=>"POST", -action=>$r->uri, -name=>'mainform'}),
740 $self->hidden_authen_fields, 1313 $self->hidden_authen_fields,
741 '<div align="center">', 1314 '<div align="center">',
742 CGI::start_table({-border=>2}); 1315 CGI::start_table({-border=>2});
743 $self->make_top_row('all_set_defs'=>\@all_set_defs, 1316 $self->make_top_row('all_db_sets'=>\@all_db_sets,
744 'browse_which'=> $browse_which); 1317 'browse_which'=> $browse_which);
745 print CGI::hidden(-name=>'browse_which', -default=>[$browse_which]), 1318 print CGI::hidden(-name=>'browse_which', -value=>$browse_which,-override=>1),
746 CGI::hidden(-name=>'problem_seed', -default=>[$problem_seed]); 1319 CGI::hidden(-name=>'problem_seed', -value=>$problem_seed, -override=>1);
747 for ($j = 0 ; $j < scalar(@pg_files) ; $j++) { 1320 for ($j = 0 ; $j < scalar(@pg_files) ; $j++) {
748 print CGI::hidden(-name=>"all_past_list$j", -default=>$pg_files[$j]); 1321 print CGI::hidden(-name=>"all_past_list$j", -value=>$pg_files[$j],-override=>1);
749 } 1322 }
750 1323
751 print CGI::hidden(-name=>'first_shown', -default=>[$first_shown]); 1324 print CGI::hidden(-name=>'first_shown', -value=>$first_shown,-override=>1);
1325
752 print CGI::hidden(-name=>'last_shown', -default=>[$last_shown]); 1326 print CGI::hidden(-name=>'last_shown', -value=>$last_shown, -override=>1);
753 1327
754 1328
755 ########## Now print problems 1329 ########## Now print problems
756 my $jj; 1330 my $jj;
757 for ($jj=0; $jj<scalar(@pg_html); $jj++) { 1331 for ($jj=0; $jj<scalar(@pg_html); $jj++) {
758 $pg_files[$jj] =~ s|^$ce->{courseDirs}->{templates}/?||; 1332 $pg_files[$jj] =~ s|^$ce->{courseDirs}->{templates}/?||;
759 $self->make_data_row($pg_files[$jj+$first_shown], $pg_html[$jj], $jj+1); 1333 $self->make_data_row($pg_files[$jj+$first_shown], $pg_html[$jj], $jj+1, $self->{past_marks}->[$jj]);
760 } 1334 #$self->make_data_row($pg_files[$jj+$first_shown], $pg_html[$jj], $jj+1, $self->{past_marks}->[$jj+$first_shown]); #MEG
1335 }
761 1336
762 ########## Finish things off 1337 ########## Finish things off
763 print CGI::end_table(); 1338 print CGI::end_table();
764 print '</div>'; 1339 print '</div>';
765 # if($first_shown>0 or (1+$last_shown)<scalar(@pg_files)) { 1340 # if($first_shown>0 or (1+$last_shown)<scalar(@pg_files)) {
766 my ($next_button, $prev_button) = ("", ""); 1341 my ($next_button, $prev_button) = ("", "");
767 if ($first_shown > 0) { 1342 if ($first_shown > 0) {
768 $prev_button = CGI::submit(-name=>"prev_page", -style=>"width:15ex", 1343 $prev_button = CGI::submit(-name=>"prev_page", -style=>"width:15ex",
769 -value=>"Previous page"); 1344 -value=>"Previous page");
770 } 1345 }
771 if ((1+$last_shown)<scalar(@pg_files)) { 1346 if ((1+$last_shown)<scalar(@pg_files)) {
772 $next_button = CGI::submit(-name=>"next_page", -style=>"width:15ex", 1347 $next_button = CGI::submit(-name=>"next_page", -style=>"width:15ex",
773 -value=>"Next page"); 1348 -value=>"Next page");
774 } 1349 }
775 if (scalar(@pg_files)>0) { 1350 if (scalar(@pg_files)>0) {
776 print CGI::p(($first_shown+1)."-".($last_shown+1)." of ".scalar(@pg_files). 1351 print CGI::p(($first_shown+1)."-".($last_shown+1)." of ".scalar(@pg_files).
777 " shown.", $prev_button, " ", $next_button); 1352 " shown.", $prev_button, " ", $next_button);
778 } 1353 }
779 # } 1354 # }
780 print CGI::endform(), "\n"; 1355 print CGI::endform(), "\n";
781 1356
782 return "";
783}
784
785############################################## End of Body
786
787# SKEL: To emit your own HTTP header, uncomment this:
788#
789#sub header {
790# my ($self) = @_;
791#
792# # Generate your HTTP header here.
793#
794# # If you return something, it will be used as the HTTP status code for this
795# # request. The Apache::Constants module might be useful for gerating status
796# # codes. If you don't return anything, the status code "OK" will be used.
797# return ""; 1357 return "";
798#} 1358}
799
800# SKEL: If you need to do any processing after the HTTP header is sent, but before
801# any template processing occurs, or you need to calculate values that will be
802# used in multiple methods, do it in this method:
803#
804#sub initialize {
805#my ($self) = @_;
806#}
807
808# SKEL: If you need to add tags to the document <HEAD>, uncomment this method:
809#
810#sub head {
811# my ($self) = @_;
812#
813# # You can print head tags here, like <META>, <SCRIPT>, etc.
814#
815# return "";
816#}
817
818# SKEL: To fill in the "info" box (to the right of the main body), use this
819# method:
820#
821#sub info {
822# my ($self) = @_;
823#
824# # Print HTML here.
825#
826# return "";
827#}
828
829# SKEL: To provide navigation links, use this method:
830#
831#sub nav {
832# my ($self, $args) = @_;
833#
834# # See the documentation of path() and pathMacro() in
835# # WeBWorK::ContentGenerator for more information.
836#
837# return "";
838#}
839
840# SKEL: For a little box for display options, etc., use this method:
841#
842#sub options {
843# my ($self) = @_;
844#
845# # Print HTML here.
846#
847# return "";
848#}
849
850# SKEL: For a list of sibling objects, use this method:
851#
852#sub siblings {
853# my ($self, $args) = @_;
854#
855# # See the documentation of siblings() and siblingsMacro() in
856# # WeBWorK::ContentGenerator for more information.
857# #
858# # Refer to implementations in ProblemSet and Problem.
859#
860# return "";
861#}
862 1359
863=head1 AUTHOR 1360=head1 AUTHOR
864 1361
865Written by John Jones, jj (at) asu.edu. 1362Written by John Jones, jj (at) asu.edu.
866 1363
867=cut 1364=cut
868 1365
869
870
8711; 13661;
Legend:
Removed from v.2116  
changed lines
  Added in v.4735
aubreyja at gmail dot com
 ViewVC Help
Powered by ViewVC 1.0.9