openwebwork-cvs

[WWcvs] webwork2: Allow users to specify default values for max_attempts and value of a problem

[Arnie P. v. a. <we...@ma...>]

Log Message:
-----------
Allow users to specify default values for max_attempts and value of a problem

Modified Files:
--------------
    webwork2/lib/WeBWorK/ContentGenerator:
        Instructor.pm

Revision Data
-------------
Index: Instructor.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm,v
retrieving revision 1.64
retrieving revision 1.65
diff -Llib/WeBWorK/ContentGenerator/Instructor.pm -Llib/WeBWorK/ContentGenerator/Instructor.pm -u -r1.64 -r1.65
--- lib/WeBWorK/ContentGenerator/Instructor.pm
+++ lib/WeBWorK/ContentGenerator/Instructor.pm
@@ -518,6 +518,9 @@
 sub addProblemToSet {
 	my ($self, %args) = @_;
 	my $db = $self->r->db;
+	my $value_default = $self->{ce}->{problemDefaults}->{value};
+	my $max_attempts_default = $self->{ce}->{problemDefaults}->{max_attempts};	
+	
 
 	die "addProblemToSet called without specifying the set name." if $args{setName} eq "";
 	my $setName = $args{setName};
@@ -526,8 +529,8 @@
 		die "addProblemToSet called without specifying the sourceFile.";
 
 	# The rest of the arguments are optional
-	my $value = $args{value} || 1;
-	my $maxAttempts = $args{maxAttempts} || -1;
+	my $value = $args{value} || $value_default;
+	my $maxAttempts = $args{maxAttempts} || $max_attempts_default;
 	my $problemID = $args{problemID};
 
 	unless ($problemID) {

[WWcvs] webwork2: Allow users to specify default values for max_attempts and value of a problem

[Arnie P. v. a. <we...@ma...>]

Log Message:
-----------
Allow users to specify default values for max_attempts and value of a problem

Modified Files:
--------------
    webwork2/lib/WeBWorK/ContentGenerator/Instructor:
        ProblemSetList.pm

Revision Data
-------------
Index: ProblemSetList.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm,v
retrieving revision 1.107
retrieving revision 1.108
diff -Llib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm -Llib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm -u -r1.107 -r1.108
--- lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
@@ -1574,6 +1574,8 @@
 	my ($self, $fileName) = @_;
 	my $templateDir   = $self->{ce}->{courseDirs}->{templates};
 	my $filePath      = "$templateDir/$fileName";
+	my $value_default = $self->{ce}->{problemDefaults}->{value};
+	my $max_attempts_default = $self->{ce}->{problemDefaults}->{max_attempts};
 
 	my $setName = '';
 
@@ -1761,10 +1763,10 @@
 			$name =~ s/\s*//g;
 			$value = "" unless defined($value);
 			$value =~ s/[^\d\.]*//g;
-			unless ($value =~ /\d+/) {$value = 1;}
+			unless ($value =~ /\d+/) {$value = $value_default;}
 			$attemptLimit = "" unless defined($attemptLimit);
 			$attemptLimit =~ s/[^\d-]*//g;
-			unless ($attemptLimit =~ /\d+/) {$attemptLimit = -1;}
+			unless ($attemptLimit =~ /\d+/) {$attemptLimit = $max_attempts_default;}
 			$continueFlag = "0" unless( defined($continueFlag) && @problemData );  
 			# can't put continuation flag onto the first problem
 			push(@problemData, {source_file    => $name,

[WWcvs] webwork2: Allow users to specify default values for max_attempts and value of a problem

[Arnie P. v. a. <we...@ma...>]

Log Message:
-----------
Allow users to specify default values for max_attempts and value of a problem

Modified Files:
--------------
    webwork2/conf:
        global.conf.dist

Revision Data
-------------
Index: global.conf.dist
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/global.conf.dist,v
retrieving revision 1.213
retrieving revision 1.214
diff -Lconf/global.conf.dist -Lconf/global.conf.dist -u -r1.213 -r1.214
--- conf/global.conf.dist
+++ conf/global.conf.dist
@@ -936,6 +936,19 @@
 	[qw(Applet FlashApplet JavaApplet)],
 ];
 
+##### Problem creation defaults
+
+# The default weight (also called value) of a problem to use when using the 
+# Library Browser, Problem Editor or Hmwk Sets Editor to add problems to a set
+# or when this value is left blank in an imported set definition file.
+$problemDefaults{value} = 1;  
+
+# The default max_attempts for a problem to use when using the 
+# Library Browser, Problem Editor or Hmwk Sets Editor to add problems to a set
+# or when this value is left blank in an imported set definition file.  Note that 
+# setting this to -1 gives students unlimited attempts.
+$problemDefaults{max_attempts} = -1;   
+
 ##### Answer evaluatior defaults
 
 $pg{ansEvalDefaults} = {