diff --git a/htdocs/lib/User/ClassGroupAdmin.php b/htdocs/lib/User/ClassGroupAdmin.php index 42f2812..26670cc 100644 --- a/htdocs/lib/User/ClassGroupAdmin.php +++ b/htdocs/lib/User/ClassGroupAdmin.php @@ -6,6 +6,7 @@ namespace UElearning\User; require_once UELEARNING_LIB_ROOT.'/Database/DBUser.php'; +require_once UELEARNING_LIB_ROOT.'/User/ClassGroup.php'; require_once UELEARNING_LIB_ROOT.'/Exception.php'; use UElearning\Database; use UElearning\Exception; @@ -141,5 +142,82 @@ class ClassGroupAdmin { } } + + /** + * 取得所有的班級ID清單 + * + * @return array 班級ID清單 + * @since 2.0.0 + */ + public function getIDList() { + + $db = new Database\DBUser(); + $queryResult = $db->queryAllClassGroup(); + + if(isset($queryResult)) { + + $output = array(); + foreach($queryResult as $key => $value) { + array_push($output, $value['class_id']); + } + + return $output; + } + else { + + return null; + } + } + + /** + * 取得所有的班級資訊清單 + * + * @return array 班級資訊清單陣列，格式為: + * + * array( + * array( + * 'class_id' => <班級ID>, + * 'name' => <班級顯示名稱>, + * 'memo' => <備註>, + * 'build_time' => <建立時間>, + * 'modify_time' => <修改時間> + * ) + * ); + * + * @since 2.0.0 + */ + public function getInfoList() { + + $db = new Database\DBUser(); + $queryResult = $db->queryAllClassGroup(); + return $queryResult; + } + + /** + * 取得所有的班級清單 + * + * @return array 班級物件 + * @since 2.0.0 + */ + public function getObjectList() { + + $db = new Database\DBUser(); + $queryResult = $db->queryAllClassGroup(); + + if(isset($queryResult)) { + + $output = array(); + foreach($queryResult as $key => $value) { + $group = new ClassGroup($value['class_id']); + array_push($output, $group); + } + + return $output; + } + else { + + return null; + } + } } \ No newline at end of file diff --git a/htdocs/lib/User/User.php b/htdocs/lib/User/User.php index 5f66eb0..a77bfe1 100644 --- a/htdocs/lib/User/User.php +++ b/htdocs/lib/User/User.php @@ -159,7 +159,7 @@ class User { $this->setUpdate('password', $passwdEncrypted); } - // ======================================================================== + // ------------------------------------------------------------------------ /** * 取得帳號建立時間 @@ -180,7 +180,7 @@ class User { public function getModifyTime(){ return $this->queryResultArray['modify_time']; } - // ======================================================================== + // ------------------------------------------------------------------------ /** * 取得所在群組 @@ -304,7 +304,7 @@ class User { } - // ======================================================================== + // ------------------------------------------------------------------------ /** * 取得帳號啟用狀態 @@ -329,7 +329,7 @@ class User { $this->setUpdate('enable', $isActive); } - // ======================================================================== + // ------------------------------------------------------------------------ /** * 取得這個人的學習導引風格 @@ -380,7 +380,7 @@ class User { $this->setUpdate('material_mode', $style); } - // ======================================================================== + // ------------------------------------------------------------------------ /** * 取得名稱 @@ -517,5 +517,39 @@ class User { $thisGroup = new UserGroup($this->getQueryInfo("GID")); return $thisGroup->havePermission($permissionName); } - + + // ======================================================================== + + /** + * 取得登入次數 + * + * @return int 登入了多少次 + * @since 2.0.0 + */ + public function getLoginTimes() { + // TODO: 取得登入次數 + } + + /** + * 目前有幾個裝置登入 + * + * @return int 幾個已登入的登入階段 + * @since 2.0.0 + */ + public function getCurrentLoginTotal() { + // TODO: 取得登入次數 + } + + // ======================================================================== + + /** + * 目前有哪些活動可以進行學習 + * + * @return array 可以學習的活動清單 + * @since 2.0.0 + */ + public function getStudyActivity() { + // TODO: 可以學習的活動清單 + } + } \ No newline at end of file diff --git a/htdocs/lib/User/UserGroupAdmin.php b/htdocs/lib/User/UserGroupAdmin.php index c7b3c50..cf7b432 100644 --- a/htdocs/lib/User/UserGroupAdmin.php +++ b/htdocs/lib/User/UserGroupAdmin.php @@ -6,6 +6,7 @@ namespace UElearning\User; require_once UELEARNING_LIB_ROOT.'/Database/DBUser.php'; +require_once UELEARNING_LIB_ROOT.'/User/UserGroup.php'; require_once UELEARNING_LIB_ROOT.'/User/Exception.php'; require_once UELEARNING_LIB_ROOT.'/Exception.php'; use UElearning\Database; @@ -149,5 +150,82 @@ class UserGroupAdmin { } } + + /** + * 取得所有的班級ID清單 + * + * @return array 班級ID清單 + * @since 2.0.0 + */ + public function getIDList() { + + $db = new Database\DBUser(); + $queryResult = $db->queryAllGroup(); + + if(isset($queryResult)) { + + $output = array(); + foreach($queryResult as $key => $value) { + array_push($output, $value['group_id']); + } + + return $output; + } + else { + + return null; + } + } + + /** + * 取得所有的班級資訊清單 + * + * @return array 班級資訊清單陣列，格式為: + * + * array( + * array( + * 'class_id' => <班級ID>, + * 'name' => <班級顯示名稱>, + * 'memo' => <備註>, + * 'build_time' => <建立時間>, + * 'modify_time' => <修改時間> + * ) + * ); + * + * @since 2.0.0 + */ + public function getInfoList() { + + $db = new Database\DBUser(); + $queryResult = $db->queryAllGroup(); + return $queryResult; + } + + /** + * 取得所有的班級清單 + * + * @return array 班級物件 + * @since 2.0.0 + */ + public function getObjectList() { + + $db = new Database\DBUser(); + $queryResult = $db->queryAllGroup(); + + if(isset($queryResult)) { + + $output = array(); + foreach($queryResult as $key => $value) { + $group = new UserGroup($value['group_id']); + array_push($output, $group); + } + + return $output; + } + else { + + return null; + } + } } \ No newline at end of file diff --git a/htdocs/lib/User/UserSession.php b/htdocs/lib/User/UserSession.php index efa6937..8afcd03 100644 --- a/htdocs/lib/User/UserSession.php +++ b/htdocs/lib/User/UserSession.php @@ -240,7 +240,7 @@ class UserSession { * @return int 所有以登入的數量 * @since 2.0.0 */ - public function getLoginTotalByUserId($userId) { + public function getCurrentLoginTotalByUserId($userId) { // 確保若無此使用者則丟例外 $user = new User($userId);