moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merging changes from MOODLE_16_STABLE

Browse source
This commit is contained in:
skodak 2006-07-31 18:10:02 +00:00
parent 889e6b46f4
commit a8ff58dd2c
7 changed files with 147 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

40
mod/lesson/db/postgres7.php
View file

@ -318,30 +318,38 @@ function lesson_upgrade($oldversion) {
execute_sql('DROP TABLE '.$CFG->prefix.'lesson_essay', false);
// properly set the correct default values
modify_database('', 'ALTER TABLE prefix_lesson
ALTER COLUMN activitylink TYPE int8,
ALTER COLUMN activitylink SET DEFAULT 0,
ALTER COLUMN dependency TYPE int8,
ALTER COLUMN dependency SET DEFAULT 0');
table_column('lesson', 'activitylink', 'activitylink', 'integer', '8', '', '0');
table_column('lesson', 'dependency', 'dependency', 'integer', '8', '', '0');
modify_database('', 'ALTER TABLE prefix_lesson_timer
ALTER COLUMN lessontime SET DEFAULT 0,
ALTER COLUMN lessonid SET DEFAULT 0,
ALTER COLUMN userid SET DEFAULT 0,
ALTER COLUMN lessontime SET DEFAULT 0');
modify_database('', 'ALTER TABLE prefix_lesson_timer
ALTER COLUMN lessonid SET DEFAULT 0');
modify_database('', 'ALTER TABLE prefix_lesson_timer
ALTER COLUMN userid SET DEFAULT 0');
modify_database('', 'ALTER TABLE prefix_lesson_timer
ALTER COLUMN starttime SET DEFAULT 0');
modify_database('', 'ALTER TABLE prefix_lesson_branch
ALTER COLUMN lessonid SET DEFAULT 0,
ALTER COLUMN timeseen SET DEFAULT 0,
ALTER COLUMN userid SET DEFAULT 0,
ALTER COLUMN retry SET DEFAULT 0,
ALTER COLUMN pageid SET DEFAULT 0,
ALTER COLUMN lessonid SET DEFAULT 0');
modify_database('', 'ALTER TABLE prefix_lesson_branch
ALTER COLUMN timeseen SET DEFAULT 0');
modify_database('', 'ALTER TABLE prefix_lesson_branch
ALTER COLUMN userid SET DEFAULT 0');
modify_database('', 'ALTER TABLE prefix_lesson_branch
ALTER COLUMN retry SET DEFAULT 0');
modify_database('', 'ALTER TABLE prefix_lesson_branch
ALTER COLUMN pageid SET DEFAULT 0');
modify_database('', 'ALTER TABLE prefix_lesson_branch
ALTER COLUMN flag SET DEFAULT 0');
modify_database('', 'ALTER TABLE prefix_lesson_high_scores
ALTER COLUMN nickname SET DEFAULT \'\',
ALTER COLUMN lessonid SET DEFAULT 0,
ALTER COLUMN gradeid SET DEFAULT 0,
ALTER COLUMN nickname SET DEFAULT \'\'');
modify_database('', 'ALTER TABLE prefix_lesson_high_scores
ALTER COLUMN lessonid SET DEFAULT 0');
modify_database('', 'ALTER TABLE prefix_lesson_high_scores
ALTER COLUMN gradeid SET DEFAULT 0');
modify_database('', 'ALTER TABLE prefix_lesson_high_scores
ALTER COLUMN userid SET DEFAULT 0');
}

12
mod/lesson/view.php
View file

@ -1306,6 +1306,12 @@
case LESSON_ENDOFBRANCH :
echo get_string("endofbranch", "lesson");
break;
case LESSON_CLUSTER :
echo get_string("clustertitle", "lesson");
break;
case LESSON_ENDOFCLUSTER :
echo get_string("endofclustertitle", "lesson");
break;
}
echo "</b></td></tr>\n";
$i = 1;
@ -1436,7 +1442,11 @@
echo "$jumptitle</td></tr>\n";
}
} else {
if ($lesson->custom && $page->qtype != LESSON_BRANCHTABLE && $page->qtype != LESSON_ENDOFBRANCH) {
if ($lesson->custom and
$page->qtype != LESSON_BRANCHTABLE and
$page->qtype != LESSON_ENDOFBRANCH and
$page->qtype != LESSON_CLUSTER and
$page->qtype != LESSON_ENDOFCLUSTER) {
echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("score", "lesson")." $i:";
echo "</b></td><td width=\"80%\">\n";
echo "$answer->score</td></tr>\n";