yuan/E-learning-Server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
yang 2015-02-05 15:40:07 +08:00
parent a7b8ab964b
commit fbacdd9076
1 changed files with 55 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
htdocs/api/v2/index.php
View File

@ -11,9 +11,11 @@ require_once UELEARNING_LIB_ROOT.'/Study/StudyManager.php';
require_once UELEARNING_LIB_ROOT.'/Target/Target.php'; require_once UELEARNING_LIB_ROOT.'/Target/Target.php';
require_once UELEARNING_LIB_ROOT.'/Target/TargetManager.php'; require_once UELEARNING_LIB_ROOT.'/Target/TargetManager.php';
require_once UELEARNING_LIB_ROOT.'/Database/DBInfo.php'; require_once UELEARNING_LIB_ROOT.'/Database/DBInfo.php';
require_once UELEARNING_LIB_ROOT.'/Recommand/RecommandPoint.php';
use UElearning\User; use UElearning\User;
use UElearning\Study; use UElearning\Study;
use UElearning\Target; use UElearning\Target;
use UElearning\Recommand;
use UElearning\Exception; use UElearning\Exception;
use UElearning\Database; use UElearning\Database;
@ -1033,12 +1035,6 @@ $app->group('/tokens', 'APIrequest', function () use ($app, $app_template) {
// 進入學習點 // 進入學習點
try{ try{
$sid = $sact->toInTarget($tId, $is_entity); $sid = $sact->toInTarget($tId, $is_entity);
}
// 若狀態為正在標的內學習時，強制當成離開標的，重新進入
catch (Exception\InLearningException $e) {
$sact->toOutTarget($tId);
$sid = $sact->toInTarget($tId, $is_entity);
}
// 噴出結果 // 噴出結果
$app->render(200,array( $app->render(200,array(
@ -1048,6 +1044,28 @@ $app->group('/tokens', 'APIrequest', function () use ($app, $app_template) {
'study_id' => $sid, 'study_id' => $sid,
'error' => false 'error' => false
)); ));
}
// 若狀態為正在標的內學習時，強制當成離開標的，重新進入
catch (Exception\InLearningException $e) {
// 查詢目前所在的標的
$inTId = $sact->getCurrentInTarget();
// 登記離開此標的
$sact->toOutTarget($inTId);
// 重新登記進入此標的
$sid = $sact->toInTarget($tId, $is_entity);
// 噴出結果
$app->render(200,array(
'token' => $token,
'user_id' => $user_id,
'activity_id' => $sact->getId(),
'study_id' => $sid,
'error' => false
));
}
} }
// 若非本人所有，則視同無此活動 // 若非本人所有，則視同無此活動
@ -1175,21 +1193,34 @@ $app->group('/tokens', 'APIrequest', function () use ($app, $app_template) {
$currentTId = (int)$currentTId; $currentTId = (int)$currentTId;
// TODO: 動作撰寫區 $tid = $sact->getThemeId(); // 取得此活動的主題
$maxItemTotal = $sact->getLearnStyle(); // 取得最大推薦數
// 取得此活動的主題
$tid = $sact->getThemeId();
// 取得本次採用的教材風格 // 取得本次採用的教材風格
$materialMode = $sact->getMaterialStyle(); $materialMode = $sact->getMaterialStyle();
// 取得主題內所有的標的資訊 // 取得推薦的學習點
$target_manager = new Target\TargetManager(); $recommand = new Recommand\RecommandPoint();
$output_targets = array( output_the_target_array(3, true, $materialMode), $recommandResult = $recommand->recommand($currentTId, $saId);
output_the_target_array(7, true, $materialMode), $recommandTotal = count($recommandResult);
output_the_target_array(12, true, $materialMode), if($recommandTotal > $maxItemTotal) {
); $result_recommand_total = $maxItemTotal;
$recommand_total = count($output_targets); }
else {
$result_recommand_total = $recommandTotal;
}
// 是否已經學完了
// TODO: 改以取得已學習標的數來判定
if($recommandTotal <= 0) { $isEnd = true; }
else { $isEnd = false; }
// 製作
$output_targets = array();
for($i=0; $i<$result_recommand_total; $i++) {
$target_id = $recommandResult[$i]['nextPoint'];
$isEntity = $recommandResult[$i]['isEntity'];
array_push($output_targets, output_the_target_array($target_id, $isEntity, $materialMode));
}
// 噴出結果 // 噴出結果
$app->render(200,array( $app->render(200,array(
@ -1197,7 +1228,8 @@ $app->group('/tokens', 'APIrequest', function () use ($app, $app_template) {
'user_id' => $user_id, 'user_id' => $user_id,
'activity_id' => $sact->getId(), 'activity_id' => $sact->getId(),
'current_target_id' => $currentTId, 'current_target_id' => $currentTId,
'recommand_total' => $recommand_total, 'is_end' => $isEnd,
'recommand_total' => $result_recommand_total,
'recommand_target' => $output_targets, 'recommand_target' => $output_targets,
'error' => false 'error' => false
)); ));