From 84710905993b074c0147df97695ebfdec05b182f Mon Sep 17 00:00:00 2001
From: Yuan Chiu <chyuaner@gmail.com>
Date: Tue, 28 Oct 2014 14:17:44 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20Fj=20(=E4=B8=8D=E6=98=AFFi)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/lib/Database/DBTarget.php | 15 ++++++++-------
 htdocs/lib/Target/Target.php     |  8 ++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/htdocs/lib/Database/DBTarget.php b/htdocs/lib/Database/DBTarget.php
index 0a934d1..23a6d74 100644
--- a/htdocs/lib/Database/DBTarget.php
+++ b/htdocs/lib/Database/DBTarget.php
@@ -33,7 +33,8 @@ class DBTarget extends Database {
     public function queryTargetByWhere($where) {
         
         $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 ".
                      "LEFT JOIN `".$this->table('Area')."` as Area ".
                      "ON Area.`AID` = Target.`AID` ".
@@ -60,7 +61,7 @@ class DBTarget extends Database {
                            'PLj'           => $thisResult['PLj'],
                            'Mj'            => $thisResult['Mj'],
                            'S'             => $thisResult['S'],
-                           'Fi'            => $thisResult['Fi']
+                           'Fj'            => $thisResult['Fj']
                 ));
             }
             return $result;
@@ -101,7 +102,7 @@ class DBTarget extends Database {
      *         'PLj'           => <學習標的的人數限制>,
      *         'Mj'            => <目前人數>,
      *         'S'             => <學習標的飽和率上限>,
-     *         'Fi'            => <學習標的滿額指標>
+     *         'Fj'            => <學習標的滿額指標>
      *     );
      * 
      */ 
@@ -136,7 +137,7 @@ class DBTarget extends Database {
      *             'PLj'           => <學習標的的人數限制>,
      *             'Mj'            => <目前人數>,
      *             'S'             => <學習標的飽和率上限>,
-     *             'Fi'            => <學習標的滿額指標>
+     *             'Fj'            => <學習標的滿額指標>
      *         )
      *     );
      * 
@@ -165,7 +166,7 @@ class DBTarget extends Database {
             case 'PLj':           $sqlField = 'PLj';         break;
             case 'Mj':            $sqlField = 'Mj';          break;
             case 'S':             $sqlField = 'S';           break;
-            case 'Fi':            $sqlField = 'Fi';          break;
+            case 'Fj':            $sqlField = 'Fj';          break;
             default:              $sqlField = $field;        break;
         }
         
@@ -306,7 +307,7 @@ class DBTarget extends Database {
     //        case 'PLj':           $sqlField = 'PLj';         break;
     //        case 'Mj':            $sqlField = 'Mj';          break;
     //        case 'S':             $sqlField = 'S';           break;
-    //        case 'Fi':            $sqlField = 'Fi';          break;
+    //        case 'Fj':            $sqlField = 'Fj';          break;
     //        default:              $sqlField = $field;        break;
     //    }
     //    
@@ -437,7 +438,7 @@ class DBTarget extends Database {
     //        case 'PLj':           $sqlField = 'PLj';         break;
     //        case 'Mj':            $sqlField = 'Mj';          break;
     //        case 'S':             $sqlField = 'S';           break;
-    //        case 'Fi':            $sqlField = 'Fi';          break;
+    //        case 'Fj':            $sqlField = 'Fj';          break;
     //        default:              $sqlField = $field;        break;
     //    }
     //    
diff --git a/htdocs/lib/Target/Target.php b/htdocs/lib/Target/Target.php
index 973928e..e4266ac 100644
--- a/htdocs/lib/Target/Target.php
+++ b/htdocs/lib/Target/Target.php
@@ -36,7 +36,7 @@ use UElearning\Exception;
  *         echo $target->isFullPeople();
  *         echo $target->getVacancyPeople();
  *         echo $target->getS();
- *         echo $target->getFi();
+ *         echo $target->getFj();
  *         
  *     }
  *     catch (Exception\TargetNoFoundException $e) {
@@ -288,7 +288,7 @@ class Target {
      * @since 2.0.0
 	 */
 	public function isFullPeople(){
-		if($this->getPLj()-$this->getMj() <= 0) return true;
+		if($this->getFj() >= 1) return true;
         else return false;
 	}
     
@@ -310,8 +310,8 @@ class Target {
 	 * @return int 學習標的滿額指標
      * @since 2.0.0
 	 */
-	public function getFi(){
-		return $this->queryResultArray['Fi'];
+	public function getFj(){
+		return $this->queryResultArray['Fj'];
 	}
     
 }
\ No newline at end of file