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

將learned_total改為即使未標記為離開，也算進去

Browse Source
This commit is contained in:
Yuan Chiu 2015-01-26 16:31:42 +08:00
parent 7993614724
commit 2e7ea6d6ab
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,8 +172,7 @@ class DBStudyActivity extends Database {
"(SELECT count(DISTINCT `TID`) "(SELECT count(DISTINCT `TID`)
FROM `".$this->table('Study')."` AS `study` FROM `".$this->table('Study')."` AS `study`
WHERE `Out_TargetTime` IS NOT NULL WHERE `study`.`SaID` = `sa`.`SaID`) AS `LearnedTotal`".
AND `study`.`SaID` = `sa`.`SaID`) AS `LearnedTotal`".
"FROM `".$this->table('StudyActivity')."` AS sa ". "FROM `".$this->table('StudyActivity')."` AS sa ".
"WHERE ".$where; "WHERE ".$where;
@ -754,7 +753,7 @@ SELECT 'study' AS `Type`,
`LMode`, `LModeForce`, `MMode`, `EnableVirtual`, '1' AS `Lock`, `LMode`, `LModeForce`, `MMode`, `EnableVirtual`, '1' AS `Lock`,
(SELECT count(`TID`) FROM `".$this->table('TBelong')."` AS `belong` WHERE `belong`.`ThID` = `sa`.`ThID`) AS ` TargetTotal`, (SELECT count(`TID`) FROM `".$this->table('TBelong')."` AS `belong` WHERE `belong`.`ThID` = `sa`.`ThID`) AS ` TargetTotal`,
(SELECT count(DISTINCT `TID`) FROM `".$this->table('Study')."` AS `study` WHERE `Out_TargetTime` IS NOT NULL AND `study`.`SaID` = `sa`.`SaID`) AS `LearnedTotal` (SELECT count(DISTINCT `TID`) FROM `".$this->table('Study')."` AS `study` WHERE `study`.`SaID` = `sa`.`SaID`) AS `LearnedTotal`
FROM `".$this->table('StudyActivity')."` AS `sa` FROM `".$this->table('StudyActivity')."` AS `sa`
LEFT JOIN `".$this->table('Theme')."` AS `th` LEFT JOIN `".$this->table('Theme')."` AS `th`