106 Commits

Author SHA1 Message Date
345e83e160 Merge branch 'develop' of github.com:CHU-TDAP/E-learning-Server-v2 into develop
Conflicts:
	htdocs/api/v2/index.php
2015-02-05 15:34:12 +08:00
yang
a7b8ab964b Merge branch 'develop' of https://github.com/CHU-TDAP/E-learning-Server-v2 into develop
Conflicts:
	htdocs/api/v2/index.php
2015-02-05 15:26:56 +08:00
yang
1d0695f223 add placeinfo and map 2015-02-05 15:23:49 +08:00
86b3e562a6 Fix getRemainingPointTotal 不包含入口本身 & Fix API Recommand is_end 2015-01-29 00:23:48 +08:00
009d8eea2c Fix Database Table Name 2015-01-28 23:22:26 +08:00
2e7ea6d6ab 將learned_total改為即使未標記為離開,也算進去 2015-01-26 16:31:42 +08:00
7993614724 Fix Target Class: 手誤砍到一個字母 2015-01-26 16:30:58 +08:00
9fafd6e4c9 Fix Study Namespace裡的類別寫法弊病 2015-01-26 16:23:23 +08:00
7c4bf21d93 Fix API: 重複進入標的時,會將上個已進入紀錄標示為離開 2015-01-26 16:11:21 +08:00
8ba983a999 實作進出標的時加減標的目前人數 2015-01-26 15:57:30 +08:00
b239c28046 整合RecommandPoint進API & Fix RecommandPoint Class 2015-01-25 21:00:51 +08:00
6f159c3a63 Fix RecommandPoint Class 2015-01-25 20:33:31 +08:00
9fe8401bde Merge branch 'develop' of https://github.com/CHU-TDAP/E-learning-Server-v2 into develop 2015-01-25 19:40:30 +08:00
3a0bac60d6 完成RecommandPoint類別(需要做單元測試) 2015-01-25 19:40:10 +08:00
de70a40b37 fix Target Class: getMaterialUrl no data bug 2015-01-20 02:46:35 +08:00
3e44a65b79 SQL Add新欄位: Theme內新增起始標的 2015-01-19 22:38:40 +08:00
995fa6fd1f 將RecommandPoint.php中計算正規化參數的方法改為private 2015-01-17 03:40:33 +08:00
08c982678c Merge branch 'develop' of https://github.com/CHU-TDAP/E-learning-Server-v2 into develop 2015-01-17 03:36:18 +08:00
0fd277cfc6 將陣列回傳(2D)改成1D Array回傳 in DBRecommand.php 2015-01-17 03:36:05 +08:00
047a174f12 Merge branch 'develop' of github.com:CHU-TDAP/E-learning-Server-v2 into develop 2015-01-17 03:31:27 +08:00
c0cd1e8d0c 新增Study\StudyActivity功能: 查詢此標的是否已學過&進出標的 2015-01-17 03:31:16 +08:00
c75ad9a358 Merge branch 'develop' of https://github.com/CHU-TDAP/E-learning-Server-v2 into develop 2015-01-17 02:53:57 +08:00
c414cdcae0 完成DBRecommand和修正Theme、Target並在RecommandPoint新增計算正規化參數的方法 2015-01-17 02:51:29 +08:00
5b7feb1332 進入/離開學習點功能實作 2015-01-16 15:59:35 +08:00
357a7e4262 完成內部函式: 進出學習點 2015-01-16 13:18:58 +08:00
e9736e5ff7 更新資料庫增加欄位: 是否啟用虛擬學習點選項 2015-01-09 17:24:40 +08:00
0fee8efd3d Merge branch 'develop' of github.com:CHU-TDAP/E-learning-Server-v2 into develop 2015-01-09 16:44:21 +08:00
b0e73eab35 更新資料庫增加欄位: 是否啟用虛擬學習點選項 2015-01-09 16:36:59 +08:00
yang
e174ef3605 Fix MySQL連接的Port沒生效 2015-01-07 16:11:18 +08:00
cc02589d2d 完成DBRecommand類別且已測試完成 2015-01-03 05:35:39 +08:00
5d5c2d786c API: 新增查看活動中所有標的資訊的教材路徑 2014-12-29 04:31:54 +08:00
20bbd0c2bc Add Target: 取得教材路徑功能 2014-12-29 04:08:47 +08:00
fb0e41d0c1 Add API: 取得此活動中所有的標的資料 2014-12-29 03:02:20 +08:00
8593d6327f Add 取得主題內所有標的功能 2014-12-29 00:20:29 +08:00
baffbd6dcf 完成queryBelongByWhere方法 2014-12-27 03:09:07 +08:00
0e81623947 Merge branch 'develop' of github.com:CHU-TDAP/E-learning-Server-v2 into develop 2014-12-27 01:28:57 +08:00
d371fa88a2 add RecommandPoint and DBRecommand file 2014-12-27 01:26:01 +08:00
6f030a1b1b Add api: 結束學習活動 2014-12-24 23:27:18 +08:00
d0efd0ea4c Add 查詢學習狀態 & 增加API過期時間 2014-12-13 04:30:34 +08:00
42721448e9 Add 開始進行學習活動(有擴充內部類別) & 更改取得可用學習清單的ID enable_activity 2014-12-13 02:09:59 +08:00
c5105a9f55 Fix DBStudyActivity getEnableActivityByUserId: lock return type to boolean 2014-11-27 02:11:55 +08:00
419ed21ae2 DBStudyActivity getEnableActivityByUserId: Add theme_name, theme_introduction 2014-11-26 22:38:24 +08:00
b86677cb9a api add: login add login_time field 2014-11-25 20:23:27 +08:00
8133620a62 暫時解Bug: remove cryptEncrypt 2014-11-25 19:26:32 +08:00
9cfc498e44 fix Password: no extension error 2014-11-25 19:15:54 +08:00
555b3ebbeb fix Password: no extension error 2014-11-25 19:03:37 +08:00
6915818678 改良密碼驗證: 改成會嘗試所有的加密法 2014-11-23 18:20:14 +08:00
01ddc82f59 先暫時把亂樹產生字串改為不包含標點符號以方便debug 2014-11-23 17:54:37 +08:00
d73f6973ee fix userAdmin lib: create (enable_noAppoint default) & add create user api 2014-11-23 17:39:27 +08:00
b3498e3505 更改資料庫: 將所有timestamp形態欄位改成datetime (為了讓舊版MySQL支援) 2014-11-23 16:23:09 +08:00