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

Fix api

Browse Source
This commit is contained in:
Yuan Chiu 2015-02-05 15:53:10 +08:00
parent 24238a3b3b
commit 58cd47df7b
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1193,13 +1193,8 @@ $app->group('/tokens', 'APIrequest', function () use ($app, $app_template) {
$currentTId = (int)$currentTId; $currentTId = (int)$currentTId;
<<<<<<< HEAD
$tid = $sact->getThemeId(); // 取得此活動的主題 $tid = $sact->getThemeId(); // 取得此活動的主題
$maxItemTotal = $sact->getLearnStyle(); // 取得最大推薦數 $maxItemTotal = $sact->getLearnStyle(); // 取得最大推薦數
=======
// 取得此活動的主題
$tid = $sact->getThemeId();
>>>>>>> 345e83e160f83e726d8571e101f54f40a63b7a13
// 取得本次採用的教材風格 // 取得本次採用的教材風格
$materialMode = $sact->getMaterialStyle(); $materialMode = $sact->getMaterialStyle();
@ -1215,18 +1210,12 @@ $app->group('/tokens', 'APIrequest', function () use ($app, $app_template) {
$result_recommand_total = $recommandTotal; $result_recommand_total = $recommandTotal;
} }
// 是否已經學完了 // 是否已經學完了
<<<<<<< HEAD
// TODO: 改以取得已學習標的數來判定
if($recommandTotal <= 0) { $isEnd = true; }
else { $isEnd = false; }
=======
if($sact->getRemainingPointTotal() <= 0) { if($sact->getRemainingPointTotal() <= 0) {
$isEnd = true; $isEnd = true;
} }
else { else {
$isEnd = false; $isEnd = false;
} }
>>>>>>> 345e83e160f83e726d8571e101f54f40a63b7a13
// 製作 // 製作
$output_targets = array(); $output_targets = array();