From 7952511d72e1050a4ce7ed2487ecc6ba387730fb Mon Sep 17 00:00:00 2001
From: Yuan Chiu <chyuaner@gmail.com>
Date: Tue, 28 Oct 2014 17:06:31 +0800
Subject: [PATCH] fix StudyActivity.php

---
 htdocs/lib/Study/Exception.php     | 33 +++++++++++-
 htdocs/lib/Study/StudyActivity.php | 82 ++++++++++++++++++++++++------
 2 files changed, 98 insertions(+), 17 deletions(-)

diff --git a/htdocs/lib/Study/Exception.php b/htdocs/lib/Study/Exception.php
index 7ea1153..fd503aa 100644
--- a/htdocs/lib/Study/Exception.php
+++ b/htdocs/lib/Study/Exception.php
@@ -8,7 +8,7 @@ namespace UElearning\Exception;
 // TODO: 將以下類別濃縮
 
 /**
- * 沒有找到此標的
+ * 沒有找到此活動
  * @since 2.0.0
  * @package         UElearning
  * @subpackage      Target
@@ -29,6 +29,37 @@ class StudyActivityNoFoundException extends \UnexpectedValueException {
         parent::__construct('No Activity: '.$this->id);
     }
     
+    /**
+     * 取得輸入的標的ID
+     * @return int 標的ID
+     */ 
+    public function getId() {
+        return $this->id;
+    }
+}
+
+/**
+ * 此活動已結束
+ * @since 2.0.0
+ * @package         UElearning
+ * @subpackage      Target
+ */ 
+class StudyActivityFinishedException extends \UnexpectedValueException {
+    /**
+     * 指定的學習活動ID
+     * @type int
+     */ 
+    private $id;
+    
+    /**
+     * 使用者帳號例外
+     * @param int $id 輸入的標的ID
+     */ 
+    public function __construct($id) {
+        $this->id = $id;
+        parent::__construct('No Activity: '.$this->id);
+    }
+    
     /**
      * 取得輸入的標的ID
      * @return int 標的ID
diff --git a/htdocs/lib/Study/StudyActivity.php b/htdocs/lib/Study/StudyActivity.php
index 363b7d5..2c944fc 100644
--- a/htdocs/lib/Study/StudyActivity.php
+++ b/htdocs/lib/Study/StudyActivity.php
@@ -15,7 +15,36 @@ use UElearning\User;
 /**
  * 學習階段類別
  * 
- * 一個物件即代表這一個主題
+ * 一個物件即代表這一個學習活動
+ * 
+ * 使用範例: 
+ * 
+ *     require_once __DIR__.'/../config.php';
+ *     require_once UELEARNING_LIB_ROOT.'/Study/StudyActivity.php';
+ *     use UElearning\Study;
+ *     use UElearning\Exception;
+ *     
+ *     try{
+ *         $sact = new Study\StudyActivity(8);
+ *         
+ *         echo $sact->getId();
+ *         echo $sact->getUserId();
+ *         echo $sact->getThemeId();
+ *         echo $sact->getLearnStyle();
+ *         echo $sact->isForceLearnStyle();
+ *         echo $sact->getMaterialStyle();
+ *         $sact->setDelay(23);
+ *         echo $sact->getDelay();
+ *         echo $sact->isLearning();
+ *         
+ *         $sact->finishActivity();
+ *     }
+ *     catch (Exception\StudyActivityNoFoundException $e) {
+ *         echo 'No Found learnActivity: '. $e->getId();
+ *     }
+ *     catch (Exception\StudyActivityFinishedException $e) {
+ *         echo 'The learnActivity is over: '. $e->getId();
+ *     }
  * 
  * @version         2.0.0
  * @package         UElearning
@@ -41,7 +70,7 @@ class StudyActivity {
 	/**
 	 * 從資料庫取得查詢
 	 *
-     * @throw UElearning\Exception\AreaNoFoundException 
+     * @throw \UElearning\Exception\StudyActivityNoFoundException 
 	 * @since 2.0.0
 	 */
 	protected function getQuery() {
@@ -75,13 +104,19 @@ class StudyActivity {
     
     /**
 	 * 結束這次學習
-	 *
+*    * 
+	 * @throw \UElearning\Exception\StudyActivityNoFoundException 
      * @since 2.0.0
 	 */
 	public function finishActivity() {
         
-        $db = new Database\DBStudyActivity();
-        $db->setEndTimeNow($this->id);
+        // 此活動還在進行中
+        if($this->isLearning()) {
+            $db = new Database\DBStudyActivity();
+            $db->setEndTimeNow($this->id);
+        }
+        // 此活動已結束
+        else throw new Exception\StudyActivityFinishedException($this->id);
 	}
     
     /**
@@ -259,31 +294,46 @@ class StudyActivity {
 	 * 設定這次學習時間要延長多久
 	 *
 	 * @param int $minute 延長時間(分)
+     * @throw \UElearning\Exception\StudyActivityNoFoundException 
      * @since 2.0.0
 	 */
 	public function setDelay($minute) {
-		$db = new Database\DBStudyActivity();
-        $db->setDelay($this->id, $minute);
         
-        $this->getQuery();
+        // 此活動還在進行中
+        if($this->isLearning()) {
+            
+            $db = new Database\DBStudyActivity();
+            $db->setDelay($this->id, $minute);
+
+            $this->getQuery();
+        }
+        // 此活動已結束
+        else throw new Exception\StudyActivityFinishedException($this->id);
 	}
     
     /**
 	 * 設定累加這次學習時間要延長多久
 	 *
 	 * @param int $minute 延長時間(分)
+     * @throw \UElearning\Exception\StudyActivityNoFoundException 
      * @since 2.0.0
 	 */
 	public function addDelay($minute) {
         
-        $setMinute = $this->queryResultArray['delay'] + $minute;
-        
-		$db = new Database\DBStudyActivity();
-        $db->setDelay($this->id, $setMinute);
-        
-        // TODO: 防呆-不能設的比開始時間還早
-        
-        $this->getQuery();
+        // 此活動還在進行中
+        if($this->isLearning()) {
+            
+            $setMinute = $this->queryResultArray['delay'] + $minute;
+
+            $db = new Database\DBStudyActivity();
+            $db->setDelay($this->id, $setMinute);
+
+            // TODO: 防呆-不能設的比開始時間還早
+
+            $this->getQuery();
+        }
+        // 此活動已結束
+        else throw new Exception\StudyActivityFinishedException($this->id);
 	}
     
     /**