--- loncom/homework/structuretags.pm	2015/12/07 08:11:55	1.542
+++ loncom/homework/structuretags.pm	2016/12/09 20:12:09	1.551
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.542 2015/12/07 08:11:55 raeburn Exp $
+# $Id: structuretags.pm,v 1.551 2016/12/09 20:12:09 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -226,9 +226,11 @@ sub end_tex {
 sub homework_js {
     my ($postsubmit,$timeout);
     if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) {
-        my $crstype;
-        if (&Apache::loncommon::course_type() eq 'Community') {
+        my $crstype = &Apache::loncommon::course_type();
+        if ($crstype eq 'Community') {
             $crstype = 'community';
+        } elsif ($crstype eq 'Placement') {
+            $crstype = 'placement'; 
         } else {
             if ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) {
                 $crstype = 'official';
@@ -417,9 +419,13 @@ sub page_start {
     $extra_head .= &homework_js().
                    &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
     if (&Apache::lonhtmlcommon::htmlareabrowser()) {
-        my %textarea_args = (
+        my %textarea_args;
+        if (($env{'request.state'} ne 'construct') ||
+            ($env{'environment.nocodemirror'})) {
+            %textarea_args = (
                                 dragmath => 'math',
                               );
+        }
         $extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
     }
     my $is_task = ($env{'request.uri'} =~ /\.task$/);
@@ -670,7 +676,7 @@ sub setup_rndseed {
             }
             $env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
         }
-	if ( ($env{'form.resetdata'} eq &mt('New Problem Variation')
+	if ( ($env{'form.resetdata'} eq 'new_problem_variation'
 	      && $env{'form.submitted'} eq 'yes')  ||
 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    srand(time);
@@ -772,7 +778,9 @@ sub problem_edit_buttons {
    if ($mode eq 'editxml') {
        $result.=&problem_edit_action_button('subedit','edit','e','Edit',1);
        $result.=&problem_edit_action_button('subundo','undoxml','u','Undo',1);
-       $result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
+       if ($env{'environment.nocodemirror'}) {
+           $result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
+       }
    } else {
        $result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1);
        $result.=&problem_edit_action_button('subundo','undo','u','Undo',1);
@@ -945,7 +953,8 @@ $show_all
      </div>
      <input type="submit" name="changeproblemmode" value="'.&mt("Change View").'" />
      <input type="submit" name="clear_style_file" accesskey="d" value="'.&mt('Show Default View').'" />
-     <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
+     <button type="submit" name="resetdata" accesskey="r" value="reset_submissions">
+     '.&mt('Reset Submissions').'</button>
    </div>
    <hr />
    <div class="LC_edit_problem_header_randomize_row">
@@ -980,8 +989,7 @@ $show_all
                'onclick="javascript:setmode(this.form,'."'editxml'".')" />';
     if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) {
         my $uri = $env{'request.uri'};
-        my $daxeurl = '/adm/daxe/daxe.html?config=config/loncapa_config.xml&amp;file=/daxeopen'.$uri.
-            '&amp;save=/daxesave';
+        my $daxeurl = '/daxepage'.$uri;
         $result .= '<input type="button" value="'.&mt('Edit with Daxe').'" '.
                   'onclick="window.open(\''.$daxeurl.'\',\'_blank\');" />';
     }
@@ -1011,8 +1019,8 @@ sub initialize_storage {
 	|| $Apache::lonhomework::type eq 'practice') {
 	
 	my $namespace = $symb || $env{'request.uri'};
-	if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
-	    ($env{'form.resetdata'} eq &mt('New Problem Variation')
+	if ($env{'form.resetdata'} eq 'reset_submissions' ||
+	    ($env{'form.resetdata'} eq 'new_problem_variation'
 	     && $env{'form.submitted'} eq 'yes') ||
 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    &Apache::lonnet::tmpreset($namespace,'',$domain,$name);
@@ -1287,7 +1295,7 @@ sub store_aggregates {
             } else {
                 $anoncounter{$symb."\0".$part} = 1;
             }
-            my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}.':'};
+            my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}.'::'};
             if ($needsrelease) {
                 my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
                 if ($curr_required eq '') {
@@ -1580,8 +1588,8 @@ sub start_problem {
 	    ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
 		$rndseed.'" />'.
-		    '<input type="submit" name="resetdata"
-                             value="'.&mt('New Problem Variation').'" />';
+		    '<button type="submit" name="resetdata"
+                        value="new_problem_variation">'.&mt('New Problem Variation').'</button>';
 	    if (exists($env{'form.username'})) {
 		$form_tag_start.=
 		    '<input type="hidden" name="username"
@@ -1603,7 +1611,10 @@ sub start_problem {
 	    $form_tag_start.='<hr />';
         } elsif (($env{'request.state'} ne "construct") &&
                  ($Apache::lonhomework::type eq 'randomizetry') &&
-                 ($status eq 'CAN_ANSWER')) {
+                 ($status eq 'CAN_ANSWER') &&
+                 ($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') &&
+                 (!$env{'request.role.adv'})) {
+# "New Problem Variation Each Try" header suppressed for Placement Tests, unless course personnel. 
             my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
             my $problemstatus = &get_problem_status($Apache::inputtags::part);
             $form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries);
@@ -1732,13 +1743,16 @@ sub start_problem {
 	      '<input type="hidden" name="submitted" value="yes" />';
 	    # create a page header and exit
 	    if ($env{'request.state'} eq "construct") {
-                unless ($env{'form.inhibitmenu'} eq 'yes') {
+                if ($env{'form.inhibitmenu'} eq 'yes') {
+                    # error messages can be useful in any case
+                    $result.= &Apache::lonxml::message_location();
+                } else {
 		    $result.= &problem_web_to_edit_header($env{'form.rndseed'});
                 }
                 if ($Apache::lonhomework::type eq 'practice') {
-                    $result.= '<input type="submit" name="resetdata" '.
-                              'value="'.&mt('New Problem Variation').'" />'.
-                              &practice_problem_header().'<hr />';
+                    $result.= '<button type="submit" name="resetdata" '.
+                        'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'.
+                        &practice_problem_header().'<hr />';
                 }
 	    }
 	    # if we are viewing someone else preserve that info
@@ -1920,7 +1934,39 @@ sub end_problem {
                 # Added separately at end of this routine, after added
                 # <script></script> so document will be valid xhtml.
                 #
-		$result.= &Apache::loncommon::end_page({'discussion' => 1,
+                my $showdisc = 1;
+                if (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') &&
+                    (!$env{'request.role.adv'})) { 
+# For Placement Tests footer with "Post Discussion" and "Send Feedback" links is suppressed.
+                    $showdisc = 0;
+                    my ($symb)= &Apache::lonnet::whichuser();
+                    if ($symb) {
+                        my $navmap = Apache::lonnavmaps::navmap->new();
+                        if (ref($navmap)) {
+                            my $hastries = &Apache::lonplacementtest::has_tries($symb,$navmap);  
+# For Placement Tests test status is displayed if this is the last resource in the course
+# and there are no tries left
+                            unless ($hastries) {
+                                if (&Apache::lonplacementtest::is_lastres($symb,$navmap)) {
+                                    my ($score,$incomplete) = 
+                                        &Apache::lonplacementtest::check_completion(undef,undef,1);
+                                    if (!$incomplete) {
+                                        $result .= &Apache::lonplacementtest::showresult(1,1);
+                                    } elsif ($incomplete < 100) { 
+                                        $result.= &Apache::lonplacementtest::showincomplete($incomplete,1);
+                                    }
+                                } else {
+# For Placement Tests score is displayed if test has just been completed
+                                    my ($score,$incomplete) = &Apache::lonplacementtest::check_completion(undef,undef,1);
+                                    if (!$incomplete) {
+                                        $result.= &Apache::lonplacementtest::showresult(1,1);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+		$result.= &Apache::loncommon::end_page({'discussion' => $showdisc,
 							'notbody'    => 1});
 	    } elsif ($target eq 'tex') {
 		my $endminipage = '';
@@ -2017,9 +2063,9 @@ sub start_library {
 		  '<input type="hidden" name="submitted" value="yes" />';
 	$result.=&problem_web_to_edit_header($rndseed);
         if ($Apache::lonhomework::type eq 'practice') {
-            $result.= '<input type="submit" name="resetdata" '.
-                      'value="'.&mt('New Problem Variation').'" />'.
-                      &practice_problem_header().'<hr />';
+            $result.= '<button type="submit" name="resetdata" '.
+                'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'.
+                &practice_problem_header().'<hr />';
         }
     }
     return $result;
@@ -2964,9 +3010,13 @@ sub end_startouttext {
                  .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
                  .&Apache::edit::deletelist($target,$token)
                  .'</span></td>'
-	         .'<td><span id="math_'.$areaid.'">'
-		 .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
-		 .'</span></td>'
+	         .'<td><span id="math_'.$areaid.'">';
+	if ($env{'environment.nocodemirror'}) {
+	    $result.=&Apache::lonhtmlcommon::dragmath_button($areaid,1);
+	} else {
+	    $result.='&nbsp;';
+	}
+	$result.='</span></td>'
 		 .'<td>'
 		 .&Apache::edit::insertlist($target,$token)
 		 .'</td>'