');
@@ -24,22 +37,47 @@ class BoltDb extends DbConn {
}
}
-class BoltCourse {
- function insert() {
- $db = BoltDb::get();
- $now = time();
- $query = "insert into DBNAME.bolt_course (create_time, short_name, name, description, doc_file) values ($now, '$this->short_name', '$this->name', '$this->description', '$this->doc_file')";
- $result = $db->do_query($query);
- if (!$result) return false;
- $this->id = $db->insert_id();
- return true;
+class BoltUser {
+ static $cache;
+ static function lookup_userid($id) {
+ $db = BoincDb::get();
+ return $db->lookup('bolt_user', 'BoltUser', "user_id=$id");
}
+ static function insert($clause) {
+ $db = BoltDb::get();
+ return $db->insert('bolt_user', $clause);
+ }
+ static function lookup(&$user) {
+ if (!$user) return;
+ if (isset($user->bolt)) return;
+ if (isset(self::$cache[$user->id])) {
+ $bolt = self::$cache[$user->id];
+ } else {
+ $bolt = self::lookup_userid($user->id);
+ if (!$bolt) {
+ self::insert("(user_id) values ($user->id)");
+ $bolt = self::lookup_userid($user->id);
+ }
+ self::$cache[$user->id] = $bolt;
+ }
+ $user->bolt = $bolt;
+ }
+ function update($clause) {
+ $db = BoltDb::get();
+ $clause = "$clause where user_id=$this->user_id";
+ return $db->update_aux('bolt_user', $clause);
+ }
+}
+class BoltCourse {
+ static function insert($clause) {
+ $db = BoltDb::get();
+ return $db->insert('bolt_course', $clause);
+ }
static function lookup_id($id) {
$db = BoltDb::get();
return $db->lookup_id($id, 'bolt_course', 'BoltCourse');
}
-
static function enum() {
$db = BoltDb::get();
return $db->enum('bolt_course', 'BoltCourse');
@@ -47,31 +85,26 @@ class BoltCourse {
}
class BoltEnrollment {
- function insert() {
+ function insert($clause) {
$db = BoltDb::get();
- $now = time();
- $query = "insert into DBNAME.bolt_enrollment (create_time, user_id, course_id) values ($now, $this->user_id, $this->course_id)";
- return $db->do_query($query);
+ return $db->insert('bolt_enrollment', $clause);
}
- function lookup($userid, $courseid) {
+ function lookup($user_id, $course_id) {
$db = BoltDb::get();
- return $db->lookup('bolt_enrollment', 'BoltEnrollment', "user_id=$userid and course_id=$courseid");
+ return $db->lookup('bolt_enrollment', 'BoltEnrollment', "user_id=$user_id and course_id=$course_id");
}
- function update_aux($clause) {
+ function update($clause) {
$db = BoltDb::get();
- $db->update_aux('bolt_enrollment', $clause);
+ $db->update_aux('bolt_enrollment', "$clause where user_id=$this->user_id and course_id=$this->course_id");
}
}
class BoltView {
- function insert() {
+ static function insert($clause) {
$db = BoltDb::get();
- $now = time();
- $query = "insert into DBNAME.bolt_view (user_id, course_id, item_name, start_time) values ($this->user_id, $this->course_id, '$this->item_name', $now)";
- $result = $db->do_query($query);
- if (!$result) return false;
- $this->id = $db->insert_id();
- return true;
+ $ret = $db->insert('bolt_view', $clause);
+ if (!$ret) return null;
+ return $db->insert_id();
}
static function lookup_id($id) {
$db = BoltDb::get();
diff --git a/html/ops/bolt_setup_sample.php b/html/ops/bolt_setup_sample.php
index 08081108b3..a3310ab2be 100644
--- a/html/ops/bolt_setup_sample.php
+++ b/html/ops/bolt_setup_sample.php
@@ -2,13 +2,13 @@
require_once("../inc/bolt_db.inc");
-$c = new BoltCourse();
-$c->short_name = 'test_course';
-$c->name = 'A test course';
-$c->description = 'This course is a demonstration of Bolt';
-$c->doc_file = 'bolt_course_sample.php';
+$short_name = 'test_course';
+$name = 'Test course';
+$description = 'This course is a demonstration of Bolt';
+$doc_file = 'bolt_course_sample.php';
+$now = time();
-if ($c->insert()) {
+if (BoltCourse::insert("(create_time, short_name, name, description, doc_file) values ($now, '$short_name', '$name', '$description', '$doc_file')")) {
echo "all done\n";
} else {
echo "database error\n";
diff --git a/html/user/bolt.php b/html/user/bolt.php
index d01c7c01c8..ba76697666 100644
--- a/html/user/bolt.php
+++ b/html/user/bolt.php
@@ -8,18 +8,27 @@ page_head("Courses");
$user = get_logged_in_user(true);
$courses = BoltCourse::enum();
+start_table();
+table_header(
+ "Course
Click to start, resume, or review
+ ", "Status"
+);
foreach ($courses as $course) {
- $e = BoltEnrollment::lookup($user->id, $course->id);
- echo "$course->name id&action=start>start
- ";
+ $e = $user?BoltEnrollment::lookup($user->id, $course->id):null;
+ $start = date_str($e->create_time);
+ $ago = time_diff(time() - $e->last_view);
if ($e) {
- echo "id>resume
- ";
+ $pct = number_format($e->fraction_done*100, 0);
+ $status = "Started $start; last visit $ago ago; $pct% done";
+ } else {
+ $status = "Not started";
}
- echo "
- $course->description
- ";
+ row2("id&action=start>$course->name
+
$course->description",
+ $status
+ );
}
+end_table();
page_tail();
?>
diff --git a/html/user/bolt_sched.php b/html/user/bolt_sched.php
index cbf4749825..a9c5dea748 100644
--- a/html/user/bolt_sched.php
+++ b/html/user/bolt_sched.php
@@ -1,9 +1,10 @@
bolt->update("sex=$sex, birth_year=$birth_year");
+ $action = "";
+}
+
+if ($action == 'start' && info_incomplete($user)) {
+ request_info($user, $course);
+ exit();
+}
+
$course_doc = require_once($course->doc_file);
if ($view_id) {
@@ -32,20 +46,20 @@ if ($view_id) {
}
}
+$frac_done = 0;
$e = BoltEnrollment::lookup($user->id, $course_id);
-
if ($e) {
$iter = new BoltIter($course_doc);
$iter->stack = json_decode($e->state);
if ($action == 'next') {
- $item = $iter->next();
+ $item = $iter->next($frac_done);
$state = json_encode($iter->stack);
- $e->update_aux("state='$state' where user_id=$user->id and course_id=$course_id");
+ $e->update("state='$state'");
} else if ($action == 'start') {
$iter->stack = null;
- $item = $iter->at();
+ $item = $iter->at($frac_done);
$state = json_encode($iter->stack);
- $e->update_aux("state='$state' where user_id=$user->id and course_id=$course_id");
+ $e->update("state='$state'");
} else {
$item = $iter->at();
}
@@ -53,11 +67,10 @@ if ($e) {
$iter = new BoltIter($course_doc);
$item = $iter->at();
- $e = new BoltEnrollment($course);
- $e->user_id = $user->id;
- $e->course_id = $course_id;
- $e->state = json_encode($iter->stack);
- $e->insert();
+ $now = time();
+ $state = json_encode($iter->stack);
+ BoltEnrollment::insert("(create_time, user_id, course_id, state) values ($now, $user->id, $course_id, '$state')");
+ $e = BoltEnrollment::lookup($user->id, $course_id);
}
if (!$item) {
@@ -67,13 +80,13 @@ if (!$item) {
exit();
}
-$view = new BoltView();
-$view->user_id = $user->id;
-$view->course_id = $course_id;
-$view->item_name = $item->name;
-$view->insert();
+$now = time();
+$e->update("last_view=$now, fraction_done=$frac_done");
+$view_id = BoltView::insert("(user_id, course_id, item_name, start_time) values ($user->id, $course_id, '$item->name', $now)");
require_once($item->filename);
-echo "id>Next";
+echo "
Next";
+
+echo "
Fraction done: $frac_done";
?>