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

Fix Fj (不是Fi)

Browse Source
This commit is contained in:
Yuan Chiu 2014-10-28 14:17:44 +08:00
parent d11804030f
commit 8471090599
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/lib/Database/DBTarget.php
View File

@ -33,7 +33,8 @@ class DBTarget extends Database {
public function queryTargetByWhere($where) { public function queryTargetByWhere($where) {
$sqlString = "SELECT `TID`, Target.`AID`, Area.`HID`, ". $sqlString = "SELECT `TID`, Target.`AID`, Area.`HID`, ".
"`TNum`, `TName`, `TMapID`, `TLearnTime`, `PLj`, `Mj`, `S`, `Fi` ". "`TNum`, `TName`, `TMapID`, `TLearnTime`, ".
"`PLj`, `Mj`, `S`, IF(`Mj` >= `PLj`, 1, 0) AS Fj ".
"FROM `".$this->table('Target')."` as Target ". "FROM `".$this->table('Target')."` as Target ".
"LEFT JOIN `".$this->table('Area')."` as Area ". "LEFT JOIN `".$this->table('Area')."` as Area ".
"ON Area.`AID` = Target.`AID` ". "ON Area.`AID` = Target.`AID` ".
@ -60,7 +61,7 @@ class DBTarget extends Database {
'PLj' => $thisResult['PLj'], 'PLj' => $thisResult['PLj'],
'Mj' => $thisResult['Mj'], 'Mj' => $thisResult['Mj'],
'S' => $thisResult['S'], 'S' => $thisResult['S'],
'Fi' => $thisResult['Fi'] 'Fj' => $thisResult['Fj']
)); ));
} }
return $result; return $result;
@ -101,7 +102,7 @@ class DBTarget extends Database {
* 'PLj' => <學習標的的人數限制>, * 'PLj' => <學習標的的人數限制>,
* 'Mj' => <目前人數>, * 'Mj' => <目前人數>,
* 'S' => <學習標的飽和率上限>, * 'S' => <學習標的飽和率上限>,
* 'Fi' => <學習標的滿額指標> * 'Fj' => <學習標的滿額指標>
* ); * );
* *
*/ */
@ -136,7 +137,7 @@ class DBTarget extends Database {
* 'PLj' => <學習標的的人數限制>, * 'PLj' => <學習標的的人數限制>,
* 'Mj' => <目前人數>, * 'Mj' => <目前人數>,
* 'S' => <學習標的飽和率上限>, * 'S' => <學習標的飽和率上限>,
* 'Fi' => <學習標的滿額指標> * 'Fj' => <學習標的滿額指標>
* ) * )
* ); * );
* *
@ -165,7 +166,7 @@ class DBTarget extends Database {
case 'PLj': $sqlField = 'PLj'; break; case 'PLj': $sqlField = 'PLj'; break;
case 'Mj': $sqlField = 'Mj'; break; case 'Mj': $sqlField = 'Mj'; break;
case 'S': $sqlField = 'S'; break; case 'S': $sqlField = 'S'; break;
case 'Fi': $sqlField = 'Fi'; break; case 'Fj': $sqlField = 'Fj'; break;
default: $sqlField = $field; break; default: $sqlField = $field; break;
} }
@ -306,7 +307,7 @@ class DBTarget extends Database {
// case 'PLj': $sqlField = 'PLj'; break; // case 'PLj': $sqlField = 'PLj'; break;
// case 'Mj': $sqlField = 'Mj'; break; // case 'Mj': $sqlField = 'Mj'; break;
// case 'S': $sqlField = 'S'; break; // case 'S': $sqlField = 'S'; break;
// case 'Fi': $sqlField = 'Fi'; break; // case 'Fj': $sqlField = 'Fj'; break;
// default: $sqlField = $field; break; // default: $sqlField = $field; break;
// } // }
// //
@ -437,7 +438,7 @@ class DBTarget extends Database {
// case 'PLj': $sqlField = 'PLj'; break; // case 'PLj': $sqlField = 'PLj'; break;
// case 'Mj': $sqlField = 'Mj'; break; // case 'Mj': $sqlField = 'Mj'; break;
// case 'S': $sqlField = 'S'; break; // case 'S': $sqlField = 'S'; break;
// case 'Fi': $sqlField = 'Fi'; break; // case 'Fj': $sqlField = 'Fj'; break;
// default: $sqlField = $field; break; // default: $sqlField = $field; break;
// } // }
// //

8
htdocs/lib/Target/Target.php
View File

@ -36,7 +36,7 @@ use UElearning\Exception;
* echo $target->isFullPeople(); * echo $target->isFullPeople();
* echo $target->getVacancyPeople(); * echo $target->getVacancyPeople();
* echo $target->getS(); * echo $target->getS();
* echo $target->getFi(); * echo $target->getFj();
* *
* } * }
* catch (Exception\TargetNoFoundException $e) { * catch (Exception\TargetNoFoundException $e) {
@ -288,7 +288,7 @@ class Target {
* @since 2.0.0 * @since 2.0.0
*/ */
public function isFullPeople(){ public function isFullPeople(){
if($this->getPLj()-$this->getMj() <= 0) return true; if($this->getFj() >= 1) return true;
else return false; else return false;
} }
@ -310,8 +310,8 @@ class Target {
* @return int 學習標的滿額指標 * @return int 學習標的滿額指標
* @since 2.0.0 * @since 2.0.0
*/ */
public function getFi(){ public function getFj(){
return $this->queryResultArray['Fi']; return $this->queryResultArray['Fj'];
} }
} }