[Aimmath-commit] moodle/mod/math_assignment mod.html,1.7,1.8

[<gus...@us...>]

Update of /cvsroot/aimmath/moodle/mod/math_assignment
In directory sc8-pr-cvs1:/tmp/cvs-serv9214/mod/math_assignment

Modified Files:
	mod.html 
Log Message:
again having to reinstate my old mods which Alex overwrote without comment :-(

Index: mod.html
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/mod.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mod.html	16 Sep 2003 15:20:12 -0000	1.7
--- mod.html	16 Sep 2003 16:58:21 -0000	1.8
***************
*** 27,31 ****
  }
  if (!isset($form->aimsubject)) {
!     $form->aimsubject = "";
  }
  if (!isset($form->aimquiz)) {
--- 27,31 ----
  }
  if (!isset($form->aimsubject)) {
!     $form->aimsubject = 0;
  }
  if (!isset($form->aimquiz)) {
***************
*** 44,50 ****
  if (!$form->name)
      $form->name = get_string("modulename", "math_assignment");
! if (!$form->aimsubject) {
!     $courses = get_courses();
!     $form->aimsubject = $courses[$form->course]->shortname;
  }
  // Process problems and solutions
--- 44,53 ----
  if (!$form->name)
      $form->name = get_string("modulename", "math_assignment");
! 
! if (!$form->aimsubject > 0) {
!     // get aimsubject from database
!     if (!$form->aimsubject = get_field("math_assignment_subject", "id", "course", $form->course)) {
!         $form->aimsubject = 0;
!     };
  }
  // Process problems and solutions
***************
*** 233,237 ****
  </tr>
  
! <tr valign="top">
      <td align="right"><p><b><?php echo "$straimsubject"; ?>:</b></p></td>
      <td>
--- 236,243 ----
  </tr>
  
! <?php 
! if ($CFG->math_assignment_teachers_choose_subject) {
!     ?>
!     <tr valign="top">
      <td align="right"><p><b><?php echo "$straimsubject"; ?>:</b></p></td>
      <td>
***************
*** 261,272 ****
          ?>
      </td>
! </tr>
  
! <tr valign="top">
      <td align="right"><p><b><?php echo $straimquiz; ?>:</b></p></td>
      <td>
          <input type="text" name="aimquiz" size="40" maxlength="255" value="<?php p($form->aimquiz); ?>" /> <?php helpbutton("addupdate_quiz", $straimquiz, "math_assignment"); ?>
      </td>
! </tr>
  
  </table>
--- 267,287 ----
          ?>
      </td>
!     </tr>
!     <?php
! }
! ?>
  
! <?php 
! if (($CFG->math_assignment_teachers_choose_subject > 0) or ($form->aimsubject > 0)) {
!     ?>
!     <tr valign="top">
      <td align="right"><p><b><?php echo $straimquiz; ?>:</b></p></td>
      <td>
          <input type="text" name="aimquiz" size="40" maxlength="255" value="<?php p($form->aimquiz); ?>" /> <?php helpbutton("addupdate_quiz", $straimquiz, "math_assignment"); ?>
      </td>
!     </tr>
!     <?php
! }
! ?>
  
  </table>