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

StudyActivity: Add 學過的標的數

Browse Source
This commit is contained in:
Yuan Chiu 2014-10-28 20:39:38 +08:00
parent 699e9fc29f
commit 7707cdc84d
4 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/lib/Database/DBStudyActivity.php
View File

@ -102,6 +102,7 @@ class DBStudyActivity extends Database {
else
$to_materialMode = "'".MMODE."'";
// 寫入學習活動資料
$sqlString = "INSERT INTO `".$this->table('StudyActivity').
"` (`UID`, `ThID`,
@ -111,8 +112,6 @@ class DBStudyActivity extends Database {
".$to_startTime.", ".$to_endTime.", ".$to_learnTime." , :delay , :timeforce ,
".$to_learnStyle.", :lstyle_force , ".$to_materialMode.")";
$query = $this->connDB->prepare($sqlString);
$query->bindParam(":uid", $userId);
$query->bindParam(":thid", $themeId);
@ -155,10 +154,18 @@ class DBStudyActivity extends Database {
$sqlString = "SELECT `SaID`, `UID`, `ThID`, ".
"`StartTime`, `EndTime`, ".
"`LearnTime`, `Delay`, `TimeForce`, ".
"`LMode`, `LModeForce`, `MMode` ".
"FROM `".$this->table('StudyActivity')."` AS Act ".
//"LEFT JOIN `".$this->table('Area')."` AS Area ".
//"ON Area.`AID` = Target.`AID` ".
"`LMode`, `LModeForce`, `MMode`, ".
"(SELECT count(`TID`)
FROM `chu__TBelong` AS `belong`
WHERE `belong`.`ThID` = `sa`.`ThID`) AS `TargetTotal`, ".
"(SELECT count(DISTINCT `TID`)
FROM `chu__Study` AS `study`
WHERE `Out_TargetTime` IS NOT NULL
AND `study`.`SaID` = `sa`.`SaID`) AS `LearnedTotal`".
"FROM `".$this->table('StudyActivity')."` AS sa ".
"WHERE ".$where;
$query = $this->connDB->prepare($sqlString);
@ -192,7 +199,10 @@ class DBStudyActivity extends Database {
'time_force' => $output_time_force,
'learnStyle_mode' => $thisResult['LMode'],
'learnStyle_force' => $output_learnStyleForce,
'material_mode' => $thisResult['MMode'])
'material_mode' => $thisResult['MMode'],
'target_total' => $thisResult['TargetTotal'],
'learned_total' => $thisResult['LearnedTotal']
)
);
}
return $result;
@ -234,7 +244,7 @@ class DBStudyActivity extends Database {
* 'learnStyle_force' => <拒絕前往非推薦的學習點>,
* 'material_mode' => <教材模式>
* );
*
* @param int $id 活動編號
*/
public function queryActivity($id) {

2
htdocs/lib/Database/DBTheme.php
View File

@ -87,6 +87,7 @@ class DBTheme extends Database {
* 'name' => <主題名稱>,
* 'learn_time' => <預估的學習時間>,
* 'introduction' => <主題介紹>,
* 'target_total' => <此主題內有多少標的>,
* 'build_time' => <主題建立時間>,
* 'modify_time' => <主題資料修改時間>
* );
@ -118,6 +119,7 @@ class DBTheme extends Database {
* 'name' => <主題名稱>,
* 'learn_time' => <預估的學習時間>,
* 'introduction' => <主題介紹>,
* 'target_total' => <此主題內有多少標的>,
* 'build_time' => <主題建立時間>,
* 'modify_time' => <主題資料修改時間>
* )

19
htdocs/lib/Study/StudyActivity.php
View File

@ -139,24 +139,37 @@ class StudyActivity {
// ========================================================================
/**
* 總共要學幾個學習點
*
* @return int 有幾個學習點
* @since 2.0.0
*/
public function getPointTotal() {
return $this->queryResultArray['target_total'];
}
/**
* 取得已經學過幾個學習點
*
* @return ing 已學過幾個學習點
* @return int 已學過幾個學習點
* @since 2.0.0
*/
public function getLearnedPointTotal() {
return $this->queryResultArray['learned_total'];
}
/**
* 取得還剩下幾個學習點還沒學
*
* @return ing 還剩下幾個學習點
* @return int 還剩下幾個學習點
* @since 2.0.0
*/
public function getRemainingPointTotal() {
$total = $this->getPointTotal();
$learned = $this->getLearnedPointTotal();
return $total - $learned;
}
// ========================================================================

2
htdocs/lib/Study/ThemeManager.php
View File

@ -3,7 +3,7 @@
* ThemeManager.php
*/
namespace UElearning\User;
namespace UElearning\Study;
require_once UELEARNING_LIB_ROOT.'/Database/DBTheme.php';
require_once UELEARNING_LIB_ROOT.'/Study/Exception.php';