[Aimmath-commit] moodle/mod/math_assignment/db mysql.php,1.6,1.7 mysql.sql,1.5,1.6

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

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

Modified Files:
	mysql.php mysql.sql 
Log Message:
There now is a new option "focus" which determines whether the aim quiz is shown with single question per page or multiple questions per page.

Index: mysql.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/db/mysql.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mysql.php	18 Sep 2003 23:57:57 -0000	1.6
--- mysql.php	20 Sep 2003 19:13:43 -0000	1.7
***************
*** 7,36 ****
      global $CFG;
  
!     $return = true;
!     if ($oldversion < 2003091500) {
!         table_column("math_assignment_subject", "", "course");
!     }
!     if ($oldversion < 2003091616) {
!         if (!execute_sql("ALTER TABLE `{$CFG->prefix}math_assignment` ADD `problemscompile` TINYINT(1) NOT NULL default '1' AFTER `problems`, ADD `solutionscompile` TINYINT(1) NOT NULL default '1' AFTER `solutions`"))
!             $return = false;
!     }
!     if ($oldversion < 2003091812) {
!         set_config("math_assignment_teachers_choose_subject", "1");
!         if (!execute_sql("ALTER TABLE `{$CFG->prefix}math_assignment` CHANGE `problemscompile` `problemsisurl` TINYINT(1) NOT NULL default '1' AFTER `problems`, CHANGE `solutionscompile` `solutionsisurl` TINYINT(1) NOT NULL default '1' AFTER `solutions`"))
!             $return = false;
!     }
!     if ($oldversion < 2003091821) {
!         if (!execute_sql("ALTER TABLE `{$CFG->prefix}math_assignment` DROP `aimsubject`"))
!             $return = false;
!         if (!execute_sql("ALTER TABLE `{$CFG->prefix}math_assignment_subject` DROP PRIMARY KEY, DROP `id`"))
!             $return = false;
!         execute_sql("ALTER TABLE `{$CFG->prefix}math_assignment_subject` ADD `course` INT(10) UNSIGNED NOT NULL default '0' FIRST");
!         execute_sql("ALTER TABLE `{$CFG->prefix}math_assignment_subject` CHANGE `course` `course` INT(10) UNSIGNED NOT NULL default '0' FIRST");
!         if (!execute_sql("ALTER TABLE `{$CFG->prefix}math_assignment_subject` ADD PRIMARY KEY (`course`)"))
!             $return = false;
!         execute_sql("ALTER TABLE `{$CFG->prefix}math_assignment_subject` COMMENT='AiM subject used by each course'");
!         execute_sql("DELETE FROM `{$CFG->prefix}config` WHERE `name`='math_assignment_teachers_choose_subject' or `name`='math_assignment_server_display'");
      }
!     return $return;
  }
  
--- 7,15 ----
      global $CFG;
  
!     if ($oldversion < 2003092001) {
!         table_column("math_assignment", "", "focus", "tinyint", "1", "unsigned", "1");
      }
! 
!     return true;
  }
  

Index: mysql.sql
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/db/mysql.sql,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mysql.sql	18 Sep 2003 23:57:57 -0000	1.5
--- mysql.sql	20 Sep 2003 19:13:43 -0000	1.6
***************
*** 5,23 ****
  # that may be used, especially new entries in the table log_display
  
! CREATE TABLE `prefix_math_assignment` (
!   `id` int(10) unsigned NOT NULL auto_increment,
!   `course` int(10) unsigned NOT NULL default '0',
!   `name` varchar(255) NOT NULL default '',
!   `problems` varchar(255) NOT NULL default '',
!   `problemsisurl` tinyint(1) NOT NULL default '1',
!   `solutions` varchar(255) NOT NULL default '',
!   `solutionsisurl` tinyint(1) NOT NULL default '1',
!   `aimquiz` varchar(255) NOT NULL default '',
!   `papergrade` int(10) unsigned NOT NULL default '0',
!   `aimgrade` int(10) unsigned NOT NULL default '0',
!   `timedue` int(10) unsigned NOT NULL default '0',
!   `timemodified` int(10) unsigned NOT NULL default '0',
! PRIMARY KEY  (`id`)
  ) TYPE=MyISAM COMMENT='Main information about each math assignment';
  
  CREATE TABLE `prefix_math_assignment_subject` (
--- 5,26 ----
  # that may be used, especially new entries in the table log_display
  
! 
! CREATE TABLE mdl_math_assignment (
!   id int(10) unsigned NOT NULL auto_increment,
!   course int(10) unsigned NOT NULL default '0',
!   name varchar(255) NOT NULL default '',
!   problems varchar(255) NOT NULL default '',
!   problemsisurl tinyint(1) NOT NULL default '1',
!   solutions varchar(255) NOT NULL default '',
!   solutionsisurl tinyint(1) NOT NULL default '1',
!   aimquiz varchar(255) NOT NULL default '',
!   papergrade int(10) unsigned NOT NULL default '0',
!   aimgrade int(10) unsigned NOT NULL default '0',
!   timedue int(10) unsigned NOT NULL default '0',
!   timemodified int(10) unsigned NOT NULL default '0',
!   focus tinyint(3) unsigned NOT NULL default '1',
!   PRIMARY KEY  (id)
  ) TYPE=MyISAM COMMENT='Main information about each math assignment';
+ 
  
  CREATE TABLE `prefix_math_assignment_subject` (