Commit Graph

22 Commits

Author SHA1 Message Date
Your Name
8fd32ed502 update to show cohort name on create and cohort name on view all threads, added cohort dictionary to convert ids to names 2013-02-01 13:01:54 -05:00
Your Name
da1660a043 fix get_cohorted_commentables 2013-01-31 17:34:37 -05:00
Your Name
3fa67c1425 allow moderators and students to select cohort on post creation 2013-01-31 17:05:15 -05:00
Your Name
1fc26de945 merge master 2013-01-30 15:19:43 -05:00
Victor Shnayder
734a8bd6e5 make tests pass with cms config as well as lms 2013-01-28 15:07:44 -05:00
Victor Shnayder
46570b01ef refactor tests, add test for is_commentable_cohorted, fix a bug 2013-01-26 13:49:12 -05:00
Victor Shnayder
439acf2df7 Fix docstring and test for get_cohort
Returns None if course isn't cohorted, even if cohorts exist.  Shouldn't happen on prod, but could if cohorting is turned off mid-course.
2013-01-26 13:06:09 -05:00
Victor Shnayder
87e92644b6 Make all tests pass
caveat: with a bit of hackery.  Need to do better testing once things are live.
2013-01-25 16:13:55 -05:00
Victor Shnayder
d453a6136b fix regexp 2013-01-25 13:42:04 -05:00
Victor Shnayder
66934ce220 Address Dave's comments on https://github.com/MITx/mitx/pull/1350 2013-01-25 13:33:19 -05:00
Victor Shnayder
22ccf9c500 Some test cleanups 2013-01-24 17:33:25 -05:00
Victor Shnayder
69711a91ff Fix inline discussion cohorting, debug logging 2013-01-24 16:58:19 -05:00
Victor Shnayder
fb7614a81c oops--fix logging bug 2013-01-24 15:47:41 -05:00
Victor Shnayder
ea3aebdfe5 add logging, explicit check whether course is cohorted 2013-01-24 15:46:22 -05:00
Victor Shnayder
103db8aaf3 add conflict detection--users should be in at most one cohort per course 2013-01-24 15:14:34 -05:00
Victor Shnayder
de02721158 Add removing students from cohorts. 2013-01-24 15:14:33 -05:00
Victor Shnayder
9e84ae14d4 Started integration work with Kevin's cohort changes
- Create new cohorts.py file
- moved code there from models.py
- implemented necessary functions.

Next: testing :)
2013-01-24 15:14:33 -05:00
Victor Shnayder
7bdb5c23e1 Allow listing of users in cohorts and adding users
- still needs style, more features, but basic functionality works
2013-01-24 15:12:53 -05:00
Victor Shnayder
bab3b0c39e Add initial set of views for managing cohorts
- lets user see and add cohorts
- needs styling
- needs to allow them to actually manage membership!
2013-01-24 15:12:53 -05:00
Victor Shnayder
3488083e6b Add a get_course_cohorts function and test 2013-01-24 15:12:52 -05:00
Victor Shnayder
1b9a3557eb get_cohort() function and test 2013-01-24 15:12:52 -05:00
Victor Shnayder
0e78eaaf80 Add a course_groups djangoapp with a CourseUserGroup model. 2013-01-24 15:12:52 -05:00