--- loncom/homework/inputtags.pm	2015/10/30 03:49:47	1.338
+++ loncom/homework/inputtags.pm	2023/04/02 03:16:28	1.358
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.338 2015/10/30 03:49:47 raeburn Exp $
+# $Id: inputtags.pm,v 1.358 2023/04/02 03:16:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -460,7 +460,8 @@ sub start_textline {
 		}
 		my $name = 'HWVAL_'.$id;
                 my $itemid = 'HWVAL_'.$partid.'_'.$id;
-                my $input_tag_id = 'HWVAL_'.$input_id;
+                # NOTE: the input id should match the one given by defaut_homework input_id().
+                my $input_tag_id = $itemid.'_'.$input_id;
 		if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
 		    $name = "none";
 		}
@@ -473,8 +474,10 @@ sub start_textline {
 
 		$result .= &spellcheck_onblur($itemid, $spellcheck);
                 if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') &&
-                    (($tagstack->[-2] eq 'formularesponse') || ($tagstack->[-2] eq 'mathresponse')) &&
-                    (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) {
+                    (((($tagstack->[-2] eq 'formularesponse') || ($tagstack->[-2] eq 'mathresponse')) &&
+                      (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) || 
+                     (($tagstack->[-2] eq 'customresponse') &&
+                       (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') eq 'no')))) {
                     $result.=&edit_mathresponse_button($input_tag_id);
                 }
 	    }
@@ -656,8 +659,13 @@ sub file_selector {
     $result .= &Apache::lonhtmlcommon::row_title($addfiles);
     my $constraints;
     if ($uploadedfiletypes ne '*') {
+        my $showtypes = $uploadedfiletypes;
+        if ($showtypes =~ /,/) {
+            my $conjunc = &mt('or');
+            $showtypes =~ s/,([^,]+)$/ $conjunc $1/;
+        }
 	$constraints =
-	    &mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />';
+	    &mt('Allowed filetypes: [_1]','<b>'.$showtypes.'</b>').'<br />';
     }
     if ($maxfilesize) {
         $constraints .= &mt('Combined size of all files not to exceed: [_1] MB.',
@@ -666,13 +674,14 @@ sub file_selector {
     if ($constraints) {
         $result .= $constraints.'<br />';
     }
-    if ($which eq 'uploadonly' || $which eq 'both') { 
+    if ($which eq 'uploadonly' || $which eq 'both') {
         my $free_space = $maxfilesize * 1048576;
         $result .= &mt('Submit a file: (only one file per submission)').
             ' <br /><input type="file" size="50" name="HWFILE'.$jspart.'_'.$id.
-            '" id="HWFILE'.$jspart.'_'.$id.'" class="flUpload" /><br />'.
-            '<input type="hidden" id="free_space" value="'.$free_space.'" /><br />'
-        }
+            '" id="HWFILE'.$jspart.'_'.$id.'" class="LC_flUpload LC_hwkfile" />'.
+            '<input type="hidden" id="LC_free_space_'.$jspart.'_'.$id.'"'.
+            ' value="'.$free_space.'" /><br />';
+    }
     if ( $which eq 'both') {
 	$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
     }
@@ -693,7 +702,6 @@ sub file_selector {
 	    &mt('Select Portfolio Files: (one or more files per submission)').'</a><br />'.
 	    '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
 	    '<br />';
-
     }
     $result.=&Apache::lonhtmlcommon::row_closure(1);
     return $result;
@@ -1046,6 +1054,7 @@ sub decideoutput {
 	  'not_charged_try' => 'LC_answer_not_charged_try',
 	  'no_grade'        => 'LC_answer_no_grade',
 	  'no_message'      => 'LC_no_message',
+          'no_charge_warn'  => 'LC_answer_warning',
 	  );
 
     my $part = $Apache::inputtags::part;
@@ -1059,7 +1068,7 @@ sub decideoutput {
 #
     
     my $computer = ($handgrade || $nocorrect)? ''
-	                       : " ".&mt("Computer's answer now shown above.");
+	                       : &mt("Computer's answer now shown above.");
     &Apache::lonxml::debug("handgrade has :$handgrade:");
 
     if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
@@ -1083,7 +1092,9 @@ sub decideoutput {
 		$message = '\textbf{'.$message.'}';
 	    } else {
 		$message = "<b>".$message."</b>";
-		$message.= $computer;
+                if ($computer) {
+                    $message = "$computer $message";
+                }
 	    }
 	    $added_computer_text=1;
 	    if ($awarded > 0) {
@@ -1127,7 +1138,9 @@ sub decideoutput {
 		$message = '\textbf{'.&mt('You are correct.').'}';
 	    } else {
 		$message = "<b>".&mt('You are correct.')."</b>";
-		$message.= $computer;
+                if ($computer) {
+                    $message = "$computer $message";
+                }
 	    }
 	    $added_computer_text=1;
 	    if  ($awarded > 0 
@@ -1156,7 +1169,11 @@ sub decideoutput {
         if ($target ne 'tex') {
            $message .= &Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted');
         }
-	$css_class=$possible_class{'not_charged_try'};
+        if (&Apache::lonhomework::show_some_problem_status()) {
+            $css_class=$possible_class{'no_charge_warn'};
+        } else {
+            $css_class=$possible_class{'not_charged_try'};
+        }
 	$button = 1;
     } elsif ($award eq 'WRONG_NUMBOXESCHECKED') {
         $message = &mt('Number of boxes checked outside permissible range (either too few or too many).');
@@ -1205,8 +1222,12 @@ sub decideoutput {
     } elsif ($award eq 'SIG_FAIL') {
 	my ($used,$min,$max)=split(':',$awardmsg);
 	my $word = ($used < $min) ? 'more' : 'fewer';
-	$message = &mt("Submission not graded. Use $word digits.",$used);
-	$css_class=$possible_class{'not_charged_try'};
+	$message = &mt("Submission not graded. Use $word significant figures.");
+        if (&Apache::lonhomework::show_some_problem_status()) {
+            $css_class=$possible_class{'no_charge_warn'};
+        } else {
+            $css_class=$possible_class{'not_charged_try'};
+        }
 	$button=1;
     } elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {
 	$message = &mt('Error in instructor specifed unit. This error has been reported to the instructor.', $awardmsg);
@@ -1216,21 +1237,37 @@ sub decideoutput {
     } elsif ($award eq 'UNIT_INVALID_STUDENT') {
 	$message = &mt('Unable to interpret units. Computer reads units as "[_1]".',&markup_unit($awardmsg,$target));
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
-	$css_class=$possible_class{'not_charged_try'};
+        if (&Apache::lonhomework::show_some_problem_status()) {
+            $css_class=$possible_class{'no_charge_warn'};
+        } else {
+            $css_class=$possible_class{'not_charged_try'};
+        }
 	$button=1;
     } elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {
 	$message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.',&markup_unit($awardmsg,$target));
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
-	$css_class=$possible_class{'not_charged_try'};
+        if (&Apache::lonhomework::show_some_problem_status()) {
+            $css_class=$possible_class{'no_charge_warn'};
+        } else {
+            $css_class=$possible_class{'not_charged_try'};
+        }
 	$button=1;
     } elsif ($award eq 'UNIT_NOTNEEDED') {
 	$message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target));
-	$css_class=$possible_class{'not_charged_try'};
+        if (&Apache::lonhomework::show_some_problem_status()) {
+            $css_class=$possible_class{'no_charge_warn'};
+        } else {
+            $css_class=$possible_class{'not_charged_try'};
+        }
 	$button=1;
     } elsif ($award eq 'NO_UNIT') {
 	$message = &mt("Units required").'.';
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')};
-	$css_class=$possible_class{'not_charged_try'};
+        if (&Apache::lonhomework::show_some_problem_status()) {
+            $css_class=$possible_class{'no_charge_warn'};
+        } else {
+            $css_class=$possible_class{'not_charged_try'};
+        }
 	$button=1;
     } elsif ($award eq 'COMMA_FAIL') {
 	$message = &mt("Proper comma separation is required").'.';
@@ -1329,17 +1366,27 @@ sub decideoutput {
             my $first_access=&Apache::lonnet::get_first_access($interval[1]);
             if (defined($first_access)) {
                 my $due_date= &Apache::lonnet::EXT("resource.$part.duedate");
-                unless (($due_date) && ($due_date < $first_access + $interval[0])) { 
+                my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+                unless (($due_date) && ($due_date < $first_access + $timelimit)) { 
                     $message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached.");
                 }
             }
         }
 	$css_class=$possible_class{'no_grade'};
 	$button=1;
+        if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') {
+            if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
+                $message = 'Answer Submitted';
+            } else {
+                undef($message); 
+            }
+        }
     }
     if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && 
 	!$added_computer_text && $target ne 'tex') {
-	$message.= $computer;
+        if ($computer) {
+            $message = "$computer $message";
+        }
 	$added_computer_text=1;
     }
     if ($Apache::lonhomework::type eq 'practice') {
@@ -1636,7 +1683,11 @@ sub get_grade_messages {
 	if ($target eq 'tex') {
 	    $message='\vskip 2 mm '.$message.' ';
 	} else {
-	    $message="<td class=\"$tdclass $css_class\">$message</td>";
+            if ($message) {
+	        $message="<td class=\"$tdclass $css_class\">$message</td>";
+            } else {
+                $message="<td class=\"$tdclass\"></td>";  
+            }
 	    if ($previousmsg) {
 		$previousmsg="<td class=\"$tdclass LC_answer_previous\">$previousmsg</td>";
 	    }
@@ -1673,7 +1724,13 @@ sub get_grade_messages {
 		    $trial.="/".$Apache::inputtags::params{'maxtries'};
 		}
 	    }
-	    $trystr = '<td class="'.$tdclass.'"><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>';
+            
+            unless (($env{'request.state'} ne "construct") && 
+                    ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') && 
+                    (!$env{'request.role.adv'})) {
+                $trystr = '<span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span>';
+            }
+	    $trystr = '<td class="'.$tdclass.'">'.$trystr.'</td>';
 	}
     }
 
@@ -1730,12 +1787,17 @@ sub gradestatus {
 	}
 	if ( $showbutton ) {
 	    if ($target ne 'tex') {
-		$button = 
+                if ($env{'form.disable_submit'}) {
+                    $button = '<input type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit" value="'.&mt('Submit Answer').'" disabled="disabled" />&nbsp;'.
+                               '<div id="msg_submit_'.$id.'" style="display:none"></div>';
+                } else {
+		    $button =
             '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';"
                     type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit"
                     value="'.&mt('Submit Answer').'" />&nbsp;'.
                     '<div id="msg_submit_'.$id.'" style="display:none">'.
                     &mt('Processing your submission ...').'</div>';
+                }
 	    }
 	}
 
@@ -1749,7 +1811,9 @@ sub gradestatus {
 	} else {
 	    $output =
 		'<table><tr><td>'.$button.'</td>'.$output;
-	    if (!$no_previous) {
+	    if ((!$no_previous) &&
+                (($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') ||
+                 ($env{'request.role.adv'}))) {
 		$output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>';
 	    }
 	    $output.= '</tr></table>';
@@ -1877,9 +1941,16 @@ sub previous_tries {
     my $tries_text = &get_tries_text('link');
     my $prefix = $env{'form.request.prefix'};
     $prefix =~ tr{.}{_};
-    my $function_name = "LONCAPA_previous_tries_".$prefix.
-	$Apache::lonxml::curdepth.'_'.$env{'form.counter'};
-    my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."<br />";
+    my $function_name = 'LONCAPA_previous_tries_'.$prefix;
+    if (($env{'request.state'} eq 'construct') || ($id =~ /\W/)) {
+        $function_name .= $Apache::lonxml::curdepth;
+    } else {
+        $function_name .= $id;
+    }
+    $function_name .= '_'.$Apache::lonxml::counter;
+    my $possmathjax = 1;
+    my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,
+                                                        &mt($tries_text),$possmathjax)."<br />";
     return $result;
 }