Ww3 feature/reduced credit

.gitignore

@@ -9,6 +9,8 @@ courses.dist
 library-directory-tree.json
 library-subject-tree.json
 textbook-tree.json
+development.yml
+production.yml
 *~
 !tmp/README
 !htdocs/tmp/README

bin/OPL-update

@@ -11,7 +11,7 @@
 #   1) The OPL downloaded to your machine (the .pg files)
 #   2) The environment variable WEBWORK_ROOT needs to be 
 #      correctly defined (as with other scripts here).
-#   3) Configuration for the OPL in site.conf needs to be
+#   3) Configuration for the OPL in localOverrides.conf needs to be
 #      done (basically just setting the path to the OPL files).
 
 #use strict;
@@ -406,7 +406,7 @@ if(open(IN, "$libraryRoot/Textbooks")) {
 	close(IN);
 } else {
 	print "Textbooks file was not found in library $libraryRoot. If the path to the problem library doesn't seem
-	correct, make modifications in webwork2/conf/site.conf (\$problemLibrary{root}).  If that is correct then
+	correct, make modifications in webwork2/conf/localOverrides.conf (\$problemLibrary{root}).  If that is correct then
 	updating from git should download the Textbooks file.\n";
 }
 #### End of textbooks

conf/defaults.config

@@ -1356,15 +1356,15 @@ $ConfigValues = [
 		  type => 'popuplist'
 		},
 		{ var  => 'pg{specialPGEnvironmentVars}{DragMath}',
-                  doc  => 'Use DragMath editor for answer entry',
-                  doc2 => 'Set to true to display pencil DragMath equation editor next to each answer box',
-                  type => 'boolean'
-                },
-                { var  => 'pg{specialPGEnvironmentVars}{MathView}',
-                  doc  => 'Use MathView editor for answer entry',
-                  doc2 => 'Set to true to display MathView equation editor icon next to each answer box',
-                  type => 'boolean'
-                }, 
+          doc  => 'Use DragMath editor for answer entry',
+          doc2 => 'Set to true to display pencil DragMath equation editor next to each answer box',
+          type => 'boolean'
+        },
+        { var  => 'pg{specialPGEnvironmentVars}{MathView}',
+          doc  => 'Use MathView editor for answer entry',
+          doc2 => 'Set to true to display MathView equation editor icon next to each answer box',
+          type => 'boolean'
+        }, 
 		{ var => 'pg{options}{showEvaluatedAnswers}',
 		  doc => 'Display the evaluated student answer',
 		  doc2 => 'Set to true to display the "Entered" column which automatically shows the evaluated student answer, e.g. 1 if student input is sin(pi/2). If this is set to false, e.g. to save space in the response area, the student can still see their evaluated answer by hovering the mouse pointer over the typeset version of their answer.',
@@ -1399,7 +1399,7 @@ $ConfigValues = [
 		  type => boolean
 		},
 		{ var => 'pg{ansEvalDefaults}{reducedScoringPeriod}',
-		  doc => 'Length of Reduced Scoring Period in minutes',
+		  doc => 'Default Length of the Reduced Scoring Period',
 		  doc2 => 'The Reduced Scoring Period is a period before the due date during which all additional work done by the student counts at a reduced rate. Here is where you set the default length of this period in minutes. This sets the default Reduced Scoring date, which can be changed on a per set basis.  If the Reduced Scoring is enabled and if it is after the reduced scoring date, but before the due date, a message like "This assignment has a Reduced Scoring Period that begins 11/08/2009  at 06:17pm EST and ends on the due date, 11/10/2009 at 06:17pm EST. During this  period all additional work done counts 50% of the original." will be displayed.' ,
 		  type => 'number'
 		},
@@ -1428,32 +1428,32 @@ $ConfigValues = [
 		  values => [qw(1 0.95 0.9 0.85 0.8 0.75 0.7 0.65 0.6 0.55 0.5 0.45 0.4 0.35 0.3 0.25 0.2 0.15 0.1)],
 		  type => 'popuplist'
 		},
-        	{ var => 'pg{timeAssignDue}',
+        { var => 'pg{timeAssignDue}',
 		  doc => 'Time that the Assignment is Due',
 		  doc2 => 'The time of the day that the assignment is due.  This can be changed on an individual basis, but WeBWorK will use this value for default when a date is set.',
 		  type => 'text'
 		},
 		{ var => 'pg{assignOpenPriorToDue}',
 		  doc => 'Amount of Time (in minutes) before Due Date that the Assignment is Open',
-		 doc2 => 'The amount of time (in minutes) before the due date when the assignment is opened.',
-		 type => 'number'
+		  doc2 => 'The amount of time (in minutes) before the due date when the assignment is opened.',
+		  type => 'number'
 		},
 		{ var => 'pg{answersOpenAfterDueDate}',
 		  doc => 'Amount of Time (in minutes) after Due Date that Answers are Open',
 		  doc2 => 'The amount of time (in minutes) after the due date that the Answers are available to student to view.',
-		   type => 'number'
+		  type => 'number'
 		},
-	        { var => 'pg{options}{enableShowMeAnother}',
-        	  doc => 'Enable Show Me Another button',
-       		  doc2 => 'Enables use of the Show Me Another button, which offers the student a newly-seeded version of the current problem, complete with solution (if it exists for that problem).',
-          	  type => 'boolean'
-                },
-	        { var => 'pg{options}{showMeAnotherMaxReps}',
-                  doc => 'Maximum times Show me Another can be used per problem (-1 => unlimited)',
-                  doc2 => 'The Maximum number of times Show me Another can be used per problem by a student. If set to -1 then there is no limit to the number of times that Show Me Another can be used.',
-                  type => 'number'
-                },
-            { var => 'pg{options}{showMeAnother}',
+        { var => 'pg{options}{enableShowMeAnother}',
+    	  doc => 'Enable Show Me Another button',
+   		  doc2 => 'Enables use of the Show Me Another button, which offers the student a newly-seeded version of the current problem, complete with solution (if it exists for that problem).',
+      	  type => 'boolean'
+            },
+        { var => 'pg{options}{showMeAnotherMaxReps}',
+          doc => 'Maximum times Show me Another can be used per problem (-1 => unlimited)',
+          doc2 => 'The Maximum number of times Show me Another can be used per problem by a student. If set to -1 then there is no limit to the number of times that Show Me Another can be used.',
+          type => 'number'
+        },
+        { var => 'pg{options}{showMeAnother}',
 		  doc => 'List of options for Show Me Another button',
 		  doc2 => '<ul><li><b>SMAcheckAnswers</b>: enables the Check Answers button <i>for the new problem</i> when Show Me Another is clicked</li> <li><b>SMAshowSolutions</b>: shows walk-through solution <i>for the new problem</i> when Show Me Another is clicked; a check is done first to make sure that a solution exists </li><li><b>SMAshowCorrect</b>: correct answers <i>for the new problem</i> can be viewed when Show Me Another is clicked; note that <b>SMAcheckAnswers</b> needs to be enabled at the same time</li><li><b>SMAshowHints</b>: show hints <i>for the new problem</i> (assuming they exist)</li></ul>Note: there is very little point enabling the button unless you check at least one of these options - the students would simply see a new version that they can not attempt or learn from.</p>',
 		  min  => 0,

webwork3/bin/app.pl

@@ -23,10 +23,10 @@
 
 hook 'before' => sub {
 
-    for my $key (keys(%{request->params})){
-    	my $value = defined(params->{$key}) ? params->{$key} : ''; 
-    	debug($key . " : " . $value);
-    } 
+    # for my $key (keys(%{request->params})){
+    # 	my $value = defined(params->{$key}) ? params->{$key} : ''; 
+    # 	debug($key . " : " . $value);
+    # } 
 
 };
 

webwork3/lib/Routes/ProblemSets.pm

@@ -9,18 +9,18 @@ package ProblemSets;
 use strict;
 use warnings;
 use Dancer ':syntax';
-use Utils::Convert qw/convertObjectToHash convertArrayOfObjectsToHash/;
+use Utils::Convert qw/convertObjectToHash convertArrayOfObjectsToHash convertBooleans/;
 use Utils::ProblemSets qw/reorderProblems addGlobalProblems addUserSet addUserProblems deleteProblems createNewUserProblem/;
 use WeBWorK::Utils qw/parseDateTime decodeAnswers/;
 use Array::Utils qw(array_minus); 
 use Routes::Authentication qw/checkPermissions setCourseEnvironment/;
 use Utils::CourseUtils qw/getCourseSettings/;
 use Dancer::Plugin::Database;
 use Dancer::Plugin::Ajax;
-use List::Util qw(first max );
+use List::Util qw/first max/;
 
-our @set_props = qw/set_id set_header hardcopy_header open_date due_date answer_date visible enable_reduced_scoring assignment_type attempts_per_version time_interval versions_per_interval version_time_limit version_creation_time version_last_attempt_time problem_randorder hide_score hide_score_by_problem hide_work time_limit_cap restrict_ip relax_restrict_ip restricted_login_proctor/;
-our @user_set_props = qw/user_id set_id psvn set_header hardcopy_header open_date due_date answer_date visible enable_reduced_scoring assignment_type description restricted_release restricted_status attempts_per_version time_interval versions_per_interval version_time_limit version_creation_time problem_randorder version_last_attempt_time problems_per_page hide_score hide_score_by_problem hide_work time_limit_cap restrict_ip relax_restrict_ip restricted_login_proctor hide_hint/;
+our @set_props = qw/set_id set_header hardcopy_header open_date reduced_scoring_date due_date answer_date visible enable_reduced_scoring assignment_type attempts_per_version time_interval versions_per_interval version_time_limit version_creation_time version_last_attempt_time problem_randorder hide_score hide_score_by_problem hide_work time_limit_cap restrict_ip relax_restrict_ip restricted_login_proctor/;
+our @user_set_props = qw/user_id set_id psvn set_header hardcopy_header open_date reduced_scoring_date due_date answer_date visible enable_reduced_scoring assignment_type description restricted_release restricted_status attempts_per_version time_interval versions_per_interval version_time_limit version_creation_time problem_randorder version_last_attempt_time problems_per_page hide_score hide_score_by_problem hide_work time_limit_cap restrict_ip relax_restrict_ip restricted_login_proctor hide_hint/;
 our @problem_props = qw/problem_id flags value max_attempts source_file/;
 our @boolean_set_props = qw/visible enable_reduced_scoring/;
 
@@ -132,19 +132,16 @@ put '/courses/:course_id/sets/:set_id' => sub {
 
     ####
     #
-    # Set up the global set for either a add (if new) or put (if old)
+    # set all the parameters sent from the client as new properties.
     #
     ##
-
+    my %allparams = params;
     my $set =  vars->{db}->getGlobalSet(params->{set_id}); 
-
-    for my $key (@set_props) {
-        $set->{$key} = params->{$key} if defined(params->{$key});
+    my $setFromClient = convertBooleans(\%allparams,\@boolean_set_props);
+    for my $key (@set_props){
+        $set->{$key} = $setFromClient->{$key};
     }
-
-
-    vars->{db}->putGlobalSet($set);
-
+    my $result = vars->{db}->putGlobalSet($set);
 
     ##
     #
@@ -155,7 +152,6 @@ put '/courses/:course_id/sets/:set_id' => sub {
     my @userNamesFromDB = vars->{db}->listSetUsers(params->{set_id});
     my @usersToAdd = array_minus(@{params->{assigned_users}},@userNamesFromDB);
     my @usersToDelete = array_minus(@userNamesFromDB,@{params->{assigned_users}});
-    my @test2 = grep{ not $_ ~~ @userNamesFromDB } @{params->{assigned_users}};
 
     for my $user(@usersToAdd){
         addUserSet($user,params->{set_id});
@@ -180,18 +176,21 @@ put '/courses/:course_id/sets/:set_id' => sub {
 
     addUserProblems(params->{set_id},params->{problems},params->{assigned_users});
 
+    ## why is this here?  it doesn't do anything.
 
     if (scalar(@usersToDelete)>0){
         debug "Deleting users to set " . params->{set_id};
         debug join("; ", @usersToDelete);
     }
 
+    my $setFromDB = vars->{db}->getGlobalSet(params->{set_id});
 
-    my $returnSet = convertObjectToHash($set,\@boolean_set_props);
+    my $returnSet = convertObjectToHash($setFromDB,\@boolean_set_props);
 
 
     $returnSet->{assigned_users} = params->{assigned_users};
     $returnSet->{problems} = convertArrayOfObjectsToHash(\@globalProblems);
+    $returnSet->{_id} = params->{set_id};
 
     return $returnSet;
 
@@ -495,14 +494,13 @@ put '/courses/:course_id/users/:user_id/sets/:set_id' => sub {
 
     for my $key (@user_set_props) {
         my $globalValue = $globalSet->{$key} || "";
-        # debug $key . " : " . $globalValue . " : " . params->{$key};
-        # check to see if the value differs from the global value.  If so, set it. 
-        $userSet->{$key} = params->{$key} 
-            if ((defined(params->{$key}) && $globalValue ne params->{$key}) || $key eq "psvn" || $key eq "user_id");
+        # check to see if the value differs from the global value.  If so, set it else delete it. 
+        $userSet->{$key} = params->{$key} if defined(params->{$key});
+        delete $userSet->{$key} if $globalValue eq $userSet->{$key} && $key ne "set_id";
+
     }
     vars->{db}->putUserSet($userSet);
 
-
     return convertObjectToHash(vars->{db}->getMergedSet(params->{user_id},params->{set_id}),\@boolean_set_props);
 };
 

webwork3/lib/Routes/Settings.pm

@@ -63,18 +63,20 @@ get '/courses/:course_id/settings/:setting_id' => sub {
 
 put '/courses/:course_id/settings/:setting_id' => sub {
 
-	debug session;
-
 	if(session->{permission} < 10){send_error($PERMISSION_ERROR,403)}
 
-	debug "in PUT /course/:course_id/settings/:setting_id";
-
+	#debug "in PUT /course/:course_id/settings/:setting_id";
+	
 	my $ConfigValues = getCourseSettingsWW2();
 	foreach my $oneConfig (@$ConfigValues) {
 		foreach my $hash (@$oneConfig) {
 			if (ref($hash)=~/HASH/){
 				if ($hash->{var} eq params->{setting_id}){
-					$hash->{value} = params->{value};
+					if($hash->{type} eq 'boolean'){
+						$hash->{value} = params->{value} ? 1 : 0;
+					} else {
+						$hash->{value} = params->{value};
+					}
 					return writeConfigToFile(vars->{ce},$hash);
 				}
 			}
@@ -161,7 +163,6 @@ sub writeConfigToFile {
 		chomp $line;
 	 	if ($line =~ /^\$/) {
 	 		my ($var,$value) = ($line =~ /^\$(.*)\s+=\s+(.*);$/);
-	 		debug $var;
 	 		if ($var eq $config->{var}){ 
 	 			$fileoutput .= writeLine($config->{var},$config->{value});
 	 			$varFound = 1; 
@@ -192,6 +193,9 @@ sub writeConfigToFile {
 	if ($writeFileErrors){
 		return {error=>$writeFileErrors};
 	} else {
+		if($config->{type} eq 'boolean'){
+			$config->{value} = $config->{value} ? JSON::true : JSON::false;
+		}
 		return $config;
 	}
 }

webwork3/lib/Utils/Convert.pm

@@ -4,8 +4,9 @@
 package Utils::Convert;
 use base qw(Exporter);
 use JSON;
+use Data::Dumper;
 our @EXPORT    = ();
-our @EXPORT_OK = qw(convertObjectToHash convertArrayOfObjectsToHash);
+our @EXPORT_OK = qw(convertObjectToHash convertArrayOfObjectsToHash convertBooleans);
 
 
 ##  This converts an array of objects to an array of Hashes
@@ -38,4 +39,15 @@ sub convertObjectToHash {
     return $s;
 }
 
+sub convertBooleans {
+    my ($obj,$boolean_props) = @_;
+
+    for my $key (@{$boolean_props}){
+            $obj->{$key} = $obj->{$key} ? 1: 0;
+    }
+
+    return $obj;
+}
+
+
 return 1;

webwork3/public/css/course-manager.css

@@ -26,7 +26,7 @@ a#view-header i {margin-left:1ex;}
 
 .set-not-visible {font-style: italic;}
 .set-visible {font-weight: bold;}
-.set-reduced-credit {color: rgb(217,115,52);}
+.set-reduced-scoring {color: rgb(217,115,52);}
 
 .assign-set-name {cursor: pointer;}
 

webwork3/public/css/webwork.css

@@ -12,6 +12,8 @@ body {  /* needed for the navigation bars top and bottom*/
 
 .sortable-placeholder {border: 1px solid black; background-color: lightyellow;}
 
+.ui-datepicker {z-index: 1200 !important;} /* To ensure that it floats above the nav bar */
+
 /* a wwdate is generally an input and we want to make it look like a span */
 
 .wwdate { width: auto; border: none;}
@@ -76,7 +78,7 @@ border-top: solid 1px rgb(220, 220, 220);}
 .assign-open {background-color: lightgreen;}
 .assign-due {background-color: red;}
 
-.assign-reduced-credit {background-color: rgb(255,128,0);}
+.assign-reduced-scoring {background-color: rgb(255,128,0);}
 
 .assign-not-visible {background-color: darkgray;}