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

Merge branch 'develop' of https://github.com/CHU-TDAP/E-learning-Server-v2 into develop

Browse Source
This commit is contained in:
kobayashi 2015-01-09 17:26:17 +08:00
commit a38d3a717e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -454,6 +454,8 @@ $app->group('/tokens', 'APIrequest', function () use ($app, $app_template) {
? $_POST['learnStyle_mode'] : null; ? $_POST['learnStyle_mode'] : null;
$learnStyle_force = isset($_POST['learnStyle_force']) $learnStyle_force = isset($_POST['learnStyle_force'])
? $_POST['learnStyle_force'] : null; ? $_POST['learnStyle_force'] : null;
$enable_virtual = isset($_POST['enable_virtual'])
? $_POST['enable_virtual'] : null;
$materialMode = isset($_POST['material_mode']) $materialMode = isset($_POST['material_mode'])
? $_POST['material_mode'] : null; ? $_POST['material_mode'] : null;
} }
@ -491,7 +493,7 @@ $app->group('/tokens', 'APIrequest', function () use ($app, $app_template) {
$studyId = $studyMgr->startActivity($user_id, $themeId, $studyId = $studyMgr->startActivity($user_id, $themeId,
$learnTime, $timeForce, $learnTime, $timeForce,
$learnStyle, $learnStyle_force, $learnStyle, $learnStyle_force,
$materialMode); $enable_virtual, $materialMode);
// 取得開始後的學習活動資訊 // 取得開始後的學習活動資訊
$sact = new Study\StudyActivity($studyId); $sact = new Study\StudyActivity($studyId);
@ -515,6 +517,7 @@ $app->group('/tokens', 'APIrequest', function () use ($app, $app_template) {
'time_force' => $sact->isForceLearnTime(), 'time_force' => $sact->isForceLearnTime(),
'learnStyle_mode' => $sact->getLearnStyle(), 'learnStyle_mode' => $sact->getLearnStyle(),
'learnStyle_force' => $sact->isForceLearnStyle(), 'learnStyle_force' => $sact->isForceLearnStyle(),
'enable_virtual' => $sact->isEnableVirtual(),
'material_mode' => $sact->getMaterialStyle(), 'material_mode' => $sact->getMaterialStyle(),
'target_total' => $sact->getPointTotal(), 'target_total' => $sact->getPointTotal(),
'learned_total' => $sact->getLearnedPointTotal() 'learned_total' => $sact->getLearnedPointTotal()
@ -577,6 +580,7 @@ $app->group('/tokens', 'APIrequest', function () use ($app, $app_template) {
'time_force' => $sact->isForceLearnTime(), 'time_force' => $sact->isForceLearnTime(),
'learnStyle_mode' => $sact->getLearnStyle(), 'learnStyle_mode' => $sact->getLearnStyle(),
'learnStyle_force' => $sact->isForceLearnStyle(), 'learnStyle_force' => $sact->isForceLearnStyle(),
'enable_virtual' => $sact->isEnableVirtual(),
'material_mode' => $sact->getMaterialStyle(), 'material_mode' => $sact->getMaterialStyle(),
'target_total' => $sact->getPointTotal(), 'target_total' => $sact->getPointTotal(),
'learned_total' => $sact->getLearnedPointTotal() 'learned_total' => $sact->getLearnedPointTotal()
@ -643,6 +647,7 @@ $app->group('/tokens', 'APIrequest', function () use ($app, $app_template) {
'end_time' => $sact->getEndTime(), 'end_time' => $sact->getEndTime(),
'learnStyle_mode' => $sact->getLearnStyle(), 'learnStyle_mode' => $sact->getLearnStyle(),
'learnStyle_force' => $sact->isForceLearnStyle(), 'learnStyle_force' => $sact->isForceLearnStyle(),
'enable_virtual' => $sact->isEnableVirtual(),
'material_mode' => $sact->getMaterialStyle(), 'material_mode' => $sact->getMaterialStyle(),
'target_total' => $sact->getPointTotal(), 'target_total' => $sact->getPointTotal(),
'learned_total' => $sact->getLearnedPointTotal() 'learned_total' => $sact->getLearnedPointTotal()